diff options
| author | Carl Hetherington <carl@carlh.net> | 2009-05-14 00:13:27 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2009-05-14 00:13:27 +0000 |
| commit | 015fc7b39fab97cee1875231694adce43155ceb5 (patch) | |
| tree | 76dded18cc9441e7325af999358ab3a3235cdb1e /libs/ardour/auditioner.cc | |
| parent | 0569107ddc0d2a8df6ca0a2c8cc16ebe8f3dee99 (diff) | |
First stage of options rework.
- Split Configuration into RCConfiguration and SessionConfiguration;
the first for options which are saved to .rc files and the second
for options which are saved in a session file.
- Move some options from the old `master' Configuration object into
SessionConfiguration; this needs more refinement.
- Reflect many RCConfiguration options in an expanded Edit->Preferences
dialog; my intention is to remove the corresponding menu items
eventually.
git-svn-id: svn://localhost/ardour2/branches/3.0@5075 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/auditioner.cc')
| -rw-r--r-- | libs/ardour/auditioner.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libs/ardour/auditioner.cc b/libs/ardour/auditioner.cc index a0abe860fb..b62d0f3406 100644 --- a/libs/ardour/auditioner.cc +++ b/libs/ardour/auditioner.cc @@ -41,8 +41,8 @@ using namespace PBD; Auditioner::Auditioner (Session& s) : AudioTrack (s, "auditioner", Route::Hidden) { - string left = Config->get_auditioner_output_left(); - string right = Config->get_auditioner_output_right(); + string left = _session.config.get_auditioner_output_left(); + string right = _session.config.get_auditioner_output_right(); if (left == "default") { left = _session.engine().get_nth_physical_output (DataType::AUDIO, 0); @@ -209,12 +209,12 @@ Auditioner::output_changed (IOChange change, void* src) if (output (0)->get_connections (connections)) { phys = _session.engine().get_nth_physical_output (DataType::AUDIO, 0); if (phys != connections[0]) { - Config->set_auditioner_output_left (connections[0]); + _session.config.set_auditioner_output_left (connections[0]); } else { - Config->set_auditioner_output_left ("default"); + _session.config.set_auditioner_output_left ("default"); } } else { - Config->set_auditioner_output_left (""); + _session.config.set_auditioner_output_left (""); } connections.clear (); @@ -222,12 +222,12 @@ Auditioner::output_changed (IOChange change, void* src) if (output (1)->get_connections (connections)) { phys = _session.engine().get_nth_physical_output (DataType::AUDIO, 1); if (phys != connections[0]) { - Config->set_auditioner_output_right (connections[0]); + _session.config.set_auditioner_output_right (connections[0]); } else { - Config->set_auditioner_output_right ("default"); + _session.config.set_auditioner_output_right ("default"); } } else { - Config->set_auditioner_output_right (""); + _session.config.set_auditioner_output_right (""); } } } |