return to the old way of editing track names, but hopefully better than it was. likel...

[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 bfb44aa5f3f5def7459dcfd20d8840e86d81081d..3a120c709fd2445c3c0936dc7bc2d928ad550339 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
@@ -788,7 +722,7 @@ Editor::add_sources (vector<string> paths, SourceList& sources, framepos_t& pos,
                        */
                        framecnt_t len = (*x)->length (pos);
                        if (len == 0) {
-                               len = (60 / 120) * _session->frame_rate ();
+                               len = (60.0 / 120.0) * _session->frame_rate ();
                        }
 
                        plist.add (ARDOUR::Properties::start, 0);
@@ -827,6 +761,8 @@ Editor::add_sources (vector<string> paths, SourceList& sources, framepos_t& pos,
        int n = 0;
        framepos_t rlen = 0;
 
+       begin_reversible_command (Operations::insert_file);
+       
        for (vector<boost::shared_ptr<Region> >::iterator r = regions.begin(); r != regions.end(); ++r, ++n) {
                boost::shared_ptr<AudioRegion> ar = boost::dynamic_pointer_cast<AudioRegion> (*r);
 
@@ -874,6 +810,8 @@ Editor::add_sources (vector<string> paths, SourceList& sources, framepos_t& pos,
                }
        }
 
+       commit_reversible_command ();
+       
        /* setup peak file building in another thread */
 
        for (SourceList::iterator x = sources.begin(); x != sources.end(); ++x) {
@@ -885,7 +823,7 @@ Editor::add_sources (vector<string> paths, SourceList& sources, framepos_t& pos,
 
 int
 Editor::finish_bringing_in_material (boost::shared_ptr<Region> region, uint32_t in_chans, uint32_t out_chans, framepos_t& pos,
-                                 ImportMode mode, boost::shared_ptr<Track>& existing_track)
+                                    ImportMode mode, boost::shared_ptr<Track>& existing_track)
 {
        boost::shared_ptr<AudioRegion> ar = boost::dynamic_pointer_cast<AudioRegion>(region);
        boost::shared_ptr<MidiRegion> mr = boost::dynamic_pointer_cast<MidiRegion>(region);
@@ -912,11 +850,9 @@ Editor::finish_bringing_in_material (boost::shared_ptr<Region> region, uint32_t
 
                boost::shared_ptr<Playlist> playlist = existing_track->playlist();
                boost::shared_ptr<Region> copy (RegionFactory::create (region, region->properties()));
-               begin_reversible_command (Operations::insert_file);
                playlist->clear_changes ();
                playlist->add_region (copy, pos);
                _session->add_command (new StatefulDiffCommand (playlist));
-               commit_reversible_command ();
                break;
        }
 
@@ -932,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;
@@ -946,11 +885,9 @@ Editor::finish_bringing_in_material (boost::shared_ptr<Region> region, uint32_t
 
                boost::shared_ptr<Playlist> playlist = existing_track->playlist();
                boost::shared_ptr<Region> copy (RegionFactory::create (region, true));
-               begin_reversible_command (Operations::insert_file);
                playlist->clear_changes ();
                playlist->add_region (copy, pos);
                _session->add_command (new StatefulDiffCommand (playlist));
-               commit_reversible_command ();
                break;
        }
 
@@ -964,11 +901,9 @@ Editor::finish_bringing_in_material (boost::shared_ptr<Region> region, uint32_t
                if (!at.empty()) {
                        boost::shared_ptr<Playlist> playlist = at.front()->playlist();
                        boost::shared_ptr<Region> copy (RegionFactory::create (region, true));
-                       begin_reversible_command (Operations::insert_file);
                        playlist->clear_changes ();
                        playlist->add_region (copy, pos);
                        _session->add_command (new StatefulDiffCommand (playlist));
-                       commit_reversible_command ();
                }
                break;
        }