mirror of
https://github.com/Ardour/ardour.git
synced 2026-01-06 13:45:43 +01:00
more changes for the import dialog, with breakout of importable source code into its own files
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2437 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis
parent
d0cd7d0048
commit
40bc1c239e
12 changed files with 300 additions and 141 deletions
|
|
@ -71,6 +71,7 @@ recent_sessions.cc
|
|||
redirect.cc
|
||||
region.cc
|
||||
region_factory.cc
|
||||
resampled_source.cc
|
||||
reverse.cc
|
||||
route.cc
|
||||
route_group.cc
|
||||
|
|
|
|||
48
libs/ardour/ardour/importable_source.h
Normal file
48
libs/ardour/ardour/importable_source.h
Normal file
|
|
@ -0,0 +1,48 @@
|
|||
/*
|
||||
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_importable_source_h__
|
||||
#define __ardour_importable_source_h__
|
||||
|
||||
#include <sndfile.h>
|
||||
#include <ardour/types.h>
|
||||
|
||||
namespace ARDOUR {
|
||||
|
||||
class ImportableSource {
|
||||
public:
|
||||
ImportableSource (SNDFILE* sf, SF_INFO* info) : in (sf), sf_info (info) {}
|
||||
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, buffer, per_channel);
|
||||
return per_channel * sf_info->channels;
|
||||
}
|
||||
|
||||
virtual float ratio() const { return 1.0f; }
|
||||
|
||||
protected:
|
||||
SNDFILE* in;
|
||||
SF_INFO* sf_info;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif /* __ardour_importable_source_h__ */
|
||||
49
libs/ardour/ardour/resampled_source.h
Normal file
49
libs/ardour/ardour/resampled_source.h
Normal file
|
|
@ -0,0 +1,49 @@
|
|||
/*
|
||||
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_resampled_source_h__
|
||||
#define __ardour_resampled_source_h__
|
||||
|
||||
#include <samplerate.h>
|
||||
|
||||
#include <ardour/importable_source.h>
|
||||
|
||||
namespace ARDOUR {
|
||||
|
||||
class ResampledImportableSource : public ImportableSource
|
||||
{
|
||||
public:
|
||||
ResampledImportableSource (SNDFILE* sf, SF_INFO* info, nframes_t rate);
|
||||
~ResampledImportableSource ();
|
||||
|
||||
nframes_t read (Sample* buffer, nframes_t nframes);
|
||||
|
||||
float ratio() const { return src_data.src_ratio; }
|
||||
|
||||
static const uint32_t blocksize;
|
||||
|
||||
private:
|
||||
float* input;
|
||||
SRC_STATE* src_state;
|
||||
SRC_DATA src_data;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif /* __ardour_resampled_source_h__ */
|
||||
|
|
@ -53,7 +53,7 @@ int tokenize_fullpath (std::string fullpath, std::string& path, std::string& nam
|
|||
int touch_file(Glib::ustring path);
|
||||
|
||||
Glib::ustring path_expand (Glib::ustring);
|
||||
Glib::ustring region_name_from_path (Glib::ustring path, bool strip_channels);
|
||||
Glib::ustring region_name_from_path (Glib::ustring path, bool strip_channels, bool add_channel_suffix = false, uint32_t total = 0, uint32_t this_one = 0);
|
||||
bool path_is_paired (Glib::ustring path, Glib::ustring& pair_base);
|
||||
|
||||
void compute_equal_power_fades (nframes_t nframes, float* in, float* out);
|
||||
|
|
|
|||
|
|
@ -32,6 +32,7 @@
|
|||
#include <glibmm.h>
|
||||
|
||||
#include <pbd/basename.h>
|
||||
#include <pbd/convert.h>
|
||||
|
||||
#include <ardour/ardour.h>
|
||||
#include <ardour/session.h>
|
||||
|
|
@ -41,72 +42,13 @@
|
|||
#include <ardour/audioregion.h>
|
||||
#include <ardour/region_factory.h>
|
||||
#include <ardour/source_factory.h>
|
||||
|
||||
#include <ardour/resampled_source.h>
|
||||
|
||||
#include "i18n.h"
|
||||
|
||||
using namespace ARDOUR;
|
||||
using namespace PBD;
|
||||
|
||||
#define BLOCKSIZE 4096U
|
||||
|
||||
class ImportableSource {
|
||||
public:
|
||||
ImportableSource (SNDFILE* sf, SF_INFO* info) : in (sf), sf_info (info) {}
|
||||
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, buffer, per_channel);
|
||||
return per_channel * sf_info->channels;
|
||||
}
|
||||
|
||||
virtual float ratio() const { return 1.0f; }
|
||||
|
||||
protected:
|
||||
SNDFILE* in;
|
||||
SF_INFO* sf_info;
|
||||
};
|
||||
|
||||
class ResampledImportableSource : public ImportableSource {
|
||||
public:
|
||||
ResampledImportableSource (SNDFILE* sf, SF_INFO* info, nframes_t rate) : ImportableSource (sf, info) {
|
||||
int err;
|
||||
|
||||
sf_seek (in, 0, SEEK_SET) ;
|
||||
|
||||
/* Initialize the sample rate converter. */
|
||||
|
||||
if ((src_state = src_new (SRC_SINC_BEST_QUALITY, sf_info->channels, &err)) == 0) {
|
||||
error << string_compose(_("Import: src_new() failed : %1"), src_strerror (err)) << endmsg ;
|
||||
throw failed_constructor ();
|
||||
}
|
||||
|
||||
src_data.end_of_input = 0 ; /* Set this later. */
|
||||
|
||||
/* Start with zero to force load in while loop. */
|
||||
|
||||
src_data.input_frames = 0 ;
|
||||
src_data.data_in = input ;
|
||||
|
||||
src_data.src_ratio = ((float) rate) / sf_info->samplerate ;
|
||||
|
||||
}
|
||||
|
||||
~ResampledImportableSource () {
|
||||
src_state = src_delete (src_state) ;
|
||||
}
|
||||
|
||||
nframes_t read (Sample* buffer, nframes_t nframes);
|
||||
|
||||
float ratio() const { return src_data.src_ratio; }
|
||||
|
||||
private:
|
||||
float input[BLOCKSIZE];
|
||||
SRC_STATE* src_state;
|
||||
SRC_DATA src_data;
|
||||
};
|
||||
|
||||
int
|
||||
Session::import_audiofile (import_status& status)
|
||||
{
|
||||
|
|
@ -124,11 +66,12 @@ Session::import_audiofile (import_status& status)
|
|||
vector<string> new_paths;
|
||||
struct tm* now;
|
||||
ImportableSource* importable = 0;
|
||||
const nframes_t nframes = BLOCKSIZE;
|
||||
const nframes_t nframes = ResampledImportableSource::blocksize;
|
||||
uint32_t cnt = 1;
|
||||
|
||||
status.sources.clear ();
|
||||
|
||||
for (vector<Glib::ustring>::iterator p = status.paths.begin(); p != status.paths.end(); ++p) {
|
||||
for (vector<Glib::ustring>::iterator p = status.paths.begin(); p != status.paths.end(); ++p, ++cnt) {
|
||||
|
||||
if ((in = sf_open ((*p).c_str(), SFM_READ, &info)) == 0) {
|
||||
error << string_compose(_("Import: cannot open input sound file \"%1\""), (*p)) << endmsg;
|
||||
|
|
@ -207,7 +150,20 @@ Session::import_audiofile (import_status& status)
|
|||
|
||||
so_far = 0;
|
||||
|
||||
status.doing_what = _("converting audio");
|
||||
if ((nframes_t) info.samplerate != frame_rate()) {
|
||||
status.doing_what = string_compose (_("converting %1\n(resample from %2KHz to %3KHz)\n(%4 of %5)"),
|
||||
basepath,
|
||||
info.samplerate/1000.0f,
|
||||
frame_rate()/1000.0f,
|
||||
cnt, status.paths.size());
|
||||
|
||||
} else {
|
||||
status.doing_what = string_compose (_("converting %1\n(%2 of %3)"),
|
||||
basepath,
|
||||
cnt, status.paths.size());
|
||||
|
||||
}
|
||||
|
||||
status.progress = 0.0;
|
||||
|
||||
while (!status.cancel) {
|
||||
|
|
@ -305,50 +261,3 @@ Session::import_audiofile (import_status& status)
|
|||
|
||||
return ret;
|
||||
}
|
||||
|
||||
nframes_t
|
||||
ResampledImportableSource::read (Sample* output, nframes_t nframes)
|
||||
{
|
||||
int err;
|
||||
|
||||
/* If the input buffer is empty, refill it. */
|
||||
|
||||
if (src_data.input_frames == 0) {
|
||||
|
||||
src_data.input_frames = ImportableSource::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.input_frames /= sf_info->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 ;
|
||||
} else {
|
||||
src_data.output_frames = src_data.input_frames;
|
||||
}
|
||||
|
||||
if ((err = src_process (src_state, &src_data))) {
|
||||
error << string_compose(_("Import: %1"), src_strerror (err)) << endmsg ;
|
||||
return 0 ;
|
||||
}
|
||||
|
||||
/* Terminate if at end */
|
||||
|
||||
if (src_data.end_of_input && src_data.output_frames_gen == 0) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
src_data.data_in += src_data.input_frames_used * sf_info->channels ;
|
||||
src_data.input_frames -= src_data.input_frames_used ;
|
||||
|
||||
return src_data.output_frames_gen * sf_info->channels;
|
||||
}
|
||||
|
||||
|
|
|
|||
108
libs/ardour/resampled_source.cc
Normal file
108
libs/ardour/resampled_source.cc
Normal file
|
|
@ -0,0 +1,108 @@
|
|||
/*
|
||||
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.
|
||||
|
||||
*/
|
||||
|
||||
#include <pbd/error.h>
|
||||
#include <ardour/resampled_source.h>
|
||||
#include <pbd/failed_constructor.h>
|
||||
|
||||
#include "i18n.h"
|
||||
|
||||
using namespace ARDOUR;
|
||||
using namespace PBD;
|
||||
|
||||
const uint32_t ResampledImportableSource::blocksize = 4096U;
|
||||
|
||||
ResampledImportableSource::ResampledImportableSource (SNDFILE* sf, SF_INFO* info, nframes_t rate)
|
||||
: ImportableSource (sf, info)
|
||||
{
|
||||
int err;
|
||||
|
||||
sf_seek (in, 0, SEEK_SET) ;
|
||||
|
||||
/* Initialize the sample rate converter. */
|
||||
|
||||
if ((src_state = src_new (SRC_SINC_BEST_QUALITY, sf_info->channels, &err)) == 0) {
|
||||
error << string_compose(_("Import: src_new() failed : %1"), src_strerror (err)) << endmsg ;
|
||||
throw failed_constructor ();
|
||||
}
|
||||
|
||||
src_data.end_of_input = 0 ; /* Set this later. */
|
||||
|
||||
/* Start with zero to force load in while loop. */
|
||||
|
||||
src_data.input_frames = 0 ;
|
||||
src_data.data_in = input ;
|
||||
|
||||
src_data.src_ratio = ((float) rate) / sf_info->samplerate ;
|
||||
|
||||
input = new float[blocksize];
|
||||
}
|
||||
|
||||
ResampledImportableSource::~ResampledImportableSource ()
|
||||
{
|
||||
src_state = src_delete (src_state) ;
|
||||
delete [] input;
|
||||
}
|
||||
|
||||
nframes_t
|
||||
ResampledImportableSource::read (Sample* output, nframes_t nframes)
|
||||
{
|
||||
int err;
|
||||
|
||||
/* If the input buffer is empty, refill it. */
|
||||
|
||||
if (src_data.input_frames == 0) {
|
||||
|
||||
src_data.input_frames = ImportableSource::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.input_frames /= sf_info->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 ;
|
||||
} else {
|
||||
src_data.output_frames = src_data.input_frames;
|
||||
}
|
||||
|
||||
if ((err = src_process (src_state, &src_data))) {
|
||||
error << string_compose(_("Import: %1"), src_strerror (err)) << endmsg ;
|
||||
return 0 ;
|
||||
}
|
||||
|
||||
/* Terminate if at end */
|
||||
|
||||
if (src_data.end_of_input && src_data.output_frames_gen == 0) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
src_data.data_in += src_data.input_frames_used * sf_info->channels ;
|
||||
src_data.input_frames -= src_data.input_frames_used ;
|
||||
|
||||
return src_data.output_frames_gen * sf_info->channels;
|
||||
}
|
||||
|
||||
|
|
@ -208,7 +208,7 @@ touch_file (ustring path)
|
|||
}
|
||||
|
||||
ustring
|
||||
region_name_from_path (ustring path, bool strip_channels)
|
||||
region_name_from_path (ustring path, bool strip_channels, bool add_channel_suffix, uint32_t total, uint32_t this_one)
|
||||
{
|
||||
path = PBD::basename_nosuffix (path);
|
||||
|
||||
|
|
@ -225,6 +225,17 @@ region_name_from_path (ustring path, bool strip_channels)
|
|||
}
|
||||
}
|
||||
|
||||
if (add_channel_suffix) {
|
||||
|
||||
path += '%';
|
||||
|
||||
if (total > 2) {
|
||||
path += (char) ('a' + this_one);
|
||||
} else {
|
||||
path += (char) (this_one == 0 ? 'L' : 'R');
|
||||
}
|
||||
}
|
||||
|
||||
return path;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue