more improvements and fixes for the import dialog

[ardour.git] / gtk2_ardour / editor.h

diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index c79bb317b0010cd94ea3ef8a1d91b3d8a22b30e2..9f1211010286af96394072c6e62ddd91e2cda0f1 100644 (file)
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -102,6 +102,7 @@ class MixerStrip;
 class StreamView;
 class AudioStreamView;
 class ControlPoint;
+class SoundFileBrowser;
 #ifdef FFT_ANALYSIS
 class AnalysisWindow;
 #endif
@@ -965,16 +966,22 @@ class Editor : public PublicEditor
        void external_audio_dialog ();
        bool check_multichannel_status (const std::vector<Glib::ustring>& paths);
 
+       SoundFileBrowser* sfbrowser;
+
        void bring_in_external_audio (Editing::ImportMode mode,  nframes64_t& pos);
-       void do_import (vector<Glib::ustring> paths, Editing::ImportChannel, Editing::ImportMode mode,  nframes64_t&);
+       void do_import (vector<Glib::ustring> paths, Editing::ImportDisposition, Editing::ImportMode mode,  nframes64_t&);
+
+       void _do_embed (vector<Glib::ustring> paths, Editing::ImportDisposition, Editing::ImportMode mode,  nframes64_t&);
+       void do_embed (vector<Glib::ustring> paths, Editing::ImportDisposition, Editing::ImportMode mode,  nframes64_t&);
+       bool idle_do_embed (vector<Glib::ustring> paths, Editing::ImportDisposition, Editing::ImportMode mode,  nframes64_t&);
 
-       void _do_embed (vector<Glib::ustring> paths, Editing::ImportChannel, Editing::ImportMode mode,  nframes64_t&);
-       void do_embed (vector<Glib::ustring> paths, Editing::ImportChannel, Editing::ImportMode mode,  nframes64_t&);
-       bool idle_do_embed (vector<Glib::ustring> paths, Editing::ImportChannel, Editing::ImportMode mode,  nframes64_t&);
+       int  import_sndfiles (vector<Glib::ustring> paths, Editing::ImportMode mode,  nframes64_t& pos,
+                             int target_regions, int target_tracks, boost::shared_ptr<ARDOUR::AudioTrack>&);
+       int  embed_sndfiles (vector<Glib::ustring> paths, bool multiple_files, bool& check_sample_rate, Editing::ImportMode mode, 
+                            nframes64_t& pos, int target_regions, int target_tracks, boost::shared_ptr<ARDOUR::AudioTrack>&);
 
-       int  import_sndfile (vector<Glib::ustring> paths, Editing::ImportMode mode,  nframes64_t& pos);
-       int  embed_sndfile (vector<Glib::ustring> paths, Editing::ImportChannel, bool multiple_files, bool& check_sample_rate, Editing::ImportMode mode, 
-                            nframes64_t& pos);
+       int add_sources (vector<Glib::ustring> paths, ARDOUR::SourceList& sources, nframes64_t& pos, Editing::ImportMode,
+                        int target_regions, int target_tracks, boost::shared_ptr<ARDOUR::AudioTrack>&);
        int finish_bringing_in_audio (boost::shared_ptr<ARDOUR::AudioRegion> region, uint32_t, uint32_t,  nframes64_t& pos, Editing::ImportMode mode,
                                      boost::shared_ptr<ARDOUR::AudioTrack>& existing_track, int nth);