Use std::function QueuedFunc overloads

Author: jlindgren90

src/cdaudio/cdaudio-ng.cc

@@ -190,7 +190,7 @@ static void purge_playlist (Playlist playlist)
 }
 
 /* main thread only */
-static void purge_all_playlists (void * = nullptr)
+static void purge_all_playlists ()
 {
     int playlists = Playlist::n_playlists ();
 
@@ -759,7 +759,7 @@ static bool refresh_trackinfo (bool warning)
 
 fail:
     reset_trackinfo ();
-    purge_func.queue (purge_all_playlists, nullptr);
+    purge_func.queue (purge_all_playlists);
     return false;
 }
 

src/gtkui/ui_gtk.cc

@@ -198,7 +198,7 @@ static void button_add_pressed ()
     audgui_run_filebrowser (false);
 }
 
-static void title_change (void * = nullptr)
+static void title_change ()
 {
     delayed_title_change.stop ();
 
@@ -435,7 +435,7 @@ static void ui_playback_begin ()
 
     /* If "title change" is not called by 1/4 second after starting playback,
      * show "Buffering ..." as the window title. */
-    delayed_title_change.queue (250, title_change, nullptr);
+    delayed_title_change.queue (250, title_change);
 }
 
 static void ui_playback_ready ()

src/gtkui/ui_playlist_widget.cc

@@ -272,7 +272,7 @@ static void popup_trigger (PlaylistWidgetData * data, int pos)
 
     data->popup_pos = pos;
     data->popup_timer.queue (aud_get_int ("filepopup_delay") * 100,
-     aud::obj_member<PlaylistWidgetData, & PlaylistWidgetData::show_popup>, data);
+     [data] () { data->show_popup (); });
 }
 
 static void mouse_motion (void * user, GdkEventMotion * event, int row)

src/gtkui/ui_statusbar.cc

@@ -108,15 +108,15 @@ static void no_advance_toggled (void *, void * label)
     else
         gtk_label_set_text ((GtkLabel *) label, _("Playlist mode."));
 
-    clear_timeout.start (1000, clear_message, label);
+    clear_timeout.start (1000, std::bind (clear_message, label));
 }
 
 static void stop_after_song_toggled (void *, void * label)
 {
     if (aud_get_bool ("stop_after_current_song"))
         gtk_label_set_text ((GtkLabel *) label, _("Stopping after song."));
 
-    clear_timeout.start (1000, clear_message, label);
+    clear_timeout.start (1000, std::bind (clear_message, label));
 }
 
 static void ui_statusbar_destroy_cb ()

src/qtui/main_window.cc

@@ -373,12 +373,9 @@ void MainWindow::playback_begin_cb()
 
     m_last_playing = playing;
 
-    m_buffering_timer.queue(
-        250, aud::obj_member<MainWindow, &MainWindow::buffering_cb>, this);
+    m_buffering_timer.queue(250, [this]() { set_title(_("Buffering ...")); });
 }
 
-void MainWindow::buffering_cb() { set_title(_("Buffering ...")); }
-
 void MainWindow::pause_cb()
 {
     update_play_pause();

src/qtui/main_window.h

@@ -72,7 +72,6 @@ class MainWindow : public QMainWindow, audqt::DockHost
 
     void title_change_cb();
     void playback_begin_cb();
-    void buffering_cb();
     void playback_ready_cb();
     void pause_cb();
     void playback_stop_cb();

src/qtui/playlist-qt.cc

@@ -529,9 +529,8 @@ void PlaylistWidget::triggerPopup(int pos)
     audqt::infopopup_hide();
 
     m_popup_pos = pos;
-    m_popup_timer.queue(
-        aud_get_int("filepopup_delay") * 100,
-        aud::obj_member<PlaylistWidget, &PlaylistWidget::showPopup>, this);
+    m_popup_timer.queue(aud_get_int("filepopup_delay") * 100,
+                        [this]() { showPopup(); });
 }
 
 void PlaylistWidget::hidePopup()

src/qtui/status_bar.cc

@@ -74,15 +74,6 @@ static aud::spinlock message_lock;
 static int current_message_level = -1;
 static unsigned current_message_serial = 0;
 
-static void one_second_cb(void * serial)
-{
-    auto lh = message_lock.take();
-
-    /* allow new messages after one second */
-    if (aud::from_ptr<unsigned>(serial) == current_message_serial)
-        current_message_level = -1;
-}
-
 static bool set_message_level(audlog::Level level)
 {
     auto lh = message_lock.take();
@@ -94,8 +85,15 @@ static bool set_message_level(audlog::Level level)
     current_message_level = level;
     current_message_serial++;
 
-    message_func.queue(1000, one_second_cb,
-                       aud::to_ptr(current_message_serial));
+    unsigned serial = current_message_serial;
+    message_func.queue(1000, [serial]() {
+        auto lh = message_lock.take();
+
+        /* allow new messages after one second */
+        if (current_message_serial == serial)
+            current_message_level = -1;
+    });
+
     return true;
 }
 

src/search-tool-qt/search-tool-qt.cc

@@ -336,8 +336,7 @@ void SearchWidget::search_timeout ()
 
 void SearchWidget::trigger_search ()
 {
-    m_search_timer.queue (SEARCH_DELAY,
-     aud::obj_member<SearchWidget, & SearchWidget::search_timeout>, this);
+    m_search_timer.queue (SEARCH_DELAY, [this] () { search_timeout (); });
     m_search_pending = true;
 }
 

src/search-tool/search-tool.cc

@@ -132,7 +132,7 @@ static void show_hide_widgets ()
     }
 }
 
-static void search_timeout (void * = nullptr)
+static void search_timeout ()
 {
     const char * text = gtk_entry_get_text ((GtkEntry *) entry);
     auto terms = str_list_to_index (str_tolower_utf8 (text), " ");
@@ -164,7 +164,7 @@ static void search_timeout (void * = nullptr)
 
 static void trigger_search ()
 {
-    s_search_timer.queue (SEARCH_DELAY, search_timeout, nullptr);
+    s_search_timer.queue (SEARCH_DELAY, search_timeout);
     s_search_pending = true;
 }
 
@@ -403,7 +403,7 @@ static const AudguiListCallbacks list_callbacks = {
 
 static void entry_cb (GtkEntry * entry, void * unused)
 {
-    s_search_timer.queue (SEARCH_DELAY, search_timeout, nullptr);
+    s_search_timer.queue (SEARCH_DELAY, search_timeout);
     s_search_pending = true;
 }