ardour/livetrax
13
0
Fork 0
Code

Remove unused playlist audition code.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@11897 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2012-04-11 15:10:12 +00:00
parent 8c9f9e746b
commit 91b6f28a9b
3 changed files with 3 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libs/ardour/ardour/auditioner.h
View File

@ -44,7 +44,6 @@ class Auditioner : public AudioTrack
void audition_region (boost::shared_ptr<Region>);
ARDOUR::AudioPlaylist& prepare_playlist ();
void audition_current_playlist ();
int play_audition (framecnt_t nframes);

23
libs/ardour/auditioner.cc
View File

@ -123,29 +123,6 @@ Auditioner::prepare_playlist ()
return *apl;
}
void
Auditioner::audition_current_playlist ()
{
if (g_atomic_int_get (&_auditioning)) {
/* don't go via session for this, because we are going
to remain active.
*/
cancel_audition ();
}
Glib::Mutex::Lock lm (lock);
_diskstream->seek (0);
length = _diskstream->playlist()->get_extent().second;
current_frame = 0;
/* force a panner reset now that we have all channels */
_main_outs->panner_shell()->configure_io (ChanCount (DataType::AUDIO, _diskstream->n_channels().n_audio()),
ChanCount (DataType::AUDIO, n_outputs().n_audio()));
g_atomic_int_set (&_auditioning, 1);
}
void
Auditioner::audition_region (boost::shared_ptr<Region> region)
{

9
libs/ardour/session.cc
View File

@ -3419,12 +3419,9 @@ Session::audition_playlist ()
void
Session::non_realtime_set_audition ()
{
if (!pending_audition_region) {
auditioner->audition_current_playlist ();
} else {
auditioner->audition_region (pending_audition_region);
pending_audition_region.reset ();
}
assert (pending_audition_region);
auditioner->audition_region (pending_audition_region);
pending_audition_region.reset ();
AuditionActive (true); /* EMIT SIGNAL */
}