convert property_foo().set_value(bar) to property_foo() = bar

[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 9dc11eaa1475e964974aac2993f41d6d6c8e344d..c524e15526918c291613757576fbd8c3300ece9e 100644 (file)
--- a/gtk2_ardour/ardour_ui_dialogs.cc
+++ b/gtk2_ardour/ardour_ui_dialogs.cc
@@ -26,14 +26,13 @@
 #include <ardour/session.h>
 
 #include "ardour_ui.h"
-#include "mixer_ui.h"
-#include "meter_bridge.h"
 #include "connection_editor.h"
-#include "public_editor.h"
-#include "option_editor.h"
 #include "location_ui.h"
+#include "mixer_ui.h"
+#include "option_editor.h"
+#include "public_editor.h"
 #include "route_params_ui.h"
-#include "library_ui.h"
+#include "sfdb_ui.h"
 
 #include "i18n.h"
 
@@ -81,9 +80,7 @@ ARDOUR_UI::connect_to_session (Session *s)
        /* </CMT Additions> */
        
 
-       if (session->n_diskstreams()) {
-               // meter_bridge_dialog_check->set_sensitive (true);
-       } else {
+       if (session->n_diskstreams() == 0) {
                session->DiskStreamAdded.connect (mem_fun(*this, &ARDOUR_UI::diskstream_added));
        }
 
@@ -141,7 +138,7 @@ ARDOUR_UI::connect_to_session (Session *s)
        start_blinking ();
 
        if (editor) {
-               editor->window().present();
+               editor->present();
        }
 
        transport_stopped ();
@@ -178,10 +175,8 @@ ARDOUR_UI::unload_session ()
        add_track_item->set_sensitive (false);
        export_item->set_sensitive (false);
        close_item->set_sensitive (false);
-       // meter_bridge_dialog_check->set_sensitive (false);
        connection_editor_check->set_sensitive (false);
        locations_dialog_check->set_sensitive (false);
-       // meter_bridge_dialog_check->set_active(false);
        connection_editor_check->set_active(false);
        locations_dialog_check->set_active(false);
        route_params_check->set_sensitive (false);
@@ -227,32 +222,17 @@ ARDOUR_UI::unload_session ()
        return 0;
 }
 
-int
-ARDOUR_UI::create_meter_bridge ()
-{
-       if (meter_bridge == 0) {
-               meter_bridge = new MeterBridge ();
-               meter_bridge->Hiding.connect (mem_fun(*this, &ARDOUR_UI::meter_bridge_hiding));
-       }
-       return 0;
-}
-
-void
-ARDOUR_UI::meter_bridge_hiding()
-{
-       // meter_bridge_dialog_check->set_active(false);
-}
-
 int
 ARDOUR_UI::create_connection_editor ()
 {
        if (connection_editor == 0) {
-               connection_editor = new ConnectionEditor ();
-               connection_editor->Hiding.connect (mem_fun(*this, &ARDOUR_UI::connection_editor_hiding));
+               // GTK2FIX
+               // connection_editor = new ConnectionEditor ();
+               // connection_editor->signal_unmap().connect (mem_fun(*this, &ARDOUR_UI::connection_editor_hiding));
        }
 
        if (session) {
-               connection_editor->set_session (session);
+               // connection_editor->set_session (session);
        }
 
        return 0;
@@ -265,6 +245,9 @@ ARDOUR_UI::toggle_connection_editor ()
                return;
        }
 
+       //GTK2FIX
+#if 0
+
        if (connection_editor->within_hiding()) {
                return;
        }
@@ -275,12 +258,14 @@ ARDOUR_UI::toggle_connection_editor ()
        } else {
                connection_editor->hide_all();
        }
+#endif
 }
 
 void
 ARDOUR_UI::connection_editor_hiding()
 {
-       connection_editor_check->set_active(false);
+       //GTK2FIX
+       // connection_editor_check->set_active(false);
 }
 
 void
@@ -292,14 +277,10 @@ ARDOUR_UI::big_clock_hiding()
 void
 ARDOUR_UI::toggle_big_clock_window ()
 {
-       if (big_clock_window->within_hiding()) {
-               return;
-       }
-
        if (big_clock_window->is_visible()) {
-               big_clock_window->hide_all ();
+               big_clock_window->hide ();
        } else {
-               big_clock_window->show_all ();
+               big_clock_window->present ();
        }
 }
 
@@ -308,16 +289,16 @@ ARDOUR_UI::toggle_options_window ()
 {
        if (option_editor == 0) {
                option_editor = new OptionEditor (*this, *editor, *mixer);
-               option_editor->Hiding.connect(mem_fun(*this, &ARDOUR_UI::option_hiding));
+               option_editor->signal_unmap().connect(mem_fun(*this, &ARDOUR_UI::option_hiding));
                option_editor->set_session (session);
        } else if (option_editor->within_hiding()) {
                return;
        }
 
        if (option_editor->is_visible()) {
-               option_editor->hide_all ();
+               option_editor->hide ();
        } else {
-               option_editor->show_all ();
+               option_editor->present ();
        }
 }
 
@@ -334,18 +315,6 @@ ARDOUR_UI::toggle_auto_input ()
        toggle_some_session_state (auto_input_button,
                                   &Session::get_auto_input,
                                   &Session::set_auto_input);
-       
-       meter_bridge->clear_all_meters ();
-}
-
-void
-ARDOUR_UI::toggle_metering ()
-{
-#if 0
-       if (global_meter_button.get_active()) {
-               meter_bridge->toggle_metering ();
-       }
-#endif
 }
 
 int
@@ -354,7 +323,7 @@ ARDOUR_UI::create_location_ui ()
        if (location_ui == 0) {
                location_ui = new LocationUI ();
                location_ui->set_session (session);
-               location_ui->Hiding.connect (mem_fun(*this, &ARDOUR_UI::location_ui_hiding));
+               location_ui->signal_unmap().connect (mem_fun(*this, &ARDOUR_UI::location_ui_hiding));
        } 
        return 0;
 }
@@ -371,9 +340,9 @@ ARDOUR_UI::toggle_location_window ()
        }
 
        if (location_ui->is_visible()) {
-               location_ui->hide_all();
+               location_ui->hide();
        } else {
-               location_ui->show_all();
+               location_ui->present();
        }
 }
 
@@ -389,7 +358,7 @@ ARDOUR_UI::create_route_params ()
        if (route_params == 0) {
                route_params = new RouteParams_UI (*engine);
                route_params->set_session (session);
-               route_params->Hiding.connect (mem_fun(*this, &ARDOUR_UI::route_params_hiding));
+               route_params->signal_unmap().connect (mem_fun(*this, &ARDOUR_UI::route_params_hiding));
        }
        return 0;
 }
@@ -406,9 +375,9 @@ ARDOUR_UI::toggle_route_params_window ()
        }
 
        if (route_params->is_visible ()) {
-               route_params->hide_all ();
+               route_params->hide ();
        } else {
-               route_params->show_all ();
+               route_params->present ();
        }
 }
        
@@ -417,3 +386,16 @@ ARDOUR_UI::route_params_hiding ()
 {
        route_params_check->set_active (false);
 }
+
+void
+ARDOUR_UI::toggle_sound_file_browser ()
+{
+       if (sfdb_check->get_active()) {
+               SoundFileBrowser sfdb(_("Sound File Browser"));
+
+               sfdb_check->signal_toggled().connect (bind (mem_fun (sfdb, &Gtk::Dialog::response), Gtk::RESPONSE_CANCEL));
+               sfdb.run();
+               sfdb_check->set_active(false);
+       }
+}
+