some fixes/improvements for track selection; add upload target to manual makefile...

[ardour.git] / gtk2_ardour / meter_bridge_strip.h

diff --git a/gtk2_ardour/meter_bridge_strip.h b/gtk2_ardour/meter_bridge_strip.h
index 932c2de925fe695657e77197e8ab020cc0e5a573..bdce16f17c5b2725f5f55fc98d4347d2176d7487 100644 (file)
--- a/gtk2_ardour/meter_bridge_strip.h
+++ b/gtk2_ardour/meter_bridge_strip.h
@@ -21,9 +21,15 @@
 #ifndef __ardour_meterbridgestrip_h__
 #define __ardour_meterbridgestrip_h__
 
-#include <sigc++/signal_system.h>
-#include <gtk--.h>
-#include <gtkmmext/fastmeter.h>
+#include <sigc++/signal.h>
+
+#include <gtkmm/box.h>
+#include <gtkmm/widget.h>
+#include <gtkmm/eventbox.h>
+#include <gtkmm/label.h>
+#include <gtkmm/frame.h>
+
+#include <gtkmm2ext/fastmeter.h>
 
 namespace ARDOUR {
        class AudioEngine;
@@ -31,12 +37,12 @@ namespace ARDOUR {
        class Route;
 }
 
-namespace Gtkmmext {
+namespace Gtkmm2ext {
        class Selector;
        struct SelectionResult;
 }
 
-class MeterBridgeStrip : public SigC::Object
+class MeterBridgeStrip : public sigc::trackable
 
 {
   public:
@@ -44,9 +50,9 @@ class MeterBridgeStrip : public SigC::Object
                          ARDOUR::Session&,
                          ARDOUR::Route&,
                          string label,
-                         jack_nframes_t long_over,
-                         jack_nframes_t short_over,
-                         jack_nframes_t meter_hold);
+                         nframes_t long_over,
+                         nframes_t short_over,
+                         nframes_t meter_hold);
        
        void update ();  /* called by meter timeout handler from ARDOUR_UI */
 
@@ -74,7 +80,7 @@ class MeterBridgeStrip : public SigC::Object
        bool                    meter_clear_pending;
        bool                    over_clear_pending;
 
-       Gtkmmext::FastMeter meter;
+       Gtkmm2ext::FastMeter meter;
        bool                meter_on;
 
        Gtk::VBox          above_meter_vbox;