Remove checks/support for obsolete RtError class (now RtAudioError).

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

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 0fc3382479d180865f668df6c2f8b4a671db3649..c05e76f83b902b67bb52ffc9dadaa6c13da5721c 100644 (file)
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -45,6 +45,7 @@
 #include "lib/config.h"
 #include "lib/compose.hpp"
 #include "lib/dcpomatic_log.h"
+#include "lib/text_content.h"
 extern "C" {
 #include <libavutil/pixfmt.h>
 }
@@ -66,6 +67,9 @@ using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using boost::weak_ptr;
 using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 using dcp::Size;
 
 static
@@ -154,11 +158,14 @@ FilmViewer::set_film (shared_ptr<Film> film)
        _player->set_play_referenced ();
 
        _film->Change.connect (boost::bind (&FilmViewer::film_change, this, _1, _2));
+       _film->ContentChange.connect (boost::bind(&FilmViewer::content_change, this, _1, _3));
        _player->Change.connect (boost::bind (&FilmViewer::player_change, this, _1, _2, _3));
 
        /* Keep about 1 second's worth of history samples */
        _latency_history_count = _film->audio_frame_rate() / _audio_block_size;
 
+       _closed_captions_dialog->update_tracks (_film);
+
        recreate_butler ();
 
        calculate_sizes ();
@@ -186,14 +193,26 @@ FilmViewer::recreate_butler ()
                   Map so that Lt = L(-3dB) + Ls(-3dB) + C(-6dB) + Lfe(-10dB)
                               Rt = R(-3dB) + Rs(-3dB) + C(-6dB) + Lfe(-10dB)
                */
-               map.set (dcp::LEFT,   0, 1 / sqrt(2)); // L -> Lt
-               map.set (dcp::RIGHT,  1, 1 / sqrt(2)); // R -> Rt
-               map.set (dcp::CENTRE, 0, 1 / 2.0); // C -> Lt
-               map.set (dcp::CENTRE, 1, 1 / 2.0); // C -> Rt
-               map.set (dcp::LFE,    0, 1 / sqrt(10)); // Lfe -> Lt
-               map.set (dcp::LFE,    1, 1 / sqrt(10)); // Lfe -> Rt
-               map.set (dcp::LS,     0, 1 / sqrt(2)); // Ls -> Lt
-               map.set (dcp::RS,     1, 1 / sqrt(2)); // Rs -> Rt
+               if (_film->audio_channels() > 0) {
+                       map.set (dcp::LEFT,   0, 1 / sqrt(2)); // L -> Lt
+               }
+               if (_film->audio_channels() > 1) {
+                       map.set (dcp::RIGHT,  1, 1 / sqrt(2)); // R -> Rt
+               }
+               if (_film->audio_channels() > 2) {
+                       map.set (dcp::CENTRE, 0, 1 / 2.0); // C -> Lt
+                       map.set (dcp::CENTRE, 1, 1 / 2.0); // C -> Rt
+               }
+               if (_film->audio_channels() > 3) {
+                       map.set (dcp::LFE,    0, 1 / sqrt(10)); // Lfe -> Lt
+                       map.set (dcp::LFE,    1, 1 / sqrt(10)); // Lfe -> Rt
+               }
+               if (_film->audio_channels() > 4) {
+                       map.set (dcp::LS,     0, 1 / sqrt(2)); // Ls -> Lt
+               }
+               if (_film->audio_channels() > 5) {
+                       map.set (dcp::RS,     1, 1 / sqrt(2)); // Rs -> Rt
+               }
        }
 
        _butler.reset (new Butler(_player, map, _audio_channels, bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true));
@@ -201,7 +220,7 @@ FilmViewer::recreate_butler ()
                _butler->disable_audio ();
        }
 
-       _closed_captions_dialog->set_film_and_butler (_film, _butler);
+       _closed_captions_dialog->set_butler (_butler);
 
        if (was_running) {
                start ();
@@ -542,6 +561,8 @@ FilmViewer::film_change (ChangeType type, Film::Property p)
 {
        if (type == CHANGE_TYPE_DONE && p == Film::AUDIO_CHANNELS) {
                recreate_butler ();
+       } else if (p == Film::CONTENT) {
+               _closed_captions_dialog->update_tracks (_film);
        }
 }
 
@@ -663,11 +684,7 @@ FilmViewer::config_changed (Config::Property p)
                sp.firstChannel = 0;
                try {
                        _audio.openStream (&sp, 0, RTAUDIO_FLOAT32, 48000, &_audio_block_size, &rtaudio_callback, this);
-#ifdef DCPOMATIC_USE_RTERROR
-               } catch (RtError& e) {
-#else
                } catch (RtAudioError& e) {
-#endif
                        error_dialog (
                                _panel,
                                _("Could not set up audio output.  There will be no audio during the preview."), std_to_wx(e.what())
@@ -780,3 +797,15 @@ FilmViewer::set_pad_black (bool p)
 {
        _pad_black = p;
 }
+
+void
+FilmViewer::content_change (ChangeType type, int property)
+{
+       if (type != CHANGE_TYPE_DONE) {
+               return;
+       }
+
+       if (property == TextContentProperty::USE || property == TextContentProperty::TYPE || property == TextContentProperty::DCP_TRACK) {
+               _closed_captions_dialog->update_tracks (_film);
+       }
+}