diff options
| -rw-r--r-- | gtk2_ardour/ardour_ui.cc | 6 | ||||
| -rw-r--r-- | gtk2_ardour/editor_ops.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/export_range_markers_dialog.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/export_video_dialog.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/linux_vst_gui_support.cc | 5 | ||||
| -rw-r--r-- | gtk2_ardour/lxvst_plugin_ui.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/system_exec.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/utils_videotl.cc | 2 |
8 files changed, 12 insertions, 11 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 763b4070be..e80a61722b 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -753,7 +753,7 @@ ARDOUR_UI::starting () // wait for announce reply from nsm server for ( i = 0; i < 5000; ++i) { nsm->check (); - usleep (i); + Glib::usleep (i); if (nsm->is_active()) { break; } @@ -765,7 +765,7 @@ ARDOUR_UI::starting () // wait for open command from nsm server for ( i = 0; i < 5000; ++i) { nsm->check (); - usleep (1000); + Glib::usleep (1000); if (nsm->client_id ()) { break; } @@ -3506,7 +3506,7 @@ ARDOUR_UI::start_video_server (Gtk::Window* float_window, bool popup_msg) } int timeout = 120; // 6 sec while (!ARDOUR_UI::instance()->video_timeline->check_server()) { - usleep (50000); + Glib::usleep (50000); if (--timeout <= 0 || !video_server_process->is_running()) break; } if (timeout <= 0) { diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index 1a818f1c71..2c21418817 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -3481,7 +3481,7 @@ Editor::freeze_route () /* wait for just a little while, because the above call is asynchronous */ - ::usleep (250000); + Glib::usleep (250000); if (clicked_routeview == 0 || !clicked_routeview->is_audio_track()) { return; diff --git a/gtk2_ardour/export_range_markers_dialog.cc b/gtk2_ardour/export_range_markers_dialog.cc index 4b99162974..97a8dba25f 100644 --- a/gtk2_ardour/export_range_markers_dialog.cc +++ b/gtk2_ardour/export_range_markers_dialog.cc @@ -93,7 +93,7 @@ ExportRangeMarkersDialog::process_range_markers_export(Locations::LocationList& if(gtk_events_pending()){ gtk_main_iteration(); }else { - usleep(10000); + Glib::usleep(10000); } } diff --git a/gtk2_ardour/export_video_dialog.cc b/gtk2_ardour/export_video_dialog.cc index 67030cdad5..e88f9c5eff 100644 --- a/gtk2_ardour/export_video_dialog.cc +++ b/gtk2_ardour/export_video_dialog.cc @@ -572,7 +572,7 @@ ExportVideoDialog::launch_export () if (gtk_events_pending()) { gtk_main_iteration (); } else { - usleep (10000); + Glib::usleep (10000); } } audio_progress_connection.disconnect(); diff --git a/gtk2_ardour/linux_vst_gui_support.cc b/gtk2_ardour/linux_vst_gui_support.cc index 6eec688a7c..4d90bdd4aa 100644 --- a/gtk2_ardour/linux_vst_gui_support.cc +++ b/gtk2_ardour/linux_vst_gui_support.cc @@ -33,6 +33,7 @@ #include <pthread.h> #include <signal.h> #include <glib.h> +#include <glibmm/timer.h> #include "ardour/linux_vst_support.h" @@ -377,7 +378,7 @@ void* gui_event_loop (void* ptr) /*We don't want to use all the CPU.. */ - usleep(1000); + Glib::usleep(1000); LXVST_sched_event_timer++; @@ -706,7 +707,7 @@ vstfx_launch_editor (VSTState* vstfx) /*QUIRK - some plugins need a slight delay after opening the editor before you can ask the window size or they might return zero - specifically discoDSP */ - usleep(100000); + Glib::usleep(100000); /*Now we can find out how big the parent window should be (and try) to resize it*/ diff --git a/gtk2_ardour/lxvst_plugin_ui.cc b/gtk2_ardour/lxvst_plugin_ui.cc index d31038755b..e3335d4990 100644 --- a/gtk2_ardour/lxvst_plugin_ui.cc +++ b/gtk2_ardour/lxvst_plugin_ui.cc @@ -141,7 +141,7 @@ LXVSTPluginUI::get_XID () */ while (!(_vst->state()->been_activated)) { - usleep (1000); + Glib::usleep (1000); } int const id = _vst->state()->xid; diff --git a/gtk2_ardour/system_exec.cc b/gtk2_ardour/system_exec.cc index 59f3647e51..d0188d5b36 100644 --- a/gtk2_ardour/system_exec.cc +++ b/gtk2_ardour/system_exec.cc @@ -537,7 +537,7 @@ SystemExec::terminate () if (pid) { ::kill(pid, SIGTERM); - ::usleep(50000); + usleep(50000); sched_yield(); wait(WNOHANG); } diff --git a/gtk2_ardour/utils_videotl.cc b/gtk2_ardour/utils_videotl.cc index ed1bfad766..2e250b2cee 100644 --- a/gtk2_ardour/utils_videotl.cc +++ b/gtk2_ardour/utils_videotl.cc @@ -325,7 +325,7 @@ extern "C" { struct A3MemoryStruct chunk; long int httpstatus; if (status) *status = 0; - //usleep(500000); return NULL; // TEST & DEBUG + //Glib::usleep(500000); return NULL; // TEST & DEBUG if (strncmp("http://", u, 7)) return NULL; chunk.data=NULL; |