/*
- Copyright (C) 2018 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2018-2019 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
#include "playhead_to_timecode_dialog.h"
#include "playhead_to_frame_dialog.h"
#include "content_view.h"
+#include "static_text.h"
+#include "check_box.h"
+#include "dcpomatic_button.h"
#include "lib/job_manager.h"
#include "lib/player_video.h"
#include "lib/dcp_content.h"
using boost::shared_ptr;
using boost::weak_ptr;
using boost::dynamic_pointer_cast;
+using namespace dcpomatic;
Controls::Controls (wxWindow* parent, shared_ptr<FilmViewer> viewer, bool editor_controls)
: wxPanel (parent)
, _slider (new wxSlider (this, wxID_ANY, 0, 0, 4096))
, _viewer (viewer)
, _slider_being_moved (false)
- , _was_running_before_slider (false)
, _outline_content (0)
, _eye (0)
, _jump_to_selected (0)
- , _rewind_button (new wxButton (this, wxID_ANY, wxT("|<")))
- , _back_button (new wxButton (this, wxID_ANY, wxT("<")))
- , _forward_button (new wxButton (this, wxID_ANY, wxT(">")))
- , _frame_number (new wxStaticText (this, wxID_ANY, wxT("")))
- , _timecode (new wxStaticText (this, wxID_ANY, wxT("")))
+ , _rewind_button (new Button (this, wxT("|<")))
+ , _back_button (new Button (this, wxT("<")))
+ , _forward_button (new Button (this, wxT(">")))
+ , _frame_number (new StaticText (this, wxT("")))
+ , _timecode (new StaticText (this, wxT("")))
+ , _timer (this)
{
_v_sizer = new wxBoxSizer (wxVERTICAL);
SetSizer (_v_sizer);
wxBoxSizer* view_options = new wxBoxSizer (wxHORIZONTAL);
if (editor_controls) {
- _outline_content = new wxCheckBox (this, wxID_ANY, _("Outline content"));
+ _outline_content = new CheckBox (this, _("Outline content"));
view_options->Add (_outline_content, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_GAP);
_eye = new wxChoice (this, wxID_ANY);
_eye->Append (_("Left"));
_eye->Append (_("Right"));
_eye->SetSelection (0);
view_options->Add (_eye, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_GAP);
- _jump_to_selected = new wxCheckBox (this, wxID_ANY, _("Jump to selected content"));
+ _jump_to_selected = new CheckBox (this, _("Jump to selected content"));
view_options->Add (_jump_to_selected, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_GAP);
}
time_sizer->Add (_timecode, 0, wxEXPAND);
h_sizer->Add (_rewind_button, 0, wxALL, 2);
- h_sizer->Add (_back_button, 0, wxALL, 2);
h_sizer->Add (time_sizer, 0, wxEXPAND);
+ h_sizer->Add (_back_button, 0, wxALL, 2);
h_sizer->Add (_forward_button, 0, wxALL, 2);
_button_sizer = new wxBoxSizer (wxHORIZONTAL);
_slider->Bind (wxEVT_SCROLL_THUMBTRACK, boost::bind(&Controls::slider_moved, this, false));
_slider->Bind (wxEVT_SCROLL_PAGEUP, boost::bind(&Controls::slider_moved, this, true));
_slider->Bind (wxEVT_SCROLL_PAGEDOWN, boost::bind(&Controls::slider_moved, this, true));
- _slider->Bind (wxEVT_SCROLL_CHANGED, boost::bind(&Controls::slider_released, this));
+ _slider->Bind (wxEVT_SCROLL_THUMBRELEASE, boost::bind(&Controls::slider_released, this));
_rewind_button->Bind (wxEVT_LEFT_DOWN, boost::bind(&Controls::rewind_clicked, this, _1));
_back_button->Bind (wxEVT_LEFT_DOWN, boost::bind(&Controls::back_clicked, this, _1));
_forward_button->Bind (wxEVT_LEFT_DOWN, boost::bind(&Controls::forward_clicked, this, _1));
_jump_to_selected->SetValue (Config::instance()->jump_to_selected ());
}
- _viewer->PositionChanged.connect (boost::bind(&Controls::position_changed, this));
_viewer->Started.connect (boost::bind(&Controls::started, this));
_viewer->Stopped.connect (boost::bind(&Controls::stopped, this));
+ Bind (wxEVT_TIMER, boost::bind(&Controls::update_position, this));
+ _timer.Start (80, wxTIMER_CONTINUOUS);
+
set_film (_viewer->film());
setup_sensitivity ();
}
void
-Controls::position_changed ()
+Controls::update_position ()
{
- if (!_slider_being_moved) {
+ if (!_slider_being_moved && !_viewer->pending_idle_get()) {
update_position_label ();
update_position_slider ();
}
if (!page && !_slider_being_moved) {
/* This is the first event of a drag; stop playback for the duration of the drag */
- _was_running_before_slider = _viewer->stop ();
+ _viewer->suspend ();
_slider_being_moved = true;
}
DCPTime t (_slider->GetValue() * _film->length().get() / 4096);
t = t.round (_film->video_frame_rate());
- /* Ensure that we hit the end of the film at the end of the slider */
+ /* Ensure that we hit the end of the film at the end of the slider. In particular, we
+ need to do an accurate seek in case there isn't a keyframe near the end.
+ */
+ bool accurate = false;
if (t >= _film->length ()) {
t = _film->length() - _viewer->one_video_frame();
+ accurate = true;
}
- _viewer->seek (t, false);
+ _viewer->seek (t, accurate);
update_position_label ();
+
+ log (
+ wxString::Format(
+ "playback-seeked %s", t.timecode(_film->video_frame_rate()).c_str()
+ )
+ );
}
void
Controls::slider_released ()
{
- if (_was_running_before_slider) {
- /* Restart after a drag */
- _viewer->start ();
- }
+ /* Restart after a drag */
+ _viewer->resume ();
_slider_being_moved = false;
}
void
Controls::timecode_clicked ()
{
- PlayheadToTimecodeDialog* dialog = new PlayheadToTimecodeDialog (this, _film->video_frame_rate ());
+ PlayheadToTimecodeDialog* dialog = new PlayheadToTimecodeDialog (this, _viewer->position(), _film->video_frame_rate());
if (dialog->ShowModal() == wxID_OK) {
_viewer->seek (dialog->get(), true);
}
void
Controls::frame_number_clicked ()
{
- PlayheadToFrameDialog* dialog = new PlayheadToFrameDialog (this, _film->video_frame_rate ());
+ PlayheadToFrameDialog* dialog = new PlayheadToFrameDialog (this, _viewer->position(), _film->video_frame_rate());
if (dialog->ShowModal() == wxID_OK) {
_viewer->seek (dialog->get(), true);
}
_film = film;
+ if (_film) {
+ _film_change_connection = _film->Change.connect (boost::bind(&Controls::film_change, this, _1, _2));
+ }
+
setup_sensitivity ();
update_position_slider ();
{
return _film;
}
+
+void
+Controls::film_change (ChangeType type, Film::Property p)
+{
+ if (type == CHANGE_TYPE_DONE) {
+ if (p == Film::CONTENT) {
+ setup_sensitivity ();
+ update_position_label ();
+ update_position_slider ();
+ } else if (p == Film::THREE_D) {
+ setup_sensitivity ();
+ }
+ }
+}
+
+void
+Controls::seek (int slider)
+{
+ _slider->SetValue (slider);
+ slider_moved (false);
+ slider_released ();
+}