X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fexport_file_notebook.cc;h=ef0c56f55cb39b7f5356aaec50743b87ba09e3a0;hb=957c0aec4fcb4f4e44d7eedcb2942326c52d69cd;hp=ab9a22ee28d34b6a56de36d4f8feb27d4ca2bf6f;hpb=bb9cc45cd22af67ac275a5e73accbe14fee664d8;p=ardour.git

diff --git a/gtk2_ardour/export_file_notebook.cc b/gtk2_ardour/export_file_notebook.cc
index ab9a22ee28..ef0c56f55c 100644
--- a/gtk2_ardour/export_file_notebook.cc
+++ b/gtk2_ardour/export_file_notebook.cc
@@ -22,6 +22,7 @@
 
 #include "ardour/export_format_specification.h"
 
+#include "gui_thread.h"
 #include "utils.h"
 #include "i18n.h"
 
@@ -49,7 +50,7 @@ ExportFileNotebook::ExportFileNotebook () :
 void
 ExportFileNotebook::set_session_and_manager (ARDOUR::Session * s, boost::shared_ptr<ARDOUR::ExportProfileManager> manager)
 {
-	session = s;
+	SessionHandlePtr::set_session (s);
 	profile_manager = manager;
 
 	sync_with_manager ();
@@ -87,7 +88,7 @@ ExportFileNotebook::sync_with_manager ()
 	CriticalSelectionChanged ();
 }
 
-Glib::ustring
+std::string
 ExportFileNotebook::get_nth_format_name (uint32_t n)
 {
 	FilePage * page;
@@ -110,7 +111,7 @@ ExportFileNotebook::add_new_file_page ()
 void
 ExportFileNotebook::add_file_page (ARDOUR::ExportProfileManager::FormatStatePtr format_state, ARDOUR::ExportProfileManager::FilenameStatePtr filename_state)
 {
-	FilePage * page = Gtk::manage (new FilePage (session, profile_manager, this, page_counter, format_state, filename_state));
+	FilePage * page = Gtk::manage (new FilePage (_session, profile_manager, this, page_counter, format_state, filename_state));
 	page->CriticalSelectionChanged.connect (CriticalSelectionChanged.make_slot());
 	insert_page (*page, page->get_tab_widget(), get_n_pages() - 1);
 
@@ -196,7 +197,7 @@ ExportFileNotebook::FilePage::FilePage (Session * s, ManagerPtr profile_manager,
 
 	tab_close_button.signal_clicked().connect (sigc::bind (sigc::mem_fun (*parent, &ExportFileNotebook::remove_file_page), this));
 
-	profile_manager->FormatListChanged.connect (sigc::mem_fun (format_selector, &ExportFormatSelector::update_format_list));
+	profile_manager->FormatListChanged.connect (format_connection, invalidator (*this), boost::bind (&ExportFormatSelector::update_format_list, &format_selector), gui_context());
 
 	format_selector.FormatEdited.connect (sigc::mem_fun (*this, &ExportFileNotebook::FilePage::save_format_to_manager));
 	format_selector.FormatRemoved.connect (sigc::mem_fun (*profile_manager, &ExportProfileManager::remove_format_profile));
@@ -231,7 +232,7 @@ ExportFileNotebook::FilePage::set_remove_sensitive (bool value)
 	tab_close_button.set_sensitive (value);
 }
 
-Glib::ustring
+std::string
 ExportFileNotebook::FilePage::get_format_name () const
 {
 	if (format_state && format_state->format) {