tweaks for the monitor section. refactoring of some buttons, using new ArdourKnob instead of VolumeController. New ArdourDisplay shows a controllables user value, and provides support for preset values (hardcoded at present). Further refactoring to come, so that ArdourWidgets are derived from a common class. Controllable now has more responsibility for scaling between internal, user, and interface (knob percent) values. This also needs more refactoring and might have some unintended consequences. tested with audio and nothing seems amiss, yet.

1 files changed, 11 insertions, 4 deletions

diff --git a/gtk2_ardour/monitor_section.h b/gtk2_ardour/monitor_section.h
index f7848a3f01..d1fc7d8da1 100644
--- a/gtk2_ardour/monitor_section.h
+++ b/gtk2_ardour/monitor_section.h
@@ -23,6 +23,8 @@
 #include "gtkmm2ext/bindable_button.h"
 
 #include "ardour_button.h"
+#include "ardour_knob.h"
+#include "ardour_display.h"
 #include "axis_view.h"
 #include "level_meter.h"
 #include "route_ui.h"
@@ -74,11 +76,16 @@ class MonitorSection : public RouteUI
         typedef std::vector<ChannelButtonSet*> ChannelButtons;
         ChannelButtons _channel_buttons;
 
-        VolumeController* gain_control;
-        VolumeController* dim_control;
-        VolumeController* solo_boost_control;
-        VolumeController* solo_cut_control;
+        ArdourKnob* gain_control;
+        ArdourKnob* dim_control;
+        ArdourKnob* solo_boost_control;
+        ArdourKnob* solo_cut_control;
 
+		ArdourDisplay*  gain_display;
+		ArdourDisplay*  dim_display;
+		ArdourDisplay*  solo_boost_display;
+		ArdourDisplay*  solo_cut_display;
+		
         void populate_buttons ();
         void map_state ();