allow to include solo,mute buttons on meterbridge

[ardour.git] / gtk2_ardour / editor_audio_import.cc

diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc
index 8a7e09df2c8a89f7b5dd5d4b4663976e325b186a..31ccdb7a533df0c93581feed8f6f5bb7317575ce 100644 (file)
--- a/gtk2_ardour/editor_audio_import.cc
+++ b/gtk2_ardour/editor_audio_import.cc
@@ -80,7 +80,7 @@ Editor::add_external_audio_action (ImportMode mode_hint)
        }
 
        if (sfbrowser == 0) {
-               sfbrowser = new SoundFileOmega (*this, _("Add Existing Media"), _session, 0, true, mode_hint);
+               sfbrowser = new SoundFileOmega (_("Add Existing Media"), _session, 0, true, mode_hint);
        } else {
                sfbrowser->set_mode (mode_hint);
        }
@@ -124,78 +124,12 @@ Editor::external_audio_dialog ()
        }
 
        if (sfbrowser == 0) {
-               sfbrowser = new SoundFileOmega (*this, _("Add Existing Media"), _session, audio_track_cnt, midi_track_cnt, true);
+               sfbrowser = new SoundFileOmega (_("Add Existing Media"), _session, audio_track_cnt, midi_track_cnt, true);
        } else {
                sfbrowser->reset (audio_track_cnt, midi_track_cnt);
        }
 
        sfbrowser->show_all ();
-
-
-       bool keepRunning;
-
-       do {
-               keepRunning = false;
-
-               int response = sfbrowser->run ();
-
-               switch (response) {
-                       case RESPONSE_APPLY:
-                               // leave the dialog open
-                               break;
-
-                       case RESPONSE_OK:
-                               sfbrowser->hide ();
-                               break;
-
-                       default:
-                               // cancel from the browser - we are done
-                               sfbrowser->hide ();
-                               return;
-               }
-
-               /* lets do it */
-
-               vector<string> upaths = sfbrowser->get_paths ();
-                for (vector<string>::iterator x = upaths.begin(); x != upaths.end(); ++x) {
-                        paths.push_back (*x);
-                }
-
-               ImportPosition pos = sfbrowser->get_position ();
-               ImportMode mode = sfbrowser->get_mode ();
-               ImportDisposition chns = sfbrowser->get_channel_disposition ();
-               framepos_t where;
-
-               switch (pos) {
-                       case ImportAtEditPoint:
-                               where = get_preferred_edit_position ();
-                               break;
-                       case ImportAtTimestamp:
-                               where = -1;
-                               break;
-                       case ImportAtPlayhead:
-                               where = playhead_cursor->current_frame;
-                               break;
-                       case ImportAtStart:
-                               where = _session->current_start_frame();
-                               break;
-               }
-
-               SrcQuality quality = sfbrowser->get_src_quality();
-
-
-               if (sfbrowser->copy_files_btn.get_active()) {
-                       do_import (paths, chns, mode, quality, where);
-               } else {
-                       do_embed (paths, chns, mode, where);
-               }
-
-               if (response == RESPONSE_APPLY) {
-                       sfbrowser->clear_selection ();
-                       keepRunning = true;
-               }
-
-       } while (keepRunning);
 }
 
 void
@@ -678,7 +612,7 @@ Editor::embed_sndfiles (vector<string> paths, bool multifile,
                                if ((s = _session->source_by_path_and_channel (path, n)) == 0) {
 
                                        source = boost::dynamic_pointer_cast<AudioFileSource> (
-                                               SourceFactory::createReadable (DataType::AUDIO, *_session,
+                                               SourceFactory::createExternal (DataType::AUDIO, *_session,
                                                                               path, n,
                                                                               (mode == ImportAsTapeTrack
                                                                                ? Source::Destructive
@@ -934,7 +868,10 @@ Editor::finish_bringing_in_material (boost::shared_ptr<Region> region, uint32_t
 
                                existing_track = at.front();
                        } else if (mr) {
-                               list<boost::shared_ptr<MidiTrack> > mt (_session->new_midi_track (boost::shared_ptr<PluginInfo>(), Normal, 0, 1));
+                               list<boost::shared_ptr<MidiTrack> > mt (_session->new_midi_track (ChanCount (DataType::MIDI, 1),
+                                                                                                 ChanCount (DataType::MIDI, 1),
+                                                                                                 boost::shared_ptr<PluginInfo>(), 
+                                                                                                 Normal, 0, 1));
 
                                if (mt.empty()) {
                                        return -1;