projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
2.8 fix.
[dcpomatic.git]
/
src
/
wx
/
film_viewer.cc
diff --git
a/src/wx/film_viewer.cc
b/src/wx/film_viewer.cc
index 96656ce097891ef8d8f6d54aaa59c518e52c9118..a40a3c78df34b2892b5de52bed3e40aab28f888d 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)
@@
-101,7
+101,14
@@
FilmViewer::film_changed (Film::Property p)
o.decode_audio = false;
o.decode_subtitles = true;
o.video_sync = false;
o.decode_audio = false;
o.decode_subtitles = true;
o.video_sync = false;
- _decoders = decoder_factory (_film, o);
+
+ try {
+ _decoders = decoder_factory (_film, o);
+ } catch (StringError& e) {
+ error_dialog (this, wxString::Format (_("Could not open content file (%s)"), e.what()));
+ return;
+ }
+
if (_decoders.video == 0) {
break;
}
if (_decoders.video == 0) {
break;
}
@@
-181,7
+188,7
@@
FilmViewer::timer (wxTimerEvent &)
get_frame ();
if (_film->length()) {
get_frame ();
if (_film->length()) {
- int const new_slider_position = 4096 * _decoders.video->last_source_time() / (_film->length().get() / _film->
frames_per_second
());
+ 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);
}
if (new_slider_position != _slider->GetValue()) {
_slider->SetValue (new_slider_position);
}
@@
-230,7
+237,7
@@
FilmViewer::slider_moved (wxScrollEvent &)
return;
}
return;
}
- if (_decoders.video->seek (_slider->GetValue() * _film->length().get() / (4096 * _film->
frames_per_second
()))) {
+ if (_decoders.video->seek (_slider->GetValue() * _film->length().get() / (4096 * _film->
source_frame_rate
()))) {
return;
}
return;
}
@@
-362,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 ();
}