diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2010-03-24 12:55:04 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-03-24 12:55:04 +0000 |
| commit | b3a3e66f7755fe35ace4cbb6b19b54a52bb71a2f (patch) | |
| tree | 40db98dac2b772b6f98ce3b1fbf1f7c91f944007 /libs/ardour/auditioner.cc | |
| parent | f11a5e176951bf6a2b74276512fc4a669aa6ac87 (diff) | |
remove XML constructors for Route, Track, AudioTrack, MidiTrack; make Session::XMLRouteFactory() call a constructor and then set_state(); lots of debugging output (will remove next commit)
git-svn-id: svn://localhost/ardour2/branches/3.0@6789 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/auditioner.cc')
| -rw-r--r-- | libs/ardour/auditioner.cc | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/libs/ardour/auditioner.cc b/libs/ardour/auditioner.cc index c88eeedf1a..dec9452977 100644 --- a/libs/ardour/auditioner.cc +++ b/libs/ardour/auditioner.cc @@ -29,6 +29,7 @@ #include "ardour/session.h" #include "ardour/auditioner.h" #include "ardour/audioplaylist.h" +#include "ardour/audio_port.h" #include "ardour/panner.h" #include "ardour/data_type.h" #include "ardour/region_factory.h" @@ -46,11 +47,19 @@ Auditioner::Auditioner (Session& s) string right = _session.config.get_auditioner_output_right(); if (left == "default") { - left = _session.engine().get_nth_physical_output (DataType::AUDIO, 0); + if (_session.monitor_out()) { + left = _session.monitor_out()->input()->audio (0)->name(); + } else { + left = _session.engine().get_nth_physical_output (DataType::AUDIO, 0); + } } if (right == "default") { - right = _session.engine().get_nth_physical_output (DataType::AUDIO, 1); + if (_session.monitor_out()) { + right = _session.monitor_out()->input()->audio (1)->name(); + } else { + right = _session.engine().get_nth_physical_output (DataType::AUDIO, 1); + } } if ((left.length() == 0) && (right.length() == 0)) { @@ -60,6 +69,8 @@ Auditioner::Auditioner (Session& s) _main_outs->defer_pan_reset (); + cerr << "Aud connect " << left << " + " << right << endl; + if (left.length()) { _output->add_port (left, this, DataType::AUDIO); } @@ -183,7 +194,10 @@ Auditioner::play_audition (nframes_t nframes) _diskstream->prepare (); + cerr << "Auditioner rolls, gain = " << gain_control()->get_value() << endl; + if ((ret = roll (this_nframes, current_frame, current_frame + nframes, false, false, false)) != 0) { + cerr << "\troll failed\n"; silence (nframes); return ret; } |