diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2006-03-22 17:03:00 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2006-03-22 17:03:00 +0000 |
| commit | 3aa346b253d515c3d0715ec5e0fa8b6ad477c4e5 (patch) | |
| tree | a41d4380ad270324a2d05cbbab0d1e57dce2bdfe /gtk2_ardour/editor.h | |
| parent | 004a49b0c7051a4d0f8972b0aff0ef8fa9cab03d (diff) | |
significant changes in code to handle import/embedding - much cleaner and less code, plus the import progress bar now works; unify response handling for Gtkmm2ext::Choice
git-svn-id: svn://localhost/trunk/ardour2@415 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor.h')
| -rw-r--r-- | gtk2_ardour/editor.h | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index f0fb67694a..dbc76993d9 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -967,18 +967,16 @@ class Editor : public PublicEditor void insert_region_list_drag (ARDOUR::AudioRegion&, int x, int y); void insert_region_list_selection (float times); - void insert_sndfile (bool as_tracks); - void embed_audio (); // inserts into region list - int reject_because_rate_differs (const string & path, ARDOUR::SoundFileInfo& finfo, const string & action, bool multiple_pending); + void add_external_audio_action (Editing::ImportMode); - void do_embed_sndfiles (vector<string> paths, bool split); - void embed_sndfile (string path, bool split, bool multiple_files, bool& check_sr); - - void do_insert_sndfile (vector<string> path, bool multi, jack_nframes_t frame); - void insert_paths_as_new_tracks (std::vector<std::string> paths, bool multi); // inserts files as new tracks - void insert_sndfile_into (const string & path, bool multi, AudioTimeAxisView* tv, jack_nframes_t& frame, bool prompt=true); - static void* _insert_sndfile_thread (void*); - void* insert_sndfile_thread (void*); + void bring_in_external_audio (Editing::ImportMode mode, ARDOUR::AudioTrack*, jack_nframes_t& pos, bool prompt); + void do_import (vector<Glib::ustring> paths, bool split, Editing::ImportMode mode, ARDOUR::AudioTrack*, jack_nframes_t&, bool); + void do_embed (vector<Glib::ustring> paths, bool split, Editing::ImportMode mode, ARDOUR::AudioTrack*, jack_nframes_t&, bool); + void import_sndfile (Glib::ustring path, Editing::ImportMode mode, ARDOUR::AudioTrack* track, jack_nframes_t& pos); + void embed_sndfile (Glib::ustring path, bool split, bool multiple_files, bool& check_sample_rate, Editing::ImportMode mode, + ARDOUR::AudioTrack* track, jack_nframes_t& pos, bool prompt); + int finish_bringing_in_audio (ARDOUR::AudioRegion& region, uint32_t, uint32_t, ARDOUR::AudioTrack* track, jack_nframes_t& pos, Editing::ImportMode mode); + int reject_because_rate_differs (Glib::ustring path, ARDOUR::SoundFileInfo& finfo, const string & action, bool multiple_pending); /* generic interthread progress window */ @@ -1003,8 +1001,6 @@ class Editor : public PublicEditor gint import_progress_timeout (void *); static void *_import_thread (void *); void* import_thread (); - void catch_new_audio_region (ARDOUR::AudioRegion*); - ARDOUR::AudioRegion* last_audio_region; /* to support this ... */ @@ -1586,7 +1582,7 @@ class Editor : public PublicEditor /* Drag-n-Drop */ - int convert_drop_to_paths (std::vector<std::string>& paths, + int convert_drop_to_paths (std::vector<Glib::ustring>& paths, const Glib::RefPtr<Gdk::DragContext>& context, gint x, gint y, |