ardour/livetrax
13
0
Fork 0
Code

fix missing Click outputs for new sessions

Browse Source
This commit is contained in:
Paul Davis 2013-10-18 15:20:19 -04:00
parent da5a490678
commit c4b1a5504e
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/ardour/ardour/session.h
View File

@ -1610,7 +1610,7 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
void setup_ltc ();
void setup_click ();
void setup_click_state (const XMLNode&);
void setup_click_state (const XMLNode*);
void setup_bundles ();
static int get_session_info_from_path (XMLTree& state_tree, const std::string& xmlpath);

10
libs/ardour/session.cc
View File

@ -597,16 +597,18 @@ Session::setup_click ()
_click_gain.reset (new Amp (*this));
_click_gain->activate ();
if (state_tree) {
setup_click_state (*state_tree->root());
setup_click_state (state_tree->root());
} else {
setup_click_state (0);
}
}
void
Session::setup_click_state (const XMLNode& node)
Session::setup_click_state (const XMLNode* node)
{
const XMLNode* child = 0;
if ((child = find_named_node (node, "Click")) != 0) {
if (node && (child = find_named_node (*node, "Click")) != 0) {
/* existing state for Click */
int c = 0;

2
libs/ardour/session_state.cc
View File

@ -1317,7 +1317,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) {