get rid of DDB_ACTION_CALLBACK macro

3 files changed, 4 insertions, 5 deletions

diff --git a/deadbeef.h b/deadbeef.h
index bde793ab..8444b596 100644
--- a/deadbeef.h
+++ b/deadbeef.h
@@ -844,7 +844,6 @@ enum {
 struct DB_plugin_action_s;
 
 typedef int (*DB_plugin_action_callback_t) (struct DB_plugin_action_s *action, int ctx);
-#define DDB_ACTION_CALLBACK(x)((int (*)(struct DB_plugin_action_s *action, int ctx))x)
 
 typedef struct DB_plugin_action_s {
     const char *title;
diff --git a/plugins/converter/convgui.c b/plugins/converter/convgui.c
index 302c31fb..b44a1c1e 100644
--- a/plugins/converter/convgui.c
+++ b/plugins/converter/convgui.c
@@ -1432,7 +1432,7 @@ static DB_plugin_action_t convert_action = {
     .title = "Convert",
     .name = "convert",
     .flags = DB_ACTION_MULTIPLE_TRACKS | DB_ACTION_SINGLE_TRACK,
-    .callback = DDB_ACTION_CALLBACK(converter_show),
+    .callback = converter_show,
     .next = NULL
 };
 
diff --git a/plugins/lastfm/lastfm.c b/plugins/lastfm/lastfm.c
index 339587dd..c5c9c313 100644
--- a/plugins/lastfm/lastfm.c
+++ b/plugins/lastfm/lastfm.c
@@ -935,7 +935,7 @@ out:
 }
 
 static int
-lfm_action_love (DB_plugin_action_t *act, DB_playItem_t *it)
+lfm_action_love (DB_plugin_action_t *act, int ctx)
 {
     printf ("Love starts here\n");
     return 0;
@@ -945,7 +945,7 @@ static DB_plugin_action_t love_action = {
     .title = "Love at Last.fm",
     .name = "lfm_love",
     .flags = DB_ACTION_SINGLE_TRACK,
-    .callback = DDB_ACTION_CALLBACK(lfm_action_love),
+    .callback = lfm_action_love,
     .next = NULL
 };
 
@@ -953,7 +953,7 @@ static DB_plugin_action_t lookup_action = {
     .title = "Lookup on Last.fm",
     .name = "lfm_lookup",
     .flags = DB_ACTION_SINGLE_TRACK,
-    .callback = DDB_ACTION_CALLBACK (lfm_action_lookup),
+    .callback = lfm_action_lookup,
     .next = NULL// &love_action
 };