SConsignFile()
EnsureSConsVersion(0, 96)
-version = '2.0beta9'
+version = '2.0beta10'
subst_dict = { }
void bring_in_external_audio (Editing::ImportMode mode, ARDOUR::AudioTrack*, nframes_t& pos, bool prompt);
void do_import (vector<Glib::ustring> paths, bool split, Editing::ImportMode mode, ARDOUR::AudioTrack*, nframes_t&, bool);
void do_embed (vector<Glib::ustring> paths, bool split, Editing::ImportMode mode, ARDOUR::AudioTrack*, nframes_t&, bool);
- int import_sndfile (Glib::ustring path, Editing::ImportMode mode, ARDOUR::AudioTrack* track, nframes_t& pos);
- int embed_sndfile (Glib::ustring path, bool split, bool multiple_files, bool& check_sample_rate, Editing::ImportMode mode,
+ int import_sndfile (vector<Glib::ustring> paths, Editing::ImportMode mode, ARDOUR::AudioTrack* track, nframes_t& pos);
+ int embed_sndfile (vector<Glib::ustring> paths, bool split, bool multiple_files, bool& check_sample_rate, Editing::ImportMode mode,
ARDOUR::AudioTrack* track, nframes_t& pos, bool prompt);
int finish_bringing_in_audio (boost::shared_ptr<ARDOUR::AudioRegion> region, uint32_t, uint32_t, ARDOUR::AudioTrack* track, nframes_t& pos, Editing::ImportMode mode);
/* to support this ... */
void import_audio (bool as_tracks);
- void do_import (vector<string> paths, bool split, bool as_tracks);
+ void do_import (vector<Glib::ustring> paths, bool split, bool as_tracks);
void move_to_start ();
void move_to_end ();
using namespace sigc;
using namespace Gtk;
using namespace Editing;
+using Glib::ustring;
/* Functions supporting the incorporation of external (non-captured) audio material into ardour */
}
void
-Editor::do_import (vector<Glib::ustring> paths, bool split, ImportMode mode, AudioTrack* track, nframes_t& pos, bool prompt)
+Editor::do_import (vector<ustring> paths, bool split, ImportMode mode, AudioTrack* track, nframes_t& pos, bool prompt)
{
/* SFDB sets "multichan" to true to indicate "split channels"
so reverse the setting to match the way libardour
if (interthread_progress_window == 0) {
build_interthread_progress_window ();
}
-
- /* for each path that was selected, import it and then potentially create a new track
- containing the new region as the sole contents.
- */
- for (vector<Glib::ustring>::iterator i = paths.begin(); i != paths.end(); ++i ) {
- import_sndfile (*i, mode, track, pos);
+ vector<ustring> to_import;
+
+ for (vector<ustring>::iterator a = paths.begin(); a != paths.end(); ++a) {
+
+ to_import.clear ();
+ to_import.push_back (*a);
+
+ import_sndfile (to_import, mode, track, pos);
}
interthread_progress_window->hide_all ();
}
void
-Editor::do_embed (vector<Glib::ustring> paths, bool split, ImportMode mode, AudioTrack* track, nframes_t& pos, bool prompt)
+Editor::do_embed (vector<ustring> paths, bool split, ImportMode mode, AudioTrack* track, nframes_t& pos, bool prompt)
{
bool multiple_files = paths.size() > 1;
bool check_sample_rate = true;
- vector<Glib::ustring>::iterator i;
+ vector<ustring>::iterator a;
+
+ for (a = paths.begin(); a != paths.end(); ) {
- for (i = paths.begin(); i != paths.end(); ++i) {
- int ret = embed_sndfile (*i, split, multiple_files, check_sample_rate, mode, track, pos, prompt);
+ Glib::ustring path = *a;
+ Glib::ustring pair_base;
+ vector<ustring> to_embed;
+
+ to_embed.push_back (path);
+ a = paths.erase (a);
+
+ if (path_is_paired (path, pair_base)) {
+
+ ustring::size_type len = pair_base.length();
- if (ret < -1) {
- break;
+ for (vector<Glib::ustring>::iterator b = paths.begin(); b != paths.end(); ) {
+
+ if (((*b).substr (0, len) == pair_base) && ((*b).length() == path.length())) {
+
+ to_embed.push_back (*b);
+
+ /* don't process this one again */
+
+ b = paths.erase (b);
+ break;
+
+ } else {
+ ++b;
+ }
+ }
}
- }
- if (i == paths.end()) {
+ if (to_embed.size() > 1) {
+
+ vector<string> choices;
+
+ choices.push_back (string_compose (_("Import as a %1 region"),
+ to_embed.size() > 2 ? _("multichannel") : _("stereo")));
+ choices.push_back (_("Import as multiple regions"));
+
+ Gtkmm2ext::Choice chooser (string_compose (_("Paired files detected (%1, %2 ...).\nDo you want to:"),
+ to_embed[0],
+ to_embed[1]),
+ choices);
+
+ if (chooser.run () == 0) {
+
+ /* keep them paired */
+
+ if (embed_sndfile (to_embed, split, multiple_files, check_sample_rate, mode, track, pos, prompt) < -1) {
+ break;
+ }
+
+ } else {
+
+ /* one thing per file */
+
+ vector<ustring> foo;
+
+ for (vector<ustring>::iterator x = to_embed.begin(); x != to_embed.end(); ++x) {
+
+ foo.clear ();
+ foo.push_back (*x);
+
+ if (embed_sndfile (foo, split, multiple_files, check_sample_rate, mode, track, pos, prompt) < -1) {
+ break;
+ }
+ }
+ }
+
+ } else {
+
+ if (embed_sndfile (to_embed, split, multiple_files, check_sample_rate, mode, track, pos, prompt) < -1) {
+ break;
+ }
+ }
+ }
+
+ if (a == paths.end()) {
session->save_state ("");
}
}
int
-Editor::import_sndfile (Glib::ustring path, ImportMode mode, AudioTrack* track, nframes_t& pos)
+Editor::import_sndfile (vector<ustring> paths, ImportMode mode, AudioTrack* track, nframes_t& pos)
{
- interthread_progress_window->set_title (string_compose (_("ardour: importing %1"), path));
+ interthread_progress_window->set_title (string_compose (_("ardour: importing %1"), paths.front()));
interthread_progress_window->set_position (Gtk::WIN_POS_MOUSE);
interthread_progress_window->show_all ();
interthread_progress_bar.set_fraction (0.0f);
interthread_cancel_label.set_text (_("Cancel Import"));
current_interthread_info = &import_status;
- import_status.pathname = path;
+ import_status.paths = paths;
import_status.done = false;
import_status.cancel = false;
import_status.freeze = false;
track_canvas.get_window()->set_cursor (Gdk::Cursor (Gdk::WATCH));
ARDOUR_UI::instance()->flush_pending ();
- /* start import thread for this path. this will ultimately call Session::import_audiofile()
- and if successful will add the file as a region to the session region list.
+ /* start import thread for this spec. this will ultimately call Session::import_audiofile()
+ and if successful will add the file(s) as a region to the session region list.
*/
pthread_create_and_store ("import", &import_status.thread, 0, _import_thread, this);
}
int
-Editor::embed_sndfile (Glib::ustring path, bool split, bool multiple_files, bool& check_sample_rate, ImportMode mode,
+Editor::embed_sndfile (vector<Glib::ustring> paths, bool split, bool multiple_files, bool& check_sample_rate, ImportMode mode,
AudioTrack* track, nframes_t& pos, bool prompt)
{
boost::shared_ptr<AudioFileSource> source;
string idspec;
string linked_path;
SoundFileInfo finfo;
- string region_name;
- uint32_t input_chan;
- uint32_t output_chan;
+ ustring region_name;
+ uint32_t input_chan = 0;
+ uint32_t output_chan = 0;
track_canvas.get_window()->set_cursor (Gdk::Cursor (Gdk::WATCH));
ARDOUR_UI::instance()->flush_pending ();
- /* lets see if we can link it into the session */
-
- linked_path = session->sound_dir();
- linked_path += Glib::path_get_basename (path);
-
- if (link (path.c_str(), linked_path.c_str()) == 0) {
+ for (vector<Glib::ustring>::iterator p = paths.begin(); p != paths.end(); ++p) {
- /* there are many reasons why link(2) might have failed.
- but if it succeeds, we now have a link in the
- session sound dir that will protect against
- unlinking of the original path. nice.
- */
-
- path = linked_path;
- }
+ ustring path = *p;
- /* note that we temporarily truncated _id at the colon */
-
- string error_msg;
-
- if (!AudioFileSource::get_soundfile_info (path, finfo, error_msg)) {
- error << string_compose(_("Editor: cannot open file \"%1\", (%2)"), selection, error_msg ) << endmsg;
- return 0;
- }
-
- if (check_sample_rate && (finfo.samplerate != (int) session->frame_rate())) {
- vector<string> choices;
+ /* lets see if we can link it into the session */
- if (multiple_files) {
- choices.push_back (_("Cancel entire import"));
- choices.push_back (_("Don't embed it"));
- choices.push_back (_("Embed all without questions"));
- } else {
- choices.push_back (_("Cancel"));
+ linked_path = session->sound_dir();
+ linked_path += '/';
+ linked_path += Glib::path_get_basename (path);
+
+ if (link (path.c_str(), linked_path.c_str()) == 0) {
+
+ /* there are many reasons why link(2) might have failed.
+ but if it succeeds, we now have a link in the
+ session sound dir that will protect against
+ unlinking of the original path. nice.
+ */
+
+ path = linked_path;
}
-
- choices.push_back (_("Embed it anyway"));
- Gtkmm2ext::Choice rate_choice (
- string_compose (_("%1\nThis audiofile's sample rate doesn't match the session sample rate!"), path),
- choices, false);
+ /* note that we temporarily truncated _id at the colon */
- switch (rate_choice.run()) {
- case 0: /* stop a multi-file import */
- case 1: /* don't import this one */
- return -1;
- case 2: /* do it, and the rest without asking */
- check_sample_rate = false;
- break;
- case 3: /* do it */
- break;
- default:
- return -2;
- }
- }
-
- track_canvas.get_window()->set_cursor (Gdk::Cursor (Gdk::WATCH));
- ARDOUR_UI::instance()->flush_pending ();
-
- /* make the proper number of channels in the region */
-
- for (int n = 0; n < finfo.channels; ++n)
- {
- idspec = path;
- idspec += string_compose(":%1", n);
+ string error_msg;
- try {
- source = boost::dynamic_pointer_cast<AudioFileSource> (SourceFactory::createReadable
- (*session, idspec,
- (mode == ImportAsTapeTrack ?
- AudioFileSource::Destructive :
- AudioFileSource::Flag (0))));
- sources.push_back(source);
- }
+ if (!AudioFileSource::get_soundfile_info (path, finfo, error_msg)) {
+ error << string_compose(_("Editor: cannot open file \"%1\", (%2)"), selection, error_msg ) << endmsg;
+ return 0;
+ }
- catch (failed_constructor& err) {
- error << string_compose(_("could not open %1"), path) << endmsg;
- goto out;
+ if (check_sample_rate && (finfo.samplerate != (int) session->frame_rate())) {
+ vector<string> choices;
+
+ if (multiple_files) {
+ choices.push_back (_("Cancel entire import"));
+ choices.push_back (_("Don't embed it"));
+ choices.push_back (_("Embed all without questions"));
+ } else {
+ choices.push_back (_("Cancel"));
+ }
+
+ choices.push_back (_("Embed it anyway"));
+
+ Gtkmm2ext::Choice rate_choice (
+ string_compose (_("%1\nThis audiofile's sample rate doesn't match the session sample rate!"), path),
+ choices, false);
+
+ switch (rate_choice.run()) {
+ case 0: /* stop a multi-file import */
+ case 1: /* don't import this one */
+ return -1;
+ case 2: /* do it, and the rest without asking */
+ check_sample_rate = false;
+ break;
+ case 3: /* do it */
+ break;
+ default:
+ return -2;
+ }
}
+ track_canvas.get_window()->set_cursor (Gdk::Cursor (Gdk::WATCH));
ARDOUR_UI::instance()->flush_pending ();
- }
+ /* make the proper number of channels in the region */
+
+ input_chan += finfo.channels;
+
+ for (int n = 0; n < finfo.channels; ++n)
+ {
+ idspec = path;
+ idspec += string_compose(":%1", n);
+
+ try {
+ source = boost::dynamic_pointer_cast<AudioFileSource> (SourceFactory::createReadable
+ (*session, idspec,
+ (mode == ImportAsTapeTrack ?
+ AudioFileSource::Destructive :
+ AudioFileSource::Flag (0))));
+ sources.push_back(source);
+ }
+
+ catch (failed_constructor& err) {
+ error << string_compose(_("could not open %1"), path) << endmsg;
+ goto out;
+ }
+
+ ARDOUR_UI::instance()->flush_pending ();
+ }
+ }
+
if (sources.empty()) {
goto out;
}
pos = sources[0]->natural_position();
}
- region_name = PBD::basename_nosuffix (path);
- region_name += "-0";
+ region_name = region_name_from_path (paths.front(), (sources.size() > 1));
region = boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (sources, 0, sources[0]->length(), region_name, 0,
Region::Flag (Region::DefaultFlags|Region::WholeFile|Region::External)));
- input_chan = finfo.channels;
-
if (Config->get_output_auto_connect() & AutoConnectMaster) {
output_chan = (session->master_out() ? session->master_out()->n_inputs() : input_chan);
} else {
output_chan = input_chan;
}
-
+
finish_bringing_in_audio (region, input_chan, output_chan, track, pos, mode);
out:
const SelectionData& data,
guint info, guint time)
{
- cerr << "dropping, target = " << data.get_target() << endl;
-
if (data.get_target() == "regions") {
drop_regions (context, x, y, data, info, time);
} else {
#include <pbd/basename.h>
#include <ardour/audioregion.h>
-#include <ardour/audiosource.h>
+#include <ardour/audiofilesource.h>
#include <ardour/session_region.h>
#include <gtkmm2ext/stop_signal.h>
if (region->whole_file()) {
str = ".../";
- str += PBD::basename_nosuffix (region->source()->name());
-
+
+ boost::shared_ptr<AudioFileSource> afs = boost::dynamic_pointer_cast<AudioFileSource>(region->source());
+
+ if (afs) {
+ str += region_name_from_path (afs->path(), region->n_channels() > 1);
+ } else {
+ str += region->source()->name();
+ }
+
} else {
str = region->name();
}
/* these variables have custom set() methods (e.g. path globbing) */
-CONFIG_VARIABLE_SPECIAL(std::string, raid_path, "raid-path", "", path_expand)
+CONFIG_VARIABLE_SPECIAL(Glib::ustring, raid_path, "raid-path", "", path_expand)
bool multichan;
bool sample_convert;
volatile bool freeze;
- string pathname;
+ std::vector<Glib::ustring> paths;
/* result */
std::vector<boost::shared_ptr<AudioRegion> > new_regions;
class XMLNode;
void elapsed_time_to_str (char *buf, uint32_t seconds);
-std::string legalize_for_path (std::string str);
+Glib::ustring legalize_for_path (Glib::ustring str);
std::ostream& operator<< (std::ostream& o, const ARDOUR::BBT_Time& bbt);
XMLNode* find_named_node (const XMLNode& node, std::string name);
std::string placement_as_string (ARDOUR::Placement);
int tokenize_fullpath (std::string fullpath, std::string& path, std::string& name);
-int touch_file(std::string path);
+int touch_file(Glib::ustring path);
-std::string region_name_from_path (std::string path);
-std::string path_expand (std::string);
+Glib::ustring path_expand (Glib::ustring);
+Glib::ustring region_name_from_path (Glib::ustring path, bool strip_channels);
+bool path_is_paired (Glib::ustring path, Glib::ustring& pair_base);
void compute_equal_power_fades (nframes_t nframes, float* in, float* out);
} else {
string whole_file_region_name;
- whole_file_region_name = region_name_from_path (channels[0].write_source->name());
+ whole_file_region_name = region_name_from_path (channels[0].write_source->name(), true);
/* Register a new region with the Session that
describes the entire source. Do this first
try {
region = boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (pending_sources, 0, first_fs->length(),
- region_name_from_path (first_fs->name()),
+ region_name_from_path (first_fs->name(), true),
0, AudioRegion::Flag (AudioRegion::DefaultFlags|AudioRegion::Automatic|AudioRegion::WholeFile)));
region->special_set_position (0);
}
}
try {
- region = boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (pending_sources, 0, first_fs->length(), region_name_from_path (first_fs->name())));
+ region = boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (pending_sources, 0, first_fs->length(), region_name_from_path (first_fs->name(), true)));
}
catch (failed_constructor& err) {
return 0;
}
-int
-ARDOUR::init (bool use_vst, bool try_optimization)
+void
+setup_hardware_optimization (bool try_optimization)
{
bool generic_mix_functions = true;
- (void) bindtextdomain(PACKAGE, LOCALEDIR);
-
- PBD::ID::init ();
-
- lrdf_init();
- Library = new AudioLibrary;
-
- Config = new Configuration;
-
- if (Config->load_state ()) {
- return -1;
- }
-
- Config->set_use_vst (use_vst);
-
- if (setup_midi ()) {
- return -1;
- }
-
-#ifdef HAVE_LIBLO
- if (setup_osc ()) {
- return -1;
- }
-#endif
-
-#ifdef VST_SUPPORT
- if (Config->get_use_vst() && fst_init ()) {
- return -1;
- }
-#endif
-
if (try_optimization) {
#if defined (ARCH_X86) && defined (BUILD_SSE_OPTIMIZATIONS)
#endif /* USE_X86_64_ASM */
if (use_sse) {
- cerr << "Enabling SSE optimized routines" << endl;
+ info << "Using SSE optimized routines" << endmsg;
// SSE SET
Session::compute_peak = x86_sse_compute_peak;
info << "No H/W specific optimizations in use" << endmsg;
}
+}
+
+int
+ARDOUR::init (bool use_vst, bool try_optimization)
+{
+ (void) bindtextdomain(PACKAGE, LOCALEDIR);
+
+ PBD::ID::init ();
+
+ lrdf_init();
+ Library = new AudioLibrary;
+
+ Config = new Configuration;
+
+ if (Config->load_state ()) {
+ return -1;
+ }
+
+ Config->set_use_vst (use_vst);
+
+ if (setup_midi ()) {
+ return -1;
+ }
+
+#ifdef HAVE_LIBLO
+ if (setup_osc ()) {
+ return -1;
+ }
+#endif
+
+#ifdef VST_SUPPORT
+ if (Config->get_use_vst() && fst_init ()) {
+ return -1;
+ }
+#endif
+
+ setup_hardware_optimization (try_optimization);
/* singleton - first object is "it" */
new PluginManager ();
status.new_regions.clear ();
- if ((in = sf_open (status.pathname.c_str(), SFM_READ, &info)) == 0) {
- error << string_compose(_("Import: cannot open input sound file \"%1\""), status.pathname) << endmsg;
+ if ((in = sf_open (status.paths.front().c_str(), SFM_READ, &info)) == 0) {
+ error << string_compose(_("Import: cannot open input sound file \"%1\""), status.paths.front()) << endmsg;
return -1;
} else {
if ((uint32_t) info.samplerate != frame_rate()) {
sf_close(in);
status.doing_what = _("resampling audio");
// resample to session frame_rate
- if (sample_rate_convert(status, status.pathname, tmp_convert_file)) {
+ if (sample_rate_convert(status, status.paths.front(), tmp_convert_file)) {
if ((in = sf_open (tmp_convert_file.c_str(), SFM_READ, &info)) == 0) {
error << string_compose(_("Import: cannot open converted sound file \"%1\""), tmp_convert_file) << endmsg;
return -1;
}
} else if (!status.cancel){
// error
- error << string_compose(_("Import: error while resampling sound file \"%1\""), status.pathname) << endmsg;
+ error << string_compose(_("Import: error while resampling sound file \"%1\""), status.paths.front()) << endmsg;
return -1;
} else {
// canceled
}
sounds_dir = discover_best_sound_dir ();
- basepath = PBD::basename_nosuffix (status.pathname);
+ basepath = PBD::basename_nosuffix (status.paths.front());
for (n = 0; n < info.channels; ++n) {
sources.push_back(newfiles[n]);
}
- boost::shared_ptr<AudioRegion> r (boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (sources, 0, newfiles[0]->length(), region_name_from_path (Glib::path_get_basename (basepath)),
+ boost::shared_ptr<AudioRegion> r (boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (sources, 0, newfiles[0]->length(), region_name_from_path (basepath, true),
0, AudioRegion::Flag (AudioRegion::DefaultFlags | AudioRegion::WholeFile))));
status.new_regions.push_back (r);
status.new_regions.push_back (boost::dynamic_pointer_cast<AudioRegion>
(RegionFactory::create (boost::static_pointer_cast<Source> (newfiles[n]), 0, newfiles[n]->length(),
- region_name_from_path (Glib::path_get_basename (newfiles[n]->name())),
+ region_name_from_path (newfiles[n]->name(), true),
0, AudioRegion::Flag (AudioRegion::DefaultFlags | AudioRegion::WholeFile | AudioRegion::Import))));
}
}
/* construct a region to represent the bounced material */
boost::shared_ptr<Region> aregion = RegionFactory::create (srcs, 0, srcs.front()->length(),
- region_name_from_path (srcs.front()->name()));
+ region_name_from_path (srcs.front()->name(), true));
ret = 0;
}
#include <pbd/error.h>
#include <pbd/stacktrace.h>
#include <pbd/xml++.h>
+#include <pbd/basename.h>
#include <ardour/utils.h>
#include "i18n.h"
using namespace ARDOUR;
using namespace std;
using namespace PBD;
+using Glib::ustring;
void
elapsed_time_to_str (char *buf, uint32_t seconds)
}
}
+ustring
+legalize_for_path (ustring str)
+{
+ ustring::size_type pos;
+ ustring legal_chars = "abcdefghijklmnopqrtsuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_+=: ";
+ ustring legal;
+
+ legal = str;
+ pos = 0;
+
+ while ((pos = legal.find_first_not_of (legal_chars, pos)) != string::npos) {
+ legal.replace (pos, 1, "_");
+ pos += 1;
+ }
+
+ return legal;
+}
+#if 0
string
legalize_for_path (string str)
{
return legal;
}
+#endif
ostream&
operator<< (ostream& o, const BBT_Time& bbt)
}
int
-touch_file (string path)
+touch_file (ustring path)
{
int fd = open (path.c_str(), O_RDWR|O_CREAT, 0660);
if (fd >= 0) {
}
}
-string
-region_name_from_path (string path)
+ustring
+region_name_from_path (ustring path, bool strip_channels)
{
- string::size_type pos;
+ path = PBD::basename_nosuffix (path);
+
+ if (strip_channels) {
+
+ /* remove any "?R", "?L" or "?[a-z]" channel identifier */
+
+ ustring::size_type len = path.length();
+
+ if (len > 3 && (path[len-2] == '%' || path[len-2] == '?' || path[len-2] == '.') &&
+ (path[len-1] == 'R' || path[len-1] == 'L' || (islower (path[len-1])))) {
+
+ path = path.substr (0, path.length() - 2);
+ }
+ }
+
+ return path;
+}
+
+bool
+path_is_paired (ustring path, ustring& pair_base)
+{
+ ustring::size_type pos;
/* remove filename suffixes etc. */
path = path.substr (0, pos);
}
- /* remove any "?R", "?L" or "?[a-z]" channel identifier */
-
- string::size_type len = path.length();
+ ustring::size_type len = path.length();
+
+ /* look for possible channel identifier: "?R", "%R", ".L" etc. */
- if (len > 3 && (path[len-2] == '%' || path[len-2] == '?') &&
+ if (len > 3 && (path[len-2] == '%' || path[len-2] == '?' || path[len-2] == '.') &&
(path[len-1] == 'R' || path[len-1] == 'L' || (islower (path[len-1])))) {
- path = path.substr (0, path.length() - 2);
- }
+ pair_base = path.substr (0, len-2);
+ return true;
- return path;
-}
+ }
-string
-path_expand (string path)
+ return false;
+}
+
+ustring
+path_expand (ustring path)
{
#ifdef HAVE_WORDEXP
/* Handle tilde and environment variable expansion in session path */
-#include <iostream>
-#include <string.h>
#include <pbd/basename.h>
+#include <glibmm/miscutils.h>
+using Glib::ustring;
-// implement this using Glib::path_get_basename
-std::string
-PBD::basename_nosuffix (const std::string& str)
+ustring
+PBD::basename_nosuffix (ustring str)
{
- std::string::size_type slash = str.find_last_of ('/');
- std::string noslash;
+ ustring base = Glib::path_get_basename (str);
- if (slash == std::string::npos) {
- noslash = str;
- } else {
- noslash = str.substr (slash+1);
- }
+ return base.substr (0, base.find_last_of ('.'));
- return noslash.substr (0, noslash.find_last_of ('.'));
}
#ifndef __stupid_basename_h__
#define __stupid_basename_h__
-#include <string>
+#include <glibmm/ustring.h>
namespace PBD
{
-extern std::string basename_nosuffix (const std::string&);
+Glib::ustring basename_nosuffix (Glib::ustring);
-} // namespace PBD
+}
#endif // __stupid_basename_h__
typedef unsigned int BOOL;
+#ifndef FALSE
#define FALSE 0
+#endif
+#ifndef TRUE
#define TRUE 1
+#endif
#endif // _WINDEF_
#ifndef __ardour_svn_revision_h__
#define __ardour_svn_revision_h__
-static const char* ardour_svn_revision = "1232";
+static const char* ardour_svn_revision = "1239";
#endif
projects / ardour.git / commitdiff