X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Flevel_meter.h;h=a7a64d7559f7950ea8630b70e5e785ab5b187308;hb=555ef505212af84e501e47a067bed3c1fe799fe5;hp=dfae72a5768382084b3211c5a5b54b31f21644ee;hpb=b42213bb04031b954eda4f9b39c5f183bfb96ede;p=ardour.git

diff --git a/gtk2_ardour/level_meter.h b/gtk2_ardour/level_meter.h
index dfae72a576..a7a64d7559 100644
--- a/gtk2_ardour/level_meter.h
+++ b/gtk2_ardour/level_meter.h
@@ -21,7 +21,6 @@
 #define __ardour_gtk_track_meter_h__
 
 #include <vector>
-#include <map>
 
 #include <gtkmm/box.h>
 #include <gtkmm/adjustment.h>
@@ -31,79 +30,123 @@
 #include <gtkmm/table.h>
 #include <gtkmm/drawingarea.h>
 
-#include <ardour/types.h>
+#include "ardour/types.h"
+#include "ardour/chan_count.h"
+#include "ardour/session_handle.h"
 
 #include <gtkmm2ext/click_box.h>
 #include <gtkmm2ext/focus_entry.h>
 #include <gtkmm2ext/slider_controller.h>
+#include <gtkmm2ext/fastmeter.h>
 
 #include "enums.h"
 
 namespace ARDOUR {
-	class IO;
 	class Session;
-	class Route;
-	class RouteGroup;
-}
-namespace Gtkmm2ext {
-	class FastMeter;
-	class BarController;
+	class PeakMeter;
 }
 namespace Gtk {
 	class Menu;
 }
 
-class LevelMeter : public Gtk::HBox
+class LevelMeterBase : public ARDOUR::SessionHandlePtr, virtual public sigc::trackable
 {
   public:
-	LevelMeter (boost::shared_ptr<ARDOUR::IO>, ARDOUR::Session&);
-	~LevelMeter ();
+	LevelMeterBase (ARDOUR::Session*, PBD::EventLoop::InvalidationRecord* ir,
+			Gtkmm2ext::FastMeter::Orientation o = Gtkmm2ext::FastMeter::Vertical);
+	virtual ~LevelMeterBase ();
+
+	virtual void set_meter (ARDOUR::PeakMeter* meter);
 
 	void update_gain_sensitive ();
 
-	void update_meters ();
+	float update_meters ();
 	void update_meters_falloff ();
-	void clear_meters ();
+	void clear_meters (bool reset_highlight = true);
 	void hide_meters ();
-	void setup_meters (int len=0);
+	void setup_meters (int len=0, int width=3, int thin=2);
 
-  private:
+	void set_type (ARDOUR::MeterType);
+	ARDOUR::MeterType get_type () { return meter_type; }
 
-	//friend class MixerStrip;
-	boost::shared_ptr<ARDOUR::IO> _io;
-	ARDOUR::Session& _session;
+	/** Emitted in the GUI thread when a button is pressed over the meter */
+	PBD::Signal1<bool, GdkEventButton *> ButtonPress;
+	PBD::Signal1<bool, GdkEventButton *> ButtonRelease;
+	PBD::Signal1<void, ARDOUR::MeterType> MeterTypeChanged;
 
-	Width                       _width;
+	protected:
+	virtual void mtr_pack(Gtk::Widget &w) = 0;
+	virtual void mtr_remove(Gtk::Widget &w) = 0;
+
+  private:
+	PBD::EventLoop::InvalidationRecord* parent_invalidator;
+	ARDOUR::PeakMeter* _meter;
+	Gtkmm2ext::FastMeter::Orientation _meter_orientation;
+
+	Width _width;
 
 	struct MeterInfo {
 	    Gtkmm2ext::FastMeter *meter;
-	    gint16          width;
-		int				length;   
-	    bool            packed;
-	    
-	    MeterInfo() { 
+	    gint16                width;
+            int			  length;
+	    bool                  packed;
+	    float                 max_peak;
+
+	    MeterInfo() {
 		    meter = 0;
 		    width = 0;
-			length = 0;
+                    length = 0;
 		    packed = false;
+		    max_peak = -INFINITY;
 	    }
 	};
 
-	static const guint16 regular_meter_width = 3;
-	static const guint16 thin_meter_width = 2;
-	vector<MeterInfo>    meters;
+	guint16                regular_meter_width;
+	int                    meter_length;
+	guint16                thin_meter_width;
+	std::vector<MeterInfo> meters;
+	float                  max_peak;
+	ARDOUR::MeterType      meter_type;
+	ARDOUR::MeterType      visible_meter_type;
+	uint32_t               visible_meter_count;
+
+	PBD::ScopedConnection _configuration_connection;
+	PBD::ScopedConnection _meter_type_connection;
+	PBD::ScopedConnection _parameter_connection;
 
-	//Gtk::HBox   meter_packer;
-	
 	void hide_all_meters ();
+	bool meter_button_press (GdkEventButton *);
+	bool meter_button_release (GdkEventButton *);
 
-	void parameter_changed (const char*);
+	void parameter_changed (std::string);
+	void configuration_changed (ARDOUR::ChanCount in, ARDOUR::ChanCount out);
+	void meter_type_changed (ARDOUR::MeterType);
 
-	void on_theme_changed ();
-	bool style_changed;
 	bool color_changed;
 	void color_handler ();
 };
 
+class LevelMeterHBox : public LevelMeterBase, public Gtk::HBox
+{
+  public:
+	LevelMeterHBox (ARDOUR::Session*);
+	~LevelMeterHBox();
+
+	protected:
+	void mtr_pack(Gtk::Widget &w);
+	void mtr_remove(Gtk::Widget &w);
+};
+
+class LevelMeterVBox : public LevelMeterBase, public Gtk::VBox
+{
+  public:
+	LevelMeterVBox (ARDOUR::Session*);
+	~LevelMeterVBox();
+
+	protected:
+	void mtr_pack(Gtk::Widget &w);
+	void mtr_remove(Gtk::Widget &w);
+};
+
 #endif /* __ardour_gtk_track_meter_h__ */