Store subtitle language(s) in Film, and allow setup of those

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

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 997fe88c8b8c4dba04c7885a79ce54e4261a65ac..9561c32b5197ce1551db7f4e6383c4a313d871f4 100644 (file)
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -219,6 +219,7 @@ FilmViewer::recreate_butler ()
                        Config::instance()->audio_mapping(_audio_channels),
                        _audio_channels,
                        bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24),
+                       VIDEO_RANGE_FULL,
                        false,
                        true
                        )
@@ -534,11 +535,7 @@ FilmViewer::config_changed (Config::Property p)
                                        if (_audio.getDeviceInfo(st).name == Config::instance()->sound_output().get()) {
                                                break;
                                        }
-#ifdef DCPOMATIC_USE_RTERROR
-                               } catch (RtError&) {
-#else
                                } catch (RtAudioError&) {
-#endif
                                        /* Something went wrong with that device so we don't want to use it anyway */
                                }
                                ++st;
@@ -557,11 +554,7 @@ FilmViewer::config_changed (Config::Property p)
                        sp.nChannels = _audio_channels;
                        sp.firstChannel = 0;
                        _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
                        _audio_channels = 0;
                        error_dialog (
                                _video_view->get(),