smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-08 14:45:43 +01:00
Code Issues Projects Releases Wiki Activity

fix resetting MMC send + recv ID

Browse source 
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2252 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2007-08-06 01:04:03 +00:00
parent e62f14e707
commit 1ad76a6c10
3 changed files with 10 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

10
gtk2_ardour/option_editor.cc
View file

@ -705,9 +705,7 @@ OptionEditor::mmc_receive_device_id_adjusted ()
{
uint8_t id = (uint8_t) mmc_receive_device_id_spinner.get_value();
if (id != Config->get_mmc_receive_device_id()) {
Config->set_mmc_receive_device_id (id);
}
Config->set_mmc_receive_device_id (id);
}
void
@ -715,9 +713,9 @@ OptionEditor::mmc_send_device_id_adjusted ()
{
uint8_t id = (uint8_t) mmc_send_device_id_spinner.get_value();
if (id != Config->get_mmc_send_device_id()) {
Config->set_mmc_send_device_id (id);
}
cerr << "New send ID = " << (int) id << endl;
Config->set_mmc_send_device_id (id);
}
void

6
libs/ardour/session_midi.cc
View file

@ -138,6 +138,8 @@ Session::set_mmc_send_device_id (uint32_t device_id)
{
if (mmc) {
mmc->set_send_device_id (device_id);
/* reset MMC buffer */
mmc_buffer[2] = mmc->send_device_id();
}
}
@ -176,8 +178,8 @@ Session::set_mmc_port (string port_tag)
MMC_ResponseSignature);
if (reset_id) {
mmc->set_receive_device_id (old_recv_device_id);
mmc->set_send_device_id (old_send_device_id);
set_mmc_receive_device_id (old_recv_device_id);
set_mmc_send_device_id (old_send_device_id);
}
mmc->Play.connect

8
libs/ardour/session_state.cc
View file

@ -3169,15 +3169,11 @@ Session::config_changed (const char* parameter_name)
} else if (PARAM_IS ("mmc-device-id") || PARAM_IS ("mmc-receive-device-id")) {
if (mmc) {
mmc->set_receive_device_id (Config->get_mmc_receive_device_id());
}
set_mmc_receive_device_id (Config->get_mmc_receive_device_id());
} else if (PARAM_IS ("mmc-send-device-id")) {
if (mmc) {
mmc->set_send_device_id (Config->get_mmc_send_device_id());
}
set_mmc_send_device_id (Config->get_mmc_send_device_id());
} else if (PARAM_IS ("midi-control")) {