GUI for optional analysis

2 files changed, 19 insertions, 4 deletions

diff --git a/gtk2_ardour/export_file_notebook.cc b/gtk2_ardour/export_file_notebook.cc
index 2469e4f6cc..2f74304ce2 100644
--- a/gtk2_ardour/export_file_notebook.cc
+++ b/gtk2_ardour/export_file_notebook.cc
@@ -109,9 +109,13 @@ ExportFileNotebook::update_soundcloud_upload ()
 			}
 		}
 	}
-
 	soundcloud_export_selector->set_visible (show_credentials_entry);
+}
 
+void
+ExportFileNotebook::FilePage::analysis_changed ()
+{
+	format_state->format->set_analyse (analysis_button.get_active ());
 }
 
 void
@@ -181,6 +185,7 @@ ExportFileNotebook::handle_page_change (GtkNotebookPage*, uint32_t page)
 	} else {
 		last_visible_page = page;
 	}
+	update_soundcloud_upload ();
 }
 
 ExportFileNotebook::FilePage::FilePage (Session * s, ManagerPtr profile_manager, ExportFileNotebook * parent, uint32_t number,
@@ -193,6 +198,7 @@ ExportFileNotebook::FilePage::FilePage (Session * s, ManagerPtr profile_manager,
   format_label (_("Format"), Gtk::ALIGN_LEFT),
   filename_label (_("Location"), Gtk::ALIGN_LEFT),
   soundcloud_upload_button (_("Upload to Soundcloud")),
+  analysis_button (_("Analyze Exported Audio")),
   tab_number (number)
 {
 	set_border_width (12);
@@ -201,7 +207,12 @@ ExportFileNotebook::FilePage::FilePage (Session * s, ManagerPtr profile_manager,
 	pack_start (format_align, false, false, 0);
 	pack_start (filename_label, false, false, 0);
 	pack_start (filename_align, false, false, 0);
-	pack_start (soundcloud_upload_button, false, false, 0);
+
+	Gtk::HBox *hbox = Gtk::manage (new Gtk::HBox());
+	hbox->set_spacing (6);
+	hbox->pack_start (soundcloud_upload_button, false, false, 0);
+	hbox->pack_start (analysis_button, false, false, 0);
+	pack_start (*hbox, false, false, 0);
 
 	format_align.add (format_selector);
 	format_align.set_padding (6, 12, 18, 0);
@@ -219,7 +230,8 @@ ExportFileNotebook::FilePage::FilePage (Session * s, ManagerPtr profile_manager,
 
 	/* Set states */
 	format_selector.set_state (format_state, s);
- 	filename_selector.set_state (filename_state, s);
+	filename_selector.set_state (filename_state, s);
+	analysis_button.set_active (format_state->format->analyse());
 
 	/* Signals */
 
@@ -237,6 +249,7 @@ ExportFileNotebook::FilePage::FilePage (Session * s, ManagerPtr profile_manager,
 		sigc::mem_fun (*this, &ExportFileNotebook::FilePage::critical_selection_changed));
 
 	soundcloud_upload_button.signal_toggled().connect (sigc::mem_fun (*parent, &ExportFileNotebook::update_soundcloud_upload));
+	analysis_button.signal_toggled().connect (sigc::mem_fun (*this, &ExportFileNotebook::FilePage::analysis_changed));
 	/* Tab widget */
 
 	tab_close_button.add (*Gtk::manage (new Gtk::Image (::get_icon("close"))));
diff --git a/gtk2_ardour/export_file_notebook.h b/gtk2_ardour/export_file_notebook.h
index 42a05e7611..43f64bf87e 100644
--- a/gtk2_ardour/export_file_notebook.h
+++ b/gtk2_ardour/export_file_notebook.h
@@ -94,6 +94,7 @@ class ExportFileNotebook : public Gtk::Notebook, public ARDOUR::SessionHandlePtr
 		void save_format_to_manager (FormatPtr format);
 		void update_tab_label ();
 		void critical_selection_changed ();
+		void analysis_changed ();
 
 		ARDOUR::ExportProfileManager::FormatStatePtr   format_state;
 		ARDOUR::ExportProfileManager::FilenameStatePtr filename_state;
@@ -110,7 +111,8 @@ class ExportFileNotebook : public Gtk::Notebook, public ARDOUR::SessionHandlePtr
 		Gtk::Alignment          filename_align;
 		ExportFilenameSelector  filename_selector;
 
-		Gtk::CheckButton	soundcloud_upload_button;
+		Gtk::CheckButton        soundcloud_upload_button;
+		Gtk::CheckButton        analysis_button;
 		Gtk::HBox               tab_widget;
 		Gtk::Label              tab_label;
 		Gtk::Alignment          tab_close_alignment;