From b6776d1102d06a1119f0d3445549cf2f97b59db3 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 27 Feb 2008 14:40:59 +0000 Subject: don't popup import progress window until we give import a chance to fail first; sndfile doesn't print open() errors if HAVE_COREAUDIO is set since we fall back to CoreAudio then git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3127 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/editor_audio_import.cc | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) (limited to 'gtk2_ardour') diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc index 2391eae927..0ecf360db4 100644 --- a/gtk2_ardour/editor_audio_import.cc +++ b/gtk2_ardour/editor_audio_import.cc @@ -22,6 +22,7 @@ #include #include #include +#include #include @@ -309,7 +310,6 @@ Editor::_do_import (vector paths, ImportDisposition chns, ImportMode mo build_interthread_progress_window (); } - if (chns == Editing::ImportMergeFiles) { /* create 1 region from all paths, add to 1 track, ignore "track" @@ -496,7 +496,6 @@ Editor::import_sndfiles (vector paths, ImportMode mode, SrcQuality qual 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; @@ -510,7 +509,7 @@ Editor::import_sndfiles (vector paths, ImportMode mode, SrcQuality qual 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)); ARDOUR_UI::instance()->flush_pending (); @@ -880,6 +879,13 @@ Editor::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) { @@ -892,9 +898,20 @@ Editor::import_progress_timeout (void *arg) 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); + } } -- cgit v1.2.3