diff options
| author | Hans Fugal <hans@fugal.net> | 2006-06-22 23:40:55 +0000 |
|---|---|---|
| committer | Hans Fugal <hans@fugal.net> | 2006-06-22 23:40:55 +0000 |
| commit | 7ff370e79895d7eb293e7214689b791bd98415fb (patch) | |
| tree | d36f88880be2925593984ee43e73283af48a0119 /gtk2_ardour/editor_audio_import.cc | |
| parent | fd742b30fa1071c44d053cf4676149641f977a35 (diff) | |
Merging from trunk
git-svn-id: svn://localhost/ardour2/branches/undo@638 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_audio_import.cc')
| -rw-r--r-- | gtk2_ardour/editor_audio_import.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc index ee73c46b24..f3e2ee1cb2 100644 --- a/gtk2_ardour/editor_audio_import.cc +++ b/gtk2_ardour/editor_audio_import.cc @@ -26,12 +26,11 @@ #include <ardour/session.h> #include <ardour/audioplaylist.h> #include <ardour/audioregion.h> -#include <ardour/diskstream.h> -#include <ardour/filesource.h> -#include <ardour/externalsource.h> +#include <ardour/audio_diskstream.h> #include <ardour/utils.h> #include <ardour/audio_track.h> #include <ardour/audioplaylist.h> +#include <ardour/audiofilesource.h> #include "ardour_ui.h" #include "editor.h" @@ -43,6 +42,7 @@ using namespace std; using namespace ARDOUR; +using namespace PBD; using namespace sigc; using namespace Gtk; using namespace Editing; @@ -187,7 +187,7 @@ int Editor::embed_sndfile (Glib::ustring path, bool split, bool multiple_files, bool& check_sample_rate, ImportMode mode, AudioTrack* track, jack_nframes_t& pos, bool prompt) { - ExternalSource *source = 0; /* keep g++ quiet */ + AudioFileSource *source = 0; /* keep g++ quiet */ AudioRegion::SourceList sources; AudioRegion* region; string idspec; @@ -220,7 +220,7 @@ Editor::embed_sndfile (Glib::ustring path, bool split, bool multiple_files, bool string error_msg; - if (!ExternalSource::get_soundfile_info (path, finfo, 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; } @@ -267,7 +267,7 @@ Editor::embed_sndfile (Glib::ustring path, bool split, bool multiple_files, bool idspec += string_compose(":%1", n); try { - source = ExternalSource::create (idspec.c_str()); + source = AudioFileSource::create (idspec.c_str()); sources.push_back(source); } |