diff options
author | David Robillard <d@drobilla.net> | 2006-09-19 03:29:16 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2006-09-19 03:29:16 +0000 |
commit | 7bd41538d951c3e476655df741adfbebbb990bde (patch) | |
tree | f9988f959571c75535341ab1de463b7cfc5209e3 /gtk2_ardour/sfdb_ui.cc | |
parent | c7307c09b8584b15610f0b29a40f839d9183419a (diff) |
Merged with trunk R920.
git-svn-id: svn://localhost/ardour2/branches/midi@921 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/sfdb_ui.cc')
-rw-r--r-- | gtk2_ardour/sfdb_ui.cc | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/gtk2_ardour/sfdb_ui.cc b/gtk2_ardour/sfdb_ui.cc index b0601704c8..f434463500 100644 --- a/gtk2_ardour/sfdb_ui.cc +++ b/gtk2_ardour/sfdb_ui.cc @@ -36,6 +36,7 @@ #include <ardour/source_factory.h> #include "ardour_ui.h" +#include "editing.h" #include "gui_thread.h" #include "prompter.h" #include "sfdb_ui.h" @@ -197,7 +198,7 @@ SoundFileBox::play_btn_clicked () for (int n = 0; n < sf_info.channels; ++n) { try { - afs = boost::dynamic_pointer_cast<AudioFileSource> (SourceFactory::createReadable (DataType::AUDIO, path+":"+string_compose("%1", n), AudioFileSource::Flag (0))); + afs = boost::dynamic_pointer_cast<AudioFileSource> (SourceFactory::createReadable (DataType::AUDIO, *_session, path+":"+string_compose("%1", n), AudioFileSource::Flag (0))); srclist.push_back(afs); } catch (failed_constructor& err) { @@ -305,6 +306,15 @@ SoundFileBox::field_selected () } } +// this needs to be kept in sync with the ImportMode enum defined in editing.h and editing_syms.h. +static const char *import_mode_strings[] = { + X_("Add to Region list"), + X_("Add to selected Track(s)"), + X_("Add as new Track(s)"), + X_("Add as new Tape Track(s)"), + 0 +}; + SoundFileBrowser::SoundFileBrowser (string title, ARDOUR::Session* s) : ArdourDialog (title, false), chooser (Gtk::FILE_CHOOSER_ACTION_OPEN) @@ -339,13 +349,6 @@ SoundFileChooser::SoundFileChooser (string title, ARDOUR::Session* s) show_all (); } -static const char *import_mode_strings[] = { - X_("Add to Region list"), - X_("Add as new Track(s)"), - X_("Add to selected Track(s)"), - 0 -}; - vector<string> SoundFileOmega::mode_strings; SoundFileOmega::SoundFileOmega (string title, ARDOUR::Session* s) |