fix visual focus indication in IOSelector; import pays attention to audio file embedd...

[ardour.git] / libs / ardour / auditioner.cc

diff --git a/libs/ardour/auditioner.cc b/libs/ardour/auditioner.cc
index addb92bbca31d751d577b51bf94dcf86b626f545..0c5e8bc6a288ce5ca5fc2ec2f63b7958270f4a93 100644 (file)
--- a/libs/ardour/auditioner.cc
+++ b/libs/ardour/auditioner.cc
@@ -78,7 +78,7 @@ Auditioner::prepare_playlist ()
        AudioPlaylist* const apl = dynamic_cast<AudioPlaylist*>(_diskstream->playlist());
        assert(apl);
 
-       apl->clear (false);
+       apl->clear ();
        return *apl;
 }
 
@@ -126,8 +126,8 @@ Auditioner::audition_region (boost::shared_ptr<Region> region)
        boost::shared_ptr<AudioRegion> the_region (boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (region)));
        the_region->set_position (0, this);
 
-       _diskstream->playlist()->clear (false);
-       _diskstream->playlist()->add_region (the_region, 0, 1, false);
+       _diskstream->playlist()->clear ();
+       _diskstream->playlist()->add_region (the_region, 0, 1);
 
        while (_diskstream->n_channels() < the_region->n_channels()) {
                audio_diskstream()->add_channel ();
@@ -148,10 +148,10 @@ Auditioner::audition_region (boost::shared_ptr<Region> region)
 }
 
 int
-Auditioner::play_audition (jack_nframes_t nframes)
+Auditioner::play_audition (nframes_t nframes)
 {
        bool need_butler;
-       jack_nframes_t this_nframes;
+       nframes_t this_nframes;
        int ret;
 
        if (g_atomic_int_get (&_active) == 0) {