From a61f25dfe9dcf1f29852d917779529d26e762ea5 Mon Sep 17 00:00:00 2001 From: Nick Mainsbridge Date: Wed, 30 Aug 2006 20:48:16 +0000 Subject: ** requires svn jack ** Hardware monitoring should work, some canvas scrolling speed improvement, don't disconcertingly churn the disk if jack auto-start fails, mixer visibility state is saved per session, slow down meters a bit (too much?), zoom cleanups, remove some unused variables, use rwlock for tempo state for no reason other than that it might be useful one day, fix compiler warning. git-svn-id: svn://localhost/ardour2/trunk@873 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/gtkmm2ext/auto_spin.cc | 6 +++--- libs/gtkmm2ext/popup.cc | 8 ++++---- libs/gtkmm2ext/selector.cc | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) (limited to 'libs/gtkmm2ext') diff --git a/libs/gtkmm2ext/auto_spin.cc b/libs/gtkmm2ext/auto_spin.cc index ba2a3cf76e..2e051b5be8 100644 --- a/libs/gtkmm2ext/auto_spin.cc +++ b/libs/gtkmm2ext/auto_spin.cc @@ -51,7 +51,7 @@ void AutoSpin::stop_timer () { if (have_timer) { - gtk_timeout_remove (timeout_tag); + g_source_remove (timeout_tag); have_timer = false; } } @@ -151,7 +151,7 @@ AutoSpin::start_spinning (bool decrement, bool page) have_timer = true; timer_calls = 0; - timeout_tag = gtk_timeout_add (initial_timer_interval, + timeout_tag = g_timeout_add (initial_timer_interval, AutoSpin::_timer, this); } @@ -216,7 +216,7 @@ AutoSpin::timer () request a much more frequent update. */ - timeout_tag = gtk_timeout_add (timer_interval, + timeout_tag = g_timeout_add (timer_interval, _timer, this); have_timer = true; diff --git a/libs/gtkmm2ext/popup.cc b/libs/gtkmm2ext/popup.cc index a8ffc4af66..0b150eefe1 100644 --- a/libs/gtkmm2ext/popup.cc +++ b/libs/gtkmm2ext/popup.cc @@ -74,7 +74,7 @@ PopUp::remove () hide (); if (popdown_time != 0 && timeout != -1) { - gtk_timeout_remove (timeout); + g_source_remove (timeout); } if (delete_on_hide) { @@ -94,7 +94,7 @@ PopUp::touch () show_all (); if (popdown_time != 0) { - timeout = gtk_timeout_add (popdown_time, + timeout = g_timeout_add (popdown_time, remove_prompt_timeout, this); } @@ -127,12 +127,12 @@ PopUp::on_delete_event (GdkEventAny* ev) hide(); if (popdown_time != 0 && timeout != -1) { - gtk_timeout_remove (timeout); + g_source_remove (timeout); } if (delete_on_hide) { std::cerr << "deleting prompter\n" << endl; - gtk_idle_add (idle_delete, this); + g_idle_add (idle_delete, this); } return true; diff --git a/libs/gtkmm2ext/selector.cc b/libs/gtkmm2ext/selector.cc index 7302de66e7..ee9a5578ba 100644 --- a/libs/gtkmm2ext/selector.cc +++ b/libs/gtkmm2ext/selector.cc @@ -220,13 +220,13 @@ TreeView_Selector::on_button_press_event(GdkEventButton* ev) if (ev && (ev->type == GDK_BUTTON_RELEASE || ev->type == GDK_2BUTTON_PRESS)) { if (ev->state & Gdk::CONTROL_MASK) { - gtk_idle_add (Selector::_control_clicked, this); + g_idle_add (Selector::_control_clicked, this); } else if (ev->state & Gdk::SHIFT_MASK) { - gtk_idle_add (Selector::_shift_clicked, this); + g_idle_add (Selector::_shift_clicked, this); } else if (ev->type == GDK_2BUTTON_PRESS) { - gtk_idle_add (Selector::_accept, this); + g_idle_add (Selector::_accept, this); } else { - gtk_idle_add (Selector::_chosen, this); + g_idle_add (Selector::_chosen, this); } } -- cgit v1.2.3