X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftiming_panel.cc;h=25cf2b5248ae46ccdfeda0ff5ce19c9e4b4a53dc;hb=94056bf7f8fdef32da3cd78eff68d58560b4e6be;hp=18a07add48838792b4ee20679b0bbe5a73a4c404;hpb=775ae0e37bbec115d742feade0adc614a9a2301c;p=dcpomatic.git diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc index 18a07add4..25cf2b524 100644 --- a/src/wx/timing_panel.cc +++ b/src/wx/timing_panel.cc @@ -1,19 +1,20 @@ /* Copyright (C) 2012-2016 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ @@ -22,13 +23,14 @@ #include "film_viewer.h" #include "timecode.h" #include "content_panel.h" +#include "move_to_dialog.h" #include "lib/content.h" #include "lib/image_content.h" -#include "lib/raw_convert.h" #include "lib/subtitle_content.h" #include "lib/dcp_subtitle_content.h" #include "lib/audio_content.h" #include "lib/text_subtitle_content.h" +#include "lib/locale_convert.h" #include "lib/video_content.h" #include #include @@ -87,6 +89,9 @@ TimingPanel::TimingPanel (ContentPanel* p, FilmViewer* viewer) add_label_to_sizer (grid, this, _("Position"), true); _position = new Timecode (this); grid->Add (_position); + _move_to_start_of_reel = new wxButton (this, wxID_ANY, _("Move to start of reel")); + grid->AddSpacer (0); + grid->Add (_move_to_start_of_reel); add_label_to_sizer (grid, this, _("Full length"), true); _full_length = new Timecode (this); grid->Add (_full_length); @@ -123,7 +128,7 @@ TimingPanel::TimingPanel (ContentPanel* p, FilmViewer* viewer) * http://trac.wxwidgets.org/ticket/13389 */ - wxString in = _("Only change this if it the content's frame rate has been read incorrectly."); + wxString in = _("Only change this if the content's frame rate has been read incorrectly."); wxString out; int const width = 20; int current = 0; @@ -141,7 +146,11 @@ TimingPanel::TimingPanel (ContentPanel* p, FilmViewer* viewer) t->SetLabelMarkup (out); grid->Add (t, 0, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT, 6); + /* Completely speculative fix for #891 */ + grid->Layout (); + _position->Changed.connect (boost::bind (&TimingPanel::position_changed, this)); + _move_to_start_of_reel->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&TimingPanel::move_to_start_of_reel_clicked, this)); _full_length->Changed.connect (boost::bind (&TimingPanel::full_length_changed, this)); _trim_start->Changed.connect (boost::bind (&TimingPanel::trim_start_changed, this)); _trim_start_to_playhead->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&TimingPanel::trim_start_to_playhead_clicked, this)); @@ -210,10 +219,8 @@ TimingPanel::film_content_changed (int property) } else if ( property == ContentProperty::LENGTH || - property == VideoContentProperty::VIDEO_FRAME_RATE || - property == VideoContentProperty::VIDEO_FRAME_TYPE || - property == AudioContentProperty::AUDIO_VIDEO_FRAME_RATE || - property == SubtitleContentProperty::SUBTITLE_VIDEO_FRAME_RATE + property == ContentProperty::VIDEO_FRAME_RATE || + property == VideoContentProperty::FRAME_TYPE ) { update_full_length (); @@ -249,49 +256,38 @@ TimingPanel::film_content_changed (int property) property == ContentProperty::LENGTH || property == ContentProperty::TRIM_START || property == ContentProperty::TRIM_END || - property == VideoContentProperty::VIDEO_FRAME_RATE || - property == VideoContentProperty::VIDEO_FRAME_TYPE || - property == AudioContentProperty::AUDIO_VIDEO_FRAME_RATE || - property == SubtitleContentProperty::SUBTITLE_VIDEO_FRAME_RATE + property == ContentProperty::VIDEO_FRAME_RATE || + property == VideoContentProperty::FRAME_TYPE ) { update_play_length (); } - if (property == VideoContentProperty::VIDEO_FRAME_RATE || property == SubtitleContentProperty::SUBTITLE_VIDEO_FRAME_RATE) { + if (property == ContentProperty::VIDEO_FRAME_RATE) { set check_vc; - shared_ptr vc; + shared_ptr content; int count_ac = 0; - shared_ptr ac; int count_sc = 0; - shared_ptr sc; BOOST_FOREACH (shared_ptr i, _parent->selected ()) { - if (i->video) { - check_vc.insert (i->video->video_frame_rate ()); - vc = i; + if (i->video && i->video_frame_rate()) { + check_vc.insert (i->video_frame_rate().get()); + content = i; } - shared_ptr at = dynamic_pointer_cast (i); - if (i->audio) { + if (i->audio && i->video_frame_rate()) { ++count_ac; - ac = at; + content = i; } - if (i->subtitle) { + if (i->subtitle && i->video_frame_rate()) { ++count_sc; - sc = i; + content = i; } } - bool const single_frame_image_content = vc && dynamic_pointer_cast (vc) && vc->number_of_paths() == 1; + bool const single_frame_image_content = content && dynamic_pointer_cast (content) && content->number_of_paths() == 1; if ((check_vc.size() == 1 || count_ac == 1 || count_sc == 1) && !single_frame_image_content) { - if (vc) { - checked_set (_video_frame_rate, raw_convert (vc->video->video_frame_rate (), 5)); - } else if (ac) { - checked_set (_video_frame_rate, raw_convert (ac->audio->audio_video_frame_rate (), 5)); - } else if (sc) { - checked_set (_video_frame_rate, raw_convert (sc->subtitle_video_frame_rate (), 5)); - } + checked_set (_video_frame_rate, locale_convert (content->video_frame_rate().get(), 5)); _video_frame_rate->Enable (true); } else { checked_set (_video_frame_rate, wxT ("")); @@ -328,7 +324,7 @@ TimingPanel::full_length_changed () shared_ptr ic = dynamic_pointer_cast (i); if (ic && ic->still ()) { int const vfr = _parent->film()->video_frame_rate (); - ic->video->set_video_length (_full_length->get (vfr).frames_round (vfr)); + ic->video->set_length (_full_length->get (vfr).frames_round (vfr)); } } } @@ -402,24 +398,12 @@ TimingPanel::video_frame_rate_changed () void TimingPanel::set_video_frame_rate () { + double const fr = locale_convert (wx_to_std (_video_frame_rate->GetValue ())); BOOST_FOREACH (shared_ptr i, _parent->selected ()) { - shared_ptr vc = dynamic_pointer_cast (i); - shared_ptr ac = dynamic_pointer_cast (i); - shared_ptr dsc = dynamic_pointer_cast (i); - shared_ptr tsc = dynamic_pointer_cast (i); - double const fr = raw_convert (wx_to_std (_video_frame_rate->GetValue ())); - if (vc) { - vc->set_video_frame_rate (fr); - } else if (ac) { - /* Audio but not video, i.e. SndfileContent */ - ac->set_audio_video_frame_rate (fr); - } else if (dsc) { - dsc->set_subtitle_video_frame_rate (fr); - } else if (tsc) { - tsc->set_subtitle_video_frame_rate (fr); - } - _set_video_frame_rate->Enable (false); + i->set_video_frame_rate (fr); } + + _set_video_frame_rate->Enable (false); } void @@ -431,9 +415,7 @@ TimingPanel::content_selection_changed () film_content_changed (ContentProperty::LENGTH); film_content_changed (ContentProperty::TRIM_START); film_content_changed (ContentProperty::TRIM_END); - film_content_changed (VideoContentProperty::VIDEO_FRAME_RATE); - film_content_changed (SubtitleContentProperty::SUBTITLE_VIDEO_FRAME_RATE); - film_content_changed (AudioContentProperty::AUDIO_VIDEO_FRAME_RATE); + film_content_changed (ContentProperty::VIDEO_FRAME_RATE); } void @@ -486,6 +468,7 @@ TimingPanel::setup_sensitivity () bool const e = !_parent->selected().empty (); _position->Enable (e); + _move_to_start_of_reel->Enable (e); _full_length->Enable (e); _trim_start->Enable (e); _trim_end->Enable (e); @@ -503,3 +486,30 @@ TimingPanel::setup_sensitivity () _trim_start_to_playhead->Enable (any_over_ph); _trim_end_to_playhead->Enable (any_over_ph); } + +void +TimingPanel::move_to_start_of_reel_clicked () +{ + /* Find common position of all selected content, if it exists */ + + optional position; + BOOST_FOREACH (shared_ptr i, _parent->selected ()) { + if (!position) { + position = i->position(); + } else { + if (position.get() != i->position()) { + position.reset (); + break; + } + } + } + + MoveToDialog* d = new MoveToDialog (this, position, _parent->film()); + + if (d->ShowModal() == wxID_OK) { + BOOST_FOREACH (shared_ptr i, _parent->selected ()) { + i->set_position (d->position ()); + } + } + d->Destroy (); +}