diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2007-09-27 16:17:21 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2007-09-27 16:17:21 +0000 |
| commit | dfa476334a5498bb287d519e4519f5f46706cf9a (patch) | |
| tree | 48a9f7d6abe67b56ad3e75f5d49a7d859b5732ab /gtk2_ardour/editor_audio_import.cc | |
| parent | e79a7e8ff95d50fec527e6f6381cd30bcf57c8f8 (diff) | |
2 patches from jdavisp3; remove some debugging output from generic MIDI; rationalize string usage in SoundFileOmega; allow "mode hint" when using SoundFileOmega; restore context menu import functionality; bump to v2.1
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2490 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_audio_import.cc')
| -rw-r--r-- | gtk2_ardour/editor_audio_import.cc | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc index 0b674ad3ab..6ab8da8e45 100644 --- a/gtk2_ardour/editor_audio_import.cc +++ b/gtk2_ardour/editor_audio_import.cc @@ -65,8 +65,21 @@ using Glib::ustring; /* Functions supporting the incorporation of external (non-captured) audio material into ardour */ void -Editor::add_external_audio_action (ImportMode mode) +Editor::add_external_audio_action (ImportMode mode_hint) { + if (session == 0) { + MessageDialog msg (0, _("You can't import or embed an audiofile until you have a session loaded.")); + msg.run (); + return; + } + + if (sfbrowser == 0) { + sfbrowser = new SoundFileOmega (*this, _("Add existing audio"), session, 0, mode_hint); + } else { + sfbrowser->set_mode (mode_hint); + } + + external_audio_dialog (); } void |