cross-thread handling of SessionEvent allocation/deallocation, with widespread conseq...
[ardour.git] / gtk2_ardour / sfdb_ui.cc
index 947f470ac8f342144a17892bd764520362f0234c..aa8d7b77f2a24164e23731b26964e9d624bc12ee 100644 (file)
@@ -1,6 +1,5 @@
 /*
-    Copyright (C) 2005 Paul Davis 
-    Written by Taybin Rutkin
+    Copyright (C) 2005-2006 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-
 */
 
 #include <map>
 #include <cerrno>
+#include <sstream>
+
+#include <unistd.h>
+#include <sys/stat.h>
+#include <sys/param.h>
 
 #include <gtkmm/box.h>
 #include <gtkmm/stock.h>
+#include <glibmm/fileutils.h>
 
-#include <pbd/convert.h>
+#include "pbd/convert.h"
+#include "pbd/tokenizer.h"
+#include "pbd/enumwriter.h"
+#include "pbd/pthread_utils.h"
+#include "pbd/xml++.h"
 
 #include <gtkmm2ext/utils.h>
 
-#include <ardour/audio_library.h>
-#include <ardour/audioregion.h>
-#include <ardour/externalsource.h>
+#include "evoral/SMF.hpp"
+
+#include "ardour/amp.h"
+#include "ardour/audio_library.h"
+#include "ardour/auditioner.h"
+#include "ardour/audioregion.h"
+#include "ardour/audiofilesource.h"
+#include "ardour/smf_source.h"
+#include "ardour/region_factory.h"
+#include "ardour/source_factory.h"
+#include "ardour/session.h"
+#include "ardour/session_directory.h"
+#include "ardour/profile.h"
 
 #include "ardour_ui.h"
+#include "editing.h"
 #include "gui_thread.h"
 #include "prompter.h"
 #include "sfdb_ui.h"
+#include "editing.h"
 #include "utils.h"
+#include "gain_meter.h"
+
+#ifdef FREESOUND
+#include "sfdb_freesound_mootcher.h"
+#endif
 
 #include "i18n.h"
 
 using namespace ARDOUR;
+using namespace PBD;
 using namespace std;
+using namespace Gtk;
+using namespace Gtkmm2ext;
+using namespace Editing;
+
+using Glib::ustring;
+
+ustring SoundFileBrowser::persistent_folder;
+
+static ImportMode
+string2importmode (string str)
+{
+       if (str == _("as new tracks")) {
+               return ImportAsTrack;
+       } else if (str == _("to selected tracks")) {
+               return ImportToTrack;
+       } else if (str == _("to region list")) {
+               return ImportAsRegion;
+       } else if (str == _("as new tape tracks")) {
+               return ImportAsTapeTrack;
+       }
+
+       warning << string_compose (_("programming error: unknown import mode string %1"), str) << endmsg;
+
+       return ImportAsTrack;
+}
+
+static string
+importmode2string (ImportMode mode)
+{
+       switch (mode) {
+       case ImportAsTrack:
+               return _("as new tracks");
+       case ImportToTrack:
+               return _("to selected tracks");
+       case ImportAsRegion:
+               return _("to region list");
+       case ImportAsTapeTrack:
+               return _("as new tape tracks");
+       }
+       /*NOTREACHED*/
+       return _("as new tracks");
+}
+
+SoundFileBox::SoundFileBox (bool persistent)
+       : _session(0),
+         table (6, 2),
+         length_clock ("sfboxLengthClock", !persistent, "EditCursorClock", false, false, true, false),
+         timecode_clock ("sfboxTimecodeClock", !persistent, "EditCursorClock", false, false, false, false),
+         main_box (false, 6),
+         autoplay_btn (_("Auto-play"))
 
-SoundFileBox::SoundFileBox ()
-       :
-       _session(0),
-       current_pid(0),
-       fields(Gtk::ListStore::create(label_columns)),
-       main_box (false, 3),
-       top_box (true, 4),
-       bottom_box (true, 4),
-       play_btn(_("Play")),
-       stop_btn(_("Stop")),
-       add_field_btn(_("Add Field...")),
-       remove_field_btn(_("Remove Field"))
 {
        set_name (X_("SoundFileBox"));
-       border_frame.set_label (_("Soundfile Info"));
+       set_size_request (300, -1);
+
+       preview_label.set_markup (_("<b>Sound File Information</b>"));
+
+       border_frame.set_label_widget (preview_label);
        border_frame.add (main_box);
 
-       pack_start (border_frame);
-       set_border_width (4);
+       pack_start (border_frame, true, true);
+       set_border_width (6);
+
+       main_box.set_border_width (6);
+
+       length.set_text (_("Length:"));
+       length.set_alignment (1, 0.5);
+       timecode.set_text (_("Timestamp:"));
+       timecode.set_alignment (1, 0.5);
+       format.set_text (_("Format:"));
+       format.set_alignment (1, 0.5);
+       channels.set_text (_("Channels:"));
+       channels.set_alignment (1, 0.5);
+       samplerate.set_text (_("Sample rate:"));
+       samplerate.set_alignment (1, 0.5);
+
+       format_text.set_max_width_chars (8);
+       format_text.set_ellipsize (Pango::ELLIPSIZE_END);
+       format_text.set_alignment (0, 1);
+
+       table.set_col_spacings (6);
+       table.set_homogeneous (false);
+       table.set_row_spacings (6);
 
-       main_box.set_border_width (4);
+       table.attach (channels, 0, 1, 0, 1, FILL, FILL);
+       table.attach (samplerate, 0, 1, 1, 2, FILL, FILL);
+       table.attach (format, 0, 1, 2, 4, FILL, FILL);
+       table.attach (length, 0, 1, 4, 5, FILL, FILL);
+       table.attach (timecode, 0, 1, 5, 6, FILL, FILL);
 
-       main_box.pack_start(length, false, false);
-       main_box.pack_start(format, false, false);
-       main_box.pack_start(channels, false, false);
-       main_box.pack_start(samplerate, false, false);
-       main_box.pack_start(field_view, true, true);
-       main_box.pack_start(top_box, false, false);
-       main_box.pack_start(bottom_box, false, false);
+       table.attach (channels_value, 1, 2, 0, 1, FILL, FILL);
+       table.attach (samplerate_value, 1, 2, 1, 2, FILL, FILL);
+       table.attach (format_text, 1, 2, 2, 4, FILL, FILL);
+       table.attach (length_clock, 1, 2, 4, 5, FILL, FILL);
+       table.attach (timecode_clock, 1, 2, 5, 6, FILL, FILL);
 
-       field_view.set_model (fields);
-       field_view.set_size_request(200, 150);
-       field_view.append_column (_("Field"), label_columns.field);
-       field_view.append_column_editable (_("Value"), label_columns.data);
+       length_clock.set_mode (ARDOUR_UI::instance()->secondary_clock.mode());
+       timecode_clock.set_mode (AudioClock::Timecode);
 
-       top_box.set_homogeneous(true);
-       top_box.pack_start(add_field_btn);
-       top_box.pack_start(remove_field_btn);
+       main_box.pack_start (table, false, false);
 
-       remove_field_btn.set_sensitive(false);
+       tags_entry.set_editable (true);
+       tags_entry.signal_focus_out_event().connect (mem_fun (*this, &SoundFileBox::tags_entry_left));
 
-       bottom_box.set_homogeneous(true);
-       bottom_box.pack_start(play_btn);
-       bottom_box.pack_start(stop_btn);
+       Label* label = manage (new Label (_("Tags:")));
+       label->set_alignment (0.0f, 0.5f);
+       main_box.pack_start (*label, false, false);
+       main_box.pack_start (tags_entry, true, true);
 
-       play_btn.signal_clicked().connect (mem_fun (*this, &SoundFileBox::play_btn_clicked));
-       stop_btn.signal_clicked().connect (mem_fun (*this, &SoundFileBox::stop_btn_clicked));
+       main_box.pack_start (bottom_box, false, false);
 
-       add_field_btn.signal_clicked().connect
-                       (mem_fun (*this, &SoundFileBox::add_field_clicked));
-       remove_field_btn.signal_clicked().connect
-                       (mem_fun (*this, &SoundFileBox::remove_field_clicked));
+       play_btn.set_image (*(manage (new Image (Stock::MEDIA_PLAY, ICON_SIZE_BUTTON))));
+       play_btn.set_label (_("Play"));
 
-       field_view.get_selection()->signal_changed().connect (mem_fun (*this, &SoundFileBox::field_selected));
-       Library->fields_changed.connect (mem_fun (*this, &SoundFileBox::setup_fields));
+       stop_btn.set_image (*(manage (new Image (Stock::MEDIA_STOP, ICON_SIZE_BUTTON))));
+       stop_btn.set_label (_("Stop"));
 
-       show_all();
-       stop_btn.hide();
+       bottom_box.set_homogeneous (false);
+       bottom_box.set_spacing (6);
+       bottom_box.pack_start(play_btn, true, true);
+       bottom_box.pack_start(stop_btn, true, true);
+       bottom_box.pack_start(autoplay_btn, false, false);
+
+       play_btn.signal_clicked().connect (mem_fun (*this, &SoundFileBox::audition));
+       stop_btn.signal_clicked().connect (mem_fun (*this, &SoundFileBox::stop_audition));
+
+       channels_value.set_alignment (0.0f, 0.5f);
+       samplerate_value.set_alignment (0.0f, 0.5f);
 }
 
 void
