Split audio; builds.

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

diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc
index c7567455b762c393d86624aca6df8a4fe136d191..573d76f4885c8a1e78606346707a67e5a9c99c1c 100644 (file)
--- a/src/wx/timing_panel.cc
+++ b/src/wx/timing_panel.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -27,7 +27,9 @@
 #include "lib/raw_convert.h"
 #include "lib/subtitle_content.h"
 #include "lib/dcp_subtitle_content.h"
-#include "lib/subrip_content.h"
+#include "lib/audio_content.h"
+#include "lib/text_subtitle_content.h"
+#include "lib/video_content.h"
 #include <boost/foreach.hpp>
 #include <set>
 #include <iostream>
@@ -41,6 +43,7 @@ using boost::optional;
 
 TimingPanel::TimingPanel (ContentPanel* p, FilmViewer* viewer)
        /* horrid hack for apparent lack of context support with wxWidgets i18n code */
+       /// TRANSLATORS: translate the word "Timing" here; do not include the "Timing|" prefix
        : ContentSubPanel (p, S_("Timing|Timing"))
        , _viewer (viewer)
 {
@@ -209,6 +212,7 @@ TimingPanel::film_content_changed (int property)
                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
                ) {
 
@@ -247,6 +251,7 @@ TimingPanel::film_content_changed (int property)
                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
                ) {
 
@@ -255,30 +260,37 @@ TimingPanel::film_content_changed (int property)
 
        if (property == VideoContentProperty::VIDEO_FRAME_RATE || property == SubtitleContentProperty::SUBTITLE_VIDEO_FRAME_RATE) {
                set<double> check_vc;
-               shared_ptr<const VideoContent> vc;
+               shared_ptr<const Content> vc;
+               int count_ac = 0;
+               shared_ptr<const Content> ac;
                int count_sc = 0;
-               shared_ptr<const SubtitleContent> sc;
+               shared_ptr<const Content> sc;
                BOOST_FOREACH (shared_ptr<const Content> i, _parent->selected ()) {
-                       shared_ptr<const VideoContent> vt = dynamic_pointer_cast<const VideoContent> (i);
-                       if (vt) {
-                               check_vc.insert (vt->video_frame_rate ());
-                               vc = vt;
+                       if (i->video) {
+                               check_vc.insert (i->video->video_frame_rate ());
+                               vc = i;
                        }
-                       shared_ptr<const SubtitleContent> st = dynamic_pointer_cast<const SubtitleContent> (i);
-                       if (st) {
+                       shared_ptr<const AudioContent> at = dynamic_pointer_cast<const AudioContent> (i);
+                       if (i->audio) {
+                               ++count_ac;
+                               ac = at;
+                       }
+                       if (i->subtitle) {
                                ++count_sc;
-                               sc = st;
+                               sc = i;
                        }
 
                }
 
                bool const single_frame_image_content = vc && dynamic_pointer_cast<const ImageContent> (vc) && vc->number_of_paths() == 1;
 
-               if ((check_vc.size() == 1 || count_sc == 1) && !single_frame_image_content) {
+               if ((check_vc.size() == 1 || count_ac == 1 || count_sc == 1) && !single_frame_image_content) {
                        if (vc) {
-                               checked_set (_video_frame_rate, raw_convert<string> (vc->video_frame_rate (), 5));
+                               checked_set (_video_frame_rate, raw_convert<string> (vc->video->video_frame_rate (), 5));
+                       } else if (ac) {
+                               checked_set (_video_frame_rate, raw_convert<string> (ac->audio->audio_video_frame_rate (), 5));
                        } else if (sc) {
-                               checked_set (_video_frame_rate, raw_convert<string> (sc->subtitle_video_frame_rate (), 5));
+                               checked_set (_video_frame_rate, raw_convert<string> (sc->subtitle->subtitle_video_frame_rate (), 5));
                        }
                        _video_frame_rate->Enable (true);
                } else {
@@ -316,7 +328,7 @@ TimingPanel::full_length_changed ()
                shared_ptr<ImageContent> ic = dynamic_pointer_cast<ImageContent> (i);
                if (ic && ic->still ()) {
                        int const vfr = _parent->film()->video_frame_rate ();
-                       ic->set_video_length (_full_length->get (vfr).frames_round (vfr));
+                       ic->video->set_video_length (_full_length->get (vfr).frames_round (vfr));
                }
        }
 }
@@ -391,15 +403,18 @@ void
 TimingPanel::set_video_frame_rate ()
 {
        BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
-               shared_ptr<VideoContent> vc = dynamic_pointer_cast<VideoContent> (i);
                shared_ptr<DCPSubtitleContent> dsc = dynamic_pointer_cast<DCPSubtitleContent> (i);
-               shared_ptr<SubRipContent> ssc = dynamic_pointer_cast<SubRipContent> (i);
-               if (vc) {
-                       vc->set_video_frame_rate (raw_convert<double> (wx_to_std (_video_frame_rate->GetValue ())));
+               shared_ptr<TextSubtitleContent> tsc = dynamic_pointer_cast<TextSubtitleContent> (i);
+               double const fr = raw_convert<double> (wx_to_std (_video_frame_rate->GetValue ()));
+               if (i->video) {
+                       i->video->set_video_frame_rate (fr);
+               } else if (i->audio) {
+                       /* Audio but not video, i.e. SndfileContent */
+                       i->audio->set_audio_video_frame_rate (fr);
                } else if (dsc) {
-                       dsc->set_subtitle_video_frame_rate (raw_convert<double> (wx_to_std (_video_frame_rate->GetValue ())));
-               } else if (ssc) {
-                       ssc->set_subtitle_video_frame_rate (raw_convert<double> (wx_to_std (_video_frame_rate->GetValue ())));
+                       dsc->set_subtitle_video_frame_rate (fr);
+               } else if (tsc) {
+                       tsc->set_subtitle_video_frame_rate (fr);
                }
                _set_video_frame_rate->Enable (false);
        }
@@ -416,6 +431,7 @@ TimingPanel::content_selection_changed ()
        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);
 }
 
 void