From: Carl Hetherington <cth@carlh.net>
Date: Tue, 9 Apr 2013 19:10:31 +0000 (+0100)
Subject: Merge master.
X-Git-Tag: v2.0.48~1337^2~461
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=e94cd129dcd66a76210880bfdf19d27f7992651b

Merge master.
---

e94cd129dcd66a76210880bfdf19d27f7992651b
diff --cc src/wx/film_editor.cc
index feb49ed78,5e597ac30..a197a7490
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@@ -1179,12 -1265,12 +1179,12 @@@ FilmEditor::setup_audio_details (
  		_audio->SetLabel (wxT (""));
  	} else {
  		wxString s;
 -		if (_film->audio_stream()->channels() == 1) {
 +		if (_film->audio_channels() == 1) {
  			s << _("1 channel");
  		} else {
- 			s << _film->audio_channels() << " " << _("channels");
 -			s << _film->audio_stream()->channels () << wxT (" ") << _("channels");
++			s << _film->audio_channels() << wxT (" ") << _("channels");
  		}
- 		s << ", " << _film->audio_frame_rate() << _("Hz");
 -		s << wxT (", ") << _film->audio_stream()->sample_rate() << _("Hz");
++		s << wxT (", ") << _film->audio_frame_rate() << _("Hz");
  		_audio->SetLabel (s);
  	}