@@ -110,67 +205,106 @@ SoundFileBox::set_session(Session* s)
        _session = s;
 
        if (!_session) {
-               play_btn.set_sensitive(false);
-       } else {
-               _session->AuditionActive.connect(mem_fun (*this, &SoundFileBox::audition_status_changed));
+               play_btn.set_sensitive (false);
+               stop_btn.set_sensitive (false);
        }
+
+
+       length_clock.set_session (s);
+       timecode_clock.set_session (s);
 }
 
 bool
-SoundFileBox::setup_labels (string filename) 
+SoundFileBox::setup_labels (const ustring& filename)
 {
+       if (!path.empty()) {
+               // save existing tags
+               tags_changed ();
+       }
+
        path = filename;
 
        string error_msg;
-       if(!ExternalSource::get_soundfile_info (filename, sf_info, error_msg)) {
-               return false;
-       }
 
-       length.set_alignment (0.0f, 0.0f);
-       length.set_text (string_compose("Length: %1", PBD::length2string(sf_info.length, sf_info.samplerate)));
+       if(!AudioFileSource::get_soundfile_info (filename, sf_info, error_msg)) {
 
-       format.set_alignment (0.0f, 0.0f);
-       format.set_text (sf_info.format_name);
+               preview_label.set_markup (_("<b>Sound File Information</b>"));
+               format_text.set_text ("");
+               channels_value.set_text ("");
+               samplerate_value.set_text ("");
+               tags_entry.get_buffer()->set_text ("");
 
-       channels.set_alignment (0.0f, 0.0f);
-       channels.set_text (string_compose("Channels: %1", sf_info.channels));
+               length_clock.set (0);
+               timecode_clock.set (0);
 
-       samplerate.set_alignment (0.0f, 0.0f);
-       samplerate.set_text (string_compose("Samplerate: %1", sf_info.samplerate));
+               tags_entry.set_sensitive (false);
+               play_btn.set_sensitive (false);
 
-       setup_fields ();
+               return false;
+       }
 
-       return true;
-}
+       preview_label.set_markup (string_compose ("<b>%1</b>", Glib::path_get_basename (filename)));
+       std::string n = sf_info.format_name;
+       if (n.substr (0, 8) == X_("Format: ")) {
+               n = n.substr (8);
+       }
+       format_text.set_text (n);
+       channels_value.set_text (to_string (sf_info.channels, std::dec));
+
+       if (_session && sf_info.samplerate != _session->frame_rate()) {
+               samplerate.set_markup (string_compose ("<b>%1</b>", _("Sample rate:")));
+               samplerate_value.set_markup (string_compose (X_("<b>%1 Hz</b>"), sf_info.samplerate));
+               samplerate_value.set_name ("NewSessionSR1Label");
+               samplerate.set_name ("NewSessionSR1Label");
+       } else {
+               samplerate.set_text (_("Sample rate:"));
+               samplerate_value.set_text (string_compose (X_("%1 Hz"), sf_info.samplerate));
+               samplerate_value.set_name ("NewSessionSR2Label");
+               samplerate.set_name ("NewSessionSR2Label");
+       }
 
