summaryrefslogtreecommitdiff
path: root/libs/ardour/import.cc
diff options
context:
space:
mode:
authorTim Mayberry <mojofunk@gmail.com>2007-11-15 02:32:40 +0000
committerTim Mayberry <mojofunk@gmail.com>2007-11-15 02:32:40 +0000
commitdb718a7f176ae0a90d5304db69a5538ac4293247 (patch)
treef6b5d62bb8e5b5d554096a5b2ce9a3e8a590e64f /libs/ardour/import.cc
parenta39a9ea2d4ce9d56f01b8fe20b921d70d227adab (diff)
Change return type of Session::import_audiofiles to void as the int return value was not used
git-svn-id: svn://localhost/ardour2/trunk@2677 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/import.cc')
-rw-r--r--libs/ardour/import.cc10
1 files changed, 2 insertions, 8 deletions
diff --git a/libs/ardour/import.cc b/libs/ardour/import.cc
index acde11aef7..a8fb4050f9 100644
--- a/libs/ardour/import.cc
+++ b/libs/ardour/import.cc
@@ -231,7 +231,7 @@ remove_file_source (boost::shared_ptr<AudioFileSource> file_source)
sys::remove (std::string(file_source->path()));
}
-int
+void
Session::import_audiofiles (import_status& status)
{
uint32_t cnt = 1;
@@ -254,7 +254,7 @@ Session::import_audiofiles (import_status& status)
{
error << string_compose(_("Import: cannot open input sound file \"%1\""), (*p)) << endmsg;
status.done = status.cancel = true;
- return -1;
+ return;
}
vector<string> new_paths = get_paths_for_new_sources (*p,
@@ -279,8 +279,6 @@ Session::import_audiofiles (import_status& status)
write_audio_data_to_new_files (source.get(), status, newfiles);
}
-
- int ret = -1;
if (!status.cancel) {
struct tm* now;
@@ -304,14 +302,10 @@ Session::import_audiofiles (import_status& status)
std::copy (all_new_sources.begin(), all_new_sources.end(),
std::back_inserter(status.sources));
-
- ret = 0;
} else {
// this can throw...but it seems very unlikely
std::for_each (all_new_sources.begin(), all_new_sources.end(), remove_file_source);
}
status.done = true;
-
- return ret;
}