From 9471f389fe557af87513b3cb25ea7759e773f8b3 Mon Sep 17 00:00:00 2001 From: Ismo Puustinen Date: Thu, 22 Nov 2012 11:16:21 +0200 Subject: [PATCH] resource-dbus: don't define the resources anymore. --- src/plugins/plugin-resource-dbus.c | 44 -------------------------------------- 1 file changed, 44 deletions(-) diff --git a/src/plugins/plugin-resource-dbus.c b/src/plugins/plugin-resource-dbus.c index 0deefe4..3ddc493 100644 --- a/src/plugins/plugin-resource-dbus.c +++ b/src/plugins/plugin-resource-dbus.c @@ -84,9 +84,6 @@ #define SIG_PROPERTYCHANGED "propertyChanged" - -#define HAVE_TO_DEFINE_RESOURCES - enum { ARG_DBUS_SERVICE, ARG_DBUS_TRACK_CLIENTS, @@ -1903,43 +1900,6 @@ error: return NULL; } -#ifdef HAVE_TO_DEFINE_RESOURCES -#include -#include - - -static void tmp_create_resources() -{ - /* FIXME: this is the wrong place to do this */ - - static mrp_resource_mgr_ftbl_t audio_playback_manager; - static mrp_resource_mgr_ftbl_t audio_record_manager; - - static mrp_attr_def_t audio_attrs[] = { - { "role", MRP_RESOURCE_RW, mqi_string , .value.string="music" }, - { "pid", MRP_RESOURCE_RW, mqi_unsignd, .value.unsignd=0 }, - { "scale", MRP_RESOURCE_RW, mqi_floating,.value.floating=3.14 }, - { "num", MRP_RESOURCE_RW, mqi_integer, .value.integer=8 }, - { NULL , 0 , mqi_unknown, .value.string=NULL } - }; - - mrp_zone_definition_create(NULL); - - mrp_zone_create("default", NULL); - - mrp_application_class_create("default", 0); - mrp_application_class_create("player", 1); - mrp_application_class_create("sound", 2); - mrp_application_class_create("camera", 3); - mrp_application_class_create("phone", 4); - - mrp_resource_definition_create("audio_playback", true, audio_attrs, - &audio_playback_manager, NULL); - - mrp_resource_definition_create("audio_record", true, NULL, - &audio_record_manager, NULL); -} -#endif static int dbus_resource_init(mrp_plugin_t *plugin) { @@ -1955,10 +1915,6 @@ static int dbus_resource_init(mrp_plugin_t *plugin) goto error; } -#ifdef HAVE_TO_DEFINE_RESOURCES - tmp_create_resources(); -#endif - ctx->mgr = create_manager(ctx); if (ctx->mgr == NULL) { -- 2.7.4