-void
-SoundFileBox::setup_fields ()
-{
-       ENSURE_GUI_THREAD(mem_fun (*this, &SoundFileBox::setup_fields));
+       nframes_t const nfr = _session ? _session->nominal_frame_rate() : 25;
+       double src_coef = (double) nfr / sf_info.samplerate;
 
-       fields->clear ();
+       length_clock.set (sf_info.length * src_coef + 0.5, true);
+       timecode_clock.set (sf_info.timecode * src_coef + 0.5, true);
 
-       vector<string> field_list;
-       Library->get_fields(field_list);
+       // this is a hack that is fixed in trunk, i think (august 26th, 2007)
 
-       vector<string>::iterator i;
-       Gtk::TreeModel::iterator iter;
-       Gtk::TreeModel::Row row;
-       for (i = field_list.begin(); i != field_list.end(); ++i) {
-               if (!(*i == _("channels") || *i == _("samplerate") ||
-                       *i == _("resolution") || *i == _("format"))) {
-                       iter = fields->append();
-                       row = *iter;
+       vector<string> tags = Library->get_tags (string ("//") + filename);
 
-                       string value = Library->get_field(path, *i);
-                       row[label_columns.field] = *i;
-                       row[label_columns.data]  = value;
+       stringstream tag_string;
+       for (vector<string>::iterator i = tags.begin(); i != tags.end(); ++i) {
+               if (i != tags.begin()) {
+                       tag_string << ", ";
                }
+               tag_string << *i;
        }
+       tags_entry.get_buffer()->set_text (tag_string.str());
+
+       tags_entry.set_sensitive (true);
+       if (_session) {
+               play_btn.set_sensitive (true);
+       }
+
+       return true;
+}
+
+bool
+SoundFileBox::autoplay() const
+{
+       return autoplay_btn.get_active();
+}
+
+bool
+SoundFileBox::audition_oneshot()
+{
+       audition ();
+       return false;
 }
 
 void
-SoundFileBox::play_btn_clicked ()
+SoundFileBox::audition ()
 {
        if (!_session) {
                return;
@@ -178,259 +312,1135 @@ SoundFileBox::play_btn_clicked ()
 
        _session->cancel_audition();
 
-       if (access(path.c_str(), R_OK)) {
+       if (!Glib::file_test (path, Glib::FILE_TEST_EXISTS)) {
                warning << string_compose(_("Could not read file: %1 (%2)."), path, strerror(errno)) << endmsg;
                return;
        }
 
-       static std::map<string, AudioRegion*> region_cache;
+       boost::shared_ptr<Region> r;
+       SourceList srclist;
+       boost::shared_ptr<AudioFileSource> afs;
+       bool old_sbp = AudioSource::get_build_peakfiles ();
 
-       if (region_cache.find (path) == region_cache.end()) {
-               AudioRegion::SourceList srclist;
-               ExternalSource* sfs;
+       /* don't even think of building peakfiles for these files */
 
-               for (int n = 0; n < sf_info.channels; ++n) {
-                       try {
-                               sfs = ExternalSource::create (path+":"+string_compose("%1", n), false);
-                               srclist.push_back(sfs);
+       AudioSource::set_build_peakfiles (false);
 
-                       } catch (failed_constructor& err) {
-                               error << _("Could not access soundfile: ") << path << endmsg;
-                               return;
-                       }
-               }
+       for (int n = 0; n < sf_info.channels; ++n) {
+               try {
+                       afs = boost::dynamic_pointer_cast<AudioFileSource> (
+                                       SourceFactory::createReadable (DataType::AUDIO, *_session,
+                                                       path, n, Source::Flag (0), false));
 
-               if (srclist.empty()) {
+                       srclist.push_back(afs);
+
+               } catch (failed_constructor& err) {
+                       error << _("Could not access soundfile: ") << path << endmsg;
+                       AudioSource::set_build_peakfiles (old_sbp);
                        return;
                }
+       }
+
+       AudioSource::set_build_peakfiles (old_sbp);
 
-               string result;
-               _session->region_name (result, Glib::path_get_basename(srclist[0]->name()), false);
-               AudioRegion* a_region = new AudioRegion(srclist, 0, srclist[0]->length(), result, 0, Region::DefaultFlags, false);
-               region_cache[path] = a_region;
+       if (srclist.empty()) {
+               return;
        }
 
-       play_btn.hide();
-       stop_btn.show();
+       afs = boost::dynamic_pointer_cast<AudioFileSource> (srclist[0]);
+       string rname = region_name_from_path (afs->path(), false);
+       r = boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (srclist, 0,
+                               srclist[0]->length(srclist[0]->timeline_position()),
+                               rname, 0, Region::DefaultFlags, false));
 
-       _session->audition_region(*region_cache[path]);
+       _session->audition_region(r);
 }
 
 void
-SoundFileBox::stop_btn_clicked ()
+SoundFileBox::stop_audition ()
 {
        if (_session) {
                _session->cancel_audition();
-               play_btn.show();
-               stop_btn.hide();
        }
 }
 
+bool
+SoundFileBox::tags_entry_left (GdkEventFocus *)
+{
+       tags_changed ();
+       return false;
+}
+
 void
-SoundFileBox::add_field_clicked ()
+SoundFileBox::tags_changed ()
 {
-    ArdourPrompter prompter (true);
-    string name;
+       string tag_string = tags_entry.get_buffer()->get_text ();
+
+       if (tag_string.empty()) {
+               return;
+       }
 
-    prompter.set_prompt (_("Name for Field"));
-    prompter.add_button (Gtk::Stock::ADD, Gtk::RESPONSE_ACCEPT);
-    prompter.set_response_sensitive (Gtk::RESPONSE_ACCEPT, false);
+       vector<string> tags;
 
-    switch (prompter.run ()) {
-               case Gtk::RESPONSE_ACCEPT:
-               prompter.get_result (name);
-                       if (name.length()) {
-                               Library->add_field (name);
-                               Library->save_changes ();
-                       }
-               break;
+       if (!PBD::tokenize (tag_string, string(",\n"), std::back_inserter (tags), true)) {
+               warning << _("SoundFileBox: Could not tokenize string: ") << tag_string << endmsg;
+               return;
+       }
 
-           default:
-               break;
-    }
+       save_tags (tags);
 }
 
 void
-SoundFileBox::remove_field_clicked ()
+SoundFileBox::save_tags (const vector<string>& tags)
 {
-       field_view.get_selection()->selected_foreach_iter(mem_fun(*this, &SoundFileBox::delete_row));
-
+       Library->set_tags (string ("//") + path, tags);
        Library->save_changes ();
 }
 
+SoundFileBrowser::SoundFileBrowser (Gtk::Window& parent, string title, ARDOUR::Session* s, bool persistent)
+       : ArdourDialog (parent, title, false, false),
+         found_list (ListStore::create(found_list_columns)),
+         freesound_list (ListStore::create(freesound_list_columns)),
+         chooser (FILE_CHOOSER_ACTION_OPEN),
+         preview (persistent),
+         found_search_btn (_("Search")),
+         found_list_view (found_list),
+         freesound_search_btn (_("Start Downloading")),
+         freesound_list_view (freesound_list)
+{
+       resetting_ourselves = false;
+       gm = 0;
+
+       resetting_ourselves = false;
+       gm = 0;
+
+       if (ARDOUR::Profile->get_sae()) {
+               chooser.add_shortcut_folder_uri("file:///Library/GarageBand/Apple Loops");
+               chooser.add_shortcut_folder_uri("file:///Library/Application Support/GarageBand/Instrument Library/Sampler/Sampler Files");
+       }
+
+
+       //add the file chooser
+       {
+               chooser.set_border_width (12);
+
+               audio_filter.add_custom (FILE_FILTER_FILENAME, mem_fun(*this, &SoundFileBrowser::on_audio_filter));
+               audio_filter.set_name (_("Audio files"));
+
+               midi_filter.add_custom (FILE_FILTER_FILENAME, mem_fun(*this, &SoundFileBrowser::on_midi_filter));
+               midi_filter.set_name (_("MIDI files"));
+
+               matchall_filter.add_pattern ("*.*");
+               matchall_filter.set_name (_("All files"));
+
+               chooser.add_filter (audio_filter);
+               chooser.add_filter (midi_filter);
+               chooser.add_filter (matchall_filter);
+               chooser.set_select_multiple (true);
+               chooser.signal_update_preview().connect(mem_fun(*this, &SoundFileBrowser::update_preview));
+               chooser.signal_file_activated().connect (mem_fun (*this, &SoundFileBrowser::chooser_file_activated));
+
+               if (!persistent_folder.empty()) {
+                       chooser.set_current_folder (persistent_folder);
+               }
+               notebook.append_page (chooser, _("Browse Files"));
+       }
+
+       hpacker.set_spacing (6);
+       hpacker.pack_start (notebook, true, true);
+       hpacker.pack_start (preview, false, false);
+
+       get_vbox()->pack_start (hpacker, true, true);
+
+       //add tag search
+       {
+               VBox* vbox;
+               HBox* hbox;
+
+
+               hbox = manage(new HBox);
+               hbox->pack_start (found_entry);
+               hbox->pack_start (found_search_btn);
+
+               Gtk::ScrolledWindow *scroll = manage(new ScrolledWindow);
+               scroll->add(found_list_view);
+               scroll->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
+
+               vbox = manage(new VBox);
+               vbox->pack_start (*hbox, PACK_SHRINK);
+               vbox->pack_start (*scroll);
+
+               found_list_view.append_column(_("Paths"), found_list_columns.pathname);
+
+               found_list_view.get_selection()->signal_changed().connect(mem_fun(*this, &SoundFileBrowser::found_list_view_selected));
+
+               found_list_view.signal_row_activated().connect (mem_fun (*this, &SoundFileBrowser::found_list_view_activated));
+
+               found_search_btn.signal_clicked().connect(mem_fun(*this, &SoundFileBrowser::found_search_clicked));
+               found_entry.signal_activate().connect(mem_fun(*this, &SoundFileBrowser::found_search_clicked));
+
+               notebook.append_page (*vbox, _("Search Tags"));
+       }
+
+       //add freesound search
+#ifdef FREESOUND
+       {
+               VBox* vbox;
+               HBox* passbox;
+               Label* label;
+
+               passbox = manage(new HBox);
+               passbox->set_border_width (12);
+               passbox->set_spacing (6);
+
+               label = manage (new Label);
+               label->set_text (_("User:"));
+               passbox->pack_start (*label, false, false);
+               passbox->pack_start (freesound_name_entry);
+               label = manage (new Label);
+               label->set_text (_("Password:"));
+               passbox->pack_start (*label, false, false);
+               passbox->pack_start (freesound_pass_entry);
+               label = manage (new Label);
+               label->set_text (_("Tags:"));
+               passbox->pack_start (*label, false, false);
+               passbox->pack_start (freesound_entry, false, false);
+               passbox->pack_start (freesound_search_btn, false, false);
+
+               Gtk::ScrolledWindow *scroll = manage(new ScrolledWindow);
+               scroll->add(freesound_list_view);
+               scroll->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
+
+               vbox = manage(new VBox);
+               vbox->pack_start (*passbox, PACK_SHRINK);
+               vbox->pack_start(*scroll);
+
+               //vbox->pack_start (freesound_list_view);
+
+               freesound_list_view.append_column(_("Paths"), freesound_list_columns.pathname);
+               freesound_list_view.get_selection()->signal_changed().connect(mem_fun(*this, &SoundFileBrowser::freesound_list_view_selected));
+
+               //freesound_list_view.get_selection()->set_mode (SELECTION_MULTIPLE);
+               freesound_list_view.signal_row_activated().connect (mem_fun (*this, &SoundFileBrowser::freesound_list_view_activated));
+               freesound_search_btn.signal_clicked().connect(mem_fun(*this, &SoundFileBrowser::freesound_search_clicked));
+               freesound_entry.signal_activate().connect(mem_fun(*this, &SoundFileBrowser::freesound_search_clicked));
+               notebook.append_page (*vbox, _("Search Freesound"));
+       }
+#endif
+
+
+       notebook.set_size_request (500, -1);
+
+       set_session (s);
+
+       add_button (Stock::CANCEL, RESPONSE_CANCEL);
+       add_button (Stock::APPLY, RESPONSE_APPLY);
+       add_button (Stock::OK, RESPONSE_OK);
+
+}
+
+SoundFileBrowser::~SoundFileBrowser ()
+{
+       persistent_folder = chooser.get_current_folder();
+}
+
+
+void
+SoundFileBrowser::on_show ()
+{
+       ArdourDialog::on_show ();
+       start_metering ();
+}
+
 void
-SoundFileBox::delete_row (const Gtk::TreeModel::iterator& iter)
+SoundFileBrowser::clear_selection ()
 {
-       Gtk::TreeModel::Row row = *iter;
+       chooser.unselect_all ();
+       found_list_view.get_selection()->unselect_all ();
+}
 
-       Library->remove_field(row[label_columns.field]);
+void
+SoundFileBrowser::chooser_file_activated ()
+{
+       preview.audition ();
 }
 
 void
-SoundFileBox::audition_status_changed (bool active)
+SoundFileBrowser::found_list_view_activated (const TreeModel::Path&, TreeViewColumn*)
 {
-       ENSURE_GUI_THREAD(bind (mem_fun (*this, &SoundFileBox::audition_status_changed), active));
-       
-       if (!active) {
-               stop_btn_clicked ();
-       }
+       preview.audition ();
 }
 
 void
-SoundFileBox::field_selected ()
+SoundFileBrowser::freesound_list_view_activated (const TreeModel::Path&, TreeViewColumn*)
 {
-       if (field_view.get_selection()->count_selected_rows()) {
-               remove_field_btn.set_sensitive(true);
+       preview.audition ();
+}
+
+void
+SoundFileBrowser::set_session (Session* s)
+{
+       ArdourDialog::set_session (s);
+       preview.set_session (s);
+       if (s) {
+               add_gain_meter ();
        } else {
-               remove_field_btn.set_sensitive(false);
+               remove_gain_meter ();
        }
 }
 
-SoundFileBrowser::SoundFileBrowser (string title, ARDOUR::Session* s)
-       : ArdourDialog (title, false),
-         chooser (Gtk::FILE_CHOOSER_ACTION_OPEN)
+void
+SoundFileBrowser::add_gain_meter ()
 {
-       get_vbox()->pack_start(chooser);
-       chooser.set_preview_widget(preview);
-       chooser.set_select_multiple (true);
+       delete gm;
 
-       chooser.signal_update_preview().connect(mem_fun(*this, &SoundFileBrowser::update_preview));
+       gm = new GainMeter (*session, 250);
 
-       set_session (s);
+       boost::shared_ptr<Route> r = session->the_auditioner ();
+
+       gm->set_controls (r, r->shared_peak_meter(), r->amp());
+
+       meter_packer.set_border_width (12);
+       meter_packer.pack_start (*gm, false, true);
+       hpacker.pack_end (meter_packer, false, false);
+       meter_packer.show_all ();
+       start_metering ();
 }
 
 void
-SoundFileBrowser::set_session (Session* s)
+SoundFileBrowser::remove_gain_meter ()
+{
+       if (gm) {
+               meter_packer.remove (*gm);
+               hpacker.remove (meter_packer);
+               delete gm;
+               gm = 0;
+       }
+}
+
+void
+SoundFileBrowser::start_metering ()
+{
+       metering_connection = ARDOUR_UI::instance()->SuperRapidScreenUpdate.connect (mem_fun(*this, &SoundFileBrowser::meter));
+}
+
+void
+SoundFileBrowser::stop_metering ()
+{
+       metering_connection.disconnect();
+}
+
+void
+SoundFileBrowser::meter ()
+{
+       if (is_mapped () && session && gm) {
+               gm->update_meters ();
+       }
+}
+
+bool
+SoundFileBrowser::on_audio_filter (const FileFilter::Info& filter_info)
+{
+       return AudioFileSource::safe_audio_file_extension (filter_info.filename);
+}
+
+bool
+SoundFileBrowser::on_midi_filter (const FileFilter::Info& filter_info)
 {
-       preview.set_session(s);
+       return SMFSource::safe_midi_file_extension (filter_info.filename);
 }
 
 void
 SoundFileBrowser::update_preview ()
 {
-       chooser.set_preview_widget_active(preview.setup_labels(chooser.get_filename()));
+       if (preview.setup_labels (chooser.get_filename())) {
+               if (preview.autoplay()) {
+                       Glib::signal_idle().connect (mem_fun (preview, &SoundFileBox::audition_oneshot));
+               }
+       }
 }
 
-SoundFileChooser::SoundFileChooser (string title, ARDOUR::Session* s)
-       :
-       SoundFileBrowser(title, s)
+void
+SoundFileBrowser::found_list_view_selected ()
 {
-       add_button (Gtk::Stock::OPEN, Gtk::RESPONSE_OK);
-       add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
-       show_all ();
+       if (!reset_options ()) {
+               set_response_sensitive (RESPONSE_OK, false);
+       } else {
+               ustring file;
+
+               TreeView::Selection::ListHandle_Path rows = found_list_view.get_selection()->get_selected_rows ();
+
+               if (!rows.empty()) {
+                       TreeIter iter = found_list->get_iter(*rows.begin());
+                       file = (*iter)[found_list_columns.pathname];
+                       chooser.set_filename (file);
+                       set_response_sensitive (RESPONSE_OK, true);
+               } else {
+                       set_response_sensitive (RESPONSE_OK, false);
+               }
+
+               preview.setup_labels (file);
+       }
 }
 
-static const char *import_mode_strings[] = {
-       X_("Add to Region list"),
-       X_("Add as new Track(s)"),
-       X_("Add to selected Track(s)"),
-       0
-};
+void
+SoundFileBrowser::freesound_list_view_selected ()
+{
+       if (!reset_options ()) {
+               set_response_sensitive (RESPONSE_OK, false);
+       } else {
+               ustring file;
+
+               TreeView::Selection::ListHandle_Path rows = freesound_list_view.get_selection()->get_selected_rows ();
 
-vector<string> SoundFileOmega::mode_strings;
+               if (!rows.empty()) {
+                       TreeIter iter = freesound_list->get_iter(*rows.begin());
+                       file = (*iter)[freesound_list_columns.pathname];
+                       chooser.set_filename (file);
+                       set_response_sensitive (RESPONSE_OK, true);
+               } else {
+                       set_response_sensitive (RESPONSE_OK, false);
+               }
+
+               preview.setup_labels (file);
+       }
+}
 
-SoundFileOmega::SoundFileOmega (string title, ARDOUR::Session* s)
-       : SoundFileBrowser (title, s),
-         split_check (_("Split Channels"))
+void
+SoundFileBrowser::found_search_clicked ()
 {
-       if (mode_strings.empty()) {
-               mode_strings = PBD::internationalize (import_mode_strings);
+       string tag_string = found_entry.get_text ();
+
+       vector<string> tags;
+
+       if (!PBD::tokenize (tag_string, string(","), std::back_inserter (tags), true)) {
+               warning << _("SoundFileBrowser: Could not tokenize string: ") << tag_string << endmsg;
+               return;
+       }
+
+       vector<string> results;
+       Library->search_members_and (results, tags);
+
+       found_list->clear();
+       for (vector<string>::iterator i = results.begin(); i != results.end(); ++i) {
+               TreeModel::iterator new_row = found_list->append();
+               TreeModel::Row row = *new_row;
+               string path = Glib::filename_from_uri (string ("file:") + *i);
+               row[found_list_columns.pathname] = path;
        }
+}
+
+void*
+freesound_search_thread_entry (void* arg)
+{
+       PBD::notify_gui_about_thread_creation (pthread_self(), X_("Freesound Search"));
+       SessionEvent::create_per_thread_pool ("freesound events", 64);
+
+       static_cast<SoundFileBrowser*>(arg)->freesound_search_thread ();
 
-       ARDOUR_UI::instance()->tooltips().set_tip(split_check, 
-                       _("Create a region for each channel"));
+       return 0;
+}
+
+bool searching = false;
+bool canceling = false;
+
+void
+SoundFileBrowser::freesound_search_clicked ()
+{
+       if (canceling)  //already canceling, button does nothing
+               return;
 
-       Gtk::Button* btn = add_button (_("Embed"), ResponseEmbed);
-       ARDOUR_UI::instance()->tooltips().set_tip(*btn, 
-                       _("Link to an external file"));
+       if ( searching ) {
+               freesound_search_btn.set_label(_("Cancelling.."));
+               canceling = true;
+       } else {
+               searching = true;
+               freesound_search_btn.set_label(_("Cancel"));
+               pthread_t freesound_thr;
+               pthread_create_and_store ("freesound_search", &freesound_thr, 0, freesound_search_thread_entry, this);
+       }
+}
+
+void
+SoundFileBrowser::freesound_search_thread()
+{
+#if 0
 
-       btn = add_button (_("Import"), ResponseImport);
-       ARDOUR_UI::instance()->tooltips().set_tip(*btn, 
-                       _("Copy a file to the session folder"));
+       THIS IS ALL TOTALLY THREAD-ILLEGAL ... YOU CANNOT DO GTK STUFF IN THIS THREAD
 
-       add_button (Gtk::Stock::CLOSE, Gtk::RESPONSE_CLOSE);
+#ifdef FREESOUND
+       freesound_list->clear();
 
-       Gtk::HBox *box = manage (new Gtk::HBox());
+       string path;
+       path = Glib::get_home_dir();
+       path += "/Freesound/";
+       Mootcher theMootcher(path.c_str());
 
-       Gtkmm2ext::set_popdown_strings (mode_combo, mode_strings);
+       string name_string = freesound_name_entry.get_text ();
+       string pass_string = freesound_pass_entry.get_text ();
+       string search_string = freesound_entry.get_text ();
 
-       set_mode (Editing::ImportAsRegion);
+       if ( theMootcher.doLogin( name_string, pass_string ) ) {
 
-       box->pack_start (split_check);
-       box->pack_start (mode_combo);
+               string theString = theMootcher.searchText(search_string);
 
-       mode_combo.signal_changed().connect (mem_fun (*this, &SoundFileOmega::mode_changed));
+               XMLTree doc;
+               doc.read_buffer( theString );
+               XMLNode *root = doc.root();
 
-       chooser.set_extra_widget (*box);
-       
-       show_all ();
+               if (root==NULL) return;
+
+               if ( strcmp(root->name().c_str(), "freesound") == 0) {
+
+                       XMLNode *node = 0;
+                       XMLNodeList children = root->children();
+                       XMLNodeConstIterator niter;
+                       for (niter = children.begin(); niter != children.end() && !canceling; ++niter) {
+                               node = *niter;
+                               if( strcmp( node->name().c_str(), "sample") == 0 ){
+                                       XMLProperty *prop=node->property ("id");
+                                       string filename = theMootcher.getFile( prop->value().c_str() );
+                                       if ( filename != "" ) {
+                                               TreeModel::iterator new_row = freesound_list->append();
+                                               TreeModel::Row row = *new_row;
+                                               string path = Glib::filename_from_uri (string ("file:") + filename);
+                                               row[freesound_list_columns.pathname] = path;
+                                       }
+                               }
+                       }
+               }
+       }
+
+       searching = false;
+       canceling = false;
+       freesound_search_btn.set_label(_("Start Downloading"));
+#endif
+#endif
+
+}
+
+vector<ustring>
+SoundFileBrowser::get_paths ()
+{
+       vector<ustring> results;
+
+       int n = notebook.get_current_page ();
+
+       if (n == 0) {
+               vector<ustring> filenames = chooser.get_filenames();
+               vector<ustring>::iterator i;
+
+               for (i = filenames.begin(); i != filenames.end(); ++i) {
+                       struct stat buf;
+                       if ((!stat((*i).c_str(), &buf)) && S_ISREG(buf.st_mode)) {
+                               results.push_back (*i);
+                       }
+               }
+
+       } else if (n==1){
+
+               typedef TreeView::Selection::ListHandle_Path ListPath;
+
+               ListPath rows = found_list_view.get_selection()->get_selected_rows ();
+               for (ListPath::iterator i = rows.begin() ; i != rows.end(); ++i) {
+                       TreeIter iter = found_list->get_iter(*i);
+                       ustring str = (*iter)[found_list_columns.pathname];
+
+                       results.push_back (str);
+               }
+       } else {
+
+               typedef TreeView::Selection::ListHandle_Path ListPath;
+
+               ListPath rows = freesound_list_view.get_selection()->get_selected_rows ();
+               for (ListPath::iterator i = rows.begin() ; i != rows.end(); ++i) {
+                       TreeIter iter = freesound_list->get_iter(*i);
+                       ustring str = (*iter)[freesound_list_columns.pathname];
+
+                       results.push_back (str);
+               }
+       }
+
+       return results;
+}
+
+void
+SoundFileOmega::reset_options_noret ()
+{
+       if (!resetting_ourselves) {
+               (void) reset_options ();
+       }
 }
 
 bool
-SoundFileOmega::get_split ()
+SoundFileOmega::reset_options ()
 {
-       return split_check.get_active();
+       vector<ustring> paths = get_paths ();
+
+       if (paths.empty()) {
+
+               channel_combo.set_sensitive (false);
+               action_combo.set_sensitive (false);
+               where_combo.set_sensitive (false);
+               copy_files_btn.set_sensitive (false);
+
+               return false;
+
+       } else {
+
+               channel_combo.set_sensitive (true);
+               action_combo.set_sensitive (true);
+               where_combo.set_sensitive (true);
+
+               /* if we get through this function successfully, this may be
+                  reset at the end, once we know if we can use hard links
+                  to do embedding
+               */
+
+               if (Config->get_only_copy_imported_files()) {
+                       copy_files_btn.set_sensitive (false);
+               } else {
+                       copy_files_btn.set_sensitive (false);
+               }
+       }
+
+       bool same_size;
+       bool src_needed;
+       bool selection_includes_multichannel;
+       bool selection_can_be_embedded_with_links = check_link_status (*session, paths);
+       ImportMode mode;
+
+       if (check_info (paths, same_size, src_needed, selection_includes_multichannel)) {
+               Glib::signal_idle().connect (mem_fun (*this, &SoundFileOmega::bad_file_message));
+               return false;
+       }
+
+       ustring existing_choice;
+       vector<string> action_strings;
+
+       if (selected_track_cnt > 0) {
+               if (channel_combo.get_active_text().length()) {
+                       ImportDisposition id = get_channel_disposition();
+
+                       switch (id) {
+                       case Editing::ImportDistinctFiles:
+                               if (selected_track_cnt == paths.size()) {
+                                       action_strings.push_back (importmode2string (ImportToTrack));
+                               }
+                               break;
+
+                       case Editing::ImportDistinctChannels:
+                               /* XXX it would be nice to allow channel-per-selected track
+                                  but its too hard we don't want to deal with all the
+                                  different per-file + per-track channel configurations.
+                               */
+                               break;
+
+                       default:
+                               action_strings.push_back (importmode2string (ImportToTrack));
+                               break;
+                       }
+               }
+       }
+
+       action_strings.push_back (importmode2string (ImportAsTrack));
+       action_strings.push_back (importmode2string (ImportAsRegion));
+       action_strings.push_back (importmode2string (ImportAsTapeTrack));
+
+       resetting_ourselves = true;
+
+       existing_choice = action_combo.get_active_text();
+
+       set_popdown_strings (action_combo, action_strings);
+
+       /* preserve any existing choice, if possible */
+
+
+       if (existing_choice.length()) {
+               vector<string>::iterator x;
+               for (x = action_strings.begin(); x != action_strings.end(); ++x) {
+                       if (*x == existing_choice) {
+                               action_combo.set_active_text (existing_choice);
+                               break;
+                       }
+               }
+               if (x == action_strings.end()) {
+                       action_combo.set_active_text (action_strings.front());
+               }
+       } else {
+               action_combo.set_active_text (action_strings.front());
+       }
+
+       resetting_ourselves = false;
+
+       if ((mode = get_mode()) == ImportAsRegion) {
+               where_combo.set_sensitive (false);
+       } else {
+               where_combo.set_sensitive (true);
+       }
+
+       vector<string> channel_strings;
+
+       if (mode == ImportAsTrack || mode == ImportAsTapeTrack || mode == ImportToTrack) {
+               channel_strings.push_back (_("one track per file"));
+
+               if (selection_includes_multichannel) {
+                       channel_strings.push_back (_("one track per channel"));
+               }
+
+               if (paths.size() > 1) {
+                       /* tape tracks are a single region per track, so we cannot
+                          sequence multiple files.
+                       */
+                       if (mode != ImportAsTapeTrack) {
+                               channel_strings.push_back (_("sequence files"));
+                       }
+                       if (same_size) {
+                               channel_strings.push_back (_("all files in one region"));
+                       }
+
+               }
+
+       } else {
+               channel_strings.push_back (_("one region per file"));
+
+               if (selection_includes_multichannel) {
+                       channel_strings.push_back (_("one region per channel"));
+               }
+
+               if (paths.size() > 1) {
+                       if (same_size) {
+                               channel_strings.push_back (_("all files in one region"));
+                       }
+               }
+       }
+
+       existing_choice = channel_combo.get_active_text();
+
+       set_popdown_strings (channel_combo, channel_strings);
+
+       /* preserve any existing choice, if possible */
+
+       if (existing_choice.length()) {
+               vector<string>::iterator x;
+               for (x = channel_strings.begin(); x != channel_strings.end(); ++x) {
+                       if (*x == existing_choice) {
+                               channel_combo.set_active_text (existing_choice);
+                               break;
+                       }
+               }
+               if (x == channel_strings.end()) {
+                       channel_combo.set_active_text (channel_strings.front());
+               }
+       } else {
+               channel_combo.set_active_text (channel_strings.front());
+       }
+
+       if (src_needed) {
+               src_combo.set_sensitive (true);
+       } else {
+               src_combo.set_sensitive (false);
+       }
+
+       if (Config->get_only_copy_imported_files()) {
+
+               if (selection_can_be_embedded_with_links) {
+                       copy_files_btn.set_sensitive (true);
+               } else {
+                       copy_files_btn.set_sensitive (false);
+               }
+
+       }  else {
+
+               copy_files_btn.set_sensitive (true);
+       }
+
+       return true;
 }
 
-vector<Glib::ustring>
-SoundFileOmega::get_paths ()
+
+bool
+SoundFileOmega::bad_file_message()
 {
-       return chooser.get_filenames();
+       MessageDialog msg (*this,
+                          _("One or more of the selected files\ncannot be used by Ardour"),
+                          true,
+                          Gtk::MESSAGE_INFO,
+                          Gtk::BUTTONS_OK);
+       msg.run ();
+       resetting_ourselves = true;
+       chooser.unselect_uri (chooser.get_preview_uri());
+       resetting_ourselves = false;
+
+       return false;
 }
 
-void
-SoundFileOmega::set_mode (Editing::ImportMode mode)
+bool
+SoundFileOmega::check_info (const vector<ustring>& paths, bool& same_size, bool& src_needed, bool& multichannel)
 {
-       mode_combo.set_active_text (mode_strings[(int)mode]);
+       SoundFileInfo info;
+       nframes64_t sz = 0;
+       bool err = false;
+       string errmsg;
 
-       switch (mode) {
-       case Editing::ImportAsRegion:
-               split_check.set_sensitive (true);
-               break;
-       case Editing::ImportAsTrack:
-               split_check.set_sensitive (true);
-               break;
-       case Editing::ImportToTrack:
-               split_check.set_sensitive (false);
-               break;
+       same_size = true;
+       src_needed = false;
+       multichannel = false;
+
+       for (vector<ustring>::const_iterator i = paths.begin(); i != paths.end(); ++i) {
+
+               if (AudioFileSource::get_soundfile_info (*i, info, errmsg)) {
+                       if (info.channels > 1) {
+                               multichannel = true;
+                       }
+                       if (sz == 0) {
+                               sz = info.length;
+                       } else {
+                               if (sz != info.length) {
+                                       same_size = false;
+                               }
+                       }
+
+                       if ((nframes_t) info.samplerate != session->frame_rate()) {
+                               src_needed = true;
+                       }
+
+               } else if (SMFSource::safe_midi_file_extension (*i)) {
+
+                       Evoral::SMF reader;
+                       reader.open(*i);
+                       if (reader.num_tracks() > 1) {
+                               multichannel = true; // "channel" == track here...
+                       }
+
+                       /* XXX we need err = true handling here in case
+                          we can't check the file
+                       */
+
+               } else {
+                       err = true;
+               }
        }
+
+       return err;
 }
 
-Editing::ImportMode
-SoundFileOmega::get_mode ()
+
+bool
+SoundFileOmega::check_link_status (const Session& s, const vector<ustring>& paths)
 {
-       vector<string>::iterator i;
-       uint32_t n;
-       string str = mode_combo.get_active_text ();
+       sys::path path = s.session_directory().sound_path() / "linktest";
+       string tmpdir = path.to_string();
+       bool ret = false;
+
+       if (mkdir (tmpdir.c_str(), 0744)) {
+               if (errno != EEXIST) {
+                       return false;
+               }
+       }
+
+       for (vector<ustring>::const_iterator i = paths.begin(); i != paths.end(); ++i) {
+
+               char tmpc[MAXPATHLEN+1];
 
-       for (n = 0, i = mode_strings.begin (); i != mode_strings.end(); ++i, ++n) {
-               if (str == (*i)) {
-                       break;
+               snprintf (tmpc, sizeof(tmpc), "%s/%s", tmpdir.c_str(), Glib::path_get_basename (*i).c_str());
+
+               /* can we link ? */
+
+               if (link ((*i).c_str(), tmpc)) {
+                       goto out;
                }
+
+               unlink (tmpc);
        }
 
-       if (i == mode_strings.end()) {
-               fatal << string_compose (_("programming error: %1"), X_("unknown import mode string")) << endmsg;
+       ret = true;
+
+  out:
+       rmdir (tmpdir.c_str());
+       return ret;
+}
+
+SoundFileChooser::SoundFileChooser (Gtk::Window& parent, string title, ARDOUR::Session* s)
+       : SoundFileBrowser (parent, title, s, false)
+{
+       chooser.set_select_multiple (false);
+       found_list_view.get_selection()->set_mode (SELECTION_SINGLE);
+       freesound_list_view.get_selection()->set_mode (SELECTION_SINGLE);
+}
+
+void
+SoundFileChooser::on_hide ()
+{
+       ArdourDialog::on_hide();
+       stop_metering ();
+
+       if (session) {
+               session->cancel_audition();
+       }
+}
+
+ustring
+SoundFileChooser::get_filename ()
+{
+       vector<ustring> paths;
+
+       paths = get_paths ();
+
+       if (paths.empty()) {
+               return ustring ();
+       }
+
+       if (!Glib::file_test (paths.front(), Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_REGULAR)) {
+               return ustring();
+       }
+
+       return paths.front();
+}
+
+SoundFileOmega::SoundFileOmega (Gtk::Window& parent, string title, ARDOUR::Session* s, int selected_tracks, bool persistent,
+                               Editing::ImportMode mode_hint)
+       : SoundFileBrowser (parent, title, s, persistent),
+         copy_files_btn ( _("Copy files to session")),
+         selected_track_cnt (selected_tracks)
+{
+       VBox* vbox;
+       HBox* hbox;
+       vector<string> str;
+
+       set_size_request (-1, 450);
+
+       block_two.set_border_width (12);
+       block_three.set_border_width (12);
+       block_four.set_border_width (12);
+
+       options.set_spacing (12);
+
+       str.clear ();
+       str.push_back (_("file timestamp"));
+       str.push_back (_("edit point"));
+       str.push_back (_("playhead"));
+       str.push_back (_("session start"));
+       set_popdown_strings (where_combo, str);
+       where_combo.set_active_text (str.front());
+
+       Label* l = manage (new Label);
+       l->set_text (_("Add files:"));
+
+       hbox = manage (new HBox);
+       hbox->set_border_width (12);
+       hbox->set_spacing (6);
+       hbox->pack_start (*l, false, false);
+       hbox->pack_start (action_combo, false, false);
+       vbox = manage (new VBox);
+       vbox->pack_start (*hbox, false, false);
+       options.pack_start (*vbox, false, false);
+
+       /* dummy entry for action combo so that it doesn't look odd if we
+          come up with no tracks selected.
+       */
+
+       str.clear ();
+       str.push_back (importmode2string (mode_hint));
+       set_popdown_strings (action_combo, str);
+       action_combo.set_active_text (str.front());
+       action_combo.set_sensitive (false);
+
+       l = manage (new Label);
+       l->set_text (_("Insert at:"));
+
+       hbox = manage (new HBox);
+       hbox->set_border_width (12);
+       hbox->set_spacing (6);
+       hbox->pack_start (*l, false, false);
+       hbox->pack_start (where_combo, false, false);
+       vbox = manage (new VBox);
+       vbox->pack_start (*hbox, false, false);
+       options.pack_start (*vbox, false, false);
+
+
+       l = manage (new Label);
+       l->set_text (_("Mapping:"));
+
+       hbox = manage (new HBox);
+       hbox->set_border_width (12);
+       hbox->set_spacing (6);
+       hbox->pack_start (*l, false, false);
+       hbox->pack_start (channel_combo, false, false);
+       vbox = manage (new VBox);
+       vbox->pack_start (*hbox, false, false);
+       options.pack_start (*vbox, false, false);
+
+       str.clear ();
+       str.push_back (_("one track per file"));
+       set_popdown_strings (channel_combo, str);
+       channel_combo.set_active_text (str.front());
+       channel_combo.set_sensitive (false);
+
+       l = manage (new Label);
+       l->set_text (_("Conversion quality:"));
+
+       hbox = manage (new HBox);
+       hbox->set_border_width (12);
+       hbox->set_spacing (6);
+       hbox->pack_start (*l, false, false);
+       hbox->pack_start (src_combo, false, false);
+       vbox = manage (new VBox);
+       vbox->pack_start (*hbox, false, false);
+       options.pack_start (*vbox, false, false);
+
+       str.clear ();
+       str.push_back (_("Best"));
+       str.push_back (_("Good"));
+       str.push_back (_("Quick"));
+       str.push_back (_("Fast"));
+       str.push_back (_("Fastest"));
+
+       set_popdown_strings (src_combo, str);
+       src_combo.set_active_text (str.front());
+       src_combo.set_sensitive (false);
+
+       reset_options ();
+
+       action_combo.signal_changed().connect (mem_fun (*this, &SoundFileOmega::reset_options_noret));
+
+       copy_files_btn.set_active (true);
+
+       block_four.pack_start (copy_files_btn, false, false);
+
+       options.pack_start (block_four, false, false);
+
+       get_vbox()->pack_start (options, false, false);
+
+       /* setup disposition map */
+
+       disposition_map.insert (pair<ustring,ImportDisposition>(_("one track per file"), ImportDistinctFiles));
+       disposition_map.insert (pair<ustring,ImportDisposition>(_("one track per channel"), ImportDistinctChannels));
+       disposition_map.insert (pair<ustring,ImportDisposition>(_("merge files"), ImportMergeFiles));
+       disposition_map.insert (pair<ustring,ImportDisposition>(_("sequence files"), ImportSerializeFiles));
+
+       disposition_map.insert (pair<ustring,ImportDisposition>(_("one region per file"), ImportDistinctFiles));
+       disposition_map.insert (pair<ustring,ImportDisposition>(_("one region per channel"), ImportDistinctChannels));
+       disposition_map.insert (pair<ustring,ImportDisposition>(_("all files in one region"), ImportMergeFiles));
+
+       chooser.signal_selection_changed().connect (mem_fun (*this, &SoundFileOmega::file_selection_changed));
+
+       /* set size requests for a couple of combos to allow them to display the longest text
+          they will ever be asked to display.  This prevents them being resized when the user
+          selects a file to import, which in turn prevents the size of the dialog from jumping
+          around. */
+
+       vector<string> t;
+       t.push_back (_("one track per file"));
+       t.push_back (_("one track per channel"));
+       t.push_back (_("sequence files"));
+       t.push_back (_("all files in one region"));
+       set_size_request_to_display_given_text (channel_combo, t, COMBO_FUDGE + 10, 15);
+
+       t.clear ();
+       t.push_back (importmode2string (ImportAsTrack));
+       t.push_back (importmode2string (ImportToTrack));
+       t.push_back (importmode2string (ImportAsRegion));
+       t.push_back (importmode2string (ImportAsTapeTrack));
+       set_size_request_to_display_given_text (action_combo, t, COMBO_FUDGE + 10, 15);
+}
+
+void
+SoundFileOmega::set_mode (ImportMode mode)
+{
+       action_combo.set_active_text (importmode2string (mode));
+}
+
+ImportMode
+SoundFileOmega::get_mode () const
+{
+       return string2importmode (action_combo.get_active_text());
+}
+
+void
+SoundFileOmega::on_hide ()
+{
+       ArdourDialog::on_hide();
+       if (session) {
+               session->cancel_audition();
+       }
+}
+
+ImportPosition
+SoundFileOmega::get_position() const
+{
+       ustring str = where_combo.get_active_text();
+
+       if (str == _("file timestamp")) {
+               return ImportAtTimestamp;
+       } else if (str == _("edit point")) {
+               return ImportAtEditPoint;
+       } else if (str == _("playhead")) {
+               return ImportAtPlayhead;
+       } else {
+               return ImportAtStart;
+       }
+}
+
+SrcQuality
+SoundFileOmega::get_src_quality() const
+{
+       ustring str = where_combo.get_active_text();
+
+       if (str == _("Best")) {
+               return SrcBest;
+       } else if (str == _("Good")) {
+               return SrcGood;
+       } else if (str == _("Quick")) {
+               return SrcQuick;
+       } else if (str == _("Fast")) {
+               return SrcFast;
+       } else {
+               return SrcFastest;
+       }
+}
+
+ImportDisposition
+SoundFileOmega::get_channel_disposition () const
+{
+       /* we use a map here because the channel combo can contain different strings
+          depending on the state of the other combos. the map contains all possible strings
+          and the ImportDisposition enum that corresponds to it.
+       */
+
+       ustring str = channel_combo.get_active_text();
+       DispositionMap::const_iterator x = disposition_map.find (str);
+
+       if (x == disposition_map.end()) {
+               fatal << string_compose (_("programming error: %1 (%2)"), "unknown string for import disposition", str) << endmsg;
                /*NOTREACHED*/
        }
 
-       return (Editing::ImportMode) (n);
+       return x->second;
 }
 
 void
-SoundFileOmega::mode_changed ()
+SoundFileOmega::reset (int selected_tracks)
 {
-       Editing::ImportMode mode = get_mode();
+       selected_track_cnt = selected_tracks;
+       reset_options ();
+}
 
-       switch (mode) {
-       case Editing::ImportAsRegion:
-               split_check.set_sensitive (true);
-               break;
-       case Editing::ImportAsTrack:
-               split_check.set_sensitive (true);
-               break;
-       case Editing::ImportToTrack:
-               split_check.set_sensitive (false);
-               break;
+void
+SoundFileOmega::file_selection_changed ()
+{
+       if (resetting_ourselves) {
+               return;
+       }
+
+       if (!reset_options ()) {
+               set_response_sensitive (RESPONSE_OK, false);
+       } else {
+               if (chooser.get_filenames().size() > 0) {
+                       set_response_sensitive (RESPONSE_OK, true);
+               } else {
+                       set_response_sensitive (RESPONSE_OK, false);
+               }
        }
 }
+