X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.cc;h=098fc2598994e4b13add02900300db71f49f47af;hp=e7b338409d3e46aa1f1b8af39f99164b72c17bd2;hb=677eaab5c03e9c614ae2bc417a43bd5c1295bb8d;hpb=6c4ba247bc27d55ed16b012225acd10d485c1f48

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index e7b338409..098fc2598 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -186,14 +186,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));
@@ -234,7 +246,11 @@ FilmViewer::get ()
 		_player_video.first->eyes() != EYES_BOTH
 		);
 
-	_butler->rethrow ();
+	try {
+		_butler->rethrow ();
+	} catch (DecodeError& e) {
+		error_dialog (_panel, e.what());
+	}
 
 	display_player_video ();
 }
@@ -393,7 +409,7 @@ FilmViewer::paint_panel ()
 		dc.SetBrush (b);
 		int const gap = (_panel_size.height - _out_size.height) / 2;
 		dc.DrawRectangle (0, 0, _panel_size.width, gap);
-		dc.DrawRectangle (0, gap + _out_size.height + 1, _panel_size.width, gap);
+		dc.DrawRectangle (0, gap + _out_size.height + 1, _panel_size.width, gap + 1);
 	}
 
 	if (_outline_content) {
@@ -652,7 +668,6 @@ FilmViewer::config_changed (Config::Property p)
 		}
 
 		_audio_channels = _audio.getDeviceInfo(st).outputChannels;
-		cout << "Opening stream " << st << "(" << _audio.getDeviceInfo(st).name << ") probed=" << _audio.getDeviceInfo(st).probed << " with " << _audio_channels << "\n";
 
 		RtAudio::StreamParameters sp;
 		sp.deviceId = st;