diff options
Diffstat (limited to 'gtk2_ardour/editor_audio_import.cc')
| -rw-r--r-- | gtk2_ardour/editor_audio_import.cc | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc index fb1e101f24..647abae153 100644 --- a/gtk2_ardour/editor_audio_import.cc +++ b/gtk2_ardour/editor_audio_import.cc @@ -52,7 +52,6 @@ #include "audio_time_axis.h" #include "midi_time_axis.h" #include "session_import_dialog.h" -#include "utils.h" #include "gui_thread.h" #include "interthread_progress_window.h" #include "mouse_cursors.h" @@ -528,8 +527,8 @@ Editor::embed_sndfiles (vector<string> paths, bool multifile, SoundFileInfo finfo; int ret = 0; - set_canvas_cursor (_cursors->wait); - gdk_flush (); + push_canvas_cursor (_cursors->wait); + gdk_flush (); for (vector<string>::iterator p = paths.begin(); p != paths.end(); ++p) { @@ -601,8 +600,6 @@ Editor::embed_sndfiles (vector<string> paths, bool multifile, } } - set_canvas_cursor (_cursors->wait); - for (int n = 0; n < finfo.channels; ++n) { try { @@ -632,7 +629,7 @@ Editor::embed_sndfiles (vector<string> paths, bool multifile, goto out; } - ARDOUR_UI::instance()->flush_pending (); + gtk_main_iteration(); } } @@ -644,7 +641,7 @@ Editor::embed_sndfiles (vector<string> paths, bool multifile, ret = add_sources (paths, sources, pos, disposition, mode, target_regions, target_tracks, track, true); out: - set_canvas_cursor (current_canvas_cursor); + pop_canvas_cursor (); return ret; } |