Interface levels in audio tab.

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

diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc
index 653e4466955e55e880683cb054ee2daaa84afad7..5a69fa6864a0333c842af1430448acfa4490d2ab 100644 (file)
--- a/src/wx/timing_panel.cc
+++ b/src/wx/timing_panel.cc
@@ -26,10 +26,10 @@
 #include "move_to_dialog.h"
 #include "lib/content.h"
 #include "lib/image_content.h"
-#include "lib/subtitle_content.h"
+#include "lib/text_content.h"
 #include "lib/dcp_subtitle_content.h"
 #include "lib/audio_content.h"
-#include "lib/text_subtitle_content.h"
+#include "lib/string_text_file_content.h"
 #include "lib/video_content.h"
 #include <dcp/locale_convert.h>
 #include <boost/foreach.hpp>
@@ -170,6 +170,12 @@ TimingPanel::TimingPanel (ContentPanel* p, FilmViewer* viewer)
        setup_sensitivity ();
 }
 
+void
+TimingPanel::add_to_grid ()
+{
+
+}
+
 void
 TimingPanel::update_full_length ()
 {
@@ -282,7 +288,7 @@ TimingPanel::film_content_changed (int property)
                                ++count_ac;
                                content = i;
                        }
-                       if (i->subtitle && i->video_frame_rate()) {
+                       if (!i->text.empty() && i->video_frame_rate()) {
                                ++count_sc;
                                content = i;
                        }
@@ -395,7 +401,7 @@ TimingPanel::play_length_changed ()
        BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
                FrameRateChange const frc = _parent->film()->active_frame_rate_change (i->position ());
                i->set_trim_end (
-                       ContentTime (i->full_length() - play_length, frc) - i->trim_start ()
+                       ContentTime (max(DCPTime(), i->full_length() - play_length), frc) - i->trim_start ()
                        );
        }
 }