summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2011-02-09 16:42:18 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2011-02-09 16:42:18 +0000
commitd9770ba4ccac352fa2d16ff40c5e626e20fba32e (patch)
treeac6e936c31f36e1af2dce435938d2ae88ab42d3e /libs
parent2b3adfb18f0c2befb39b8b56d3e3f07833cc7b33 (diff)
set up default speakers in new sessions
git-svn-id: svn://localhost/ardour2/branches/3.0@8809 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
-rw-r--r--libs/ardour/session_state.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc
index 54c36a3459..453d0ac772 100644
--- a/libs/ardour/session_state.cc
+++ b/libs/ardour/session_state.cc
@@ -259,6 +259,10 @@ Session::first_stage_init (string fullpath, string snapshot_name)
// set_default_fade (0.2, 5.0); /* steepness, millisecs */
+ /* default: assume simple stereo speaker configuration */
+
+ _speakers->setup_default_speakers (2);
+
/* slave stuff */
average_slave_delta = 1800; // !!! why 1800 ????
@@ -1296,10 +1300,7 @@ Session::set_state (const XMLNode& node, int version)
goto out;
}
- if ((child = find_named_node (node, X_("Speakers"))) == 0) {
- warning << _("Session: XML state has no speakers section - assuming simple stereo") << endmsg;
- _speakers->setup_default_speakers (2);
- } else {
+ if ((child = find_named_node (node, X_("Speakers"))) != 0) {
_speakers->set_state (*child, version);
}