p->push_back (PresetPoint (1, 0));
fade_out_presets->push_back (p);
- // p = new Preset ("regout.xpm");
- p = new Preset ("crossfade_out_constant");
- p->push_back (PresetPoint (0, 1));
- p->push_back (PresetPoint (0.228111, 0.988889));
- p->push_back (PresetPoint (0.347926, 0.972222));
- p->push_back (PresetPoint (0.529954, 0.886111));
- p->push_back (PresetPoint (0.753456, 0.658333));
- p->push_back (PresetPoint (0.9262673, 0.308333));
- p->push_back (PresetPoint (1, 0));
- fade_out_presets->push_back (p);
-
// p = new Preset ("loout.xpm");
p = new Preset ("crossfade_out_transition");
p->push_back (PresetPoint (0, 1));
p->push_back (PresetPoint (1, 0));
fade_out_presets->push_back (p);
+ // p = new Preset ("regout.xpm");
+ p = new Preset ("crossfade_out_constant");
+ p->push_back (PresetPoint (0, 1));
+ p->push_back (PresetPoint (0.228111, 0.988889));
+ p->push_back (PresetPoint (0.347926, 0.972222));
+ p->push_back (PresetPoint (0.529954, 0.886111));
+ p->push_back (PresetPoint (0.753456, 0.658333));
+ p->push_back (PresetPoint (0.9262673, 0.308333));
+ p->push_back (PresetPoint (1, 0));
+ fade_out_presets->push_back (p);
+
// p = new Preset ("regout2.xpm");
p = new Preset ("crossfade_out_slow-fade");
p->push_back (PresetPoint (0, 1));
Location* tll;
if ((tll = transport_loop_location()) == 0) {
- cerr << "Set new\n";
Location* loc = new Location (start, end, _("Loop"), Location::IsAutoLoop);
XMLNode &before = session->locations()->get_state();
session->locations()->add (loc, true);
XMLNode &after = session->locations()->get_state();
session->add_command (new MementoCommand<Locations>(*(session->locations()), &before, &after));
} else {
- cerr << "Set existing\n";
XMLNode &before = tll->get_state();
tll->set_hidden (false, this);
tll->set (start, end);
silentfilesource.cc
sndfile_helpers.cc
sndfilesource.cc
+sndfileimportable.cc
source.cc
source_factory.cc
tempo.cc
#ifndef __ardour_importable_source_h__
#define __ardour_importable_source_h__
-#include <sndfile.h>
#include <pbd/failed_constructor.h>
#include <ardour/types.h>
class ImportableSource {
public:
- ImportableSource (const std::string& path)
- : in (sf_open (path.c_str(), SFM_READ, &sf_info), sf_close)
- {
- if (!in) throw failed_constructor();
-
- }
-
+ ImportableSource () {}
virtual ~ImportableSource() {}
- virtual nframes_t read (Sample* buffer, nframes_t nframes) {
- nframes_t per_channel = nframes / sf_info.channels;
- per_channel = sf_readf_float (in.get(), buffer, per_channel);
- return per_channel * sf_info.channels;
- }
-
+ virtual nframes_t read (Sample* buffer, nframes_t nframes) = 0;
virtual float ratio() const { return 1.0f; }
-
- uint channels() const { return sf_info.channels; }
-
- nframes_t length() const { return sf_info.frames; }
-
- nframes_t samplerate() const { return sf_info.samplerate; }
-
-protected:
- SF_INFO sf_info;
- boost::shared_ptr<SNDFILE> in;
+ virtual uint32_t channels() const = 0;
+ virtual nframes_t length() const = 0;
+ virtual nframes_t samplerate() const = 0;
+ virtual void seek (nframes_t pos) = 0;
};
}
class ResampledImportableSource : public ImportableSource
{
public:
- ResampledImportableSource (const std::string& path,
- nframes_t rate, SrcQuality);
+ ResampledImportableSource (boost::shared_ptr<ImportableSource>, nframes_t rate, SrcQuality);
~ResampledImportableSource ();
nframes_t read (Sample* buffer, nframes_t nframes);
-
float ratio() const { return src_data.src_ratio; }
+ uint32_t channels() const { return source->channels(); }
+ nframes_t length() const { return source->length(); }
+ nframes_t samplerate() const { return source->samplerate(); }
+ void seek (nframes_t pos) { source->seek (pos); }
static const uint32_t blocksize;
private:
+ boost::shared_ptr<ImportableSource> source;
float* input;
SRC_STATE* src_state;
SRC_DATA src_data;
--- /dev/null
+/*
+ Copyright (C) 2007 Paul Davis
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#ifndef __ardour_sndfile_importable_source_h__
+#define __ardour_sndfile_importable_source_h__
+
+#include <boost/shared_ptr.hpp>
+#include <sndfile.h>
+#include <pbd/failed_constructor.h>
+#include <ardour/types.h>
+#include <ardour/importable_source.h>
+
+namespace ARDOUR {
+
+class SndFileImportableSource : public ImportableSource {
+ public:
+ SndFileImportableSource (const std::string& path);
+ virtual ~SndFileImportableSource();
+
+ nframes_t read (Sample* buffer, nframes_t nframes);
+ uint32_t channels() const;
+ nframes_t length() const;
+ nframes_t samplerate() const;
+ void seek (nframes_t pos);
+
+ protected:
+ SF_INFO sf_info;
+ boost::shared_ptr<SNDFILE> in;
+
+};
+
+}
+
+#endif /* __ardour_sndfile_importable_source_h__ */
#include <ardour/region_factory.h>
#include <ardour/source_factory.h>
#include <ardour/resampled_source.h>
+#include <ardour/sndfileimportable.h>
#include <ardour/analyser.h>
+#ifdef HAVE_COREAUDIO
+#include <ardour/caimportable.h>
+#endif
+
#include "i18n.h"
using namespace ARDOUR;
using namespace PBD;
-static std::auto_ptr<ImportableSource>
+
+static boost::shared_ptr<ImportableSource>
open_importable_source (const string& path, nframes_t samplerate, ARDOUR::SrcQuality quality)
{
- std::auto_ptr<ImportableSource> source(new ImportableSource(path));
+#ifdef HAVE_COREAUDIO
- if (source->samplerate() == samplerate) {
- return source;
- }
+ /* see if we can use CoreAudio to handle the IO */
- return std::auto_ptr<ImportableSource>(new ResampledImportableSource(path, samplerate, quality));
+ try {
+ boost::shared_ptr<CAImportableSource> source(new CAImportableSource(path));
+
+ if (source->samplerate() == samplerate) {
+ return source;
+ }
+
+ /* rewrap as a resampled source */
+
+ return boost::shared_ptr<ImportableSource>(new ResampledImportableSource(source, samplerate, quality));
+ }
+
+ catch (...) {
+
+ /* fall back to SndFile */
+
+#endif
+
+ try {
+ boost::shared_ptr<SndFileImportableSource> source(new SndFileImportableSource(path));
+
+ if (source->samplerate() == samplerate) {
+ return source;
+ }
+
+ /* rewrap as a resampled source */
+
+ return boost::shared_ptr<ImportableSource>(new ResampledImportableSource(source, samplerate, quality));
+ }
+
+ catch (...) {
+ throw; // rethrow
+ }
+
+#ifdef HAVE_COREAUDIO
+ }
+#endif
}
static std::string
p != status.paths.end() && !status.cancel;
++p, ++cnt)
{
- std::auto_ptr<ImportableSource> source;
-
+ boost::shared_ptr<ImportableSource> source;
+
try
{
source = open_importable_source (*p, frame_rate(), status.quality);
}
+
catch (const failed_constructor& err)
{
error << string_compose(_("Import: cannot open input sound file \"%1\""), (*p)) << endmsg;
const uint32_t ResampledImportableSource::blocksize = 4096U;
-ResampledImportableSource::ResampledImportableSource (const std::string& path,
- nframes_t rate, SrcQuality srcq)
- : ImportableSource (path)
+ResampledImportableSource::ResampledImportableSource (boost::shared_ptr<ImportableSource> src, nframes_t rate, SrcQuality srcq)
+ : source (src)
{
int err;
- sf_seek (in.get(), 0, SEEK_SET) ;
+ source->seek (0);
/* Initialize the sample rate converter. */
break;
}
- if ((src_state = src_new (src_type, sf_info.channels, &err)) == 0) {
+ if ((src_state = src_new (src_type, source->channels(), &err)) == 0) {
error << string_compose(_("Import: src_new() failed : %1"), src_strerror (err)) << endmsg ;
throw failed_constructor ();
}
src_data.input_frames = 0 ;
src_data.data_in = input ;
- src_data.src_ratio = ((float) rate) / sf_info.samplerate ;
+ src_data.src_ratio = ((float) rate) / source->samplerate();
input = new float[blocksize];
}
if (src_data.input_frames == 0) {
- src_data.input_frames = ImportableSource::read (input, blocksize);
+ src_data.input_frames = source->read (input, blocksize);
/* The last read will not be a full buffer, so set end_of_input. */
if ((nframes_t) src_data.input_frames < blocksize) {
- src_data.end_of_input = SF_TRUE ;
+ src_data.end_of_input = true;
}
- src_data.input_frames /= sf_info.channels;
- src_data.data_in = input ;
+ src_data.input_frames /= source->channels();
+ src_data.data_in = input;
}
src_data.data_out = output;
if (!src_data.end_of_input) {
- src_data.output_frames = nframes / sf_info.channels ;
+ src_data.output_frames = nframes / source->channels();
} else {
src_data.output_frames = src_data.input_frames;
}
return 0;
}
- src_data.data_in += src_data.input_frames_used * sf_info.channels ;
+ src_data.data_in += src_data.input_frames_used * source->channels();
src_data.input_frames -= src_data.input_frames_used ;
- return src_data.output_frames_gen * sf_info.channels;
+ return src_data.output_frames_gen * source->channels();
}
--- /dev/null
+#include <ardour/sndfileimportable.h>
+#include <sndfile.h>
+
+using namespace ARDOUR;
+using namespace std;
+
+SndFileImportableSource::SndFileImportableSource (const string& path)
+ : in (sf_open (path.c_str(), SFM_READ, &sf_info), sf_close)
+{
+ if (!in) throw failed_constructor();
+}
+
+SndFileImportableSource::~SndFileImportableSource ()
+{
+}
+
+nframes_t
+SndFileImportableSource::read (Sample* buffer, nframes_t nframes)
+{
+ nframes_t per_channel = nframes / sf_info.channels;
+ per_channel = sf_readf_float (in.get(), buffer, per_channel);
+ return per_channel * sf_info.channels;
+}
+
+uint
+SndFileImportableSource::channels () const
+{
+ return sf_info.channels;
+}
+
+nframes_t
+SndFileImportableSource::length () const
+{
+ return sf_info.frames;
+}
+
+nframes_t
+SndFileImportableSource::samplerate() const
+{
+ return sf_info.samplerate;
+}
+
+void
+SndFileImportableSource::seek (nframes_t pos)
+{
+ sf_seek (in.get(), 0, SEEK_SET);
+}
projects / ardour.git / commitdiff