try that one on for size (VST build fu)

[ardour.git] / gtk2_ardour / ardour_ui_dialogs.cc

diff --git a/gtk2_ardour/ardour_ui_dialogs.cc b/gtk2_ardour/ardour_ui_dialogs.cc
index a6f0e2dc500a4be6b1e23636063ac75b7fbfcab4..e467b2e2327e13152f7636f1a03b569bd416190f 100644 (file)
--- a/gtk2_ardour/ardour_ui_dialogs.cc
+++ b/gtk2_ardour/ardour_ui_dialogs.cc
@@ -39,6 +39,7 @@
 #include "i18n.h"
 
 using namespace ARDOUR;
+using namespace PBD;
 using namespace Glib;
 using namespace Gtk;
 using namespace Gtkmm2ext;
@@ -49,6 +50,7 @@ ARDOUR_UI::connect_to_session (Session *s)
        session = s;
 
        session->HaltOnXrun.connect (mem_fun(*this, &ARDOUR_UI::halt_on_xrun_message));
+       session->RecordStateChanged.connect (mem_fun (*this, &ARDOUR_UI::record_state_changed));
 
        /* sensitize menu bar options that are now valid */
 
@@ -75,10 +77,6 @@ ARDOUR_UI::connect_to_session (Session *s)
        rec_button.set_sensitive (true);
        shuttle_box.set_sensitive (true);
        
-       if (session->n_diskstreams() == 0) {
-               session->DiskStreamAdded.connect (mem_fun(*this, &ARDOUR_UI::diskstream_added));
-       }
-
        if (connection_editor) {
                connection_editor->set_session (s);
        }
@@ -134,10 +132,6 @@ ARDOUR_UI::connect_to_session (Session *s)
        start_clocking ();
        start_blinking ();
 
-       if (editor) {
-               editor->present();
-       }
-
        transport_stopped ();
 
        second_connection = Glib::signal_timeout().connect (mem_fun(*this, &ARDOUR_UI::every_second), 1000);
@@ -158,7 +152,7 @@ ARDOUR_UI::unload_session ()
                        break;
                }
        }
-
+       editor->hide ();
        second_connection.disconnect ();
        point_one_second_connection.disconnect ();
        point_zero_one_second_connection.disconnect();
@@ -356,8 +350,7 @@ int
 ARDOUR_UI::create_sound_file_browser ()
 {
        if (sfdb == 0) {
-               sfdb = new SoundFileBrowser (_("Sound File Browser"));
-               sfdb->set_session (session);
+               sfdb = new SoundFileBrowser (_("Sound File Browser"), session);
                sfdb->signal_unmap().connect (sigc::bind(sigc::ptr_fun(&ActionManager::uncheck_toggleaction), X_("<Actions>/Common/ToggleSoundFileBrowser")));
        }
        return 0;