projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 81f64d26717364bb830c66317b87c002d006d354..0c5e8bc6a288ce5ca5fc2ec2f63b7958270f4a93 100644
(file)
--- a/
libs/ardour/auditioner.cc
+++ b/
libs/ardour/auditioner.cc
@@
-20,6
+20,8
@@
#include <glibmm/thread.h>
#include <glibmm/thread.h>
+#include <pbd/error.h>
+
#include <ardour/audio_diskstream.h>
#include <ardour/audioregion.h>
#include <ardour/route.h>
#include <ardour/audio_diskstream.h>
#include <ardour/audioregion.h>
#include <ardour/route.h>
@@
-27,9
+29,14
@@
#include <ardour/auditioner.h>
#include <ardour/audioplaylist.h>
#include <ardour/panner.h>
#include <ardour/auditioner.h>
#include <ardour/audioplaylist.h>
#include <ardour/panner.h>
+#include <ardour/data_type.h>
+#include <ardour/region_factory.h>
using namespace std;
using namespace ARDOUR;
using namespace std;
using namespace ARDOUR;
+using namespace PBD;
+
+#include "i18n.h"
Auditioner::Auditioner (Session& s)
: AudioTrack (s, "auditioner", Route::Hidden)
Auditioner::Auditioner (Session& s)
: AudioTrack (s, "auditioner", Route::Hidden)
@@
-44,19
+51,19
@@
Auditioner::Auditioner (Session& s)
defer_pan_reset ();
if (left.length()) {
defer_pan_reset ();
if (left.length()) {
- add_output_port (left, this, AUDIO);
+ add_output_port (left, this,
DataType::
AUDIO);
}
if (right.length()) {
}
if (right.length()) {
- audio_diskstream()
.
add_channel();
- add_output_port (right, this, AUDIO);
+ audio_diskstream()
->
add_channel();
+ add_output_port (right, this,
DataType::
AUDIO);
}
allow_pan_reset ();
IO::output_changed.connect (mem_fun (*this, &Auditioner::output_changed));
}
allow_pan_reset ();
IO::output_changed.connect (mem_fun (*this, &Auditioner::output_changed));
- the_region
= 0
;
+ the_region
.reset ((AudioRegion*) 0)
;
g_atomic_int_set (&_active, 0);
}
g_atomic_int_set (&_active, 0);
}
@@
-71,7
+78,7
@@
Auditioner::prepare_playlist ()
AudioPlaylist* const apl = dynamic_cast<AudioPlaylist*>(_diskstream->playlist());
assert(apl);
AudioPlaylist* const apl = dynamic_cast<AudioPlaylist*>(_diskstream->playlist());
assert(apl);
- apl->clear (
false, false
);
+ apl->clear ();
return *apl;
}
return *apl;
}
@@
-98,7
+105,7
@@
Auditioner::audition_current_playlist ()
}
void
}
void
-Auditioner::audition_region (
AudioRegion&
region)
+Auditioner::audition_region (
boost::shared_ptr<Region>
region)
{
if (g_atomic_int_get (&_active)) {
/* don't go via session for this, because we are going
{
if (g_atomic_int_get (&_active)) {
/* don't go via session for this, because we are going
@@
-107,20
+114,27
@@
Auditioner::audition_region (AudioRegion& region)
cancel_audition ();
}
cancel_audition ();
}
+ if (boost::dynamic_pointer_cast<AudioRegion>(region) == 0) {
+ error << _("Auditioning of non-audio regions not yet supported") << endmsg;
+ return;
+ }
+
Glib::Mutex::Lock lm (lock);
Glib::Mutex::Lock lm (lock);
- the_region = new AudioRegion (region);
+ /* copy it */
+
+ boost::shared_ptr<AudioRegion> the_region (boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (region)));
the_region->set_position (0, this);
the_region->set_position (0, this);
- _diskstream->playlist()->clear (
true, 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()) {
while (_diskstream->n_channels() < the_region->n_channels()) {
- audio_diskstream()
.
add_channel ();
+ audio_diskstream()
->
add_channel ();
}
while (_diskstream->n_channels() > the_region->n_channels()) {
}
while (_diskstream->n_channels() > the_region->n_channels()) {
- audio_diskstream()
.
remove_channel ();
+ audio_diskstream()
->
remove_channel ();
}
/* force a panner reset now that we have all channels */
}
/* force a panner reset now that we have all channels */
@@
-134,10
+148,10
@@
Auditioner::audition_region (AudioRegion& region)
}
int
}
int
-Auditioner::play_audition (
jack_
nframes_t nframes)
+Auditioner::play_audition (nframes_t nframes)
{
bool need_butler;
{
bool need_butler;
-
jack_
nframes_t this_nframes;
+ nframes_t this_nframes;
int ret;
if (g_atomic_int_get (&_active) == 0) {
int ret;
if (g_atomic_int_get (&_active) == 0) {