Remove cruft (old MIDI feedback API)

diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h
index d0749e59fe3bbfca9afbec43b3da7aa2c8f0dd64..cc469142b49ea44cf6b45836e325ccc56d20651e 100644 (file)
--- 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 d9275e089283792281e598621dcbbcb1259bbf7d..ace6076e4deb95e52dfcd6ef7a5526ff7996ba3f 100644 (file)
--- 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 dc0e8b41f49b5c167b99370c93d4e88243e10b19..318a2bfe602432870021cce20245b96dc17a85c2 100644 (file)
--- a/gtk2_ardour/ardour_ui_options.cc
+++ b/gtk2_ardour/ardour_ui_options.cc
@@ -104,12 +104,6 @@ ARDOUR_UI::toggle_use_mmc ()
        ActionManager::toggle_config_state ("Options", "UseMMC", &RCConfiguration::set_mmc_control, &RCConfiguration::get_mmc_control);
 }
 
-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 ()
 {
@@ -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 24199f6d9857fef7d09c7fe2d57ed329a6781809..f20bca19b0e767001e24ff6fef8f183ec5b1ba81 100644 (file)
--- 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 798566152d8703d586585f3abedb3d8dbff420a5..47617608f339f5493c5ff9b75ac74a353ff4be3c 100644 (file)
--- 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 56b3f2a38cb9a80b9fd07d6bd0503379bd86ef5d..c373539ad64f74e3261a925673a58ebe8f2900e2 100644 (file)
--- 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 3d839d818634f4519bf8377d0b0bbd6744cd27f1..0dbd21d04d964900968887d811b8e80cab9000dd 100644 (file)
--- 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 ebae2e9294341134a223aed851b4a52a5dc0f14a..a2d96b783069efce39700cadb6361c5f0e26f330 100644 (file)
--- 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);