X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.cc;h=7adf2ba2d16b49716536c179eb16319fb4f22c01;hb=f7c43baf9b67505f04bb0954ab6e9e36f88efced;hp=bb483f0e235c98cace1283c627bf0957f893ad4c;hpb=cef7a679a59044a5c807768042deecfd56ec6fc2;p=dcpomatic.git

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index bb483f0e2..7adf2ba2d 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -47,6 +47,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>
 }
@@ -68,6 +69,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;
 using namespace dcpomatic;
 
@@ -89,9 +93,6 @@ FilmViewer::FilmViewer (wxWindow* p)
 	, _closed_captions_dialog (new ClosedCaptionsDialog(p, this))
 	, _outline_content (false)
 	, _pad_black (false)
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-	, _background_image (false)
-#endif
 	, _idle_get (false)
 {
 	switch (Config::instance()->video_view_type()) {
@@ -179,6 +180,7 @@ 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));
 	_film->LengthChange.connect (boost::bind(&FilmViewer::film_length_change, this));
 	_player->Change.connect (boost::bind (&FilmViewer::player_change, this, _1, _2, _3));
 
@@ -189,6 +191,8 @@ FilmViewer::set_film (shared_ptr<Film> film)
 	/* 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 ();
@@ -208,10 +212,12 @@ FilmViewer::recreate_butler ()
 
 	_butler.reset(
 		new Butler(
+			_film,
 			_player,
 			Config::instance()->audio_mapping(_audio_channels),
 			_audio_channels,
 			bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24),
+			VIDEO_RANGE_FULL,
 			false,
 			true
 			)
@@ -221,7 +227,7 @@ FilmViewer::recreate_butler ()
 		_butler->disable_audio ();
 	}
 
-	_closed_captions_dialog->set_film_and_butler (_film, _butler);
+	_closed_captions_dialog->set_butler (_butler);
 
 	resume ();
 }
@@ -408,6 +414,8 @@ FilmViewer::film_change (ChangeType type, Film::Property p)
 		_video_view->set_video_frame_rate (_film->video_frame_rate());
 	} else if (p == Film::THREE_D) {
 		_video_view->set_three_d (_film->three_d());
+	} else if (p == Film::CONTENT) {
+		_closed_captions_dialog->update_tracks (_film);
 	}
 }
 
@@ -431,10 +439,10 @@ FilmViewer::slow_refresh ()
 bool
 FilmViewer::quick_refresh ()
 {
-	if (!_video_view || !_film) {
+	if (!_video_view || !_film || !_player) {
 		return true;
 	}
-	return _video_view->refresh_metadata (_film, _player->video_container_size(), _film->frame_size());
+	return _video_view->reset_metadata (_film, _player->video_container_size());
 }
 
 void
@@ -497,13 +505,6 @@ FilmViewer::seek (DCPTime t, bool accurate)
 void
 FilmViewer::config_changed (Config::Property p)
 {
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-	if (p == Config::PLAYER_BACKGROUND_IMAGE) {
-		_video_view->update ();
-		return;
-	}
-#endif
-
 	if (p == Config::AUDIO_MAPPING) {
 		recreate_butler ();
 		return;
@@ -521,8 +522,12 @@ FilmViewer::config_changed (Config::Property p)
 		unsigned int st = 0;
 		if (Config::instance()->sound_output()) {
 			while (st < _audio.getDeviceCount()) {
-				if (_audio.getDeviceInfo(st).name == Config::instance()->sound_output().get()) {
-					break;
+				try {
+					if (_audio.getDeviceInfo(st).name == Config::instance()->sound_output().get()) {
+						break;
+					}
+				} catch (RtAudioError&) {
+					/* Something went wrong with that device so we don't want to use it anyway */
 				}
 				++st;
 			}
@@ -533,19 +538,15 @@ FilmViewer::config_changed (Config::Property p)
 			st = _audio.getDefaultOutputDevice();
 		}
 
-		_audio_channels = _audio.getDeviceInfo(st).outputChannels;
-
-		RtAudio::StreamParameters sp;
-		sp.deviceId = st;
-		sp.nChannels = _audio_channels;
-		sp.firstChannel = 0;
 		try {
+			_audio_channels = _audio.getDeviceInfo(st).outputChannels;
+			RtAudio::StreamParameters sp;
+			sp.deviceId = st;
+			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(),
 				_("Could not set up audio output.  There will be no audio during the preview."), std_to_wx(e.what())
@@ -703,3 +704,22 @@ FilmViewer::gets () const
 }
 
 
+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);
+	}
+}
+
+
+void
+FilmViewer::image_changed (shared_ptr<PlayerVideo> pv)
+{
+	emit (boost::bind(boost::ref(ImageChanged), pv));
+}
+