diff options
Diffstat (limited to 'libs/ardour/import.cc')
| -rw-r--r-- | libs/ardour/import.cc | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/libs/ardour/import.cc b/libs/ardour/import.cc index c13816e648..410171a590 100644 --- a/libs/ardour/import.cc +++ b/libs/ardour/import.cc @@ -36,8 +36,8 @@ #include <ardour/ardour.h> #include <ardour/session.h> -#include <ardour/diskstream.h> -#include <ardour/filesource.h> +#include <ardour/audio_diskstream.h> +#include <ardour/sndfilesource.h> #include <ardour/sndfile_helpers.h> #include <ardour/audioregion.h> @@ -51,8 +51,8 @@ int Session::import_audiofile (import_status& status) { SNDFILE *in; - FileSource **newfiles = 0; - ARDOUR::AudioRegion::SourceList sources; + AudioFileSource **newfiles = 0; + AudioRegion::SourceList sources; SF_INFO info; float *data = 0; Sample **channel_data = 0; @@ -94,7 +94,7 @@ Session::import_audiofile (import_status& status) } } - newfiles = new FileSource *[info.channels]; + newfiles = new AudioFileSource *[info.channels]; for (n = 0; n < info.channels; ++n) { newfiles[n] = 0; } @@ -137,7 +137,10 @@ Session::import_audiofile (import_status& status) try { - newfiles[n] = new FileSource (buf, frame_rate(), false, Config->get_native_file_data_format()); + newfiles[n] = new SndFileSource (buf, + Config->get_native_file_data_format(), + Config->get_native_file_header_format(), + frame_rate ()); } catch (failed_constructor& err) { |