using boost::shared_ptr;
using boost::dynamic_pointer_cast;
using boost::weak_ptr;
+using boost::optional;
using dcp::Size;
FilmViewer::FilmViewer (wxWindow* p)
}
try {
- _player.reset (new Player (_film));
+ _player.reset (new Player (_film, _film->playlist ()));
} catch (bad_alloc) {
error_dialog (this, _("There is not enough free memory to do that."));
_film.reset ();
in the preview.
*/
_player->set_always_burn_subtitles (true);
+ _player->set_ignore_audio ();
_film_connection = _film->Changed.connect (boost::bind (&FilmViewer::film_changed, this, _1));
_player_connection = _player->Changed.connect (boost::bind (&FilmViewer::player_changed, this, _1));
calculate_sizes ();
- get (_position, _last_get_accurate);
+ refresh ();
setup_sensitivity ();
}
if (!pvf.empty ()) {
try {
_frame = pvf.front()->image (PIX_FMT_RGB24, boost::bind (&Log::dcp_log, _film->log().get(), _1, _2));
+ ImageChanged (pvf.front ());
dcp::YUVToRGB yuv_to_rgb = dcp::YUV_TO_RGB_REC601;
if (pvf.front()->colour_conversion()) {
_panel_size.height = ev.GetSize().GetHeight();
calculate_sizes ();
- get (_position, _last_get_accurate);
+ refresh ();
update_position_label ();
update_position_slider ();
}
if (panel_ratio < film_ratio) {
/* panel is less widscreen than the film; clamp width */
_out_size.width = _panel_size.width;
- _out_size.height = rint (_out_size.width / film_ratio);
+ _out_size.height = lrintf (_out_size.width / film_ratio);
} else {
/* panel is more widescreen than the film; clamp height */
_out_size.height = _panel_size.height;
- _out_size.width = rint (_out_size.height * film_ratio);
+ _out_size.width = lrintf (_out_size.height * film_ratio);
}
/* Catch silly values */
double const fps = _film->video_frame_rate ();
/* Count frame number from 1 ... not sure if this is the best idea */
- _frame_number->SetLabel (wxString::Format (wxT("%d"), int (rint (_position.seconds() * fps)) + 1));
+ _frame_number->SetLabel (wxString::Format (wxT("%ld"), lrint (_position.seconds() * fps) + 1));
_timecode->SetLabel (time_to_timecode (_position, fps));
}
void
-FilmViewer::active_jobs_changed (bool a)
+FilmViewer::active_jobs_changed (optional<string> j)
{
- if (a) {
- list<shared_ptr<Job> > jobs = JobManager::instance()->get ();
- list<shared_ptr<Job> >::iterator i = jobs.begin ();
- while (i != jobs.end() && boost::dynamic_pointer_cast<ExamineContentJob> (*i) == 0) {
- ++i;
- }
-
- if (i == jobs.end() || (*i)->finished()) {
- /* no examine content job running, so we're ok to use the viewer */
- a = false;
- }
- }
-
- _slider->Enable (!a);
- _play_button->Enable (!a);
+ /* examine content is the only job which stops the viewer working */
+ bool const a = !j || *j != "examine_content";
+ _slider->Enable (a);
+ _play_button->Enable (a);
}
void
void
FilmViewer::forward_clicked ()
{
- get (_position + DCPTime::from_frames (1, _film->video_frame_rate ()), true);
+ DCPTime p = _position + DCPTime::from_frames (1, _film->video_frame_rate ());
+ if (p >= _film->length ()) {
+ p = _position;
+ }
+
+ get (p, true);
update_position_label ();
update_position_slider ();
}
}
calculate_sizes ();
- get (_position, _last_get_accurate);
+ refresh ();
update_position_label ();
update_position_slider ();
}
setup_sensitivity ();
}
}
+
+/** Re-get the current frame */
+void
+FilmViewer::refresh ()
+{
+ get (_position, _last_get_accurate);
+}