From 1c6bcfe2208d76393aa1f4b677de689c2e52a976 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Sat, 20 Oct 2012 20:15:21 +0100
Subject: [PATCH] Fix update of channel count in UI.

---
 src/wx/film_editor.cc | 24 +++++++++++++++---------
 src/wx/film_editor.h  |  1 +
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 36f3bc898..54b810db9 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -461,19 +461,11 @@ FilmEditor::film_changed (FilmState::Property p)
 		_dcp_name->SetLabel (std_to_wx (_film->dcp_name ()));
 		break;
 	case FilmState::FRAMES_PER_SECOND:
-	{
-		stringstream s;
 		s << fixed << setprecision(2) << _film->frames_per_second();
 		_frames_per_second->SetLabel (std_to_wx (s.str ()));
 		break;
-	}
 	case FilmState::AUDIO_SAMPLE_RATE:
-		if (_film->audio_channels() == 0 && _film->audio_sample_rate() == 0) {
-			_audio->SetLabel (wxT (""));
-		} else {
-			s << _film->audio_channels () << " channels, " << _film->audio_sample_rate() << "Hz";
-			_audio->SetLabel (std_to_wx (s.str ()));
-		}
+		setup_audio_details ();
 		break;
 	case FilmState::SIZE:
 		if (_film->size().width == 0 && _film->size().height == 0) {
@@ -546,6 +538,7 @@ FilmEditor::film_changed (FilmState::Property p)
 	case FilmState::AUDIO_STREAM:
 		_dcp_name->SetLabel (std_to_wx (_film->dcp_name ()));
 		_audio_stream->SetSelection (_film->audio_stream_index ());
+		setup_audio_details ();
 		break;
 	case FilmState::SUBTITLE_STREAM:
 		_subtitle_stream->SetSelection (_film->subtitle_stream_index ());
@@ -920,3 +913,16 @@ FilmEditor::subtitle_stream_changed (wxCommandEvent &)
 	_film->set_subtitle_stream (_subtitle_stream->GetSelection ());
 	_ignore_changes = Film::NONE;
 }
+
+void
+FilmEditor::setup_audio_details ()
+{
+	if (_film->audio_channels() == 0 && _film->audio_sample_rate() == 0) {
+		_audio->SetLabel (wxT (""));
+	} else {
+		stringstream s;
+		s << _film->audio_channels () << " channels, " << _film->audio_sample_rate() << "Hz";
+		_audio->SetLabel (std_to_wx (s.str ()));
+	}
+}
+
diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index 2439b01dd..578ef9e80 100644
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -79,6 +79,7 @@ private:
 	void setup_formats ();
 	void setup_subtitle_button ();
 	void setup_streams ();
+	void setup_audio_details ();
 	
 	wxControl* video_control (wxControl *);
 	wxControl* still_control (wxControl *);
-- 
2.30.2