Add primitive description of what the playlist is doing. Add missing de-interleave of multi-channel audio sources.

2 files changed, 27 insertions, 5 deletions

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 85c4f71f8..db3e03d78 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -88,6 +88,8 @@ FilmEditor::FilmEditor (shared_ptr<Film> f, wxWindow* parent)
 	make_subtitle_panel ();
 	_notebook->AddPage (_subtitle_panel, _("Subtitles"), false);
 
+	setup_formats ();
+
 	set_film (f);
 	connect_to_widgets ();
 
@@ -95,8 +97,6 @@ FilmEditor::FilmEditor (shared_ptr<Film> f, wxWindow* parent)
 		bind (&FilmEditor::active_jobs_changed, this, _1)
 		);
 	
-	setup_formats ();
-
 	SetSizerAndFit (s);
 }
 
@@ -367,9 +367,12 @@ FilmEditor::make_content_panel ()
 
                 s->Add (b, 0, wxALL, 4);
 
-                _content_sizer->Add (s, 1, wxEXPAND | wxALL, 6);
+                _content_sizer->Add (s, 0.75, wxEXPAND | wxALL, 6);
         }
 
+	_content_information = new wxTextCtrl (_content_panel, wxID_ANY, wxT ("\n \n "), wxDefaultPosition, wxDefaultSize, wxTE_READONLY | wxTE_MULTILINE);
+	_content_sizer->Add (_content_information, 1, wxEXPAND | wxALL, 6);
+
 	wxBoxSizer* h = new wxBoxSizer (wxHORIZONTAL);
 	_loop_content = new wxCheckBox (_content_panel, wxID_ANY, _("Loop everything"));
 	h->Add (_loop_content, 0, wxALL, 6);
@@ -378,8 +381,12 @@ FilmEditor::make_content_panel ()
 	add_label_to_sizer (h, _content_panel, _("times"));
 	_content_sizer->Add (h, 0, wxALL, 6);
 
-	_content_information = new wxTextCtrl (_content_panel, wxID_ANY, wxT ("\n\n\n\n"), wxDefaultPosition, wxDefaultSize, wxTE_READONLY | wxTE_MULTILINE);
-	_content_sizer->Add (_content_information, 1, wxEXPAND | wxALL, 6);
+	_playlist_description = new wxStaticText (_content_panel, wxID_ANY, wxT ("\n \n \n \n "));
+	_content_sizer->Add (_playlist_description, 0.25, wxEXPAND | wxALL, 6);
+	wxFont font = _playlist_description->GetFont();
+	font.SetStyle(wxFONTSTYLE_ITALIC);
+	font.SetPointSize(font.GetPointSize() - 1);
+	_playlist_description->SetFont(font);
 
 	_loop_count->SetRange (2, 1024);
 }
@@ -1198,6 +1205,8 @@ FilmEditor::setup_content ()
 		/* Select the first item of content if non was selected before */
 		_content->SetItemState (0, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
 	}
+
+	setup_playlist_description ();
 }
 
 void
@@ -1429,3 +1438,14 @@ FilmEditor::setup_loop_sensitivity ()
 {
 	_loop_count->Enable (_loop_content->GetValue ());
 }
+
+void
+FilmEditor::setup_playlist_description ()
+{
+	if (!_film) {
+		_playlist_description->SetLabel (wxT (""));
+		return;
+	}
+
+	_playlist_description->SetLabel (std_to_wx (_film->playlist_description ()));
+}
diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index db657a7d3..baaeb46d7 100644
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -112,6 +112,7 @@ private:
 	void setup_content_information ();
 	void setup_content_button_sensitivity ();
 	void setup_loop_sensitivity ();
+	void setup_playlist_description ();
 	
 	void active_jobs_changed (bool);
 	boost::shared_ptr<Content> selected_content ();
@@ -144,6 +145,7 @@ private:
 	wxTextCtrl* _content_information;
 	wxCheckBox* _loop_content;
 	wxSpinCtrl* _loop_count;
+	wxStaticText* _playlist_description;
 	wxButton* _edit_dci_button;
 	wxChoice* _format;
 	wxStaticText* _format_description;