projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix newly-appearing crash-at-close caused by muddled thinking in pbd/pthread_utils
[ardour.git]
/
gtk2_ardour
/
gain_meter.h
diff --git
a/gtk2_ardour/gain_meter.h
b/gtk2_ardour/gain_meter.h
index 466569e355d4be2492872e3e57f94702911821f3..8286cbeb954893b8cd6abc73ca36e58277433439 100644
(file)
--- a/
gtk2_ardour/gain_meter.h
+++ b/
gtk2_ardour/gain_meter.h
@@
-85,10
+85,11
@@
class GainMeterBase : virtual public sigc::trackable, ARDOUR::SessionHandlePtr
void set_flat_buttons ();
virtual void setup_meters (int len=0);
void set_flat_buttons ();
virtual void setup_meters (int len=0);
+ virtual void set_type (ARDOUR::MeterType);
boost::shared_ptr<PBD::Controllable> get_controllable();
boost::shared_ptr<PBD::Controllable> get_controllable();
- LevelMeter& get_level_meter() const { return *level_meter; }
+ LevelMeter
HBox
& get_level_meter() const { return *level_meter; }
Gtkmm2ext::SliderController& get_gain_slider() const { return *gain_slider; }
/** Emitted in the GUI thread when a button is pressed over the level meter;
Gtkmm2ext::SliderController& get_gain_slider() const { return *gain_slider; }
/** Emitted in the GUI thread when a button is pressed over the level meter;
@@
-114,7
+115,9
@@
class GainMeterBase : virtual public sigc::trackable, ARDOUR::SessionHandlePtr
Gtkmm2ext::FocusEntry gain_display;
Gtk::Button peak_display;
Gtk::DrawingArea meter_metric_area;
Gtkmm2ext::FocusEntry gain_display;
Gtk::Button peak_display;
Gtk::DrawingArea meter_metric_area;
- LevelMeter *level_meter;
+ Gtk::DrawingArea meter_ticks1_area;
+ Gtk::DrawingArea meter_ticks2_area;
+ LevelMeterHBox *level_meter;
sigc::connection gain_watching;
sigc::connection gain_watching;
@@
-179,11
+182,10
@@
class GainMeterBase : virtual public sigc::trackable, ARDOUR::SessionHandlePtr
void parameter_changed (const char*);
void reset_peak_display ();
void parameter_changed (const char*);
void reset_peak_display ();
+ void reset_route_peak_display (ARDOUR::Route*);
void reset_group_peak_display (ARDOUR::RouteGroup*);
void reset_group_peak_display (ARDOUR::RouteGroup*);
- static sigc::signal<void> ResetAllPeakDisplays;
- static sigc::signal<void,ARDOUR::RouteGroup*> ResetGroupPeakDisplays;
-
+ void redraw_metrics ();
void on_theme_changed ();
void color_handler(bool);
ARDOUR::DataType _data_type;
void on_theme_changed ();
void color_handler(bool);
ARDOUR::DataType _data_type;
@@
-199,7
+201,7
@@
class GainMeter : public GainMeterBase, public Gtk::VBox
{
public:
GainMeter (ARDOUR::Session*, int);
{
public:
GainMeter (ARDOUR::Session*, int);
- ~GainMeter () {}
+ virtual ~GainMeter ();
virtual void set_controls (boost::shared_ptr<ARDOUR::Route> route,
boost::shared_ptr<ARDOUR::PeakMeter> meter,
virtual void set_controls (boost::shared_ptr<ARDOUR::Route> route,
boost::shared_ptr<ARDOUR::PeakMeter> meter,
@@
-207,20
+209,26
@@
class GainMeter : public GainMeterBase, public Gtk::VBox
int get_gm_width ();
void setup_meters (int len=0);
int get_gm_width ();
void setup_meters (int len=0);
+ void set_type (ARDOUR::MeterType);
+ void route_active_changed ();
protected:
void hide_all_meters ();
gint meter_metrics_expose (GdkEventExpose *);
protected:
void hide_all_meters ();
gint meter_metrics_expose (GdkEventExpose *);
+ gint meter_ticks1_expose (GdkEventExpose *);
+ gint meter_ticks2_expose (GdkEventExpose *);
private:
void meter_configuration_changed (ARDOUR::ChanCount);
private:
void meter_configuration_changed (ARDOUR::ChanCount);
+ void meter_type_changed (ARDOUR::MeterType);
Gtk::HBox gain_display_box;
Gtk::HBox fader_box;
Gtk::VBox* fader_vbox;
Gtk::HBox hbox;
Gtk::HBox gain_display_box;
Gtk::HBox fader_box;
Gtk::VBox* fader_vbox;
Gtk::HBox hbox;
+ Gtk::HBox meter_hbox;
Gtk::Alignment fader_alignment;
Gtk::Alignment meter_alignment;
std::vector<ARDOUR::DataType> _types;
Gtk::Alignment fader_alignment;
Gtk::Alignment meter_alignment;
std::vector<ARDOUR::DataType> _types;