From 02a5c4088b79b830bec23827acd934c2e58bbcf3 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Sat, 4 Aug 2007 14:46:39 +0000 Subject: [PATCH] use all-call default for MMC send ID, and correct parameter names in session state handling git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2240 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/ardour/configuration_vars.h | 2 +- libs/ardour/session_state.cc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/ardour/ardour/configuration_vars.h b/libs/ardour/ardour/configuration_vars.h index 133a0af6e1..8c3cb38ebe 100644 --- a/libs/ardour/ardour/configuration_vars.h +++ b/libs/ardour/ardour/configuration_vars.h @@ -37,7 +37,7 @@ CONFIG_VARIABLE (bool, send_mmc, "send-mmc", false) CONFIG_VARIABLE (bool, mmc_control, "mmc-control", false) CONFIG_VARIABLE (bool, midi_feedback, "midi-feedback", false) CONFIG_VARIABLE (uint8_t, mmc_receive_device_id, "mmc-receive-device-id", 0) -CONFIG_VARIABLE (uint8_t, mmc_send_device_id, "mmc-send-device-id", 0) +CONFIG_VARIABLE (uint8_t, mmc_send_device_id, "mmc-send-device-id", 0x7f) /* control surfaces */ diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc index e30d3e4948..e14c1c3779 100644 --- a/libs/ardour/session_state.cc +++ b/libs/ardour/session_state.cc @@ -3163,13 +3163,13 @@ Session::config_changed (const char* parameter_name) poke_midi_thread (); - } else if (PARAM_IS ("mmc-device-id") || PARAM_IS ("mmc-receive-id")) { + } 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()); } - } else if (PARAM_IS ("mmc-send-id")) { + } else if (PARAM_IS ("mmc-send-device-id")) { if (mmc) { mmc->set_send_device_id (Config->get_mmc_send_device_id());