#include <sys/time.h>
#include <errno.h>
#include <unistd.h>
+#include <algorithm>
#include <sndfile.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;
}
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;
}
int
Editor::check_whether_and_how_to_import(string path, bool all_or_nothing)
{
- string wave_name (basename(path.c_str()));
+ string wave_name (Glib::path_get_basename(path));
AudioSourceList all_sources = session->get_audio_sources();
bool wave_name_exists = false;
for (AudioSourceList::iterator i = all_sources.begin(); i != all_sources.end(); ++i) {
boost::shared_ptr<AudioFileSource> afs = boost::dynamic_pointer_cast<AudioFileSource>(i->second);
- string tmp (basename(afs->path().c_str()));
+ string tmp (Glib::path_get_basename (afs->path()));
if (tmp == wave_name) {
wave_name_exists = true;
//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 = _("Lorem ipsum. Do you want to skidaddle?");
+ 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);
return atv->audio_track();
}
+bool
+Editor::idle_do_import (vector<ustring> paths, ImportDisposition chns, ImportMode mode, SrcQuality quality, nframes64_t& pos)
+{
+ _do_import (paths, chns, mode, quality, pos);
+ return false;
+}
+
void
Editor::do_import (vector<ustring> paths, ImportDisposition chns, ImportMode mode, SrcQuality quality, nframes64_t& pos)
+{
+#ifdef GTKOSX
+ Glib::signal_idle().connect (bind (mem_fun (*this, &Editor::idle_do_import), paths, chns, mode, quality, pos));
+#else
+ _do_import (paths, chns, mode, quality, pos);
+#endif
+}
+
+void
+Editor::_do_import (vector<ustring> paths, ImportDisposition chns, ImportMode mode, SrcQuality quality, nframes64_t& pos)
{
boost::shared_ptr<AudioTrack> track;
vector<ustring> to_import;
build_interthread_progress_window ();
}
-
if (chns == Editing::ImportMergeFiles) {
/* create 1 region from all paths, add to 1 track,
ignore "track"
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;
import_status.replace_existing_source = 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));
+ track_canvas->get_window()->set_cursor (Gdk::Cursor (Gdk::WATCH));
ARDOUR_UI::instance()->flush_pending ();
/* start import thread for this spec. this will ultimately call Session::import_audiofile()
}
out:
- track_canvas.get_window()->set_cursor (*current_canvas_cursor);
+ track_canvas->get_window()->set_cursor (*current_canvas_cursor);
return 0;
}
SoundFileInfo finfo;
int ret = 0;
- track_canvas.get_window()->set_cursor (Gdk::Cursor (Gdk::WATCH));
+ track_canvas->get_window()->set_cursor (Gdk::Cursor (Gdk::WATCH));
ARDOUR_UI::instance()->flush_pending ();
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) {
+
+ cerr << "add embed/import source with defer_peaks = true\n";
+
source = boost::dynamic_pointer_cast<AudioFileSource> (SourceFactory::createReadable
(*session, path, n,
(mode == ImportAsTapeTrack ?
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;
}
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