X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Feditor_audio_import.cc;h=7f56cd9121225db90714585d0ef34412ce77dcdc;hb=91e6c1b176d93f43bab6713574c590ea97801bdc;hp=f8b6d7c141ca5294fc8a0ed04573402cb0d80562;hpb=4a3d7877f6b03fac7755f997b945583ba5732d13;p=ardour.git diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc index f8b6d7c141..7f56cd9121 100644 --- a/gtk2_ardour/editor_audio_import.cc +++ b/gtk2_ardour/editor_audio_import.cc @@ -29,6 +29,7 @@ #include "pbd/pthread_utils.h" #include "pbd/basename.h" #include "pbd/shortpath.h" +#include "pbd/stateful_diff_command.h" #include @@ -46,6 +47,8 @@ #include "ardour/region_factory.h" #include "ardour/source_factory.h" #include "ardour/session.h" +#include "ardour/smf_source.h" +#include "ardour/operations.h" #include "pbd/memento_command.h" #include "ardour_ui.h" @@ -57,31 +60,33 @@ #include "session_import_dialog.h" #include "utils.h" #include "gui_thread.h" +#include "interthread_progress_window.h" +#include "mouse_cursors.h" +#include "editor_cursors.h" #include "i18n.h" using namespace std; using namespace ARDOUR; using namespace PBD; -using namespace sigc; using namespace Gtk; using namespace Gtkmm2ext; using namespace Editing; -using Glib::ustring; +using std::string; /* Functions supporting the incorporation of external (non-captured) audio material into ardour */ void Editor::add_external_audio_action (ImportMode mode_hint) { - if (session == 0) { + if (_session == 0) { MessageDialog msg (_("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 Media"), session, 0, true, mode_hint); + sfbrowser = new SoundFileOmega (*this, _("Add Existing Media"), _session, 0, true, mode_hint); } else { sfbrowser->set_mode (mode_hint); } @@ -92,10 +97,10 @@ Editor::add_external_audio_action (ImportMode mode_hint) void Editor::external_audio_dialog () { - vector paths; + vector paths; uint32_t track_cnt; - if (session == 0) { + if (_session == 0) { MessageDialog msg (_("You can't import or embed an audiofile until you have a session loaded.")); msg.run (); return; @@ -114,7 +119,7 @@ Editor::external_audio_dialog () } if (sfbrowser == 0) { - sfbrowser = new SoundFileOmega (*this, _("Add Existing Media"), session, track_cnt, true); + sfbrowser = new SoundFileOmega (*this, _("Add Existing Media"), _session, track_cnt, true); } else { sfbrowser->reset (track_cnt); } @@ -146,12 +151,15 @@ Editor::external_audio_dialog () /* lets do it */ - paths = sfbrowser->get_paths (); - + vector upaths = sfbrowser->get_paths (); + for (vector::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 (); - nframes64_t where; + framepos_t where; switch (pos) { case ImportAtEditPoint: @@ -164,7 +172,7 @@ Editor::external_audio_dialog () where = playhead_cursor->current_frame; break; case ImportAtStart: - where = session->current_start_frame(); + where = _session->current_start_frame(); break; } @@ -188,7 +196,7 @@ Editor::external_audio_dialog () void Editor::session_import_dialog () { - SessionImportDialog dialog (*session); + SessionImportDialog dialog (_session); ensure_float (dialog); dialog.run (); } @@ -212,20 +220,17 @@ Editor::check_whether_and_how_to_import(string path, bool all_or_nothing) { string wave_name (Glib::path_get_basename(path)); - SourceMap all_sources = session->get_sources(); - bool wave_name_exists = false; + SourceMap all_sources = _session->get_sources(); + bool already_exists = false; + uint32_t existing; - for (SourceMap::iterator i = all_sources.begin(); i != all_sources.end(); ++i) { - string tmp (Glib::path_get_basename (i->second->path())); - if (tmp == wave_name) { - wave_name_exists = true; - break; - } + if ((existing = _session->count_sources_by_origin (path)) > 0) { + already_exists = true; } int function = 1; - if (wave_name_exists) { + if (already_exists) { string message; if (all_or_nothing) { // updating is still disabled @@ -320,15 +325,21 @@ Editor::get_nth_selected_midi_track (int nth) const } void -Editor::do_import (vector paths, ImportDisposition chns, ImportMode mode, SrcQuality quality, nframes64_t& pos) +Editor::do_import (vector paths, ImportDisposition chns, ImportMode mode, SrcQuality quality, framepos_t& pos) { boost::shared_ptr track; - vector to_import; + vector to_import; int nth = 0; + bool use_timestamp = (pos == -1); - if (interthread_progress_window == 0) { - build_interthread_progress_window (); - } + current_interthread_info = &import_status; + import_status.current = 1; + import_status.total = paths.size (); + import_status.all_done = false; + + ImportProgressWindow ipw (&import_status, _("Import"), _("Cancel Import")); + + bool ok = true; if (chns == Editing::ImportMergeFiles) { @@ -337,7 +348,7 @@ Editor::do_import (vector paths, ImportDisposition chns, ImportMode mod */ bool cancel = false; - for (vector::iterator a = paths.begin(); a != paths.end(); ++a) { + for (vector::iterator a = paths.begin(); a != paths.end(); ++a) { int check = check_whether_and_how_to_import(*a, false); if (check == 2) { cancel = true; @@ -345,63 +356,101 @@ Editor::do_import (vector paths, ImportDisposition chns, ImportMode mod } } - if (!cancel) { - import_sndfiles (paths, mode, quality, pos, 1, 1, track, false, paths.size()); + if (cancel) { + ok = false; + } else { + ipw.show (); + ok = (import_sndfiles (paths, mode, quality, pos, 1, 1, track, false) == 0); } } else { - for (vector::iterator a = paths.begin(); a != paths.end(); ++a) { + bool replace = false; - int const check = check_whether_and_how_to_import (*a, true); + for (vector::iterator a = paths.begin(); a != paths.end(); ++a) { - if (check != 2) { - to_import.push_back (*a); + const int check = check_whether_and_how_to_import (*a, true); + + switch (check) { + case 2: + // user said skip + continue; + case 0: + fatal << "Updating existing sources should be disabled!" << endmsg; + /* NOTREACHED*/ + break; + case 1: + replace = false; + break; + default: + fatal << "Illegal return " << check << " from check_whether_and_how_to_import()!" << endmsg; + /* NOTREACHED*/ } - } - - bool ok = true; - switch (chns) { - case Editing::ImportDistinctFiles: - - if (mode == Editing::ImportToTrack) { - track = get_nth_selected_audio_track (nth++); + /* have to reset this for every file we handle */ + + if (use_timestamp) { + pos = -1; } - ok = (import_sndfiles (to_import, mode, quality, pos, 1, -1, track, false, to_import.size()) == 0); - break; - - case Editing::ImportDistinctChannels: - ok = (import_sndfiles (to_import, mode, quality, pos, -1, -1, track, false, to_import.size()) == 0); - break; + ipw.show (); + + switch (chns) { + case Editing::ImportDistinctFiles: + + to_import.clear (); + to_import.push_back (*a); + + if (mode == Editing::ImportToTrack) { + track = get_nth_selected_audio_track (nth++); + } + + ok = (import_sndfiles (to_import, mode, quality, pos, 1, -1, track, replace) == 0); + break; + + case Editing::ImportDistinctChannels: + + to_import.clear (); + to_import.push_back (*a); + + ok = (import_sndfiles (to_import, mode, quality, pos, -1, -1, track, replace) == 0); + break; + + case Editing::ImportSerializeFiles: + + to_import.clear (); + to_import.push_back (*a); - case Editing::ImportSerializeFiles: - ok = (import_sndfiles (to_import, mode, quality, pos, 1, 1, track, false, to_import.size()) == 0); - break; + ok = (import_sndfiles (to_import, mode, quality, pos, 1, 1, track, replace) == 0); + break; - case Editing::ImportMergeFiles: - // Not entered, handled in earlier if() branch - break; + case Editing::ImportMergeFiles: + // Not entered, handled in earlier if() branch + break; + } } } - interthread_progress_window->hide_all (); + if (ok) { + _session->save_state (""); + } + + import_status.all_done = true; } void -Editor::do_embed (vector paths, ImportDisposition chns, ImportMode mode, nframes64_t& pos) +Editor::do_embed (vector paths, ImportDisposition chns, ImportMode mode, framepos_t& pos) { boost::shared_ptr track; bool check_sample_rate = true; bool ok = false; - vector to_embed; + vector to_embed; bool multi = paths.size() > 1; int nth = 0; switch (chns) { case Editing::ImportDistinctFiles: - for (vector::iterator a = paths.begin(); a != paths.end(); ++a) { + for (vector::iterator a = paths.begin(); a != paths.end(); ++a) { to_embed.clear (); to_embed.push_back (*a); @@ -417,7 +466,7 @@ Editor::do_embed (vector paths, ImportDisposition chns, ImportMode mode break; case Editing::ImportDistinctChannels: - for (vector::iterator a = paths.begin(); a != paths.end(); ++a) { + for (vector::iterator a = paths.begin(); a != paths.end(); ++a) { to_embed.clear (); to_embed.push_back (*a); @@ -432,10 +481,10 @@ Editor::do_embed (vector paths, ImportDisposition chns, ImportMode mode if (embed_sndfiles (paths, multi, check_sample_rate, mode, pos, 1, 1, track) < -1) { goto out; } - break; + break; case Editing::ImportSerializeFiles: - for (vector::iterator a = paths.begin(); a != paths.end(); ++a) { + for (vector::iterator a = paths.begin(); a != paths.end(); ++a) { to_embed.clear (); to_embed.push_back (*a); @@ -451,28 +500,20 @@ Editor::do_embed (vector paths, ImportDisposition chns, ImportMode mode out: if (ok) { - session->save_state (""); + _session->save_state (""); } } int -Editor::import_sndfiles (vector paths, ImportMode mode, SrcQuality quality, nframes64_t& pos, - int target_regions, int target_tracks, boost::shared_ptr track, bool replace, uint32_t total) +Editor::import_sndfiles (vector paths, ImportMode mode, SrcQuality quality, framepos_t& pos, + int target_regions, int target_tracks, boost::shared_ptr& track, bool replace) { - interthread_progress_window->set_title (string_compose (_("Importing %1"), paths.front())); - interthread_progress_window->set_position (Gtk::WIN_POS_MOUSE); - interthread_progress_bar.set_fraction (0.0f); - interthread_cancel_label.set_text (_("Cancel Import")); - current_interthread_info = &import_status; - import_status.paths = paths; import_status.done = false; import_status.cancel = false; import_status.freeze = false; - import_status.done = 0.0; import_status.quality = quality; import_status.replace_existing_source = replace; - import_status.total = total; import_status.mode = mode; import_status.pos = pos; @@ -480,10 +521,8 @@ Editor::import_sndfiles (vector paths, ImportMode mode, SrcQuality qual import_status.target_regions = target_regions; import_status.track = track; import_status.replace = replace; - interthread_progress_connection = Glib::signal_timeout().connect - (bind (mem_fun(*this, &Editor::import_progress_timeout), (gpointer) 0), 500); - - track_canvas->get_window()->set_cursor (Gdk::Cursor (Gdk::WATCH)); + + set_canvas_cursor (_cursors->wait); gdk_flush (); /* start import thread for this spec. this will ultimately call Session::import_audiofiles() @@ -491,41 +530,40 @@ Editor::import_sndfiles (vector paths, ImportMode mode, SrcQuality qual (the GUI) to direct additional steps after that. */ - pthread_create_and_store ("import", &import_status.thread, 0, _import_thread, this); + pthread_create_and_store ("import", &import_status.thread, _import_thread, this); pthread_detach (import_status.thread); while (!import_status.done && !import_status.cancel) { gtk_main_iteration (); } - interthread_progress_window->hide (); import_status.done = true; - interthread_progress_connection.disconnect (); + + int result = -1; if (!import_status.cancel && !import_status.sources.empty()) { - if (add_sources (import_status.paths, - import_status.sources, - import_status.pos, - import_status.mode, - import_status.target_regions, - import_status.target_tracks, - import_status.track, false) == 0) { - session->save_state (""); - } + result = add_sources ( + import_status.paths, + import_status.sources, + import_status.pos, + import_status.mode, + import_status.target_regions, + import_status.target_tracks, + track, false + ); /* update position from results */ pos = import_status.pos; } - - track_canvas->get_window()->set_cursor (*current_canvas_cursor); - return 0; + set_canvas_cursor (current_canvas_cursor); + return result; } int -Editor::embed_sndfiles (vector paths, bool multifile, - bool& check_sample_rate, ImportMode mode, nframes64_t& pos, int target_regions, int target_tracks, +Editor::embed_sndfiles (vector paths, bool multifile, + bool& check_sample_rate, ImportMode mode, framepos_t& pos, int target_regions, int target_tracks, boost::shared_ptr& track) { boost::shared_ptr source; @@ -533,62 +571,23 @@ Editor::embed_sndfiles (vector paths, bool multifile, string linked_path; SoundFileInfo finfo; int ret = 0; - Glib::ustring path_to_use; - track_canvas->get_window()->set_cursor (Gdk::Cursor (Gdk::WATCH)); + set_canvas_cursor (_cursors->wait); gdk_flush (); - for (vector::iterator p = paths.begin(); p != paths.end(); ++p) { - - ustring path = *p; + for (vector::iterator p = paths.begin(); p != paths.end(); ++p) { - if (Config->get_try_link_for_embed()) { - - /* lets see if we can link it into the session */ - - sys::path tmp = session->session_directory().sound_path() / Glib::path_get_basename(path); - linked_path = tmp.to_string(); - - path_to_use = linked_path; - - if (link (path.c_str(), linked_path.c_str()) == 0) { - - /* there are many reasons why link(2) might have failed. - but if it succeeds, we now have a link in the - session sound dir that will protect against - unlinking of the original path. nice. - */ - - path = linked_path; - path_to_use = Glib::path_get_basename (path); - - } else { - - /* one possible reason is that its already linked */ - - if (errno == EEXIST) { - struct stat sb; - - if (stat (linked_path.c_str(), &sb) == 0) { - if (sb.st_nlink > 1) { // its a hard link, assume its the one we want - path = linked_path; - path_to_use = Glib::path_get_basename (path); - } - } - } - } - } + string path = *p; + string error_msg; /* note that we temporarily truncated _id at the colon */ - string error_msg; - if (!AudioFileSource::get_soundfile_info (path, finfo, error_msg)) { error << string_compose(_("Editor: cannot open file \"%1\", (%2)"), path, error_msg ) << endmsg; goto out; } - if (check_sample_rate && (finfo.samplerate != (int) session->frame_rate())) { + if (check_sample_rate && (finfo.samplerate != (int) _session->frame_rate())) { vector choices; if (multifile) { @@ -597,9 +596,11 @@ Editor::embed_sndfiles (vector paths, bool multifile, choices.push_back (_("Embed all without questions")); Gtkmm2ext::Choice rate_choice ( + _("Sample rate"), string_compose (_("%1\nThis audiofile's sample rate doesn't match the session sample rate!"), short_path (path, 40)), - choices, false); + choices, false + ); int resx = rate_choice.run (); @@ -624,8 +625,10 @@ Editor::embed_sndfiles (vector paths, bool multifile, choices.push_back (_("Embed it anyway")); Gtkmm2ext::Choice rate_choice ( + _("Sample rate"), string_compose (_("%1\nThis audiofile's sample rate doesn't match the session sample rate!"), path), - choices, false); + choices, false + ); int resx = rate_choice.run (); @@ -642,7 +645,7 @@ Editor::embed_sndfiles (vector paths, bool multifile, } } - track_canvas->get_window()->set_cursor (Gdk::Cursor (Gdk::WATCH)); + set_canvas_cursor (_cursors->wait); for (int n = 0; n < finfo.channels; ++n) { try { @@ -651,11 +654,11 @@ Editor::embed_sndfiles (vector paths, bool multifile, boost::shared_ptr s; - if ((s = session->source_by_path_and_channel (path, n)) == 0) { + if ((s = _session->source_by_path_and_channel (path, n)) == 0) { source = boost::dynamic_pointer_cast ( - SourceFactory::createReadable (DataType::AUDIO, *session, - path_to_use, n, + SourceFactory::createReadable (DataType::AUDIO, *_session, + path, n, (mode == ImportAsTapeTrack ? Source::Destructive : Source::Flag (0)), @@ -683,33 +686,26 @@ Editor::embed_sndfiles (vector paths, bool multifile, ret = add_sources (paths, sources, pos, mode, target_regions, target_tracks, track, true); out: - track_canvas->get_window()->set_cursor (*current_canvas_cursor); + set_canvas_cursor (current_canvas_cursor); return ret; } int -Editor::add_sources (vector paths, SourceList& sources, nframes64_t& pos, ImportMode mode, +Editor::add_sources (vector paths, SourceList& sources, framepos_t& pos, ImportMode mode, int target_regions, int target_tracks, boost::shared_ptr& track, bool /*add_channel_suffix*/) { vector > regions; - ustring region_name; + string region_name; uint32_t input_chan = 0; uint32_t output_chan = 0; bool use_timestamp; use_timestamp = (pos == -1); - if (use_timestamp) { - if (sources[0]->natural_position() != 0) { - pos = sources[0]->natural_position(); - } else { - pos = get_preferred_edit_position (); - } - } - // kludge (for MIDI we're abusing "channel" for "track" here) - if (paths.front().rfind(".mid") != Glib::ustring::npos) + if (SMFSource::safe_midi_file_extension (paths.front())) { target_regions = -1; + } if (target_regions == 1) { @@ -717,8 +713,22 @@ Editor::add_sources (vector paths, SourceList& sources, nframes64 region_name = region_name_from_path (paths.front(), (sources.size() > 1), false); - boost::shared_ptr r = RegionFactory::create (sources, 0, sources[0]->length(pos), region_name, 0, - Region::Flag (Region::DefaultFlags|Region::WholeFile|Region::External)); + /* we checked in import_sndfiles() that there were not too many */ + + while (RegionFactory::region_by_name (region_name)) { + region_name = bump_name_once (region_name, '.'); + } + + PropertyList plist; + + plist.add (ARDOUR::Properties::start, 0); + plist.add (ARDOUR::Properties::length, sources[0]->length (pos)); + plist.add (ARDOUR::Properties::name, region_name); + plist.add (ARDOUR::Properties::layer, 0); + plist.add (ARDOUR::Properties::whole_file, true); + plist.add (ARDOUR::Properties::external, true); + + boost::shared_ptr r = RegionFactory::create (sources, plist); if (use_timestamp && boost::dynamic_pointer_cast(r)) { boost::dynamic_pointer_cast(r)->special_set_position(sources[0]->natural_position()); @@ -742,8 +752,16 @@ Editor::add_sources (vector paths, SourceList& sources, nframes64 region_name = region_name_from_path ((*x)->path(), false, false, sources.size(), n); - boost::shared_ptr r = RegionFactory::create (just_one, 0, (*x)->length(pos), region_name, 0, - Region::Flag (Region::DefaultFlags|Region::WholeFile|Region::External)); + PropertyList plist; + + plist.add (ARDOUR::Properties::start, 0); + plist.add (ARDOUR::Properties::length, (*x)->length (pos)); + plist.add (ARDOUR::Properties::name, region_name); + plist.add (ARDOUR::Properties::layer, 0); + plist.add (ARDOUR::Properties::whole_file, true); + plist.add (ARDOUR::Properties::external, true); + + boost::shared_ptr r = RegionFactory::create (just_one, plist); if (use_timestamp && boost::dynamic_pointer_cast(r)) { boost::dynamic_pointer_cast(r)->special_set_position((*x)->natural_position()); @@ -764,21 +782,58 @@ Editor::add_sources (vector paths, SourceList& sources, nframes64 } if (Config->get_output_auto_connect() & AutoConnectMaster) { - output_chan = (session->master_out() ? session->master_out()->n_inputs().n_audio() : input_chan); + output_chan = (_session->master_out() ? _session->master_out()->n_inputs().n_audio() : input_chan); } else { output_chan = input_chan; } int n = 0; - - for (vector >::iterator r = regions.begin(); r != regions.end(); ++r, ++n) { + framepos_t rlen = 0; + + for (vector >::iterator r = regions.begin(); r != regions.end(); ++r, ++n) { + boost::shared_ptr ar = boost::dynamic_pointer_cast (*r); + + if (use_timestamp) { + if (ar) { + + /* get timestamp for this region */ + + const boost::shared_ptr s (ar->sources().front()); + const boost::shared_ptr as = boost::dynamic_pointer_cast (s); + + assert (as); + + if (as->natural_position() != 0) { + pos = as->natural_position(); + } else if (target_tracks == 1) { + /* hmm, no timestamp available, put it after the previous region + */ + if (n == 0) { + pos = get_preferred_edit_position (); + } else { + pos += rlen; + } + } else { + pos = get_preferred_edit_position (); + } + } else { + /* should really get first position in MIDI file, but for now, use edit position*/ + pos = get_preferred_edit_position (); + } + } + finish_bringing_in_material (*r, input_chan, output_chan, pos, mode, track); + rlen = (*r)->length(); + if (target_tracks != 1) { track.reset (); - } else { - pos += (*r)->length(); + } else { + if (!use_timestamp || !ar) { + /* line each one up right after the other */ + pos += (*r)->length(); + } } } @@ -792,7 +847,7 @@ Editor::add_sources (vector paths, SourceList& sources, nframes64 } int -Editor::finish_bringing_in_material (boost::shared_ptr region, uint32_t in_chans, uint32_t out_chans, nframes64_t& pos, +Editor::finish_bringing_in_material (boost::shared_ptr region, uint32_t in_chans, uint32_t out_chans, framepos_t& pos, ImportMode mode, boost::shared_ptr& existing_track) { boost::shared_ptr ar = boost::dynamic_pointer_cast(region); @@ -818,12 +873,12 @@ Editor::finish_bringing_in_material (boost::shared_ptr region, uint32_t } } - boost::shared_ptr playlist = existing_track->diskstream()->playlist(); - boost::shared_ptr copy (RegionFactory::create (region)); - begin_reversible_command (_("insert file")); - XMLNode &before = playlist->get_state(); + boost::shared_ptr playlist = existing_track->playlist(); + boost::shared_ptr copy (RegionFactory::create (region, region->properties())); + begin_reversible_command (Operations::insert_file); + playlist->clear_changes (); playlist->add_region (copy, pos); - session->add_command (new MementoCommand(*playlist, &before, &playlist->get_state())); + _session->add_command (new StatefulDiffCommand (playlist)); commit_reversible_command (); break; } @@ -832,7 +887,7 @@ Editor::finish_bringing_in_material (boost::shared_ptr region, uint32_t { if (!existing_track) { if (ar) { - list > at (session->new_audio_track (in_chans, out_chans, Normal, 0, 1)); + list > at (_session->new_audio_track (in_chans, out_chans, Normal, 0, 1)); if (at.empty()) { return -1; @@ -840,7 +895,7 @@ Editor::finish_bringing_in_material (boost::shared_ptr region, uint32_t existing_track = at.front(); } else if (mr) { - list > mt (session->new_midi_track (Normal, 0, 1)); + list > mt (_session->new_midi_track (Normal, 0, 1)); if (mt.empty()) { return -1; @@ -848,26 +903,37 @@ Editor::finish_bringing_in_material (boost::shared_ptr region, uint32_t existing_track = mt.front(); } - + existing_track->set_name (region->name()); } + + boost::shared_ptr playlist = existing_track->playlist(); boost::shared_ptr copy (RegionFactory::create (region)); - existing_track->diskstream()->playlist()->add_region (copy, pos); + begin_reversible_command (Operations::insert_file); + playlist->clear_changes (); + playlist->add_region (copy, pos); + _session->add_command (new StatefulDiffCommand (playlist)); + commit_reversible_command (); break; } case ImportAsTapeTrack: { - if (!ar) + if (!ar) { return -1; + } - list > at (session->new_audio_track (in_chans, out_chans, Destructive)); + list > at (_session->new_audio_track (in_chans, out_chans, Destructive)); if (!at.empty()) { + boost::shared_ptr playlist = at.front()->playlist(); boost::shared_ptr copy (RegionFactory::create (region)); - at.front()->set_name (basename_nosuffix (copy->name())); - at.front()->diskstream()->playlist()->add_region (copy, pos); + begin_reversible_command (Operations::insert_file); + playlist->clear_changes (); + playlist->add_region (copy, pos); + _session->add_command (new StatefulDiffCommand (playlist)); + commit_reversible_command (); } break; } @@ -879,7 +945,6 @@ Editor::finish_bringing_in_material (boost::shared_ptr region, uint32_t void * Editor::_import_thread (void *arg) { - PBD::notify_gui_about_thread_creation (pthread_self(), X_("Import")); SessionEvent::create_per_thread_pool ("import events", 64); Editor *ed = (Editor *) arg; @@ -889,48 +954,8 @@ Editor::_import_thread (void *arg) void * Editor::import_thread () { - session->import_audiofiles (import_status); + _session->import_audiofiles (import_status); pthread_exit_pbd (0); /*NOTREACHED*/ return 0; } - -gint -Editor::import_progress_timeout (void */*arg*/) -{ - bool reset = false; - - if (!interthread_progress_window->is_visible()) { - interthread_progress_window->show_all (); - reset = true; - } - - interthread_progress_label.set_text (import_status.doing_what); - - if (import_status.freeze) { - interthread_cancel_button.set_sensitive(false); - } else { - interthread_cancel_button.set_sensitive(true); - } - - if (import_status.doing_what == "building peak files") { - interthread_progress_bar.pulse (); - return FALSE; - } else { - float val = import_status.progress; - interthread_progress_bar.set_fraction (min (max (0.0f, val), 1.0f)); - } - - if (reset) { - - /* the window is now visible, speed up the updates */ - - interthread_progress_connection.disconnect (); - interthread_progress_connection = Glib::signal_timeout().connect - (bind (mem_fun(*this, &Editor::import_progress_timeout), (gpointer) 0), 100); - return false; - } else { - return !(import_status.done || import_status.cancel); - } -} -