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

[ardour.git] / gtk2_ardour / meter_bridge.cc

diff --git a/gtk2_ardour/meter_bridge.cc b/gtk2_ardour/meter_bridge.cc
index 7524ba4b3542d176467350c2253b4fa952cc8ce2..6b83a343226e88d944542a71f07a253bce918fae 100644 (file)
--- a/gtk2_ardour/meter_bridge.cc
+++ b/gtk2_ardour/meter_bridge.cc
@@ -33,13 +33,16 @@
 
 using namespace ARDOUR;
 using namespace Gtk;
-using namespace SigC;
+using namespace sigc;
 
-#define FRAME_SHADOW_STYLE GTK_SHADOW_IN
+#define FRAME_SHADOW_STYLE Gtk::SHADOW_IN
 #define FRAME_NAME "BaseFrame"
 
 MeterBridge::MeterBridge ()
-       : ArdourDialog ("meter bridge")
+       : ArdourDialog ("meter bridge"),
+         hadjustment (0.0, 0.0, 0.0),
+         vadjustment (0.0, 0.0, 0.0),
+       meter_viewport (hadjustment, vadjustment)
 {
        meter_base.set_name ("MeterBase");
        meter_frame.set_shadow_type (FRAME_SHADOW_STYLE);
@@ -61,21 +64,21 @@ MeterBridge::MeterBridge ()
        meter_scroll_base.add (metering_hbox);
 
        meter_viewport.add (meter_scroll_base);
-       meter_viewport.set_shadow_type (GTK_SHADOW_NONE);
+       meter_viewport.set_shadow_type (Gtk::SHADOW_NONE);
 
        meter_scroller.add (meter_viewport);
        meter_scroller.set_name ("MeterBridgeWindow");
-       meter_scroller.set_policy (GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+       meter_scroller.set_policy (Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
        meter_scroller.set_border_width (5);
 
        add (meter_scroller);
-       add_events (GDK_KEY_PRESS_MASK|GDK_KEY_RELEASE_MASK);
+       add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK);
        set_name ("MeterBridgeWindow");
        set_title (_("ardour: meter bridge"));
        set_wmclass (_("ardour_meter_bridge"), "Ardour");
        // set_policy (false, false, false); // no user resizing of any kind
 
-       delete_event.connect (bind (slot (just_hide_it), static_cast<Gtk::Window*>(this)));
+       signal_delete_event().connect (bind (sigc::ptr_fun (just_hide_it), static_cast<Gtk::Window*>(this)));
 
        metering = false;
 
@@ -96,8 +99,8 @@ MeterBridge::set_session (Session *s)
                // XXX this stuff has to be fixed if we ever use this code again
                // (refs vs. ptrs)
                // session->foreach_route (this, &MeterBridge::add_route);
-               session->RouteAdded.connect (slot (*this, &MeterBridge::add_route));
-               session->going_away.connect (slot (*this, &MeterBridge::session_gone));
+               session->RouteAdded.connect (mem_fun(*this, &MeterBridge::add_route));
+               session->going_away.connect (mem_fun(*this, &MeterBridge::session_gone));
                start_metering ();
        }
 }
@@ -105,7 +108,7 @@ MeterBridge::set_session (Session *s)
 void
 MeterBridge::session_gone ()
 {
-       ENSURE_GUI_THREAD(slot (*this, &MeterBridge::session_gone));
+       ENSURE_GUI_THREAD(mem_fun(*this, &MeterBridge::session_gone));
        
        stop_metering ();
        hide_all ();
@@ -129,7 +132,7 @@ MeterBridge::session_gone ()
 void
 MeterBridge::add_route (ARDOUR::Route* route)
 {
-       ENSURE_GUI_THREAD(bind (slot (*this, &MeterBridge::add_route), route));
+       ENSURE_GUI_THREAD(bind (mem_fun(*this, &MeterBridge::add_route), route));
        
        uint32_t n;
        char buf[32];
@@ -160,20 +163,20 @@ MeterBridge::add_route (ARDOUR::Route* route)
        meter->meter_widget().show ();
        meter->below_box().show_all ();
 
-       route->GoingAway.connect (bind (slot (*this, &MeterBridge::remove_route), route));
+       route->GoingAway.connect (bind (mem_fun(*this, &MeterBridge::remove_route), route));
        meters.insert (meters.begin(), meter);
 
        set_default_size (30 + ((n+1) * packing_factor), 315);
     
        meter->set_meter_on(true);
        
-       session->going_away.connect (slot (*this, &MeterBridge::session_gone));
+       session->going_away.connect (mem_fun(*this, &MeterBridge::session_gone));
 }
 
 void
 MeterBridge::remove_route (Route* route)
 {
-       ENSURE_GUI_THREAD(bind (slot (*this, &MeterBridge::remove_route), route));
+       ENSURE_GUI_THREAD(bind (mem_fun(*this, &MeterBridge::remove_route), route));
        list<MeterBridgeStrip *>::iterator i;
 
        for (i = meters.begin(); i != meters.end(); ++i) {
@@ -214,7 +217,7 @@ MeterBridge::start_metering ()
                (*i)->set_meter_on (true);
        }
        metering_connection = ARDOUR_UI::instance()->RapidScreenUpdate.connect 
-               (slot (*this, &MeterBridge::update));
+               (mem_fun(*this, &MeterBridge::update));
        metering = true;
 }
 
@@ -240,17 +243,17 @@ MeterBridge::toggle_metering ()
        }
 }
 
-gint
-MeterBridge::map_event_impl (GdkEventAny *ev)
+void
+MeterBridge::on_map ()
 {
        start_metering ();
-       return Window::map_event_impl (ev);
+       return Window::on_map ();
 }
 
-gint
-MeterBridge::unmap_event_impl (GdkEventAny *ev)
+void
+MeterBridge::on_unmap ()
 {
        stop_metering ();
-       return Window::unmap_event_impl (ev);
+       return Window::on_unmap ();
 }