Merge branch 'ardour'

gtk2_ardour/gain_meter.cc

@@ -45,6 +45,7 @@
 #include "gtkmm2ext/utils.h"
 #include "gtkmm2ext/gtk_ui.h"
 
+#include "widgets/slider_controller.h"
 #include "widgets/tooltips.h"
 
 #include "pbd/fastlog.h"
@@ -315,6 +316,11 @@ GainMeterBase::set_gain_astate (AutoState as)
 	}
 }
 
+CairoWidget&
+GainMeterBase::get_gain_slider() const {
+	return *gain_slider;
+}
+
 void
 GainMeterBase::setup_gain_adjustment ()
 {
@@ -676,7 +682,7 @@ void
 GainMeterBase::update_gain_sensitive ()
 {
 	bool x = !(_control->alist()->automation_state() & Play);
-	static_cast<ArdourWidgets::SliderController*>(gain_slider)->set_sensitive (x);
+	gain_slider->set_sensitive (x);
 }
 
 gint

gtk2_ardour/gain_meter.h

@@ -48,7 +48,6 @@
 
 #include "widgets/ardour_button.h"
 #include "widgets/focus_entry.h"
-#include "widgets/slider_controller.h"
 
 #include "enums.h"
 #include "level_meter.h"
@@ -70,6 +69,10 @@ namespace Gtk {
 	class Menu;
 }
 
+namespace ArdourWidgets {
+	class SliderController;
+}
+
 enum MeterPointChangeTarget {
 	MeterPointChangeAll,
 	MeterPointChangeGroup,
@@ -106,7 +109,7 @@ public:
 	std::shared_ptr<PBD::Controllable> get_controllable();
 
 	LevelMeterHBox& get_level_meter() const { return *level_meter; }
-	ArdourWidgets::SliderController& get_gain_slider() const { return *gain_slider; }
+	CairoWidget& get_gain_slider() const;
 
 	/** Emitted in the GUI thread when a button is pressed over the level meter;
 	 *  return true if the event is handled.

gtk2_ardour/level_meter.h

@@ -37,8 +37,6 @@
 #include "ardour/session_handle.h"
 
 #include "widgets/fastmeter.h"
-#include "widgets/focus_entry.h"
-#include "widgets/slider_controller.h"
 
 #include "enums.h"
 

gtk2_ardour/option_editor.cc

@@ -46,6 +46,7 @@
 #include "pbd/strsplit.h"
 
 #include "widgets/frame.h"
+#include "widgets/slider_controller.h"
 
 #include "gui_thread.h"
 #include "option_editor.h"
@@ -679,6 +680,11 @@ FaderOption::add_to_page (OptionEditorPage* p)
 	add_widgets_to_page (p, _label, &_box);
 }
 
+Gtk::Widget&
+FaderOption::tip_widget() {
+	return *_db_slider;
+}
+
 /*--------------------------*/
 
 ClockOption::ClockOption (string const & i, string const & n, sigc::slot<std::string> g, sigc::slot<bool, std::string> s)

gtk2_ardour/option_editor.h

@@ -39,8 +39,6 @@
 
 #include "pbd/configuration.h"
 
-#include "widgets/slider_controller.h"
-
 #include "actions.h"
 #include "ardour_window.h"
 #include "audio_clock.h"
@@ -64,6 +62,7 @@
 
 namespace ArdourWidgets {
 	class Frame;
+	class HSliderController;
 }
 
 class OptionEditorPage;
@@ -601,7 +600,7 @@ public:
 	void set_state_from_config ();
 	void add_to_page (OptionEditorPage *);
 
-	Gtk::Widget& tip_widget() { return *_db_slider; }
+	Gtk::Widget& tip_widget();
 
 private:
 	void db_changed ();

gtk2_ardour/slot_properties_box.h

@@ -44,11 +44,6 @@ namespace ARDOUR {
 	class Location;
 }
 
-namespace ArdourWidgets {
-	class ArdourButton;
-	class HSliderController;
-}
-
 class TriggerPropertiesBox;
 class RegionPropertiesBox;
 class RegionOperationsBox;

gtk2_ardour/trigger_ui.h

@@ -20,13 +20,13 @@
 #define __ardour_gtk_trigger_ui_h__
 
 #include "gtkmm/colorselection.h"
+#include "gtkmm/entry.h"
 
 #include "gtkmm2ext/actions.h"
 #include "gtkmm2ext/bindings.h"
 
 #include "ardour/triggerbox.h"
 #include "widgets/ardour_button.h"
-#include "widgets/slider_controller.h"
 #include "widgets/frame.h"
 
 namespace Gtk

gtk2_ardour/virtual_keyboard_window.cc

@@ -26,6 +26,8 @@
 #include "ardour/session.h"
 
 #include "gtkmm2ext/utils.h"
+
+#include "widgets/slider_controller.h"
 #include "widgets/tooltips.h"
 
 #include "ardour_ui.h"

gtk2_ardour/virtual_keyboard_window.h

@@ -30,7 +30,6 @@
 #include "widgets/ardour_button.h"
 #include "widgets/ardour_dropdown.h"
 #include "widgets/ardour_knob.h"
-#include "widgets/slider_controller.h"
 
 #include "ardour_window.h"
 #include "pianokeyboard.h"
@@ -39,6 +38,10 @@ namespace ARDOUR {
 	class Session;
 }
 
+namespace ArdourWidgets {
+	class VSliderController;
+}
+
 class VKBDControl : public PBD::Controllable
 {
 public:

share/scripts/dm10studio.lua

@@ -34,7 +34,7 @@ function dsp_run (_, _, n_samples)
 		if #d == 0 then event_type = -1 else event_type = d[1] >> 4 end
 
 		-- intercept CC message
-		if #d == 3 and event_type == 11 and d[2] == 8 then
+		if #d == 3 and event_type == 11 and d[2] == 4 then
 			hihat_state = d[3]
 		end