#include <sys/time.h>
#include <errno.h>
#include <unistd.h>
+#include <algorithm>
#include <sndfile.h>
-#include <pbd/pthread_utils.h>
-#include <pbd/basename.h>
-#include <pbd/shortpath.h>
+#include "pbd/pthread_utils.h"
+#include "pbd/basename.h"
+#include "pbd/shortpath.h"
#include <gtkmm2ext/choice.h>
#include <gtkmm2ext/window_title.h>
-#include <ardour/session.h>
-#include <ardour/session_directory.h>
-#include <ardour/audioplaylist.h>
-#include <ardour/audioregion.h>
-#include <ardour/audio_diskstream.h>
-#include <ardour/utils.h>
-#include <ardour/audio_track.h>
-#include <ardour/audioplaylist.h>
-#include <ardour/audiofilesource.h>
-#include <ardour/region_factory.h>
-#include <ardour/source_factory.h>
-#include <pbd/memento_command.h>
+#include "ardour/session.h"
+#include "ardour/session_directory.h"
+#include "ardour/audioplaylist.h"
+#include "ardour/audioregion.h"
+#include "ardour/audio_diskstream.h"
+#include "ardour/midi_track.h"
+#include "ardour/midi_region.h"
+#include "ardour/utils.h"
+#include "ardour/audio_track.h"
+#include "ardour/audioplaylist.h"
+#include "ardour/audiofilesource.h"
+#include "ardour/region_factory.h"
+#include "ardour/source_factory.h"
+#include "ardour/session.h"
+#include "pbd/memento_command.h"
#include "ardour_ui.h"
#include "editor.h"
#include "sfdb_ui.h"
#include "editing.h"
#include "audio_time_axis.h"
+#include "midi_time_axis.h"
+#include "session_import_dialog.h"
#include "utils.h"
+#include "gui_thread.h"
#include "i18n.h"
Editor::add_external_audio_action (ImportMode mode_hint)
{
if (session == 0) {
- MessageDialog msg (0, _("You can't import or embed an audiofile until you have a session loaded."));
+ 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 audio"), session, 0, true, mode_hint);
+ sfbrowser = new SoundFileOmega (*this, _("Add existing media"), session, 0, true, mode_hint);
} else {
sfbrowser->set_mode (mode_hint);
}
uint32_t track_cnt;
if (session == 0) {
- MessageDialog msg (0, _("You can't import or embed an audiofile until you have a session loaded."));
+ 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 audio"), session, track_cnt, true);
+ sfbrowser = new SoundFileOmega (*this, _("Add existing media"), session, track_cnt, true);
} else {
sfbrowser->reset (track_cnt);
}
sfbrowser->show_all ();
- again:
- int response = sfbrowser->run ();
- switch (response) {
- case RESPONSE_APPLY:
- // leave the dialog open
- break;
+ bool keepRunning;
- case RESPONSE_OK:
- sfbrowser->hide ();
- break;
+ do {
+ keepRunning = false;
- default:
- // cancel from the browser - we are done
- sfbrowser->hide ();
- return;
- }
+ int response = sfbrowser->run ();
- /* lets do it */
-
- paths = sfbrowser->get_paths ();
+ switch (response) {
+ case RESPONSE_APPLY:
+ // leave the dialog open
+ break;
- ImportPosition pos = sfbrowser->get_position ();
- ImportMode mode = sfbrowser->get_mode ();
- ImportDisposition chns = sfbrowser->get_channel_disposition ();
- nframes64_t where;
+ case RESPONSE_OK:
+ sfbrowser->hide ();
+ break;
- 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;
- }
+ default:
+ // cancel from the browser - we are done
+ sfbrowser->hide ();
+ return;
+ }
- SrcQuality quality = sfbrowser->get_src_quality();
+ /* lets do it */
+
+ paths = sfbrowser->get_paths ();
+
+ ImportPosition pos = sfbrowser->get_position ();
+ ImportMode mode = sfbrowser->get_mode ();
+ ImportDisposition chns = sfbrowser->get_channel_disposition ();
+ nframes64_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;
+ }
- if (sfbrowser->copy_files_btn.get_active()) {
- do_import (paths, chns, mode, quality, where);
- } else {
- do_embed (paths, chns, mode, where);
+ 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
+Editor::session_import_dialog ()
+{
+ SessionImportDialog dialog (*session);
+ ensure_float (dialog);
+ dialog.run ();
+}
+
+typedef std::map<PBD::ID,boost::shared_ptr<ARDOUR::Source> > SourceMap;
+
+/**
+ * Updating is still disabled, see note in libs/ardour/import.cc Session::import_audiofiles()
+ *
+ * all_or_nothing:
+ * true = show "Update", "Import" and "Skip"
+ * false = show "Import", and "Cancel"
+ *
+ * Returns:
+ * 0 To update an existing source of the same name
+ * 1 To import/embed the file normally (make sure the new name will be unique)
+ * 2 If the user wants to skip this file
+ **/
+int
+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;
+
+ 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 (response == RESPONSE_APPLY) {
- sfbrowser->clear_selection ();
- goto again;
+ int function = 1;
+
+ if (wave_name_exists) {
+ string message;
+ if (all_or_nothing) {
+ // updating is still disabled
+ //message = string_compose(_("The session already contains a source file named %1. Do you want to update that file (and thus all regions using the file) or import this file as a new file?"),wave_name);
+ message = string_compose(_("The session already contains a source file named %1. This file will be imported as a new file, please confirm."),wave_name);
+ } else {
+ message = string_compose(_("A source file %1 already exists. This operation will not update that source but import the file %2 as a new source, please confirm."), wave_name, wave_name);
+
+ }
+ MessageDialog dialog(message, false, Gtk::MESSAGE_QUESTION, Gtk::BUTTONS_NONE, true);
+
+ if (all_or_nothing) {
+ // disabled
+ //dialog.add_button("Update", 0);
+ dialog.add_button("Import", 1);
+ dialog.add_button("Skip", 2);
+ } else {
+ dialog.add_button("Import", 1);
+ dialog.add_button("Cancel", 2);
+ }
+
+ //dialog.add_button("Skip all", 4); // All or rest?
+
+ dialog.show();
+
+ function = dialog.run ();
+
+ dialog.hide();
}
+
+ return function;
}
boost::shared_ptr<AudioTrack>
return atv->audio_track();
}
+boost::shared_ptr<MidiTrack>
+Editor::get_nth_selected_midi_track (int nth) const
+{
+ MidiTimeAxisView* mtv;
+ TrackSelection::iterator x;
+
+ for (x = selection->tracks.begin(); nth > 0 && x != selection->tracks.end(); ++x) {
+
+ mtv = dynamic_cast<MidiTimeAxisView*>(*x);
+
+ if (!mtv) {
+ continue;
+ } else if (mtv->is_midi_track()) {
+ --nth;
+ }
+ }
+
+ if (x == selection->tracks.end()) {
+ mtv = dynamic_cast<MidiTimeAxisView*>(selection->tracks.back());
+ } else {
+ mtv = dynamic_cast<MidiTimeAxisView*>(*x);
+ }
+
+ if (!mtv || !mtv->is_midi_track()) {
+ return boost::shared_ptr<MidiTrack>();
+ }
+
+ return mtv->midi_track();
+}
+
void
Editor::do_import (vector<ustring> paths, ImportDisposition chns, ImportMode mode, SrcQuality quality, nframes64_t& pos)
{
- boost::shared_ptr<AudioTrack> track;
+ boost::shared_ptr<Track> track;
vector<ustring> to_import;
- bool ok = false;
int nth = 0;
if (interthread_progress_window == 0) {
build_interthread_progress_window ();
}
- switch (chns) {
- case Editing::ImportDistinctFiles:
- for (vector<ustring>::iterator a = paths.begin(); a != paths.end(); ++a) {
+ if (chns == Editing::ImportMergeFiles) {
- to_import.clear ();
- to_import.push_back (*a);
+ /* create 1 region from all paths, add to 1 track,
+ ignore "track"
+ */
- if (mode == Editing::ImportToTrack) {
- track = get_nth_selected_audio_track (nth++);
- }
-
- if (import_sndfiles (to_import, mode, quality, pos, 1, -1, track)) {
- goto out;
+ bool cancel = false;
+ for (vector<ustring>::iterator a = paths.begin(); a != paths.end(); ++a) {
+ int check = check_whether_and_how_to_import(*a, false);
+ if (check == 2) {
+ cancel = true;
+ break;
}
+ }
+ if (!cancel) {
+ import_sndfiles (paths, mode, quality, pos, 1, 1, track, false, paths.size());
}
- break;
- case Editing::ImportDistinctChannels:
- for (vector<ustring>::iterator a = paths.begin(); a != paths.end(); ++a) {
+ } else {
- to_import.clear ();
- to_import.push_back (*a);
+ bool replace = false;
+ bool ok = true;
+ vector<ustring>::size_type total = paths.size();
- if (import_sndfiles (to_import, mode, quality, pos, -1, -1, track)) {
- goto out;
+ for (vector<ustring>::iterator a = paths.begin(); a != paths.end() && ok; ++a) {
+
+ int check = check_whether_and_how_to_import(*a, true);
+
+ if (check == 2 ) {
+ // user said skip
+ continue;
}
- }
- break;
+ if (check == 0) {
+ fatal << "Updating existing sources should be disabled!" << endl;
+ replace = true;
+ } else if (check == 1) {
+ replace = false;
+ }
+
- case Editing::ImportMergeFiles:
- /* create 1 region from all paths, add to 1 track,
- ignore "track"
- */
- if (import_sndfiles (paths, mode, quality, pos, 1, 1, track)) {
- goto out;
- }
- break;
- case Editing::ImportSerializeFiles:
- for (vector<ustring>::iterator a = paths.begin(); a != paths.end(); ++a) {
+ 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, total) == 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, total) == 0);
+ break;
+
+ case Editing::ImportSerializeFiles:
+
+ to_import.clear ();
+ to_import.push_back (*a);
- to_import.clear ();
- to_import.push_back (*a);
-
- /* create 1 region from this path, add to 1 track,
- reuse "track" across paths
- */
+ ok = (import_sndfiles (to_import, mode, quality, pos, 1, 1, track, replace, total) == 0);
+ break;
- if (import_sndfiles (to_import, mode, quality, pos, 1, 1, track)) {
- goto out;
+ case Editing::ImportMergeFiles:
+ // Not entered, handled in earlier if() branch
+ break;
}
-
}
- break;
- }
-
- ok = true;
-
- out:
- if (ok) {
- session->save_state ("");
}
interthread_progress_window->hide_all ();
}
-bool
-Editor::idle_do_embed (vector<ustring> paths, ImportDisposition chns, ImportMode mode, nframes64_t& pos)
-{
- _do_embed (paths, chns, mode, pos);
- return false;
-}
-
void
Editor::do_embed (vector<ustring> paths, ImportDisposition chns, ImportMode mode, nframes64_t& pos)
{
-#ifdef GTKOSX
- Glib::signal_idle().connect (bind (mem_fun (*this, &Editor::idle_do_embed), paths, chns, mode, pos));
-#else
- _do_embed (paths, chns, mode, pos);
-#endif
-}
-
-void
-Editor::_do_embed (vector<ustring> paths, ImportDisposition chns, ImportMode mode, nframes64_t& pos)
-{
- boost::shared_ptr<AudioTrack> track;
+ boost::shared_ptr<Track> track;
bool check_sample_rate = true;
bool ok = false;
vector<ustring> to_embed;
int
Editor::import_sndfiles (vector<ustring> paths, ImportMode mode, SrcQuality quality, nframes64_t& pos,
- int target_regions, int target_tracks, boost::shared_ptr<AudioTrack>& track)
+ int target_regions, int target_tracks, boost::shared_ptr<Track> track, bool replace, uint32_t total)
{
WindowTitle title = string_compose (_("importing %1"), paths.front());
interthread_progress_window->set_title (title.get_string());
interthread_progress_window->set_position (Gtk::WIN_POS_MOUSE);
- interthread_progress_window->show_all ();
interthread_progress_bar.set_fraction (0.0f);
interthread_cancel_label.set_text (_("Cancel Import"));
- current_interthread_info = &import_status;
+ current_interthread_info = &import_status;
import_status.paths = paths;
import_status.done = 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;
+ import_status.target_tracks = target_tracks;
+ 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), 100);
+ (bind (mem_fun(*this, &Editor::import_progress_timeout), (gpointer) 0), 500);
- track_canvas.get_window()->set_cursor (Gdk::Cursor (Gdk::WATCH));
- ARDOUR_UI::instance()->flush_pending ();
+ track_canvas->get_window()->set_cursor (Gdk::Cursor (Gdk::WATCH));
+ gdk_flush ();
/* start import thread for this spec. this will ultimately call Session::import_audiofiles()
- and if successful will add the file(s) as a region to the session region list.
+ which, if successful, will add the files as regions to the region list. its up to us
+ (the GUI) to direct additional steps after that.
*/
-
+
pthread_create_and_store ("import", &import_status.thread, 0, _import_thread, this);
pthread_detach (import_status.thread);
- while (!(import_status.done || import_status.cancel)) {
+ while (!import_status.done && !import_status.cancel) {
gtk_main_iteration ();
}
interthread_progress_window->hide ();
-
import_status.done = true;
interthread_progress_connection.disconnect ();
- /* import thread finished - see if we should build a new track */
-
- boost::shared_ptr<AudioRegion> r;
-
- if (import_status.cancel || import_status.sources.empty()) {
- goto out;
+ 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 ("");
+ }
+
+ /* update position from results */
+
+ pos = import_status.pos;
}
- if (add_sources (paths, import_status.sources, pos, mode, target_regions, target_tracks, track, false) == 0) {
- session->save_state ("");
- }
- out:
- track_canvas.get_window()->set_cursor (*current_canvas_cursor);
+ track_canvas->get_window()->set_cursor (*current_canvas_cursor);
return 0;
}
int
Editor::embed_sndfiles (vector<Glib::ustring> paths, bool multifile,
bool& check_sample_rate, ImportMode mode, nframes64_t& pos, int target_regions, int target_tracks,
- boost::shared_ptr<AudioTrack>& track)
+ boost::shared_ptr<Track>& track)
{
boost::shared_ptr<AudioFileSource> source;
SourceList sources;
SoundFileInfo finfo;
int ret = 0;
- track_canvas.get_window()->set_cursor (Gdk::Cursor (Gdk::WATCH));
- ARDOUR_UI::instance()->flush_pending ();
+ track_canvas->get_window()->set_cursor (Gdk::Cursor (Gdk::WATCH));
+ gdk_flush ();
for (vector<Glib::ustring>::iterator p = paths.begin(); p != paths.end(); ++p) {
}
}
- track_canvas.get_window()->set_cursor (Gdk::Cursor (Gdk::WATCH));
+ track_canvas->get_window()->set_cursor (Gdk::Cursor (Gdk::WATCH));
for (int n = 0; n < finfo.channels; ++n) {
try {
boost::shared_ptr<Source> s;
if ((s = session->source_by_path_and_channel (path, n)) == 0) {
- source = boost::dynamic_pointer_cast<AudioFileSource> (SourceFactory::createReadable
- (DataType::AUDIO, *session, path, n,
- (mode == ImportAsTapeTrack ?
- AudioFileSource::Destructive :
- AudioFileSource::Flag (0)),
- true, true));
+
+ source = boost::dynamic_pointer_cast<AudioFileSource> (
+ SourceFactory::createReadable (DataType::AUDIO, *session,
+ path, false, n,
+ (mode == ImportAsTapeTrack
+ ? Source::Destructive
+ : Source::Flag (0)),
+ true, true));
} else {
source = boost::dynamic_pointer_cast<AudioFileSource> (s);
}
ret = add_sources (paths, sources, pos, mode, target_regions, target_tracks, track, true);
out:
- track_canvas.get_window()->set_cursor (*current_canvas_cursor);
+ track_canvas->get_window()->set_cursor (*current_canvas_cursor);
return ret;
}
int
Editor::add_sources (vector<Glib::ustring> paths, SourceList& sources, nframes64_t& pos, ImportMode mode,
- int target_regions, int target_tracks, boost::shared_ptr<AudioTrack>& track, bool add_channel_suffix)
+ int target_regions, int target_tracks, boost::shared_ptr<Track>& track, bool add_channel_suffix)
{
- vector<boost::shared_ptr<AudioRegion> > regions;
+ vector<boost::shared_ptr<Region> > regions;
ustring region_name;
uint32_t input_chan = 0;
uint32_t output_chan = 0;
}
}
+ // kludge (for MIDI we're abusing "channel" for "track" here)
+ if (paths.front().rfind(".mid") != Glib::ustring::npos)
+ target_regions = -1;
+
if (target_regions == 1) {
/* take all the sources we have and package them up as a region */
region_name = region_name_from_path (paths.front(), (sources.size() > 1), false);
- regions.push_back (boost::dynamic_pointer_cast<AudioRegion>
- (RegionFactory::create (sources, 0, sources[0]->length(), region_name, 0,
- Region::Flag (Region::DefaultFlags|Region::WholeFile|Region::External))));
+ regions.push_back (RegionFactory::create (sources, 0, sources[0]->length(pos), region_name, 0,
+ Region::Flag (Region::DefaultFlags|Region::WholeFile|Region::External)));
- } else if (target_regions == -1) {
+ } else if (target_regions == -1 || target_regions > 1) {
/* take each source and create a region for each one */
just_one.clear ();
just_one.push_back (*x);
- boost::shared_ptr<AudioFileSource> afs = boost::dynamic_pointer_cast<AudioFileSource> (*x);
-
- region_name = region_name_from_path (afs->path(), false, true, sources.size(), n);
+ region_name = region_name_from_path ((*x)->path(), false, false, sources.size(), n);
- regions.push_back (boost::dynamic_pointer_cast<AudioRegion>
- (RegionFactory::create (just_one, 0, (*x)->length(), region_name, 0,
- Region::Flag (Region::DefaultFlags|Region::WholeFile|Region::External))));
+ regions.push_back (RegionFactory::create (just_one, 0, (*x)->length(pos), region_name, 0,
+ Region::Flag (Region::DefaultFlags|Region::WholeFile|Region::External)));
}
}
int n = 0;
- for (vector<boost::shared_ptr<AudioRegion> >::iterator r = regions.begin(); r != regions.end(); ++r, ++n) {
+ for (vector<boost::shared_ptr<Region> >::iterator r = regions.begin(); r != regions.end(); ++r, ++n) {
- finish_bringing_in_audio (*r, input_chan, output_chan, pos, mode, track);
+ finish_bringing_in_material (*r, input_chan, output_chan, pos, mode, track);
if (target_tracks != 1) {
track.reset ();
}
int
-Editor::finish_bringing_in_audio (boost::shared_ptr<AudioRegion> region, uint32_t in_chans, uint32_t out_chans, nframes64_t& pos,
- ImportMode mode, boost::shared_ptr<AudioTrack>& existing_track)
+Editor::finish_bringing_in_material (boost::shared_ptr<Region> region, uint32_t in_chans, uint32_t out_chans, nframes64_t& pos,
+ 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);
+
switch (mode) {
case ImportAsRegion:
/* relax, its been done */
{
if (!existing_track) {
- existing_track = get_nth_selected_audio_track (0);
+ if (ar) {
+ existing_track = get_nth_selected_audio_track (0);
+ } else if (mr) {
+ existing_track = get_nth_selected_midi_track (0);
+ }
if (!existing_track) {
return -1;
}
boost::shared_ptr<Playlist> playlist = existing_track->diskstream()->playlist();
- boost::shared_ptr<AudioRegion> copy (boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (region)));
- begin_reversible_command (_("insert sndfile"));
+ boost::shared_ptr<Region> copy (RegionFactory::create (region));
+ begin_reversible_command (_("insert file"));
XMLNode &before = playlist->get_state();
playlist->add_region (copy, pos);
session->add_command (new MementoCommand<Playlist>(*playlist, &before, &playlist->get_state()));
case ImportAsTrack:
{
if (!existing_track) {
- list<boost::shared_ptr<AudioTrack> > at (session->new_audio_track (in_chans, out_chans, Normal, 1));
+ if (ar) {
+ list<boost::shared_ptr<AudioTrack> > at (session->new_audio_track (in_chans, out_chans, Normal, 0, 1));
- if (at.empty()) {
- return -1;
+ if (at.empty()) {
+ return -1;
+ }
+
+ existing_track = at.front();
+ } else if (mr) {
+ list<boost::shared_ptr<MidiTrack> > mt (session->new_midi_track (Normal, 0, 1));
+
+ if (mt.empty()) {
+ return -1;
+ }
+
+ existing_track = mt.front();
}
- existing_track = at.front();
existing_track->set_name (region->name());
}
- boost::shared_ptr<AudioRegion> copy (boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (region)));
+ boost::shared_ptr<Region> copy (RegionFactory::create (region));
existing_track->diskstream()->playlist()->add_region (copy, pos);
break;
}
case ImportAsTapeTrack:
{
+ if (!ar)
+ return -1;
+
list<boost::shared_ptr<AudioTrack> > at (session->new_audio_track (in_chans, out_chans, Destructive));
if (!at.empty()) {
- boost::shared_ptr<AudioRegion> copy (boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (region)));
+ boost::shared_ptr<Region> copy (RegionFactory::create (region));
at.front()->set_name (basename_nosuffix (copy->name()));
at.front()->diskstream()->playlist()->add_region (copy, pos);
}
void *
Editor::_import_thread (void *arg)
{
- PBD::ThreadCreated (pthread_self(), X_("Import"));
+ PBD::notify_gui_about_thread_creation (pthread_self(), X_("Import"));
Editor *ed = (Editor *) arg;
return ed->import_thread ();
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_progress_bar.pulse ();
return FALSE;
} else {
- interthread_progress_bar.set_fraction (import_status.progress);
+ float val = import_status.progress;
+ interthread_progress_bar.set_fraction (min (max (0.0f, val), 1.0f));
}
- return !(import_status.done || import_status.cancel);
+ 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);
+ }
}
projects / ardour.git / blobdiff