Attempted Windows GL fixes.

[dcpomatic.git] / src / wx / timing_panel.cc

diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc
index ebdd99487bff709b9f58e2999e1c40ecfa143068..06d655b6bde6138a9411f3616e01828b3a9cacbd 100644 (file)
--- a/src/wx/timing_panel.cc
+++ b/src/wx/timing_panel.cc
@@ -25,6 +25,7 @@
 #include "content_panel.h"
 #include "move_to_dialog.h"
 #include "static_text.h"
+#include "dcpomatic_button.h"
 #include "lib/content.h"
 #include "lib/image_content.h"
 #include "lib/text_content.h"
@@ -32,6 +33,8 @@
 #include "lib/audio_content.h"
 #include "lib/string_text_file_content.h"
 #include "lib/video_content.h"
+#include "lib/dcp_content.h"
+#include "lib/ffmpeg_content.h"
 #include <dcp/locale_convert.h>
 #include <boost/foreach.hpp>
 #include <set>
@@ -45,6 +48,7 @@ using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
 using boost::optional;
 using dcp::locale_convert;
+using namespace dcpomatic;
 
 TimingPanel::TimingPanel (ContentPanel* p, weak_ptr<FilmViewer> viewer)
        /* horrid hack for apparent lack of context support with wxWidgets i18n code */
@@ -82,21 +86,21 @@ TimingPanel::TimingPanel (ContentPanel* p, weak_ptr<FilmViewer> viewer)
 
        _position_label = create_label (this, _("Position"), true);
        _position = new Timecode<DCPTime> (this);
-       _move_to_start_of_reel = new wxButton (this, wxID_ANY, _("Move to start of reel"));
+       _move_to_start_of_reel = new Button (this, _("Move to start of reel"));
        _full_length_label = create_label (this, _("Full length"), true);
        _full_length = new Timecode<DCPTime> (this);
        _trim_start_label = create_label (this, _("Trim from start"), true);
        _trim_start = new Timecode<ContentTime> (this);
-       _trim_start_to_playhead = new wxButton (this, wxID_ANY, _("Trim up to current position"));
+       _trim_start_to_playhead = new Button (this, _("Trim up to current position"));
        _trim_end_label = create_label (this, _("Trim from end"), true);
        _trim_end = new Timecode<ContentTime> (this);
-       _trim_end_to_playhead = new wxButton (this, wxID_ANY, _("Trim after current position"));
+       _trim_end_to_playhead = new Button (this, _("Trim after current position"));
        _play_length_label = create_label (this, _("Play length"), true);
        _play_length = new Timecode<DCPTime> (this);
 
        _video_frame_rate_label = create_label (this, _("Video frame rate"), true);
        _video_frame_rate = new wxTextCtrl (this, wxID_ANY);
-       _set_video_frame_rate = new wxButton (this, wxID_ANY, _("Set"));
+       _set_video_frame_rate = new Button (this, _("Set"));
        _set_video_frame_rate->Enable (false);
 
        /* We can't use Wrap() here as it doesn't work with markup:
@@ -168,12 +172,6 @@ TimingPanel::add_to_grid ()
        _move_to_start_of_reel->Show (full);
        _full_length_label->Show (full);
        _full_length->Show (full);
-       _trim_start_label->Show (full);
-       _trim_start->Show (full);
-       _trim_start_to_playhead->Show (full);
-       _trim_end_label->Show (full);
-       _trim_end->Show (full);
-       _trim_end_to_playhead->Show (full);
        _play_length_label->Show (full);
        _play_length->Show (full);
        _video_frame_rate_label->Show (full);
@@ -188,21 +186,23 @@ TimingPanel::add_to_grid ()
                add_label_to_sizer (_grid, _full_length_label, true, wxGBPosition(r, 0));
                _grid->Add (_full_length, wxGBPosition(r, 1));
                ++r;
+       }
 
-               add_label_to_sizer (_grid, _trim_start_label, true, wxGBPosition(r, 0));
-               _grid->Add (_trim_start, wxGBPosition(r, 1));
-               ++r;
+       add_label_to_sizer (_grid, _trim_start_label, true, wxGBPosition(r, 0));
+       _grid->Add (_trim_start, wxGBPosition(r, 1));
+       ++r;
 
-               _grid->Add (_trim_start_to_playhead, wxGBPosition(r, 1));
-               ++r;
+       _grid->Add (_trim_start_to_playhead, wxGBPosition(r, 1));
+       ++r;
 
-               add_label_to_sizer (_grid, _trim_end_label, true, wxGBPosition(r, 0));
-               _grid->Add (_trim_end, wxGBPosition(r, 1));
-               ++r;
+       add_label_to_sizer (_grid, _trim_end_label, true, wxGBPosition(r, 0));
+       _grid->Add (_trim_end, wxGBPosition(r, 1));
+       ++r;
 
-               _grid->Add (_trim_end_to_playhead, wxGBPosition(r, 1));
-               ++r;
+       _grid->Add (_trim_end_to_playhead, wxGBPosition(r, 1));
+       ++r;
 
+       if (full) {
                add_label_to_sizer (_grid, _play_length_label, true, wxGBPosition(r, 0));
                _grid->Add (_play_length, wxGBPosition(r, 1));
                ++r;
@@ -466,7 +466,22 @@ TimingPanel::play_length_changed ()
 void
 TimingPanel::video_frame_rate_changed ()
 {
-       _set_video_frame_rate->Enable (true);
+       bool enable = true;
+       if (_video_frame_rate->GetValue() == wxT("")) {
+               /* No frame rate has been entered; if the user clicks "set" now it would unset the video
+                  frame rate in the selected content.  This can't be allowed for some content types.
+               */
+               BOOST_FOREACH (shared_ptr<Content> i, _parent->selected()) {
+                       if (
+                               dynamic_pointer_cast<DCPContent>(i) ||
+                               dynamic_pointer_cast<FFmpegContent>(i)
+                               ) {
+                               enable = false;
+                       }
+               }
+       }
+
+       _set_video_frame_rate->Enable (enable);
 }
 
 void