Remove cruft (old MIDI feedback API)
This commit is contained in:
parent
a2bf54c041
commit
3afe3f32df
|
@ -799,7 +799,6 @@ private:
|
||||||
|
|
||||||
std::vector<std::string> positional_sync_strings;
|
std::vector<std::string> positional_sync_strings;
|
||||||
|
|
||||||
void toggle_send_midi_feedback ();
|
|
||||||
void toggle_use_mmc ();
|
void toggle_use_mmc ();
|
||||||
void toggle_send_mmc ();
|
void toggle_send_mmc ();
|
||||||
void toggle_send_mtc ();
|
void toggle_send_mtc ();
|
||||||
|
|
|
@ -558,8 +558,6 @@ ARDOUR_UI::install_actions ()
|
||||||
ActionManager::session_sensitive_actions.push_back (act);
|
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));
|
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);
|
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 */
|
/* MIDI */
|
||||||
|
|
||||||
|
|
|
@ -104,12 +104,6 @@ ARDOUR_UI::toggle_use_mmc ()
|
||||||
ActionManager::toggle_config_state ("Options", "UseMMC", &RCConfiguration::set_mmc_control, &RCConfiguration::get_mmc_control);
|
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
|
void
|
||||||
ARDOUR_UI::toggle_auto_input ()
|
ARDOUR_UI::toggle_auto_input ()
|
||||||
{
|
{
|
||||||
|
@ -340,8 +334,6 @@ ARDOUR_UI::parameter_changed (std::string p)
|
||||||
|
|
||||||
} else if (p == "mmc-control") {
|
} else if (p == "mmc-control") {
|
||||||
ActionManager::map_some_state ("Options", "UseMMC", &RCConfiguration::get_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") {
|
} else if (p == "auto-play") {
|
||||||
ActionManager::map_some_state ("Transport", "ToggleAutoPlay", sigc::mem_fun (_session->config, &SessionConfiguration::get_auto_play));
|
ActionManager::map_some_state ("Transport", "ToggleAutoPlay", sigc::mem_fun (_session->config, &SessionConfiguration::get_auto_play));
|
||||||
} else if (p == "auto-return") {
|
} else if (p == "auto-return") {
|
||||||
|
|
|
@ -2716,16 +2716,6 @@ if (!Profile->get_mixbus()) {
|
||||||
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_never_display_periodic_midi)
|
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"), new OptionEditorHeading (_("Audition")));
|
||||||
|
|
||||||
add_option (_("MIDI"),
|
add_option (_("MIDI"),
|
||||||
|
|
|
@ -1363,7 +1363,6 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop
|
||||||
* know when to send full MTC messages every so often.
|
* know when to send full MTC messages every so often.
|
||||||
*/
|
*/
|
||||||
pframes_t _pframes_since_last_mtc;
|
pframes_t _pframes_since_last_mtc;
|
||||||
bool session_midi_feedback;
|
|
||||||
bool play_loop;
|
bool play_loop;
|
||||||
bool loop_changing;
|
bool loop_changing;
|
||||||
framepos_t last_loopend;
|
framepos_t last_loopend;
|
||||||
|
|
|
@ -222,7 +222,6 @@ Session::Session (AudioEngine &eng,
|
||||||
, _is_new (true)
|
, _is_new (true)
|
||||||
, _send_qf_mtc (false)
|
, _send_qf_mtc (false)
|
||||||
, _pframes_since_last_mtc (0)
|
, _pframes_since_last_mtc (0)
|
||||||
, session_midi_feedback (0)
|
|
||||||
, play_loop (false)
|
, play_loop (false)
|
||||||
, loop_changing (false)
|
, loop_changing (false)
|
||||||
, last_loopend (0)
|
, last_loopend (0)
|
||||||
|
|
|
@ -3951,10 +3951,6 @@ Session::config_changed (std::string p, bool ours)
|
||||||
|
|
||||||
_mmc->enable_send (Config->get_send_mmc ());
|
_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") {
|
} else if (p == "jack-time-master") {
|
||||||
|
|
||||||
engine().reset_timebase ();
|
engine().reset_timebase ();
|
||||||
|
|
|
@ -75,9 +75,6 @@ class MIDIControllable : public PBD::Stateful
|
||||||
void stop_learning ();
|
void stop_learning ();
|
||||||
void drop_external_control ();
|
void drop_external_control ();
|
||||||
|
|
||||||
bool get_midi_feedback () { return feedback; }
|
|
||||||
void set_midi_feedback (bool val) { feedback = val; }
|
|
||||||
|
|
||||||
int control_to_midi(float val);
|
int control_to_midi(float val);
|
||||||
float midi_to_control(int val);
|
float midi_to_control(int val);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user