diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-06-12 22:27:11 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-06-12 22:27:11 +0100 |
| commit | 4e411ea97b4dab8a5fa282d1d4cf7971ef1e24ad (patch) | |
| tree | 06db8731e77dfeaf537f2814d73c7a599035b95c /src/wx/timing_panel.cc | |
| parent | 8102046b2f29e0c7b234c29bf204b056cb30e64f (diff) | |
| parent | 66162217d93baa3fd50594bb013a44bbd779d02a (diff) | |
Merge master.
Diffstat (limited to 'src/wx/timing_panel.cc')
| -rw-r--r-- | src/wx/timing_panel.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc index f33e052a1..cc0639b4c 100644 --- 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" @@ -134,10 +133,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); } |