diff options
| -rw-r--r-- | gtk2_ardour/ardour_ui.h | 1 | ||||
| -rw-r--r-- | gtk2_ardour/ardour_ui_ed.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/ardour_ui_options.cc | 8 | ||||
| -rw-r--r-- | gtk2_ardour/rc_option_editor.cc | 10 | ||||
| -rw-r--r-- | libs/ardour/ardour/session.h | 1 | ||||
| -rw-r--r-- | libs/ardour/session.cc | 1 | ||||
| -rw-r--r-- | libs/ardour/session_state.cc | 4 | ||||
| -rw-r--r-- | libs/surfaces/generic_midi/midicontrollable.h | 3 |
8 files changed, 0 insertions, 30 deletions
diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index d0749e59fe..cc469142b4 100644 --- a/gtk2_ardour/ardour_ui.h +++ b/gtk2_ardour/ardour_ui.h @@ -799,7 +799,6 @@ private: std::vector<std::string> positional_sync_strings; - void toggle_send_midi_feedback (); void toggle_use_mmc (); void toggle_send_mmc (); void toggle_send_mtc (); diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc index d9275e0892..ace6076e4d 100644 --- a/gtk2_ardour/ardour_ui_ed.cc +++ b/gtk2_ardour/ardour_ui_ed.cc @@ -558,8 +558,6 @@ ARDOUR_UI::install_actions () ActionManager::session_sensitive_actions.push_back (act); act = global_actions.register_toggle_action (option_actions, X_("SendMidiClock"), _("Send MIDI Clock"), sigc::mem_fun (*this, &ARDOUR_UI::toggle_send_midi_clock)); ActionManager::session_sensitive_actions.push_back (act); - act = global_actions.register_toggle_action (option_actions, X_("SendMIDIfeedback"), _("Send MIDI Feedback"), sigc::mem_fun (*this, &ARDOUR_UI::toggle_send_midi_feedback)); - ActionManager::session_sensitive_actions.push_back (act); /* MIDI */ diff --git a/gtk2_ardour/ardour_ui_options.cc b/gtk2_ardour/ardour_ui_options.cc index dc0e8b41f4..318a2bfe60 100644 --- a/gtk2_ardour/ardour_ui_options.cc +++ b/gtk2_ardour/ardour_ui_options.cc @@ -105,12 +105,6 @@ ARDOUR_UI::toggle_use_mmc () } void -ARDOUR_UI::toggle_send_midi_feedback () -{ - ActionManager::toggle_config_state ("Options", "SendMIDIfeedback", &RCConfiguration::set_midi_feedback, &RCConfiguration::get_midi_feedback); -} - -void ARDOUR_UI::toggle_auto_input () { ActionManager::toggle_config_state_foo ("Transport", "ToggleAutoInput", sigc::mem_fun (_session->config, &SessionConfiguration::set_auto_input), sigc::mem_fun (_session->config, &SessionConfiguration::get_auto_input)); @@ -340,8 +334,6 @@ ARDOUR_UI::parameter_changed (std::string p) } else if (p == "mmc-control") { ActionManager::map_some_state ("Options", "UseMMC", &RCConfiguration::get_mmc_control); - } else if (p == "midi-feedback") { - ActionManager::map_some_state ("Options", "SendMIDIfeedback", &RCConfiguration::get_midi_feedback); } else if (p == "auto-play") { ActionManager::map_some_state ("Transport", "ToggleAutoPlay", sigc::mem_fun (_session->config, &SessionConfiguration::get_auto_play)); } else if (p == "auto-return") { diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc index 24199f6d98..f20bca19b0 100644 --- a/gtk2_ardour/rc_option_editor.cc +++ b/gtk2_ardour/rc_option_editor.cc @@ -2716,16 +2716,6 @@ if (!Profile->get_mixbus()) { sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_never_display_periodic_midi) )); -#if 0 // unused ?! - add_option (_("MIDI"), - new BoolOption ( - "midi-feedback", - _("Send MIDI control feedback"), - sigc::mem_fun (*_rc_config, &RCConfiguration::get_midi_feedback), - sigc::mem_fun (*_rc_config, &RCConfiguration::set_midi_feedback) - )); -#endif - add_option (_("MIDI"), new OptionEditorHeading (_("Audition"))); add_option (_("MIDI"), diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index 798566152d..47617608f3 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -1363,7 +1363,6 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop * know when to send full MTC messages every so often. */ pframes_t _pframes_since_last_mtc; - bool session_midi_feedback; bool play_loop; bool loop_changing; framepos_t last_loopend; diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index 56b3f2a38c..c373539ad6 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -222,7 +222,6 @@ Session::Session (AudioEngine &eng, , _is_new (true) , _send_qf_mtc (false) , _pframes_since_last_mtc (0) - , session_midi_feedback (0) , play_loop (false) , loop_changing (false) , last_loopend (0) diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc index 3d839d8186..0dbd21d04d 100644 --- a/libs/ardour/session_state.cc +++ b/libs/ardour/session_state.cc @@ -3951,10 +3951,6 @@ Session::config_changed (std::string p, bool ours) _mmc->enable_send (Config->get_send_mmc ()); - } else if (p == "midi-feedback") { - - session_midi_feedback = Config->get_midi_feedback(); - } else if (p == "jack-time-master") { engine().reset_timebase (); diff --git a/libs/surfaces/generic_midi/midicontrollable.h b/libs/surfaces/generic_midi/midicontrollable.h index ebae2e9294..a2d96b7830 100644 --- a/libs/surfaces/generic_midi/midicontrollable.h +++ b/libs/surfaces/generic_midi/midicontrollable.h @@ -75,9 +75,6 @@ class MIDIControllable : public PBD::Stateful void stop_learning (); void drop_external_control (); - bool get_midi_feedback () { return feedback; } - void set_midi_feedback (bool val) { feedback = val; } - int control_to_midi(float val); float midi_to_control(int val); |