Merge...

Author: dehnhardt

libs/surfaces/console1/c1_gui.h

@@ -32,15 +32,6 @@
 #include <ytkmm/scrolledwindow.h>
 #include <ytkmm/spinbutton.h>
 #include <ytkmm/notebook.h>
-#include <gtkmm/box.h>
-#include <gtkmm/combobox.h>
-#include <gtkmm/checkbutton.h>
-#include <gtkmm/image.h>
-#include <gtkmm/notebook.h>
-#include <gtkmm/scrolledwindow.h>
-#include <gtkmm/table.h>
-#include <gtkmm/treestore.h>
-#include <gtkmm/spinbutton.h>
 
 namespace Gtk {
     class ListStore;
@@ -74,7 +65,6 @@ class C1GUI : public Gtk::Notebook
 	Gtk::Image image;
 	Gtk::CheckButton swap_solo_mute_cb;
 	Gtk::CheckButton band_q_as_send_cb;
-	Gtk::CheckButton band_q_as_send_cb;
 	Gtk::CheckButton create_plugin_stubs_btn;
 
 	Gtk::TreeView plugin_assignment_editor;

libs/surfaces/console1/c1_operations.cc

@@ -417,17 +417,6 @@ Console1::eq_band_q (const uint32_t band, uint32_t value)
 	session->set_control (control, freq, PBD::Controllable::UseGroup);
 }
 
-void
-Console1::eq_band_q (const uint32_t band, uint32_t value)
-{
-	if (!_current_stripable || !_current_stripable->mapped_control (EQ_BandQ, band)) {
-		return;
-	}
-	std::shared_ptr<AutomationControl> control = _current_stripable->mapped_control (EQ_BandQ, band);
-	double freq = midi_to_control (control, value);
-	session->set_control (control, freq, PBD::Controllable::UseGroup);
-}
-
 // The Mixbus-Sends are in the EQ section
 // Without Shift:
 // LowMid Shape is Send 11
@@ -931,42 +920,6 @@ Console1::map_eq ()
 	}
 }
 
-void
-Console1::map_eq_mode (){
-#ifdef MIXBUS
-    DEBUG_TRACE (DEBUG::Console1, "Enter map_eq_mode()\n");
-	if (!_current_stripable)
-		return;
-    std::shared_ptr<ARDOUR::Route> rt = std::dynamic_pointer_cast<ARDOUR::Route>( _current_stripable );
-    if (!rt)
-        return;
-    EQ_MODE current_eq_mode = EQ_MODE (rt->eq_mode_control() ? rt->eq_mode_control()->get_value() : -1);
-    DEBUG_TRACE (DEBUG::Console1, string_compose ("map_eq_mode() - mode: %1\n", current_eq_mode));
-    if (current_eq_mode != strip_eq_mode)
-    {
-        strip_eq_mode = current_eq_mode;
-        EQBandQBindingChange();
-    }
-#endif
-}
-
-
-void
-Console1::map_eq_band_q (const uint32_t band)
-{
-    DEBUG_TRACE (DEBUG::Console1, string_compose( "map_eq_band_q band: %1 \n", band));
-	if (shift_state || switch_eq_q_dials) {
-		DEBUG_TRACE (DEBUG::Console1, "Exit map_eq_band_q 1\n");
-		return;
-	}
-	ControllerID controllerID = eq_q_controller_for_band (band);
-	if (map_encoder (controllerID)) {
-		std::shared_ptr<AutomationControl> control = _current_stripable->mapped_control (EQ_BandQ, band);
-		map_encoder (controllerID, control);
-    }
-}
-
-
 void
 Console1::map_eq_mode ()
 {
@@ -1208,36 +1161,6 @@ Console1::map_comp_emph ()
 	}
 }
 
-void Console1::eqBandQChangeMapping(){
-
-    DEBUG_TRACE(DEBUG::Console1, string_compose("eqBandQChangeMapping(): band_q_as_send = %1, strip_eq_mode = %2\n", band_q_as_send, strip_eq_mode));
-    Encoder* lme = get_encoder (LOW_MID_SHAPE);
-    Encoder* hme = get_encoder (HIGH_MID_SHAPE);
-    switch_eq_q_dials = band_q_as_send || (strip_eq_mode == EQM_HARRISON );
-
-    if (!lme || !hme)
-    {
-    	DEBUG_TRACE (DEBUG::Console1, "eqBandQChangeMapping: Controller not found \n");
-        return;
-    }
-
-    if ( switch_eq_q_dials )
-    {
-        DEBUG_TRACE (DEBUG::Console1, "eqBandQChangeMapping() set harrison or send mode\n");
-        lme->set_action(std::function<void (uint32_t)> (std::bind (&Console1::mb_send_level, this, 10, _1)));
-        hme->set_action(std::function<void (uint32_t)> (std::bind (&Console1::mb_send_level, this, 11, _1)));
-        map_mb_send_level (10);
-        map_mb_send_level (11);
-    }
-    else 
-    {
-        DEBUG_TRACE (DEBUG::Console1, "eqBandQChangeMapping() set ssl q mode\n");
-        lme->set_action(std::function<void (uint32_t)> (std::bind (&Console1::eq_band_q, this, 1, _1)));
-        hme->set_action(std::function<void (uint32_t)> (std::bind (&Console1::eq_band_q, this, 2, _1)));
-        map_eq_band_q (1);
-        map_eq_band_q (2);
-    }
-}
 
 void Console1::eqBandQChangeMapping (bool mapValues)
 {

libs/surfaces/console1/console1.h

@@ -689,8 +689,6 @@ class Console1 : public MIDISurface
 
 	bool map_select_plugin (const int32_t plugin_index);
 
-    void eqBandQChangeMapping();
-
     void eqBandQChangeMapping (bool mapValues);