Merge master.

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

diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc
index f33e052a1ad41dad2f2adea9b0b7aa39f7823ceb..9a4551193e9672dfe2ed4468fe01678f5af556c5 100644 (file)
--- a/src/wx/timing_panel.cc
+++ b/src/wx/timing_panel.cc
@@ -19,7 +19,6 @@
 
 #include "lib/content.h"
 #include "lib/image_content.h"
-#include "lib/sndfile_content.h"
 #include "timing_panel.h"
 #include "wx_util.h"
 #include "timecode.h"
@@ -32,7 +31,8 @@ using boost::dynamic_pointer_cast;
 using boost::lexical_cast;
 
 TimingPanel::TimingPanel (FilmEditor* e)
-       : FilmEditorPanel (e, _("Timing"))
+       /* horrid hack for apparent lack of context support with wxWidgets i18n code */
+       : FilmEditorPanel (e, S_("Timing|Timing"))
 {
        wxFlexGridSizer* grid = new wxFlexGridSizer (2, 4, 4);
        _sizer->Add (grid, 0, wxALL, 8);
@@ -134,10 +134,9 @@ TimingPanel::film_content_changed (int property)
        }
 
        shared_ptr<ImageContent> ic = dynamic_pointer_cast<ImageContent> (content);
-       shared_ptr<SndfileContent> sc = dynamic_pointer_cast<SndfileContent> (content);
        _full_length->set_editable (ic && ic->still ());
        _play_length->set_editable (!ic || !ic->still ());
-       _video_frame_rate->Enable ((ic && !ic->still ()) || sc);
+       _video_frame_rate->Enable (ic && !ic->still ());
        _set_video_frame_rate->Enable (false);
 }