From 7bddf6208f763272c5aef181b66e4f47706970bb Mon Sep 17 00:00:00 2001
From: Tim Mayberry <mojofunk@gmail.com>
Date: Thu, 15 Nov 2007 02:32:15 +0000
Subject: Use sys::basename instead of PBD::basename_nosuffix in
 Session::import_audiofile

git-svn-id: svn://localhost/ardour2/trunk@2671 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 libs/ardour/import.cc | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'libs/ardour')

diff --git a/libs/ardour/import.cc b/libs/ardour/import.cc
index 82571e157c..f2b5e9b790 100644
--- a/libs/ardour/import.cc
+++ b/libs/ardour/import.cc
@@ -34,7 +34,6 @@
 #include <boost/scoped_array.hpp>
 #include <boost/shared_array.hpp>
 
-#include <pbd/basename.h>
 #include <pbd/convert.h>
 
 #include <ardour/ardour.h>
@@ -159,7 +158,6 @@ write_audio_data_to_new_files (ImportableSource* source, Session::import_status&
 int
 Session::import_audiofile (import_status& status)
 {
-	string basepath;
 	int ret = -1;
 	vector<string> new_paths;
 	uint32_t cnt = 1;
@@ -188,12 +186,12 @@ Session::import_audiofile (import_status& status)
 		}
 
 		SessionDirectory sdir(get_best_session_directory_for_new_source ());
+	
+		const string basename = sys::basename (string(*p));
 
-		basepath = PBD::basename_nosuffix ((*p));
-		
 		for (uint n = 0; n < source->channels(); ++n) {
 
-			std::string filename = get_non_existent_filename (basepath, n, source->channels()); 
+			std::string filename = get_non_existent_filename (basename, n, source->channels()); 
 
 			sys::path filepath = sdir.sound_path() / filename;
 
-- 
cgit v1.2.3