smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 14:54:56 +01:00
Code Issues Projects Releases Wiki Activity

Move "Feedback" option to control-portocol settings

Browse source
This commit is contained in:
Robin Gareus 2016-12-28 22:59:15 +01:00
parent e1846c79a9
commit d1e869f96d
3 changed files with 31 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

17
libs/surfaces/generic_midi/gmcp_gui.cc
View file

@ -54,6 +54,7 @@ private:
Gtk::ComboBoxText map_combo;
Gtk::Adjustment bank_adjustment;
Gtk::SpinButton bank_spinner;
Gtk::CheckButton feedback_enable;
Gtk::CheckButton motorised_button;
Gtk::Adjustment threshold_adjustment;
Gtk::SpinButton threshold_spinner;
@ -65,6 +66,7 @@ private:
void bank_changed ();
void motorised_changed ();
void threshold_changed ();
void toggle_feedback_enable ();
void update_port_combos ();
PBD::ScopedConnection connection_change_connection;
@ -128,7 +130,8 @@ GMCPGUI::GMCPGUI (GenericMidiControlProtocol& p)
: cp (p)
, bank_adjustment (1, 1, 100, 1, 10)
, bank_spinner (bank_adjustment)
, motorised_button ("Motorised")
, feedback_enable (_("Enable Feedback"))
, motorised_button (_("Motorised"))
, threshold_adjustment (p.threshold(), 1, 127, 1, 10)
, threshold_spinner (threshold_adjustment)
, ignore_active_change (false)
@ -202,6 +205,12 @@ GMCPGUI::GMCPGUI (GenericMidiControlProtocol& p)
bank_spinner.show ();
label->show ();
feedback_enable.signal_toggled().connect (sigc::mem_fun (*this, &GMCPGUI::toggle_feedback_enable));
table->attach (feedback_enable, 0, 2, n, n + 1);
++n;
feedback_enable.show ();
feedback_enable.set_active (p.get_feedback ());
motorised_button.signal_toggled().connect (sigc::mem_fun (*this, &GMCPGUI::motorised_changed));
table->attach (motorised_button, 0, 2, n, n + 1);
++n;
@ -266,6 +275,12 @@ GMCPGUI::binding_changed ()
}
}
void
GMCPGUI::toggle_feedback_enable ()
{
cp.set_feedback (feedback_enable.get_active ());
}
void
GMCPGUI::motorised_changed ()
{

14
libs/surfaces/osc/osc_gui.cc
View file

@ -266,11 +266,14 @@ OSC_GUI::OSC_GUI (OSC& p)
fbtable->set_col_spacings (6);
fbtable->set_border_width (12);
// show our url
label = manage (new Gtk::Label(_("Select Desired Types of Feedback")));
fbtable->attach (*label, 0, 2, fn, fn+1, AttachOptions(FILL|EXPAND), AttachOptions(0));
++fn;
feedback_enable.add (*manage (new Label (_("Enable Feedback"))));
fbtable->attach (feedback_enable, 0, 2, fn, fn+1, AttachOptions(FILL|EXPAND), AttachOptions(0));
++fn;
label = manage (new Gtk::Label(_("Feedback Value:")));
label->set_alignment(1, .5);
fbtable->attach (*label, 0, 1, fn, fn+1, AttachOptions(FILL|EXPAND), AttachOptions(0), 0, 15);
@ -369,6 +372,7 @@ OSC_GUI::OSC_GUI (OSC& p)
// set strips and feedback from loaded default values
reshow_values ();
// connect signals
feedback_enable.signal_clicked().connect (sigc::mem_fun (*this, &OSC_GUI::toggle_feedback_enable));
audio_tracks.signal_clicked().connect (sigc::mem_fun (*this, &OSC_GUI::set_bitsets));
midi_tracks.signal_clicked().connect (sigc::mem_fun (*this, &OSC_GUI::set_bitsets));
audio_buses.signal_clicked().connect (sigc::mem_fun (*this, &OSC_GUI::set_bitsets));
@ -601,6 +605,8 @@ OSC_GUI::reshow_values ()
//hp_gui.set_active (false); // we don't have this yet (Mixbus wants)
select_fb.set_active(def_feedback & 8192);
feedback_enable.set_active (cp.get_feedback ());
calculate_strip_types ();
calculate_feedback ();
}
@ -693,6 +699,12 @@ OSC_GUI::calculate_strip_types ()
current_strip_types.set_text(string_compose("%1", stvalue));
}
void
OSC_GUI::toggle_feedback_enable ()
{
cp.set_feedback (feedback_enable.get_active ());
}
void
OSC_GUI::set_bitsets ()
{

2
libs/surfaces/osc/osc_gui.h
View file

@ -92,6 +92,7 @@ private:
uint32_t def_feedback;
void calculate_feedback ();
Gtk::Label current_feedback;
Gtk::CheckButton feedback_enable;
Gtk::CheckButton strip_buttons_button;
Gtk::CheckButton strip_control_button;
Gtk::CheckButton ssid_as_path;
@ -108,6 +109,7 @@ private:
Gtk::CheckButton select_fb;
int fbvalue;
void set_bitsets ();
void toggle_feedback_enable ();