diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2007-09-03 22:46:21 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2007-09-03 22:46:21 +0000 |
| commit | 0593717d589c01ee6537d8441001297b36604f30 (patch) | |
| tree | e2b40dc905028712ca4b6c771605bfa577504c43 /gtk2_ardour/sfdb_ui.cc | |
| parent | 429f302103b728b4b5e97b4dd379365e1a1987c5 (diff) | |
fix for NSD filename/folder extraction; import now works as well as embed does (and shares the codepath)
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2365 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/sfdb_ui.cc')
| -rw-r--r-- | gtk2_ardour/sfdb_ui.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/gtk2_ardour/sfdb_ui.cc b/gtk2_ardour/sfdb_ui.cc index 5c7e0c06f4..f96e958877 100644 --- a/gtk2_ardour/sfdb_ui.cc +++ b/gtk2_ardour/sfdb_ui.cc @@ -475,14 +475,14 @@ SoundFileBrowser::SoundFileBrowser (Gtk::Window& parent, string title, ARDOUR::S /* setup disposition map */ - disposition_map.insert (pair<Glib::ustring,ImportChannel>(_("one track per file"), ImportDistinctFiles)); - disposition_map.insert (pair<Glib::ustring,ImportChannel>(_("one track per channel"), ImportDistinctChannels)); - disposition_map.insert (pair<Glib::ustring,ImportChannel>(_("merge files"), ImportMergeFiles)); - disposition_map.insert (pair<Glib::ustring,ImportChannel>(_("sequence files"), ImportSerializeFiles)); - - disposition_map.insert (pair<Glib::ustring,ImportChannel>(_("one region per file"), ImportDistinctFiles)); - disposition_map.insert (pair<Glib::ustring,ImportChannel>(_("one region per channel"), ImportDistinctChannels)); - disposition_map.insert (pair<Glib::ustring,ImportChannel>(_("all files in one region"), ImportMergeFiles)); + disposition_map.insert (pair<Glib::ustring,ImportDisposition>(_("one track per file"), ImportDistinctFiles)); + disposition_map.insert (pair<Glib::ustring,ImportDisposition>(_("one track per channel"), ImportDistinctChannels)); + disposition_map.insert (pair<Glib::ustring,ImportDisposition>(_("merge files"), ImportMergeFiles)); + disposition_map.insert (pair<Glib::ustring,ImportDisposition>(_("sequence files"), ImportSerializeFiles)); + + disposition_map.insert (pair<Glib::ustring,ImportDisposition>(_("one region per file"), ImportDistinctFiles)); + disposition_map.insert (pair<Glib::ustring,ImportDisposition>(_("one region per channel"), ImportDistinctChannels)); + disposition_map.insert (pair<Glib::ustring,ImportDisposition>(_("all files in one region"), ImportMergeFiles)); } SoundFileBrowser::~SoundFileBrowser () @@ -874,7 +874,7 @@ SoundFileBrowser::get_position() const } } -ImportChannel +ImportDisposition SoundFileBrowser::get_channel_disposition () const { /* we use a map here because the channel combo can contain different strings |