diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2006-09-28 17:23:52 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2006-09-28 17:23:52 +0000 |
| commit | 93c7aeba048f19df5abee5e4325ef8b0ef62c279 (patch) | |
| tree | 5bc2149d17fb5272c5b6284f7e902faad39a92f7 /gtk2_ardour/editor_audio_import.cc | |
| parent | 3e6feb62ae37cbf98364ccb36e9be47a52ceb8bf (diff) | |
fixes for destructive track offsets of various kinds; move from jack_nframes_t -> nframes_t
git-svn-id: svn://localhost/ardour2/trunk@933 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_audio_import.cc')
| -rw-r--r-- | gtk2_ardour/editor_audio_import.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc index 8f964cc1c4..3ba1f062cb 100644 --- a/gtk2_ardour/editor_audio_import.cc +++ b/gtk2_ardour/editor_audio_import.cc @@ -55,7 +55,7 @@ using namespace Editing; void Editor::add_external_audio_action (ImportMode mode) { - jack_nframes_t& pos = edit_cursor->current_frame; + nframes_t& pos = edit_cursor->current_frame; AudioTrack* track = 0; if (!selection->tracks.empty()) { @@ -69,7 +69,7 @@ Editor::add_external_audio_action (ImportMode mode) } void -Editor::bring_in_external_audio (ImportMode mode, AudioTrack* track, jack_nframes_t& pos, bool prompt) +Editor::bring_in_external_audio (ImportMode mode, AudioTrack* track, nframes_t& pos, bool prompt) { if (session == 0) { MessageDialog msg (0, _("You can't import or embed an audiofile until you have a session loaded.")); @@ -95,7 +95,7 @@ Editor::bring_in_external_audio (ImportMode mode, AudioTrack* track, jack_nframe } void -Editor::do_import (vector<Glib::ustring> paths, bool split, ImportMode mode, AudioTrack* track, jack_nframes_t& pos, bool prompt) +Editor::do_import (vector<Glib::ustring> paths, bool split, ImportMode mode, AudioTrack* track, nframes_t& pos, bool prompt) { /* SFDB sets "multichan" to true to indicate "split channels" so reverse the setting to match the way libardour @@ -120,7 +120,7 @@ Editor::do_import (vector<Glib::ustring> paths, bool split, ImportMode mode, Aud } void -Editor::do_embed (vector<Glib::ustring> paths, bool split, ImportMode mode, AudioTrack* track, jack_nframes_t& pos, bool prompt) +Editor::do_embed (vector<Glib::ustring> paths, bool split, ImportMode mode, AudioTrack* track, nframes_t& pos, bool prompt) { bool multiple_files = paths.size() > 1; bool check_sample_rate = true; @@ -140,7 +140,7 @@ Editor::do_embed (vector<Glib::ustring> paths, bool split, ImportMode mode, Audi } int -Editor::import_sndfile (Glib::ustring path, ImportMode mode, AudioTrack* track, jack_nframes_t& pos) +Editor::import_sndfile (Glib::ustring path, ImportMode mode, AudioTrack* track, nframes_t& pos) { interthread_progress_window->set_title (string_compose (_("ardour: importing %1"), path)); interthread_progress_window->set_position (Gtk::WIN_POS_MOUSE); @@ -188,7 +188,7 @@ Editor::import_sndfile (Glib::ustring path, ImportMode mode, AudioTrack* track, 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) + AudioTrack* track, nframes_t& pos, bool prompt) { boost::shared_ptr<AudioFileSource> source; SourceList sources; @@ -308,7 +308,7 @@ Editor::embed_sndfile (Glib::ustring path, bool split, bool multiple_files, bool } int -Editor::finish_bringing_in_audio (boost::shared_ptr<AudioRegion> region, uint32_t in_chans, uint32_t out_chans, AudioTrack* track, jack_nframes_t& pos, ImportMode mode) +Editor::finish_bringing_in_audio (boost::shared_ptr<AudioRegion> region, uint32_t in_chans, uint32_t out_chans, AudioTrack* track, nframes_t& pos, ImportMode mode) { switch (mode) { case ImportAsRegion: |