projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Runs.
[dcpomatic.git]
/
src
/
wx
/
film_viewer.cc
diff --git
a/src/wx/film_viewer.cc
b/src/wx/film_viewer.cc
index 6d46b2c2119f3fd19f0c48a4c60908ea5be0c813..1e2a74be9727328d4660810251c21723c8f585b3 100644
(file)
--- a/
src/wx/film_viewer.cc
+++ b/
src/wx/film_viewer.cc
@@
-51,7
+51,7
@@
FilmViewer::FilmViewer (shared_ptr<Film> f, wxWindow* p)
: wxPanel (p)
, _panel (new wxPanel (this))
, _slider (new wxSlider (this, wxID_ANY, 0, 0, 4096))
: wxPanel (p)
, _panel (new wxPanel (this))
, _slider (new wxSlider (this, wxID_ANY, 0, 0, 4096))
- , _play_button (new wxToggleButton (this, wxID_ANY,
wxT
("Play")))
+ , _play_button (new wxToggleButton (this, wxID_ANY,
_
("Play")))
, _display_frame_x (0)
, _got_frame (false)
, _clear_required (false)
, _display_frame_x (0)
, _got_frame (false)
, _clear_required (false)
@@
-105,7
+105,7
@@
FilmViewer::film_changed (Film::Property p)
try {
_decoders = decoder_factory (_film, o);
} catch (StringError& e) {
try {
_decoders = decoder_factory (_film, o);
} catch (StringError& e) {
- error_dialog (this, wxString::Format (_("Could not open content file (%s)"),
e.what
()));
+ error_dialog (this, wxString::Format (_("Could not open content file (%s)"),
std_to_wx(e.what()).data
()));
return;
}
return;
}
@@
-114,12
+114,10
@@
FilmViewer::film_changed (Film::Property p)
}
_decoders.video->Video.connect (bind (&FilmViewer::process_video, this, _1, _2, _3));
_decoders.video->OutputChanged.connect (boost::bind (&FilmViewer::decoder_changed, this));
}
_decoders.video->Video.connect (bind (&FilmViewer::process_video, this, _1, _2, _3));
_decoders.video->OutputChanged.connect (boost::bind (&FilmViewer::decoder_changed, this));
-
_decoders.video->set_subtitle_stream (_film->subtitle_stream());
+
//
_decoders.video->set_subtitle_stream (_film->subtitle_stream());
calculate_sizes ();
get_frame ();
_panel->Refresh ();
calculate_sizes ();
get_frame ();
_panel->Refresh ();
- _slider->Show (_film->content_type() == VIDEO);
- _play_button->Show (_film->content_type() == VIDEO);
_v_sizer->Layout ();
break;
}
_v_sizer->Layout ();
break;
}
@@
-132,7
+130,7
@@
FilmViewer::film_changed (Film::Property p)
break;
case Film::SUBTITLE_STREAM:
if (_decoders.video) {
break;
case Film::SUBTITLE_STREAM:
if (_decoders.video) {
-
_decoders.video->set_subtitle_stream (_film->subtitle_stream ());
+
//
_decoders.video->set_subtitle_stream (_film->subtitle_stream ());
}
break;
default:
}
break;
default:
@@
-187,12
+185,12
@@
FilmViewer::timer (wxTimerEvent &)
get_frame ();
get_frame ();
-
if (_film->length()) {
-
int const new_slider_position = 4096 * _decoders.video->last_source_time() / (_film->length().get() / _film->frames_per_second
());
-
if (new_slider_position != _slider->GetValue()) {
-
_slider->SetValue (new_slider_position);
-
}
-
}
+
//
if (_film->length()) {
+
// int const new_slider_position = 4096 * _decoders.video->last_source_time() / (_film->length().get() / _film->source_frame_rate
());
+
//
if (new_slider_position != _slider->GetValue()) {
+
//
_slider->SetValue (new_slider_position);
+
//
}
+
//
}
}
}
@@
-233,13
+231,13
@@
FilmViewer::paint_panel (wxPaintEvent &)
void
FilmViewer::slider_moved (wxScrollEvent &)
{
void
FilmViewer::slider_moved (wxScrollEvent &)
{
-
if (!_film || !_film->length() || !_decoders.video) {
-
return;
-
}
+
//
if (!_film || !_film->length() || !_decoders.video) {
+
//
return;
+
//
}
-
if (_decoders.video->seek (_slider->GetValue() * _film->length().get() / (4096 * _film->frames_per_second
()))) {
-
return;
-
}
+
// if (_decoders.video->seek (_slider->GetValue() * _film->length().get() / (4096 * _film->source_frame_rate
()))) {
+
//
return;
+
//
}
get_frame ();
_panel->Refresh ();
get_frame ();
_panel->Refresh ();
@@
-294,6
+292,7
@@
FilmViewer::raw_to_display ()
_clear_required = true;
}
_clear_required = true;
}
+#if 0
if (_raw_sub) {
/* Our output is already cropped by the decoder, so we need to account for that
if (_raw_sub) {
/* Our output is already cropped by the decoder, so we need to account for that
@@
-314,6
+313,7
@@
FilmViewer::raw_to_display ()
} else {
_display_sub.reset ();
}
} else {
_display_sub.reset ();
}
+#endif
}
void
}
void
@@
-342,9
+342,9
@@
FilmViewer::calculate_sizes ()
of our _display_frame.
*/
_display_frame_x = 0;
of our _display_frame.
*/
_display_frame_x = 0;
-
if (format) {
-
_display_frame_x = static_cast<float> (format->dcp_padding (_film)) * _out_size.width / format->dcp_size().width;
-
}
+
//
if (format) {
+
//
_display_frame_x = static_cast<float> (format->dcp_padding (_film)) * _out_size.width / format->dcp_size().width;
+
//
}
_film_size = _out_size;
_film_size.width -= _display_frame_x * 2;
_film_size = _out_size;
_film_size.width -= _display_frame_x * 2;
@@
-369,7
+369,7
@@
FilmViewer::check_play_state ()
}
if (_play_button->GetValue()) {
}
if (_play_button->GetValue()) {
-
_timer.Start (1000 / _film->frames_per_second
());
+
// _timer.Start (1000 / _film->source_frame_rate
());
} else {
_timer.Stop ();
}
} else {
_timer.Stop ();
}
@@
-411,7
+411,7
@@
FilmViewer::get_frame ()
} catch (DecodeError& e) {
_play_button->SetValue (false);
check_play_state ();
} catch (DecodeError& e) {
_play_button->SetValue (false);
check_play_state ();
- error_dialog (this, wxString::Format (_("Could not decode video for view (%s)"),
e.what
()));
+ error_dialog (this, wxString::Format (_("Could not decode video for view (%s)"),
std_to_wx(e.what()).data
()));
}
}
}
}