diff options
| author | Sampo Savolainen <v2@iki.fi> | 2007-03-25 11:48:22 +0000 |
|---|---|---|
| committer | Sampo Savolainen <v2@iki.fi> | 2007-03-25 11:48:22 +0000 |
| commit | ee9f39ed3c764aa4a99dfd1634856468bbe944b2 (patch) | |
| tree | 89c7ca5431e8d6f5506b4c78f6fb474c10ae68fe /libs | |
| parent | 6bcb3cde4316b17dbf9d87ac3f3c2d4430c45069 (diff) | |
Send MMC/MTC options will stick now, and prevent the engine from messing
the configuration variables.
git-svn-id: svn://localhost/ardour2/trunk@1638 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ardour/session_midi.cc | 18 | ||||
| -rw-r--r-- | libs/ardour/session_state.cc | 5 |
2 files changed, 5 insertions, 18 deletions
diff --git a/libs/ardour/session_midi.cc b/libs/ardour/session_midi.cc index a043a60c27..f58098d9d1 100644 --- a/libs/ardour/session_midi.cc +++ b/libs/ardour/session_midi.cc @@ -398,24 +398,6 @@ Session::setup_midi_control () mtc_msg[10] = 0xf1; mtc_msg[12] = 0xf1; mtc_msg[14] = 0xf1; - - if (_mmc_port != 0) { - - Config->set_send_mmc (session_send_mmc); - - } else { - - mmc = 0; - session_send_mmc = false; - } - - if (_mtc_port != 0) { - - Config->set_send_mtc (session_send_mtc); - - } else { - session_send_mtc = false; - } } int diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc index ec170d728c..dfa95161a9 100644 --- a/libs/ardour/session_state.cc +++ b/libs/ardour/session_state.cc @@ -3177,6 +3177,8 @@ Session::config_changed (const char* parameter_name) /* mark us ready to send */ next_quarter_frame_to_send = 0; } + } else { + session_send_mtc = false; } } else if (PARAM_IS ("send-mmc")) { @@ -3187,6 +3189,9 @@ Session::config_changed (const char* parameter_name) if (_mmc_port != 0) { session_send_mmc = Config->get_send_mmc(); + } else { + mmc = 0; + session_send_mmc = false; } } else if (PARAM_IS ("midi-feedback")) { |