diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-10-23 08:47:57 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-10-23 08:47:57 -0400 |
| commit | d135c4dc3a307d0be606f3afbbc8fd8c3ec56438 (patch) | |
| tree | dbedf6ddfe1c1b6557a885ad3b87455ba2213a12 /libs/ardour/session_state.cc | |
| parent | fb313fb1741a04f270fff3703967df572ac4fc45 (diff) | |
| parent | 75271a17d8d4ed0003c4627e80a28feb68f5d9c9 (diff) | |
fix merge conflicts with master
Diffstat (limited to 'libs/ardour/session_state.cc')
| -rw-r--r-- | libs/ardour/session_state.cc | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc index 59bb3fd718..bbd3432205 100644 --- a/libs/ardour/session_state.cc +++ b/libs/ardour/session_state.cc @@ -1318,7 +1318,7 @@ Session::set_state (const XMLNode& node, int version) if ((child = find_named_node (node, "Click")) == 0) { warning << _("Session: XML state has no click section") << endmsg; } else if (_click_io) { - setup_click_state (node); + setup_click_state (&node); } if ((child = find_named_node (node, ControlProtocolManager::state_node_name)) != 0) { @@ -3483,22 +3483,6 @@ Session::config_changed (std::string p, bool ours) /* XXX DO SOMETHING HERE TO TELL THE GUI THAT WE NEED TO SET REMOTE ID'S */ - } else if (p == "sync-all-route-ordering") { - - /* sync to editor order unless mixer is used for remote IDs - */ - - switch (Config->get_remote_model()) { - case UserOrdered: - sync_order_keys (EditorSort); - break; - case EditorOrdered: - sync_order_keys (EditorSort); - break; - case MixerOrdered: - sync_order_keys (MixerSort); - } - } else if (p == "initial-program-change") { if (_mmc->output_port() && Config->get_initial_program_change() >= 0) { |