small but major fix for Controllable state storage (do not create illegal XML nodes...

[ardour.git] / gtk2_ardour / meter_bridge.cc

diff --git a/gtk2_ardour/meter_bridge.cc b/gtk2_ardour/meter_bridge.cc
index 755eae94c0b58d108e5f018a5bc94efd0a360606..0e88eff5e06ed660aa6833a1f6e274b4af3b1998 100644 (file)
--- a/gtk2_ardour/meter_bridge.cc
+++ b/gtk2_ardour/meter_bridge.cc
@@ -20,7 +20,7 @@
 
 #include <ardour/session.h>
 #include <ardour/session_route.h>
-#include <ardour/diskstream.h>
+#include <ardour/audio_diskstream.h>
 #include <ardour/audio_track.h>
 
 #include "ardour_ui.h"
@@ -32,6 +32,7 @@
 #include "i18n.h"
 
 using namespace ARDOUR;
+using namespace PBD;
 using namespace Gtk;
 using namespace sigc;
 
@@ -39,7 +40,10 @@ using namespace sigc;
 #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);
@@ -72,7 +76,7 @@ MeterBridge::MeterBridge ()
        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_wmclass (X_("ardour_meter_bridge"), "Ardour");
        // set_policy (false, false, false); // no user resizing of any kind
 
        signal_delete_event().connect (bind (sigc::ptr_fun (just_hide_it), static_cast<Gtk::Window*>(this)));
@@ -97,7 +101,7 @@ MeterBridge::set_session (Session *s)
                // (refs vs. ptrs)
                // session->foreach_route (this, &MeterBridge::add_route);
                session->RouteAdded.connect (mem_fun(*this, &MeterBridge::add_route));
-               session->going_away.connect (mem_fun(*this, &MeterBridge::session_gone));
+               session->GoingAway.connect (mem_fun(*this, &MeterBridge::session_gone));
                start_metering ();
        }
 }
@@ -167,7 +171,7 @@ MeterBridge::add_route (ARDOUR::Route* route)
     
        meter->set_meter_on(true);
        
-       session->going_away.connect (mem_fun(*this, &MeterBridge::session_gone));
+       session->GoingAway.connect (mem_fun(*this, &MeterBridge::session_gone));
 }
 
 void
@@ -240,17 +244,17 @@ MeterBridge::toggle_metering ()
        }
 }
 
-bool
-MeterBridge::on_map (GdkEventAny *ev)
+void
+MeterBridge::on_map ()
 {
        start_metering ();
-       return Window::on_map (ev);
+       return Window::on_map ();
 }
 
-bool
-MeterBridge::on_unmap (GdkEventAny *ev)
+void
+MeterBridge::on_unmap ()
 {
        stop_metering ();
-       return Window::on_unmap (ev);
+       return Window::on_unmap ();
 }