From 4a2432f593c1a71fc7fe0a20341d23f4af8f47fb Mon Sep 17 00:00:00 2001 From: Stefan Schmidt Date: Tue, 7 Apr 2015 17:26:37 +0200 Subject: [PATCH] music-control: Generate eldbus files during compile Better have up to date eldbus files generated from the xml instead of keeping the generated files around. --- src/modules/Makefile_music_control.mk | 22 +- src/modules/music-control/.gitignore | 5 + .../gen/eldbus_media_player2_player.c | 933 ------------------ .../gen/eldbus_media_player2_player.h | 47 - .../gen/eldbus_mpris_media_player2.c | 352 ------- .../gen/eldbus_mpris_media_player2.h | 22 - src/modules/music-control/gen/eldbus_utils.h | 24 - .../music-control/{gen => }/introspect.xml | 0 src/modules/music-control/private.h | 4 +- 9 files changed, 23 insertions(+), 1386 deletions(-) create mode 100644 src/modules/music-control/.gitignore delete mode 100644 src/modules/music-control/gen/eldbus_media_player2_player.c delete mode 100644 src/modules/music-control/gen/eldbus_media_player2_player.h delete mode 100644 src/modules/music-control/gen/eldbus_mpris_media_player2.c delete mode 100644 src/modules/music-control/gen/eldbus_mpris_media_player2.h delete mode 100644 src/modules/music-control/gen/eldbus_utils.h rename src/modules/music-control/{gen => }/introspect.xml (100%) diff --git a/src/modules/Makefile_music_control.mk b/src/modules/Makefile_music_control.mk index adcaa1859..aedd4856e 100644 --- a/src/modules/Makefile_music_control.mk +++ b/src/modules/Makefile_music_control.mk @@ -1,9 +1,23 @@ EXTRA_DIST += src/modules/music-control/module.desktop.in \ -src/modules/music-control/e-module-music-control.edj +src/modules/music-control/e-module-music-control.edj \ +src/modules/music-control/introspect.xml + music_controldir = $(MDIR)/music-control music_control_DATA = src/modules/music-control/module.desktop \ src/modules/music-control/e-module-music-control.edj +MUSIC_GEN = \ +src/modules/music-control/eldbus_media_player2_player.c \ +src/modules/music-control/eldbus_media_player2_player.h \ +src/modules/music-control/eldbus_mpris_media_player2.c \ +src/modules/music-control/eldbus_mpris_media_player2.h \ +src/modules/music-control/eldbus_utils.h + +MAINTAINERCLEANFILES += $(MUSIC_GEN) + +$(MUSIC_GEN): src/modules/music-control/introspect.xml + @cd $(top_builddir)/src/modules/music-control && \ + eldbus-codegen $(abs_top_srcdir)/src/modules/music-control/introspect.xml music_controlpkgdir = $(MDIR)/music-control/$(MODULE_ARCH) music_controlpkg_LTLIBRARIES = src/modules/music-control/module.la @@ -17,11 +31,7 @@ src/modules/music-control/e_mod_main.h \ src/modules/music-control/e_mod_main.c \ src/modules/music-control/private.h \ src/modules/music-control/ui.c \ -src/modules/music-control/gen/eldbus_utils.h \ -src/modules/music-control/gen/eldbus_media_player2_player.c \ -src/modules/music-control/gen/eldbus_media_player2_player.h \ -src/modules/music-control/gen/eldbus_mpris_media_player2.c \ -src/modules/music-control/gen/eldbus_mpris_media_player2.h +$(MUSIC_GEN) PHONIES += music-control install-music-control music-control: $(music_controlpkg_LTLIBRARIES) $(music_control_DATA) diff --git a/src/modules/music-control/.gitignore b/src/modules/music-control/.gitignore new file mode 100644 index 000000000..00cb35d59 --- /dev/null +++ b/src/modules/music-control/.gitignore @@ -0,0 +1,5 @@ +/eldbus_media_player2_player.c +/eldbus_media_player2_player.h +/eldbus_mpris_media_player2.c +/eldbus_mpris_media_player2.h +/eldbus_utils.h diff --git a/src/modules/music-control/gen/eldbus_media_player2_player.c b/src/modules/music-control/gen/eldbus_media_player2_player.c deleted file mode 100644 index 8e7d0d994..000000000 --- a/src/modules/music-control/gen/eldbus_media_player2_player.c +++ /dev/null @@ -1,933 +0,0 @@ -#include "eldbus_media_player2_player.h" - -static int _log_main = -1; -#undef ERR -#define ERR(...) EINA_LOG_DOM_ERR(_log_main, __VA_ARGS__); -int MEDIA_PLAYER2_PLAYER_SEEKED_EVENT = 0; - -void -media_player2_player_next_call(Eldbus_Proxy *proxy) -{ - Eldbus_Message *msg; - EINA_SAFETY_ON_NULL_RETURN(proxy); - msg = eldbus_proxy_method_call_new(proxy, "Next"); - if (!eldbus_message_arguments_append(msg, "")) - { - ERR("Error: Filling message."); - eldbus_message_unref(msg); - return; - } - eldbus_proxy_send(proxy, msg, NULL, NULL, -1); -} - -void -media_player2_player_open_uri_call(Eldbus_Proxy *proxy, const char *arg0) -{ - Eldbus_Message *msg; - EINA_SAFETY_ON_NULL_RETURN(proxy); - msg = eldbus_proxy_method_call_new(proxy, "OpenUri"); - if (!eldbus_message_arguments_append(msg, "s", arg0)) - { - ERR("Error: Filling message."); - eldbus_message_unref(msg); - return; - } - eldbus_proxy_send(proxy, msg, NULL, NULL, -1); -} - -void -media_player2_player_pause_call(Eldbus_Proxy *proxy) -{ - Eldbus_Message *msg; - EINA_SAFETY_ON_NULL_RETURN(proxy); - msg = eldbus_proxy_method_call_new(proxy, "Pause"); - if (!eldbus_message_arguments_append(msg, "")) - { - ERR("Error: Filling message."); - eldbus_message_unref(msg); - return; - } - eldbus_proxy_send(proxy, msg, NULL, NULL, -1); -} - -void -media_player2_player_play_call(Eldbus_Proxy *proxy) -{ - Eldbus_Message *msg; - EINA_SAFETY_ON_NULL_RETURN(proxy); - msg = eldbus_proxy_method_call_new(proxy, "Play"); - if (!eldbus_message_arguments_append(msg, "")) - { - ERR("Error: Filling message."); - eldbus_message_unref(msg); - return; - } - eldbus_proxy_send(proxy, msg, NULL, NULL, -1); -} - -void -media_player2_player_play_pause_call(Eldbus_Proxy *proxy) -{ - Eldbus_Message *msg; - EINA_SAFETY_ON_NULL_RETURN(proxy); - msg = eldbus_proxy_method_call_new(proxy, "PlayPause"); - if (!eldbus_message_arguments_append(msg, "")) - { - ERR("Error: Filling message."); - eldbus_message_unref(msg); - return; - } - eldbus_proxy_send(proxy, msg, NULL, NULL, -1); -} - -void -media_player2_player_previous_call(Eldbus_Proxy *proxy) -{ - Eldbus_Message *msg; - EINA_SAFETY_ON_NULL_RETURN(proxy); - msg = eldbus_proxy_method_call_new(proxy, "Previous"); - if (!eldbus_message_arguments_append(msg, "")) - { - ERR("Error: Filling message."); - eldbus_message_unref(msg); - return; - } - eldbus_proxy_send(proxy, msg, NULL, NULL, -1); -} - -void -media_player2_player_seek_call(Eldbus_Proxy *proxy, int64_t arg0) -{ - Eldbus_Message *msg; - EINA_SAFETY_ON_NULL_RETURN(proxy); - msg = eldbus_proxy_method_call_new(proxy, "Seek"); - if (!eldbus_message_arguments_append(msg, "x", arg0)) - { - ERR("Error: Filling message."); - eldbus_message_unref(msg); - return; - } - eldbus_proxy_send(proxy, msg, NULL, NULL, -1); -} - -void -media_player2_player_set_position_call(Eldbus_Proxy *proxy, const char *arg0, int64_t arg1) -{ - Eldbus_Message *msg; - EINA_SAFETY_ON_NULL_RETURN(proxy); - msg = eldbus_proxy_method_call_new(proxy, "SetPosition"); - if (!eldbus_message_arguments_append(msg, "ox", arg0, arg1)) - { - ERR("Error: Filling message."); - eldbus_message_unref(msg); - return; - } - eldbus_proxy_send(proxy, msg, NULL, NULL, -1); -} - -void -media_player2_player_stop_call(Eldbus_Proxy *proxy) -{ - Eldbus_Message *msg; - EINA_SAFETY_ON_NULL_RETURN(proxy); - msg = eldbus_proxy_method_call_new(proxy, "Stop"); - if (!eldbus_message_arguments_append(msg, "")) - { - ERR("Error: Filling message."); - eldbus_message_unref(msg); - return; - } - eldbus_proxy_send(proxy, msg, NULL, NULL, -1); -} - -static void -media_player2_player_seeked_data_free(void *user_data EINA_UNUSED, void *func_data) -{ - Media_Player2_Player_Seeked_Data *s_data = func_data; - free(s_data); -} - -static void -on_media_player2_player_seeked(void *data, const Eldbus_Message *msg) -{ - Eldbus_Proxy *proxy = data; - Media_Player2_Player_Seeked_Data *s_data = calloc(1, sizeof(Media_Player2_Player_Seeked_Data)); - s_data->proxy = proxy; - if (!eldbus_message_arguments_get(msg, "x", &s_data->arg0)) - { - ERR("Error: Getting arguments from message."); - free(s_data); - return; - } - ecore_event_add(MEDIA_PLAYER2_PLAYER_SEEKED_EVENT, s_data, media_player2_player_seeked_data_free, NULL); -} - -static void -cb_media_player2_player_can_control(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending) -{ - void *user_data = eldbus_pending_data_del(pending, "__user_data"); - const char *error, *error_msg; - Eldbus_Codegen_Property_Bool_Get_Cb cb = data; - Eldbus_Proxy *proxy = eldbus_pending_data_del(pending, "__proxy"); - Eldbus_Message_Iter *variant; - Eina_Bool v; - if (eldbus_message_error_get(msg, &error, &error_msg)) - { - Eldbus_Error_Info error_info = {error, error_msg}; - cb(user_data, pending, "CanControl", proxy, &error_info, 0); - return; - } - if (!eldbus_message_arguments_get(msg, "v", &variant)) - { - Eldbus_Error_Info error_info = {"", ""}; - cb(user_data, pending, "CanControl", proxy, &error_info, 0); - return; - } - if (!eldbus_message_iter_arguments_get(variant, "b", &v)) - { - Eldbus_Error_Info error_info = {"", ""}; - cb(user_data, pending, "CanControl", proxy, &error_info, 0); - return; - } - cb(user_data, pending, "CanControl", proxy, NULL, v); -} - -Eldbus_Pending * -media_player2_player_can_control_propget(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_Bool_Get_Cb cb, const void *data) -{ - Eldbus_Pending *p; - EINA_SAFETY_ON_NULL_RETURN_VAL(proxy, NULL); - p = eldbus_proxy_property_get(proxy, "CanControl", cb_media_player2_player_can_control, cb); - if (data) - eldbus_pending_data_set(p, "__user_data", data); - eldbus_pending_data_set(p, "__proxy", proxy); - return p; -} - -static void -cb_media_player2_player_can_go_next(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending) -{ - void *user_data = eldbus_pending_data_del(pending, "__user_data"); - const char *error, *error_msg; - Eldbus_Codegen_Property_Bool_Get_Cb cb = data; - Eldbus_Proxy *proxy = eldbus_pending_data_del(pending, "__proxy"); - Eldbus_Message_Iter *variant; - Eina_Bool v; - if (eldbus_message_error_get(msg, &error, &error_msg)) - { - Eldbus_Error_Info error_info = {error, error_msg}; - cb(user_data, pending, "CanGoNext", proxy, &error_info, 0); - return; - } - if (!eldbus_message_arguments_get(msg, "v", &variant)) - { - Eldbus_Error_Info error_info = {"", ""}; - cb(user_data, pending, "CanGoNext", proxy, &error_info, 0); - return; - } - if (!eldbus_message_iter_arguments_get(variant, "b", &v)) - { - Eldbus_Error_Info error_info = {"", ""}; - cb(user_data, pending, "CanGoNext", proxy, &error_info, 0); - return; - } - cb(user_data, pending, "CanGoNext", proxy, NULL, v); -} - -Eldbus_Pending * -media_player2_player_can_go_next_propget(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_Bool_Get_Cb cb, const void *data) -{ - Eldbus_Pending *p; - EINA_SAFETY_ON_NULL_RETURN_VAL(proxy, NULL); - p = eldbus_proxy_property_get(proxy, "CanGoNext", cb_media_player2_player_can_go_next, cb); - if (data) - eldbus_pending_data_set(p, "__user_data", data); - eldbus_pending_data_set(p, "__proxy", proxy); - return p; -} - -static void -cb_media_player2_player_can_go_previous(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending) -{ - void *user_data = eldbus_pending_data_del(pending, "__user_data"); - const char *error, *error_msg; - Eldbus_Codegen_Property_Bool_Get_Cb cb = data; - Eldbus_Proxy *proxy = eldbus_pending_data_del(pending, "__proxy"); - Eldbus_Message_Iter *variant; - Eina_Bool v; - if (eldbus_message_error_get(msg, &error, &error_msg)) - { - Eldbus_Error_Info error_info = {error, error_msg}; - cb(user_data, pending, "CanGoPrevious", proxy, &error_info, 0); - return; - } - if (!eldbus_message_arguments_get(msg, "v", &variant)) - { - Eldbus_Error_Info error_info = {"", ""}; - cb(user_data, pending, "CanGoPrevious", proxy, &error_info, 0); - return; - } - if (!eldbus_message_iter_arguments_get(variant, "b", &v)) - { - Eldbus_Error_Info error_info = {"", ""}; - cb(user_data, pending, "CanGoPrevious", proxy, &error_info, 0); - return; - } - cb(user_data, pending, "CanGoPrevious", proxy, NULL, v); -} - -Eldbus_Pending * -media_player2_player_can_go_previous_propget(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_Bool_Get_Cb cb, const void *data) -{ - Eldbus_Pending *p; - EINA_SAFETY_ON_NULL_RETURN_VAL(proxy, NULL); - p = eldbus_proxy_property_get(proxy, "CanGoPrevious", cb_media_player2_player_can_go_previous, cb); - if (data) - eldbus_pending_data_set(p, "__user_data", data); - eldbus_pending_data_set(p, "__proxy", proxy); - return p; -} - -static void -cb_media_player2_player_can_pause(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending) -{ - void *user_data = eldbus_pending_data_del(pending, "__user_data"); - const char *error, *error_msg; - Eldbus_Codegen_Property_Bool_Get_Cb cb = data; - Eldbus_Proxy *proxy = eldbus_pending_data_del(pending, "__proxy"); - Eldbus_Message_Iter *variant; - Eina_Bool v; - if (eldbus_message_error_get(msg, &error, &error_msg)) - { - Eldbus_Error_Info error_info = {error, error_msg}; - cb(user_data, pending, "CanPause", proxy, &error_info, 0); - return; - } - if (!eldbus_message_arguments_get(msg, "v", &variant)) - { - Eldbus_Error_Info error_info = {"", ""}; - cb(user_data, pending, "CanPause", proxy, &error_info, 0); - return; - } - if (!eldbus_message_iter_arguments_get(variant, "b", &v)) - { - Eldbus_Error_Info error_info = {"", ""}; - cb(user_data, pending, "CanPause", proxy, &error_info, 0); - return; - } - cb(user_data, pending, "CanPause", proxy, NULL, v); -} - -Eldbus_Pending * -media_player2_player_can_pause_propget(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_Bool_Get_Cb cb, const void *data) -{ - Eldbus_Pending *p; - EINA_SAFETY_ON_NULL_RETURN_VAL(proxy, NULL); - p = eldbus_proxy_property_get(proxy, "CanPause", cb_media_player2_player_can_pause, cb); - if (data) - eldbus_pending_data_set(p, "__user_data", data); - eldbus_pending_data_set(p, "__proxy", proxy); - return p; -} - -static void -cb_media_player2_player_can_play(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending) -{ - void *user_data = eldbus_pending_data_del(pending, "__user_data"); - const char *error, *error_msg; - Eldbus_Codegen_Property_Bool_Get_Cb cb = data; - Eldbus_Proxy *proxy = eldbus_pending_data_del(pending, "__proxy"); - Eldbus_Message_Iter *variant; - Eina_Bool v; - if (eldbus_message_error_get(msg, &error, &error_msg)) - { - Eldbus_Error_Info error_info = {error, error_msg}; - cb(user_data, pending, "CanPlay", proxy, &error_info, 0); - return; - } - if (!eldbus_message_arguments_get(msg, "v", &variant)) - { - Eldbus_Error_Info error_info = {"", ""}; - cb(user_data, pending, "CanPlay", proxy, &error_info, 0); - return; - } - if (!eldbus_message_iter_arguments_get(variant, "b", &v)) - { - Eldbus_Error_Info error_info = {"", ""}; - cb(user_data, pending, "CanPlay", proxy, &error_info, 0); - return; - } - cb(user_data, pending, "CanPlay", proxy, NULL, v); -} - -Eldbus_Pending * -media_player2_player_can_play_propget(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_Bool_Get_Cb cb, const void *data) -{ - Eldbus_Pending *p; - EINA_SAFETY_ON_NULL_RETURN_VAL(proxy, NULL); - p = eldbus_proxy_property_get(proxy, "CanPlay", cb_media_player2_player_can_play, cb); - if (data) - eldbus_pending_data_set(p, "__user_data", data); - eldbus_pending_data_set(p, "__proxy", proxy); - return p; -} - -static void -cb_media_player2_player_can_seek(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending) -{ - void *user_data = eldbus_pending_data_del(pending, "__user_data"); - const char *error, *error_msg; - Eldbus_Codegen_Property_Bool_Get_Cb cb = data; - Eldbus_Proxy *proxy = eldbus_pending_data_del(pending, "__proxy"); - Eldbus_Message_Iter *variant; - Eina_Bool v; - if (eldbus_message_error_get(msg, &error, &error_msg)) - { - Eldbus_Error_Info error_info = {error, error_msg}; - cb(user_data, pending, "CanSeek", proxy, &error_info, 0); - return; - } - if (!eldbus_message_arguments_get(msg, "v", &variant)) - { - Eldbus_Error_Info error_info = {"", ""}; - cb(user_data, pending, "CanSeek", proxy, &error_info, 0); - return; - } - if (!eldbus_message_iter_arguments_get(variant, "b", &v)) - { - Eldbus_Error_Info error_info = {"", ""}; - cb(user_data, pending, "CanSeek", proxy, &error_info, 0); - return; - } - cb(user_data, pending, "CanSeek", proxy, NULL, v); -} - -Eldbus_Pending * -media_player2_player_can_seek_propget(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_Bool_Get_Cb cb, const void *data) -{ - Eldbus_Pending *p; - EINA_SAFETY_ON_NULL_RETURN_VAL(proxy, NULL); - p = eldbus_proxy_property_get(proxy, "CanSeek", cb_media_player2_player_can_seek, cb); - if (data) - eldbus_pending_data_set(p, "__user_data", data); - eldbus_pending_data_set(p, "__proxy", proxy); - return p; -} - -static void -cb_media_player2_player_loop_status(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending) -{ - void *user_data = eldbus_pending_data_del(pending, "__user_data"); - const char *error, *error_msg; - Eldbus_Codegen_Property_String_Get_Cb cb = data; - Eldbus_Proxy *proxy = eldbus_pending_data_del(pending, "__proxy"); - Eldbus_Message_Iter *variant; - const char *v; - if (eldbus_message_error_get(msg, &error, &error_msg)) - { - Eldbus_Error_Info error_info = {error, error_msg}; - cb(user_data, pending, "LoopStatus", proxy, &error_info, NULL); - return; - } - if (!eldbus_message_arguments_get(msg, "v", &variant)) - { - Eldbus_Error_Info error_info = {"", ""}; - cb(user_data, pending, "LoopStatus", proxy, &error_info, NULL); - return; - } - if (!eldbus_message_iter_arguments_get(variant, "s", &v)) - { - Eldbus_Error_Info error_info = {"", ""}; - cb(user_data, pending, "LoopStatus", proxy, &error_info, NULL); - return; - } - cb(user_data, pending, "LoopStatus", proxy, NULL, v); -} - -Eldbus_Pending * -media_player2_player_loop_status_propget(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_String_Get_Cb cb, const void *data) -{ - Eldbus_Pending *p; - EINA_SAFETY_ON_NULL_RETURN_VAL(proxy, NULL); - p = eldbus_proxy_property_get(proxy, "LoopStatus", cb_media_player2_player_loop_status, cb); - if (data) - eldbus_pending_data_set(p, "__user_data", data); - eldbus_pending_data_set(p, "__proxy", proxy); - return p; -} - -static void -cb_media_player2_player_loop_status_set(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending) -{ - const char *error, *error_msg; - void *user_data = eldbus_pending_data_del(pending, "__user_data"); - Eldbus_Proxy *proxy = eldbus_pending_data_del(pending, "__proxy"); - Eldbus_Codegen_Property_Set_Cb cb = data; - if (eldbus_message_error_get(msg, &error, &error_msg)) { - Eldbus_Error_Info error_info = {error, error_msg}; - - cb(user_data, "LoopStatus", proxy, pending, &error_info); - return; - } - cb(user_data, "LoopStatus", proxy, pending, NULL); -} - -Eldbus_Pending * -media_player2_player_loop_status_propset(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_Set_Cb cb, const void *data, const void *value) -{ - Eldbus_Pending *p; - EINA_SAFETY_ON_NULL_RETURN_VAL(proxy, NULL); - EINA_SAFETY_ON_NULL_RETURN_VAL(value, NULL); - p = eldbus_proxy_property_set(proxy, "LoopStatus", "s", value, cb_media_player2_player_loop_status_set, cb); - eldbus_pending_data_set(p, "__user_data", data); - eldbus_pending_data_set(p, "__proxy", proxy); - return p; -} - -static void -cb_media_player2_player_maximum_rate(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending) -{ - void *user_data = eldbus_pending_data_del(pending, "__user_data"); - const char *error, *error_msg; - Eldbus_Codegen_Property_Double_Get_Cb cb = data; - Eldbus_Proxy *proxy = eldbus_pending_data_del(pending, "__proxy"); - Eldbus_Message_Iter *variant; - double v; - if (eldbus_message_error_get(msg, &error, &error_msg)) - { - Eldbus_Error_Info error_info = {error, error_msg}; - cb(user_data, pending, "MaximumRate", proxy, &error_info, 0); - return; - } - if (!eldbus_message_arguments_get(msg, "v", &variant)) - { - Eldbus_Error_Info error_info = {"", ""}; - cb(user_data, pending, "MaximumRate", proxy, &error_info, 0); - return; - } - if (!eldbus_message_iter_arguments_get(variant, "d", &v)) - { - Eldbus_Error_Info error_info = {"", ""}; - cb(user_data, pending, "MaximumRate", proxy, &error_info, 0); - return; - } - cb(user_data, pending, "MaximumRate", proxy, NULL, v); -} - -Eldbus_Pending * -media_player2_player_maximum_rate_propget(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_Double_Get_Cb cb, const void *data) -{ - Eldbus_Pending *p; - EINA_SAFETY_ON_NULL_RETURN_VAL(proxy, NULL); - p = eldbus_proxy_property_get(proxy, "MaximumRate", cb_media_player2_player_maximum_rate, cb); - if (data) - eldbus_pending_data_set(p, "__user_data", data); - eldbus_pending_data_set(p, "__proxy", proxy); - return p; -} - -static void -cb_media_player2_player_metadata(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending) -{ - void *user_data = eldbus_pending_data_del(pending, "__user_data"); - const char *error, *error_msg; - Eldbus_Codegen_Property_Complex_Get_Cb cb = data; - Eldbus_Proxy *proxy = eldbus_pending_data_del(pending, "__proxy"); - Eldbus_Message_Iter *variant; - Eina_Value *v, stack_value; - if (eldbus_message_error_get(msg, &error, &error_msg)) - { - Eldbus_Error_Info error_info = {error, error_msg}; - cb(user_data, pending, "Metadata", proxy, &error_info, NULL); - return; - } - if (!eldbus_message_arguments_get(msg, "v", &variant)) - { - Eldbus_Error_Info error_info = {"", ""}; - cb(user_data, pending, "Metadata", proxy, &error_info, NULL); - return; - } - v = eldbus_message_iter_struct_like_to_eina_value(variant); - eina_value_struct_value_get(v, "arg0", &stack_value); - cb(user_data, pending, "Metadata", proxy, NULL, &stack_value); - eina_value_flush(&stack_value); - eina_value_free(v); -} - -Eldbus_Pending * -media_player2_player_metadata_propget(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_Complex_Get_Cb cb, const void *data) -{ - Eldbus_Pending *p; - EINA_SAFETY_ON_NULL_RETURN_VAL(proxy, NULL); - p = eldbus_proxy_property_get(proxy, "Metadata", cb_media_player2_player_metadata, cb); - if (data) - eldbus_pending_data_set(p, "__user_data", data); - eldbus_pending_data_set(p, "__proxy", proxy); - return p; -} - -static void -cb_media_player2_player_minimum_rate(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending) -{ - void *user_data = eldbus_pending_data_del(pending, "__user_data"); - const char *error, *error_msg; - Eldbus_Codegen_Property_Double_Get_Cb cb = data; - Eldbus_Proxy *proxy = eldbus_pending_data_del(pending, "__proxy"); - Eldbus_Message_Iter *variant; - double v; - if (eldbus_message_error_get(msg, &error, &error_msg)) - { - Eldbus_Error_Info error_info = {error, error_msg}; - cb(user_data, pending, "MinimumRate", proxy, &error_info, 0); - return; - } - if (!eldbus_message_arguments_get(msg, "v", &variant)) - { - Eldbus_Error_Info error_info = {"", ""}; - cb(user_data, pending, "MinimumRate", proxy, &error_info, 0); - return; - } - if (!eldbus_message_iter_arguments_get(variant, "d", &v)) - { - Eldbus_Error_Info error_info = {"", ""}; - cb(user_data, pending, "MinimumRate", proxy, &error_info, 0); - return; - } - cb(user_data, pending, "MinimumRate", proxy, NULL, v); -} - -Eldbus_Pending * -media_player2_player_minimum_rate_propget(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_Double_Get_Cb cb, const void *data) -{ - Eldbus_Pending *p; - EINA_SAFETY_ON_NULL_RETURN_VAL(proxy, NULL); - p = eldbus_proxy_property_get(proxy, "MinimumRate", cb_media_player2_player_minimum_rate, cb); - if (data) - eldbus_pending_data_set(p, "__user_data", data); - eldbus_pending_data_set(p, "__proxy", proxy); - return p; -} - -static void -cb_media_player2_player_playback_status(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending) -{ - void *user_data = eldbus_pending_data_del(pending, "__user_data"); - const char *error, *error_msg; - Eldbus_Codegen_Property_String_Get_Cb cb = data; - Eldbus_Proxy *proxy = eldbus_pending_data_del(pending, "__proxy"); - Eldbus_Message_Iter *variant; - const char *v; - if (eldbus_message_error_get(msg, &error, &error_msg)) - { - Eldbus_Error_Info error_info = {error, error_msg}; - cb(user_data, pending, "PlaybackStatus", proxy, &error_info, NULL); - return; - } - if (!eldbus_message_arguments_get(msg, "v", &variant)) - { - Eldbus_Error_Info error_info = {"", ""}; - cb(user_data, pending, "PlaybackStatus", proxy, &error_info, NULL); - return; - } - if (!eldbus_message_iter_arguments_get(variant, "s", &v)) - { - Eldbus_Error_Info error_info = {"", ""}; - cb(user_data, pending, "PlaybackStatus", proxy, &error_info, NULL); - return; - } - cb(user_data, pending, "PlaybackStatus", proxy, NULL, v); -} - -Eldbus_Pending * -media_player2_player_playback_status_propget(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_String_Get_Cb cb, const void *data) -{ - Eldbus_Pending *p; - EINA_SAFETY_ON_NULL_RETURN_VAL(proxy, NULL); - p = eldbus_proxy_property_get(proxy, "PlaybackStatus", cb_media_player2_player_playback_status, cb); - if (data) - eldbus_pending_data_set(p, "__user_data", data); - eldbus_pending_data_set(p, "__proxy", proxy); - return p; -} - -static void -cb_media_player2_player_position(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending) -{ - void *user_data = eldbus_pending_data_del(pending, "__user_data"); - const char *error, *error_msg; - Eldbus_Codegen_Property_Int64_Get_Cb cb = data; - Eldbus_Proxy *proxy = eldbus_pending_data_del(pending, "__proxy"); - Eldbus_Message_Iter *variant; - int64_t v; - if (eldbus_message_error_get(msg, &error, &error_msg)) - { - Eldbus_Error_Info error_info = {error, error_msg}; - cb(user_data, pending, "Position", proxy, &error_info, 0); - return; - } - if (!eldbus_message_arguments_get(msg, "v", &variant)) - { - Eldbus_Error_Info error_info = {"", ""}; - cb(user_data, pending, "Position", proxy, &error_info, 0); - return; - } - if (!eldbus_message_iter_arguments_get(variant, "x", &v)) - { - Eldbus_Error_Info error_info = {"", ""}; - cb(user_data, pending, "Position", proxy, &error_info, 0); - return; - } - cb(user_data, pending, "Position", proxy, NULL, v); -} - -Eldbus_Pending * -media_player2_player_position_propget(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_Int64_Get_Cb cb, const void *data) -{ - Eldbus_Pending *p; - EINA_SAFETY_ON_NULL_RETURN_VAL(proxy, NULL); - p = eldbus_proxy_property_get(proxy, "Position", cb_media_player2_player_position, cb); - if (data) - eldbus_pending_data_set(p, "__user_data", data); - eldbus_pending_data_set(p, "__proxy", proxy); - return p; -} - -static void -cb_media_player2_player_rate(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending) -{ - void *user_data = eldbus_pending_data_del(pending, "__user_data"); - const char *error, *error_msg; - Eldbus_Codegen_Property_Double_Get_Cb cb = data; - Eldbus_Proxy *proxy = eldbus_pending_data_del(pending, "__proxy"); - Eldbus_Message_Iter *variant; - double v; - if (eldbus_message_error_get(msg, &error, &error_msg)) - { - Eldbus_Error_Info error_info = {error, error_msg}; - cb(user_data, pending, "Rate", proxy, &error_info, 0); - return; - } - if (!eldbus_message_arguments_get(msg, "v", &variant)) - { - Eldbus_Error_Info error_info = {"", ""}; - cb(user_data, pending, "Rate", proxy, &error_info, 0); - return; - } - if (!eldbus_message_iter_arguments_get(variant, "d", &v)) - { - Eldbus_Error_Info error_info = {"", ""}; - cb(user_data, pending, "Rate", proxy, &error_info, 0); - return; - } - cb(user_data, pending, "Rate", proxy, NULL, v); -} - -Eldbus_Pending * -media_player2_player_rate_propget(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_Double_Get_Cb cb, const void *data) -{ - Eldbus_Pending *p; - EINA_SAFETY_ON_NULL_RETURN_VAL(proxy, NULL); - p = eldbus_proxy_property_get(proxy, "Rate", cb_media_player2_player_rate, cb); - if (data) - eldbus_pending_data_set(p, "__user_data", data); - eldbus_pending_data_set(p, "__proxy", proxy); - return p; -} - -static void -cb_media_player2_player_rate_set(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending) -{ - const char *error, *error_msg; - void *user_data = eldbus_pending_data_del(pending, "__user_data"); - Eldbus_Proxy *proxy = eldbus_pending_data_del(pending, "__proxy"); - Eldbus_Codegen_Property_Set_Cb cb = data; - if (eldbus_message_error_get(msg, &error, &error_msg)) { - Eldbus_Error_Info error_info = {error, error_msg}; - - cb(user_data, "Rate", proxy, pending, &error_info); - return; - } - cb(user_data, "Rate", proxy, pending, NULL); -} - -Eldbus_Pending * -media_player2_player_rate_propset(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_Set_Cb cb, const void *data, const void *value) -{ - Eldbus_Pending *p; - EINA_SAFETY_ON_NULL_RETURN_VAL(proxy, NULL); - EINA_SAFETY_ON_NULL_RETURN_VAL(value, NULL); - p = eldbus_proxy_property_set(proxy, "Rate", "d", value, cb_media_player2_player_rate_set, cb); - eldbus_pending_data_set(p, "__user_data", data); - eldbus_pending_data_set(p, "__proxy", proxy); - return p; -} - -static void -cb_media_player2_player_shuffle(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending) -{ - void *user_data = eldbus_pending_data_del(pending, "__user_data"); - const char *error, *error_msg; - Eldbus_Codegen_Property_Bool_Get_Cb cb = data; - Eldbus_Proxy *proxy = eldbus_pending_data_del(pending, "__proxy"); - Eldbus_Message_Iter *variant; - Eina_Bool v; - if (eldbus_message_error_get(msg, &error, &error_msg)) - { - Eldbus_Error_Info error_info = {error, error_msg}; - cb(user_data, pending, "Shuffle", proxy, &error_info, 0); - return; - } - if (!eldbus_message_arguments_get(msg, "v", &variant)) - { - Eldbus_Error_Info error_info = {"", ""}; - cb(user_data, pending, "Shuffle", proxy, &error_info, 0); - return; - } - if (!eldbus_message_iter_arguments_get(variant, "b", &v)) - { - Eldbus_Error_Info error_info = {"", ""}; - cb(user_data, pending, "Shuffle", proxy, &error_info, 0); - return; - } - cb(user_data, pending, "Shuffle", proxy, NULL, v); -} - -Eldbus_Pending * -media_player2_player_shuffle_propget(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_Bool_Get_Cb cb, const void *data) -{ - Eldbus_Pending *p; - EINA_SAFETY_ON_NULL_RETURN_VAL(proxy, NULL); - p = eldbus_proxy_property_get(proxy, "Shuffle", cb_media_player2_player_shuffle, cb); - if (data) - eldbus_pending_data_set(p, "__user_data", data); - eldbus_pending_data_set(p, "__proxy", proxy); - return p; -} - -static void -cb_media_player2_player_shuffle_set(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending) -{ - const char *error, *error_msg; - void *user_data = eldbus_pending_data_del(pending, "__user_data"); - Eldbus_Proxy *proxy = eldbus_pending_data_del(pending, "__proxy"); - Eldbus_Codegen_Property_Set_Cb cb = data; - if (eldbus_message_error_get(msg, &error, &error_msg)) { - Eldbus_Error_Info error_info = {error, error_msg}; - - cb(user_data, "Shuffle", proxy, pending, &error_info); - return; - } - cb(user_data, "Shuffle", proxy, pending, NULL); -} - -Eldbus_Pending * -media_player2_player_shuffle_propset(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_Set_Cb cb, const void *data, const void *value) -{ - Eldbus_Pending *p; - EINA_SAFETY_ON_NULL_RETURN_VAL(proxy, NULL); - EINA_SAFETY_ON_NULL_RETURN_VAL(value, NULL); - p = eldbus_proxy_property_set(proxy, "Shuffle", "b", value, cb_media_player2_player_shuffle_set, cb); - eldbus_pending_data_set(p, "__user_data", data); - eldbus_pending_data_set(p, "__proxy", proxy); - return p; -} - -static void -cb_media_player2_player_volume(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending) -{ - void *user_data = eldbus_pending_data_del(pending, "__user_data"); - const char *error, *error_msg; - Eldbus_Codegen_Property_Double_Get_Cb cb = data; - Eldbus_Proxy *proxy = eldbus_pending_data_del(pending, "__proxy"); - Eldbus_Message_Iter *variant; - double v; - if (eldbus_message_error_get(msg, &error, &error_msg)) - { - Eldbus_Error_Info error_info = {error, error_msg}; - cb(user_data, pending, "Volume", proxy, &error_info, 0); - return; - } - if (!eldbus_message_arguments_get(msg, "v", &variant)) - { - Eldbus_Error_Info error_info = {"", ""}; - cb(user_data, pending, "Volume", proxy, &error_info, 0); - return; - } - if (!eldbus_message_iter_arguments_get(variant, "d", &v)) - { - Eldbus_Error_Info error_info = {"", ""}; - cb(user_data, pending, "Volume", proxy, &error_info, 0); - return; - } - cb(user_data, pending, "Volume", proxy, NULL, v); -} - -Eldbus_Pending * -media_player2_player_volume_propget(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_Double_Get_Cb cb, const void *data) -{ - Eldbus_Pending *p; - EINA_SAFETY_ON_NULL_RETURN_VAL(proxy, NULL); - p = eldbus_proxy_property_get(proxy, "Volume", cb_media_player2_player_volume, cb); - if (data) - eldbus_pending_data_set(p, "__user_data", data); - eldbus_pending_data_set(p, "__proxy", proxy); - return p; -} - -static void -cb_media_player2_player_volume_set(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending) -{ - const char *error, *error_msg; - void *user_data = eldbus_pending_data_del(pending, "__user_data"); - Eldbus_Proxy *proxy = eldbus_pending_data_del(pending, "__proxy"); - Eldbus_Codegen_Property_Set_Cb cb = data; - if (eldbus_message_error_get(msg, &error, &error_msg)) { - Eldbus_Error_Info error_info = {error, error_msg}; - - cb(user_data, "Volume", proxy, pending, &error_info); - return; - } - cb(user_data, "Volume", proxy, pending, NULL); -} - -Eldbus_Pending * -media_player2_player_volume_propset(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_Set_Cb cb, const void *data, const void *value) -{ - Eldbus_Pending *p; - EINA_SAFETY_ON_NULL_RETURN_VAL(proxy, NULL); - EINA_SAFETY_ON_NULL_RETURN_VAL(value, NULL); - p = eldbus_proxy_property_set(proxy, "Volume", "d", value, cb_media_player2_player_volume_set, cb); - eldbus_pending_data_set(p, "__user_data", data); - eldbus_pending_data_set(p, "__proxy", proxy); - return p; -} - -void -media_player2_player_log_domain_set(int id) -{ - _log_main = id; -} - -void -media_player2_player_proxy_unref(Eldbus_Proxy *proxy) -{ - Eldbus_Object *obj = eldbus_proxy_object_get(proxy); - eldbus_proxy_unref(proxy); - eldbus_object_unref(obj); -} - -Eldbus_Proxy * -media_player2_player_proxy_get(Eldbus_Connection *conn, const char *bus, const char *path) -{ - Eldbus_Object *obj; - Eldbus_Proxy *proxy; - EINA_SAFETY_ON_NULL_RETURN_VAL(conn, NULL); - EINA_SAFETY_ON_NULL_RETURN_VAL(bus, NULL); - if (!path) path = "/org/mpris/MediaPlayer2"; - obj = eldbus_object_get(conn, bus, path); - proxy = eldbus_proxy_get(obj, "org.mpris.MediaPlayer2.Player"); - eldbus_proxy_signal_handler_add(proxy, "Seeked", on_media_player2_player_seeked, proxy); - if (!MEDIA_PLAYER2_PLAYER_SEEKED_EVENT) - MEDIA_PLAYER2_PLAYER_SEEKED_EVENT = ecore_event_type_new(); - return proxy; -} diff --git a/src/modules/music-control/gen/eldbus_media_player2_player.h b/src/modules/music-control/gen/eldbus_media_player2_player.h deleted file mode 100644 index e48a62f77..000000000 --- a/src/modules/music-control/gen/eldbus_media_player2_player.h +++ /dev/null @@ -1,47 +0,0 @@ -#ifndef ELDBUS_MEDIA_PLAYER2_PLAYER_H -#define ELDBUS_MEDIA_PLAYER2_PLAYER_H - -#include -#include -#include -#include "eldbus_utils.h" - -Eldbus_Proxy *media_player2_player_proxy_get(Eldbus_Connection *conn, const char *bus, const char *path); -void media_player2_player_proxy_unref(Eldbus_Proxy *proxy); -void media_player2_player_log_domain_set(int id); -void media_player2_player_next_call(Eldbus_Proxy *proxy); -void media_player2_player_open_uri_call(Eldbus_Proxy *proxy, const char *arg0); -void media_player2_player_pause_call(Eldbus_Proxy *proxy); -void media_player2_player_play_call(Eldbus_Proxy *proxy); -void media_player2_player_play_pause_call(Eldbus_Proxy *proxy); -void media_player2_player_previous_call(Eldbus_Proxy *proxy); -void media_player2_player_seek_call(Eldbus_Proxy *proxy, int64_t arg0); -void media_player2_player_set_position_call(Eldbus_Proxy *proxy, const char *arg0, int64_t arg1); -void media_player2_player_stop_call(Eldbus_Proxy *proxy); -extern int MEDIA_PLAYER2_PLAYER_SEEKED_EVENT; -typedef struct _Media_Player2_Player_Seeked_Data -{ - Eldbus_Proxy *proxy; - int64_t arg0; -} Media_Player2_Player_Seeked_Data; -Eldbus_Pending *media_player2_player_can_control_propget(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_Bool_Get_Cb cb, const void *data); -Eldbus_Pending *media_player2_player_can_go_next_propget(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_Bool_Get_Cb cb, const void *data); -Eldbus_Pending *media_player2_player_can_go_previous_propget(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_Bool_Get_Cb cb, const void *data); -Eldbus_Pending *media_player2_player_can_pause_propget(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_Bool_Get_Cb cb, const void *data); -Eldbus_Pending *media_player2_player_can_play_propget(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_Bool_Get_Cb cb, const void *data); -Eldbus_Pending *media_player2_player_can_seek_propget(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_Bool_Get_Cb cb, const void *data); -Eldbus_Pending *media_player2_player_loop_status_propget(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_String_Get_Cb cb, const void *data); -Eldbus_Pending *media_player2_player_loop_status_propset(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_Set_Cb cb, const void *data, const void *value); -Eldbus_Pending *media_player2_player_maximum_rate_propget(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_Double_Get_Cb cb, const void *data); -Eldbus_Pending *media_player2_player_metadata_propget(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_Complex_Get_Cb cb, const void *data); -Eldbus_Pending *media_player2_player_minimum_rate_propget(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_Double_Get_Cb cb, const void *data); -Eldbus_Pending *media_player2_player_playback_status_propget(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_String_Get_Cb cb, const void *data); -Eldbus_Pending *media_player2_player_position_propget(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_Int64_Get_Cb cb, const void *data); -Eldbus_Pending *media_player2_player_rate_propget(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_Double_Get_Cb cb, const void *data); -Eldbus_Pending *media_player2_player_rate_propset(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_Set_Cb cb, const void *data, const void *value); -Eldbus_Pending *media_player2_player_shuffle_propget(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_Bool_Get_Cb cb, const void *data); -Eldbus_Pending *media_player2_player_shuffle_propset(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_Set_Cb cb, const void *data, const void *value); -Eldbus_Pending *media_player2_player_volume_propget(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_Double_Get_Cb cb, const void *data); -Eldbus_Pending *media_player2_player_volume_propset(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_Set_Cb cb, const void *data, const void *value); - -#endif \ No newline at end of file diff --git a/src/modules/music-control/gen/eldbus_mpris_media_player2.c b/src/modules/music-control/gen/eldbus_mpris_media_player2.c deleted file mode 100644 index 6528bf1c2..000000000 --- a/src/modules/music-control/gen/eldbus_mpris_media_player2.c +++ /dev/null @@ -1,352 +0,0 @@ -#include "eldbus_mpris_media_player2.h" - -static int _log_main = -1; -#undef ERR -#define ERR(...) EINA_LOG_DOM_ERR(_log_main, __VA_ARGS__); - -void -mpris_media_player2_quit_call(Eldbus_Proxy *proxy) -{ - Eldbus_Message *msg; - EINA_SAFETY_ON_NULL_RETURN(proxy); - msg = eldbus_proxy_method_call_new(proxy, "Quit"); - if (!eldbus_message_arguments_append(msg, "")) - { - ERR("Error: Filling message."); - eldbus_message_unref(msg); - return; - } - eldbus_proxy_send(proxy, msg, NULL, NULL, -1); -} - -void -mpris_media_player2_raise_call(Eldbus_Proxy *proxy) -{ - Eldbus_Message *msg; - EINA_SAFETY_ON_NULL_RETURN(proxy); - msg = eldbus_proxy_method_call_new(proxy, "Raise"); - if (!eldbus_message_arguments_append(msg, "")) - { - ERR("Error: Filling message."); - eldbus_message_unref(msg); - return; - } - eldbus_proxy_send(proxy, msg, NULL, NULL, -1); -} - -static void -cb_mpris_media_player2_can_quit(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending) -{ - void *user_data = eldbus_pending_data_del(pending, "__user_data"); - const char *error, *error_msg; - Eldbus_Codegen_Property_Bool_Get_Cb cb = data; - Eldbus_Proxy *proxy = eldbus_pending_data_del(pending, "__proxy"); - Eldbus_Message_Iter *variant; - Eina_Bool v; - if (eldbus_message_error_get(msg, &error, &error_msg)) - { - Eldbus_Error_Info error_info = {error, error_msg}; - cb(user_data, pending, "CanQuit", proxy, &error_info, 0); - return; - } - if (!eldbus_message_arguments_get(msg, "v", &variant)) - { - Eldbus_Error_Info error_info = {"", ""}; - cb(user_data, pending, "CanQuit", proxy, &error_info, 0); - return; - } - if (!eldbus_message_iter_arguments_get(variant, "b", &v)) - { - Eldbus_Error_Info error_info = {"", ""}; - cb(user_data, pending, "CanQuit", proxy, &error_info, 0); - return; - } - cb(user_data, pending, "CanQuit", proxy, NULL, v); -} - -Eldbus_Pending * -mpris_media_player2_can_quit_propget(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_Bool_Get_Cb cb, const void *data) -{ - Eldbus_Pending *p; - EINA_SAFETY_ON_NULL_RETURN_VAL(proxy, NULL); - p = eldbus_proxy_property_get(proxy, "CanQuit", cb_mpris_media_player2_can_quit, cb); - if (data) - eldbus_pending_data_set(p, "__user_data", data); - eldbus_pending_data_set(p, "__proxy", proxy); - return p; -} - -static void -cb_mpris_media_player2_can_raise(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending) -{ - void *user_data = eldbus_pending_data_del(pending, "__user_data"); - const char *error, *error_msg; - Eldbus_Codegen_Property_Bool_Get_Cb cb = data; - Eldbus_Proxy *proxy = eldbus_pending_data_del(pending, "__proxy"); - Eldbus_Message_Iter *variant; - Eina_Bool v; - if (eldbus_message_error_get(msg, &error, &error_msg)) - { - Eldbus_Error_Info error_info = {error, error_msg}; - cb(user_data, pending, "CanRaise", proxy, &error_info, 0); - return; - } - if (!eldbus_message_arguments_get(msg, "v", &variant)) - { - Eldbus_Error_Info error_info = {"", ""}; - cb(user_data, pending, "CanRaise", proxy, &error_info, 0); - return; - } - if (!eldbus_message_iter_arguments_get(variant, "b", &v)) - { - Eldbus_Error_Info error_info = {"", ""}; - cb(user_data, pending, "CanRaise", proxy, &error_info, 0); - return; - } - cb(user_data, pending, "CanRaise", proxy, NULL, v); -} - -Eldbus_Pending * -mpris_media_player2_can_raise_propget(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_Bool_Get_Cb cb, const void *data) -{ - Eldbus_Pending *p; - EINA_SAFETY_ON_NULL_RETURN_VAL(proxy, NULL); - p = eldbus_proxy_property_get(proxy, "CanRaise", cb_mpris_media_player2_can_raise, cb); - if (data) - eldbus_pending_data_set(p, "__user_data", data); - eldbus_pending_data_set(p, "__proxy", proxy); - return p; -} - -static void -cb_mpris_media_player2_desktop_entry(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending) -{ - void *user_data = eldbus_pending_data_del(pending, "__user_data"); - const char *error, *error_msg; - Eldbus_Codegen_Property_String_Get_Cb cb = data; - Eldbus_Proxy *proxy = eldbus_pending_data_del(pending, "__proxy"); - Eldbus_Message_Iter *variant; - const char *v; - if (eldbus_message_error_get(msg, &error, &error_msg)) - { - Eldbus_Error_Info error_info = {error, error_msg}; - cb(user_data, pending, "DesktopEntry", proxy, &error_info, NULL); - return; - } - if (!eldbus_message_arguments_get(msg, "v", &variant)) - { - Eldbus_Error_Info error_info = {"", ""}; - cb(user_data, pending, "DesktopEntry", proxy, &error_info, NULL); - return; - } - if (!eldbus_message_iter_arguments_get(variant, "s", &v)) - { - Eldbus_Error_Info error_info = {"", ""}; - cb(user_data, pending, "DesktopEntry", proxy, &error_info, NULL); - return; - } - cb(user_data, pending, "DesktopEntry", proxy, NULL, v); -} - -Eldbus_Pending * -mpris_media_player2_desktop_entry_propget(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_String_Get_Cb cb, const void *data) -{ - Eldbus_Pending *p; - EINA_SAFETY_ON_NULL_RETURN_VAL(proxy, NULL); - p = eldbus_proxy_property_get(proxy, "DesktopEntry", cb_mpris_media_player2_desktop_entry, cb); - if (data) - eldbus_pending_data_set(p, "__user_data", data); - eldbus_pending_data_set(p, "__proxy", proxy); - return p; -} - -static void -cb_mpris_media_player2_has_track_list(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending) -{ - void *user_data = eldbus_pending_data_del(pending, "__user_data"); - const char *error, *error_msg; - Eldbus_Codegen_Property_Bool_Get_Cb cb = data; - Eldbus_Proxy *proxy = eldbus_pending_data_del(pending, "__proxy"); - Eldbus_Message_Iter *variant; - Eina_Bool v; - if (eldbus_message_error_get(msg, &error, &error_msg)) - { - Eldbus_Error_Info error_info = {error, error_msg}; - cb(user_data, pending, "HasTrackList", proxy, &error_info, 0); - return; - } - if (!eldbus_message_arguments_get(msg, "v", &variant)) - { - Eldbus_Error_Info error_info = {"", ""}; - cb(user_data, pending, "HasTrackList", proxy, &error_info, 0); - return; - } - if (!eldbus_message_iter_arguments_get(variant, "b", &v)) - { - Eldbus_Error_Info error_info = {"", ""}; - cb(user_data, pending, "HasTrackList", proxy, &error_info, 0); - return; - } - cb(user_data, pending, "HasTrackList", proxy, NULL, v); -} - -Eldbus_Pending * -mpris_media_player2_has_track_list_propget(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_Bool_Get_Cb cb, const void *data) -{ - Eldbus_Pending *p; - EINA_SAFETY_ON_NULL_RETURN_VAL(proxy, NULL); - p = eldbus_proxy_property_get(proxy, "HasTrackList", cb_mpris_media_player2_has_track_list, cb); - if (data) - eldbus_pending_data_set(p, "__user_data", data); - eldbus_pending_data_set(p, "__proxy", proxy); - return p; -} - -static void -cb_mpris_media_player2_identity(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending) -{ - void *user_data = eldbus_pending_data_del(pending, "__user_data"); - const char *error, *error_msg; - Eldbus_Codegen_Property_String_Get_Cb cb = data; - Eldbus_Proxy *proxy = eldbus_pending_data_del(pending, "__proxy"); - Eldbus_Message_Iter *variant; - const char *v; - if (eldbus_message_error_get(msg, &error, &error_msg)) - { - Eldbus_Error_Info error_info = {error, error_msg}; - cb(user_data, pending, "Identity", proxy, &error_info, NULL); - return; - } - if (!eldbus_message_arguments_get(msg, "v", &variant)) - { - Eldbus_Error_Info error_info = {"", ""}; - cb(user_data, pending, "Identity", proxy, &error_info, NULL); - return; - } - if (!eldbus_message_iter_arguments_get(variant, "s", &v)) - { - Eldbus_Error_Info error_info = {"", ""}; - cb(user_data, pending, "Identity", proxy, &error_info, NULL); - return; - } - cb(user_data, pending, "Identity", proxy, NULL, v); -} - -Eldbus_Pending * -mpris_media_player2_identity_propget(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_String_Get_Cb cb, const void *data) -{ - Eldbus_Pending *p; - EINA_SAFETY_ON_NULL_RETURN_VAL(proxy, NULL); - p = eldbus_proxy_property_get(proxy, "Identity", cb_mpris_media_player2_identity, cb); - if (data) - eldbus_pending_data_set(p, "__user_data", data); - eldbus_pending_data_set(p, "__proxy", proxy); - return p; -} - -static void -cb_mpris_media_player2_supported_mime_types(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending) -{ - void *user_data = eldbus_pending_data_del(pending, "__user_data"); - const char *error, *error_msg; - Eldbus_Codegen_Property_Complex_Get_Cb cb = data; - Eldbus_Proxy *proxy = eldbus_pending_data_del(pending, "__proxy"); - Eldbus_Message_Iter *variant; - Eina_Value *v, stack_value; - if (eldbus_message_error_get(msg, &error, &error_msg)) - { - Eldbus_Error_Info error_info = {error, error_msg}; - cb(user_data, pending, "SupportedMimeTypes", proxy, &error_info, NULL); - return; - } - if (!eldbus_message_arguments_get(msg, "v", &variant)) - { - Eldbus_Error_Info error_info = {"", ""}; - cb(user_data, pending, "SupportedMimeTypes", proxy, &error_info, NULL); - return; - } - v = eldbus_message_iter_struct_like_to_eina_value(variant); - eina_value_struct_value_get(v, "arg0", &stack_value); - cb(user_data, pending, "SupportedMimeTypes", proxy, NULL, &stack_value); - eina_value_flush(&stack_value); - eina_value_free(v); -} - -Eldbus_Pending * -mpris_media_player2_supported_mime_types_propget(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_Complex_Get_Cb cb, const void *data) -{ - Eldbus_Pending *p; - EINA_SAFETY_ON_NULL_RETURN_VAL(proxy, NULL); - p = eldbus_proxy_property_get(proxy, "SupportedMimeTypes", cb_mpris_media_player2_supported_mime_types, cb); - if (data) - eldbus_pending_data_set(p, "__user_data", data); - eldbus_pending_data_set(p, "__proxy", proxy); - return p; -} - -static void -cb_mpris_media_player2_supported_uri_schemes(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending) -{ - void *user_data = eldbus_pending_data_del(pending, "__user_data"); - const char *error, *error_msg; - Eldbus_Codegen_Property_Complex_Get_Cb cb = data; - Eldbus_Proxy *proxy = eldbus_pending_data_del(pending, "__proxy"); - Eldbus_Message_Iter *variant; - Eina_Value *v, stack_value; - if (eldbus_message_error_get(msg, &error, &error_msg)) - { - Eldbus_Error_Info error_info = {error, error_msg}; - cb(user_data, pending, "SupportedUriSchemes", proxy, &error_info, NULL); - return; - } - if (!eldbus_message_arguments_get(msg, "v", &variant)) - { - Eldbus_Error_Info error_info = {"", ""}; - cb(user_data, pending, "SupportedUriSchemes", proxy, &error_info, NULL); - return; - } - v = eldbus_message_iter_struct_like_to_eina_value(variant); - eina_value_struct_value_get(v, "arg0", &stack_value); - cb(user_data, pending, "SupportedUriSchemes", proxy, NULL, &stack_value); - eina_value_flush(&stack_value); - eina_value_free(v); -} - -Eldbus_Pending * -mpris_media_player2_supported_uri_schemes_propget(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_Complex_Get_Cb cb, const void *data) -{ - Eldbus_Pending *p; - EINA_SAFETY_ON_NULL_RETURN_VAL(proxy, NULL); - p = eldbus_proxy_property_get(proxy, "SupportedUriSchemes", cb_mpris_media_player2_supported_uri_schemes, cb); - if (data) - eldbus_pending_data_set(p, "__user_data", data); - eldbus_pending_data_set(p, "__proxy", proxy); - return p; -} - -void -mpris_media_player2_log_domain_set(int id) -{ - _log_main = id; -} - -void -mpris_media_player2_proxy_unref(Eldbus_Proxy *proxy) -{ - Eldbus_Object *obj = eldbus_proxy_object_get(proxy); - eldbus_proxy_unref(proxy); - eldbus_object_unref(obj); -} - -Eldbus_Proxy * -mpris_media_player2_proxy_get(Eldbus_Connection *conn, const char *bus, const char *path) -{ - Eldbus_Object *obj; - Eldbus_Proxy *proxy; - EINA_SAFETY_ON_NULL_RETURN_VAL(conn, NULL); - EINA_SAFETY_ON_NULL_RETURN_VAL(bus, NULL); - if (!path) path = "/org/mpris/MediaPlayer2"; - obj = eldbus_object_get(conn, bus, path); - proxy = eldbus_proxy_get(obj, "org.mpris.MediaPlayer2"); - return proxy; -} diff --git a/src/modules/music-control/gen/eldbus_mpris_media_player2.h b/src/modules/music-control/gen/eldbus_mpris_media_player2.h deleted file mode 100644 index 415cec168..000000000 --- a/src/modules/music-control/gen/eldbus_mpris_media_player2.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef ELDBUS_MPRIS_MEDIA_PLAYER2_H -#define ELDBUS_MPRIS_MEDIA_PLAYER2_H - -#include -#include -#include -#include "eldbus_utils.h" - -Eldbus_Proxy *mpris_media_player2_proxy_get(Eldbus_Connection *conn, const char *bus, const char *path); -void mpris_media_player2_proxy_unref(Eldbus_Proxy *proxy); -void mpris_media_player2_log_domain_set(int id); -void mpris_media_player2_quit_call(Eldbus_Proxy *proxy); -void mpris_media_player2_raise_call(Eldbus_Proxy *proxy); -Eldbus_Pending *mpris_media_player2_can_quit_propget(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_Bool_Get_Cb cb, const void *data); -Eldbus_Pending *mpris_media_player2_can_raise_propget(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_Bool_Get_Cb cb, const void *data); -Eldbus_Pending *mpris_media_player2_desktop_entry_propget(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_String_Get_Cb cb, const void *data); -Eldbus_Pending *mpris_media_player2_has_track_list_propget(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_Bool_Get_Cb cb, const void *data); -Eldbus_Pending *mpris_media_player2_identity_propget(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_String_Get_Cb cb, const void *data); -Eldbus_Pending *mpris_media_player2_supported_mime_types_propget(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_Complex_Get_Cb cb, const void *data); -Eldbus_Pending *mpris_media_player2_supported_uri_schemes_propget(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_Complex_Get_Cb cb, const void *data); - -#endif \ No newline at end of file diff --git a/src/modules/music-control/gen/eldbus_utils.h b/src/modules/music-control/gen/eldbus_utils.h deleted file mode 100644 index db4f9ae39..000000000 --- a/src/modules/music-control/gen/eldbus_utils.h +++ /dev/null @@ -1,24 +0,0 @@ -#ifndef ELDBUS_UTILS_H -#define ELDBUS_UTILS_H 1 - -typedef struct _Eldbus_Error_Info -{ - const char *error; - const char *message; -} Eldbus_Error_Info; - -typedef void (*Eldbus_Codegen_Property_Set_Cb)(void *data, const char *propname, Eldbus_Proxy *proxy, Eldbus_Pending *p, Eldbus_Error_Info *error_info); - -typedef void (*Eldbus_Codegen_Property_String_Get_Cb)(void *data, Eldbus_Pending *p, const char *propname, Eldbus_Proxy *proxy, Eldbus_Error_Info *error_info, const char *value); -typedef void (*Eldbus_Codegen_Property_Int32_Get_Cb)(void *data, Eldbus_Pending *p, const char *propname, Eldbus_Proxy *proxy, Eldbus_Error_Info *error_info, int value); -typedef void (*Eldbus_Codegen_Property_Byte_Get_Cb)(void *data, Eldbus_Pending *p, const char *propname, Eldbus_Proxy *proxy, Eldbus_Error_Info *error_info, unsigned char value); -typedef void (*Eldbus_Codegen_Property_Bool_Get_Cb)(void *data, Eldbus_Pending *p, const char *propname, Eldbus_Proxy *proxy, Eldbus_Error_Info *error_info, Eina_Bool value); -typedef void (*Eldbus_Codegen_Property_Int16_Get_Cb)(void *data, Eldbus_Pending *p, const char *propname, Eldbus_Proxy *proxy, Eldbus_Error_Info *error_info, short int value); -typedef void (*Eldbus_Codegen_Property_Uint16_Get_Cb)(void *data, Eldbus_Pending *p, const char *propname, Eldbus_Proxy *proxy, Eldbus_Error_Info *error_info, unsigned short int value); -typedef void (*Eldbus_Codegen_Property_Uint32_Get_Cb)(void *data, Eldbus_Pending *p, const char *propname, Eldbus_Proxy *proxy, Eldbus_Error_Info *error_info, unsigned int value); -typedef void (*Eldbus_Codegen_Property_Double_Get_Cb)(void *data, Eldbus_Pending *p, const char *propname, Eldbus_Proxy *proxy, Eldbus_Error_Info *error_info, double value); -typedef void (*Eldbus_Codegen_Property_Int64_Get_Cb)(void *data, Eldbus_Pending *p, const char *propname, Eldbus_Proxy *proxy, Eldbus_Error_Info *error_info, int64_t value); -typedef void (*Eldbus_Codegen_Property_Uint64_Get_Cb)(void *data, Eldbus_Pending *p, const char *propname, Eldbus_Proxy *proxy, Eldbus_Error_Info *error_info, uint64_t value); -typedef void (*Eldbus_Codegen_Property_Complex_Get_Cb)(void *data, Eldbus_Pending *p, const char *propname, Eldbus_Proxy *proxy, Eldbus_Error_Info *error_info, Eina_Value *value); - -#endif \ No newline at end of file diff --git a/src/modules/music-control/gen/introspect.xml b/src/modules/music-control/introspect.xml similarity index 100% rename from src/modules/music-control/gen/introspect.xml rename to src/modules/music-control/introspect.xml diff --git a/src/modules/music-control/private.h b/src/modules/music-control/private.h index b674068f2..7cae597a2 100644 --- a/src/modules/music-control/private.h +++ b/src/modules/music-control/private.h @@ -2,8 +2,8 @@ #define MUSIC_CONTROL_PRIVATE_H #include "e_mod_main.h" -#include "gen/eldbus_media_player2_player.h" -#include "gen/eldbus_mpris_media_player2.h" +#include "eldbus_media_player2_player.h" +#include "eldbus_mpris_media_player2.h" static Ecore_Event_Handler *desklock_handler = NULL;