From 3303d82a7e637f7c15b55ee21d555df7b672ae81 Mon Sep 17 00:00:00 2001 From: Manuel Bachmann Date: Wed, 11 May 2016 13:28:48 +0200 Subject: Update Radio plugin, Media plugin Radio and Media plugins are now ported to the new API and build again. Signed-off-by: Manuel Bachmann --- plugins/media/media-api.c | 188 ++++++++++++++++++++++++++------------------ plugins/media/media-api.h | 4 - plugins/media/media-rygel.c | 51 ++++++------ plugins/media/media-rygel.h | 42 ++++++---- 4 files changed, 163 insertions(+), 122 deletions(-) (limited to 'plugins/media') diff --git a/plugins/media/media-api.c b/plugins/media/media-api.c index 7260d3fb..3351ab33 100644 --- a/plugins/media/media-api.c +++ b/plugins/media/media-api.c @@ -15,12 +15,21 @@ * limitations under the License. */ +#define _GNU_SOURCE +#include + #include "media-api.h" +#include "media-rygel.h" + +#include "afb-plugin.h" +#include "afb-req-itf.h" + +json_object* _rygel_list (mediaCtxHandleT *); /* ------ LOCAL HELPER FUNCTIONS --------- */ /* private client context creation ; default values */ -STATIC mediaCtxHandleT* initMediaCtx () { +static mediaCtxHandleT* initMediaCtx () { mediaCtxHandleT *ctx; @@ -31,51 +40,47 @@ STATIC mediaCtxHandleT* initMediaCtx () { return ctx; } -/* called when client session dies [e.g. client quits for more than 15mns] */ -STATIC void freeMedia (void *context) { - - free (context); -} - /* ------ PUBLIC PLUGIN FUNCTIONS --------- */ -STATIC json_object* init (AFB_request *request) { /* AFB_SESSION_CHECK */ +static void init (struct afb_req request) { /* AFB_SESSION_CHECK */ - mediaCtxHandleT *ctx; + mediaCtxHandleT *ctx = (mediaCtxHandleT*) afb_req_context_get(request); json_object *jresp; /* create a private client context */ - if (!request->context) - request->context = initMediaCtx(); - - ctx = (mediaCtxHandleT*)request->context; + if (!ctx) { + ctx = initMediaCtx(); + afb_req_context_set (request, ctx, free); + } /* initialize server connection */ if (!ctx->media_server) - _rygel_init (request->context); + _rygel_init (ctx); - jresp = json_object_new_object(); - json_object_object_add(jresp, "info", json_object_new_string ("Media initialized")); - return jresp; + jresp = json_object_new_object (); + json_object_object_add (jresp, "init", json_object_new_string ("success")); + afb_req_success (request, jresp, "Media - Initialized"); } -STATIC json_object* list (AFB_request *request) { /* AFB_SESSION_CHECK */ +static void list (struct afb_req request) { /* AFB_SESSION_CHECK */ - mediaCtxHandleT *ctx = (mediaCtxHandleT*)request->context; + mediaCtxHandleT *ctx = (mediaCtxHandleT*) afb_req_context_get(request); json_object *jresp; jresp = _rygel_list (ctx); - if (!jresp) - return jsonNewMessage(AFB_FAIL, "No content found in media server"); + if (!jresp) { + afb_req_fail (request, "failed", "no content found in media server"); + return; + } - return jresp; + afb_req_success (request, jresp, "Media - Listed"); } -STATIC json_object* selecting (AFB_request *request) { /* AFB_SESSION_CHECK */ +static void selecting (struct afb_req request) { /* AFB_SESSION_CHECK */ - mediaCtxHandleT *ctx = (mediaCtxHandleT*)request->context; - const char *value = getQueryValue (request, "value"); + mediaCtxHandleT *ctx = (mediaCtxHandleT*) afb_req_context_get(request); + const char *value = afb_req_value (request, "value"); json_object *jresp; unsigned int index; char index_str[5]; @@ -88,15 +93,19 @@ STATIC json_object* selecting (AFB_request *request) { /* AFB_SESSION_CHECK */ } /* "?value=" parameter is negative */ - else if (atoi(value) < 0) - return jsonNewMessage(AFB_FAIL, "Chosen index cannot be negative"); + else if (atoi(value) < 0) { + afb_req_fail (request, "failed", "chosen index cannot be negatuve"); + return; + } /* "?value=" parameter is positive */ else if (atoi(value) >= 0) { index = (unsigned int) atoi(value); - if (!_rygel_select (ctx, index)) - return jsonNewMessage(AFB_FAIL, "Chosen index superior to current media count"); + if (!_rygel_select (ctx, index)) { + afb_req_fail (request, "failed", "chosen index superior to current media count"); + return; + } ctx->index = index; jresp = json_object_new_object(); @@ -105,57 +114,80 @@ STATIC json_object* selecting (AFB_request *request) { /* AFB_SESSION_CHECK */ else jresp = NULL; - return jresp; + afb_req_success (request, jresp, "Media - Listed"); } -STATIC json_object* play (AFB_request *request) { /* AFB_SESSION_CHECK */ +static void play (struct afb_req request) { /* AFB_SESSION_CHECK */ - mediaCtxHandleT *ctx = (mediaCtxHandleT*)request->context; + mediaCtxHandleT *ctx = (mediaCtxHandleT*) afb_req_context_get(request); + json_object *jresp; - if (!_rygel_do (ctx, PLAY, NULL)) - return jsonNewMessage(AFB_FAIL, "Could not play chosen media"); + if (!_rygel_do (ctx, PLAY, NULL)) { + afb_req_fail (request, "failed", "could not play chosen media"); + return; + } - return jsonNewMessage(AFB_SUCCESS, "PLaying media"); + jresp = json_object_new_object (); + json_object_object_add (jresp, "play", json_object_new_string ("success")); + afb_req_success (request, jresp, "Media - Listed"); } -STATIC json_object* stop (AFB_request *request) { /* AFB_SESSION_CHECK */ +static void stop (struct afb_req request) { /* AFB_SESSION_CHECK */ - mediaCtxHandleT *ctx = (mediaCtxHandleT*)request->context; + mediaCtxHandleT *ctx = (mediaCtxHandleT*) afb_req_context_get(request); + json_object *jresp; - if (!_rygel_do (ctx, STOP, NULL)) - return jsonNewMessage(AFB_FAIL, "Could not stop chosen media"); + if (!_rygel_do (ctx, STOP, NULL)) { + afb_req_fail (request, "failed", "could not stop chosen media"); + return; + } - return jsonNewMessage(AFB_SUCCESS, "Stopped media"); + jresp = json_object_new_object (); + json_object_object_add (jresp, "stop", json_object_new_string ("success")); + afb_req_success (request, jresp, "Media - Stopped"); } -STATIC json_object* pausing (AFB_request *request) { /* AFB_SESSION_CHECK */ +static void pausing (struct afb_req request) { /* AFB_SESSION_CHECK */ - mediaCtxHandleT *ctx = (mediaCtxHandleT*)request->context; + mediaCtxHandleT *ctx = (mediaCtxHandleT*) afb_req_context_get(request); + json_object *jresp; - if (!_rygel_do (ctx, PAUSE, NULL)) - return jsonNewMessage(AFB_FAIL, "Could not pause chosen media"); + if (!_rygel_do (ctx, PAUSE, NULL)) { + afb_req_fail (request, "failed", "could not pause chosen media"); + return; + } - return jsonNewMessage(AFB_SUCCESS, "Paused media"); + jresp = json_object_new_object(); + json_object_object_add (jresp, "pause", json_object_new_string ("success")); + afb_req_success (request, jresp, "Media - Paused"); } -STATIC json_object* seek (AFB_request *request) { /* AFB_SESSION_CHECK */ +static void seek (struct afb_req request) { /* AFB_SESSION_CHECK */ - mediaCtxHandleT *ctx = (mediaCtxHandleT*)request->context; - const char *value = getQueryValue (request, "value"); + mediaCtxHandleT *ctx = (mediaCtxHandleT*) afb_req_context_get(request); + const char *value = afb_req_value (request, "value"); + json_object *jresp; /* no "?value=" parameter : return error */ - if (!value) - return jsonNewMessage(AFB_FAIL, "You must provide a time"); + if (!value) { + afb_req_fail (request, "failed", "you must provide a time"); + return; + } - if (!_rygel_do (ctx, SEEK, value)) - return jsonNewMessage(AFB_FAIL, "Could not seek chosen media"); + if (!_rygel_do (ctx, SEEK, (char *)value)) { + afb_req_fail (request, "failed", "could not seek chosen media"); + return; + } - return jsonNewMessage(AFB_SUCCESS, "Seeked media"); + jresp = json_object_new_object(); + json_object_object_add (jresp, "seek", json_object_new_string ("success")); + afb_req_success (request, jresp, "Media - Sought"); } -STATIC json_object* upload (AFB_request *request, AFB_PostItem *item) { /* AFB_SESSION_CHECK */ +#if 0 +static void upload (AFB_request *request, AFB_PostItem *item) { /* AFB_SESSION_CHECK */ - mediaCtxHandleT *ctx = (mediaCtxHandleT*)request->context; + mediaCtxHandleT *ctx = (mediaCtxHandleT*) afb_req_context_get(request); AFB_PostCtx *postFileCtx; json_object *jresp; char *path; @@ -183,34 +215,34 @@ STATIC json_object* upload (AFB_request *request, AFB_PostItem *item) { /* AFB_S /* finalizes file transfer */ return getPostFile (request, item, NULL); } +#endif -STATIC json_object* ping (AFB_request *request) { /* AFB_SESSION_NONE */ - return jsonNewMessage(AFB_SUCCESS, "Ping Binder Daemon - Media API"); +static void ping (struct afb_req request) { /* AFB_SESSION_NONE */ + afb_req_success (request, NULL, "Media - Ping succeeded"); } -STATIC AFB_restapi pluginApis[]= { - {"init" , AFB_SESSION_CHECK, (AFB_apiCB)init , "Media API - init" }, - {"list" , AFB_SESSION_CHECK, (AFB_apiCB)list , "Media API - list" }, - {"select" , AFB_SESSION_CHECK, (AFB_apiCB)selecting , "Media API - select" }, - {"play" , AFB_SESSION_CHECK, (AFB_apiCB)play , "Media API - play" }, - {"stop" , AFB_SESSION_CHECK, (AFB_apiCB)stop , "Media API - stop" }, - {"pause" , AFB_SESSION_CHECK, (AFB_apiCB)pausing , "Media API - pause" }, - {"seek" , AFB_SESSION_CHECK, (AFB_apiCB)seek , "Media API - seek" }, - {"upload" , AFB_SESSION_CHECK, (AFB_apiCB)upload , "Media API - upload" }, - {"ping" , AFB_SESSION_NONE, (AFB_apiCB)ping , "Media API - ping" }, +static const struct AFB_restapi pluginApis[]= { + {"init" , AFB_SESSION_CHECK, init , "Media API - init" }, + {"list" , AFB_SESSION_CHECK, list , "Media API - list" }, + {"select" , AFB_SESSION_CHECK, selecting , "Media API - select" }, + {"play" , AFB_SESSION_CHECK, play , "Media API - play" }, + {"stop" , AFB_SESSION_CHECK, stop , "Media API - stop" }, + {"pause" , AFB_SESSION_CHECK, pausing , "Media API - pause" }, + {"seek" , AFB_SESSION_CHECK, seek , "Media API - seek" }, +// {"upload" , AFB_SESSION_CHECK, (AFB_apiCB)upload , "Media API - upload" }, + {"ping" , AFB_SESSION_NONE, ping , "Media API - ping" }, {NULL} }; -PUBLIC AFB_plugin* pluginRegister () { - AFB_plugin *plugin = malloc (sizeof(AFB_plugin)); - plugin->type = AFB_PLUGIN_JSON; - plugin->info = "Application Framework Binder - Media plugin"; - plugin->prefix = "media"; - plugin->apis = pluginApis; - - /*plugin->handle = initRadioPlugin();*/ - plugin->freeCtxCB = (AFB_freeCtxCB)freeMedia; - - return (plugin); +static const struct AFB_plugin pluginDesc = { + .type = AFB_PLUGIN_JSON, + .info = "Application Framework Binder - Media plugin", + .prefix = "media", + .apis = pluginApis }; + +const struct AFB_plugin *pluginRegister (const struct AFB_interface *itf) +{ + return &pluginDesc; +} diff --git a/plugins/media/media-api.h b/plugins/media/media-api.h index c545e5d3..c1d764c2 100644 --- a/plugins/media/media-api.h +++ b/plugins/media/media-api.h @@ -18,8 +18,6 @@ #ifndef MEDIA_API_H #define MEDIA_API_H -#include "media-rygel.h" - /* -------------- PLUGIN DEFINITIONS ----------------- */ /* private client context [will be destroyed when client leaves] */ @@ -28,6 +26,4 @@ typedef struct { unsigned int index; /* currently selected media file */ } mediaCtxHandleT; -PUBLIC json_object* _rygel_list (mediaCtxHandleT *); - #endif /* MEDIA_API_H */ diff --git a/plugins/media/media-rygel.c b/plugins/media/media-rygel.c index 93a5bce7..66e2901a 100644 --- a/plugins/media/media-rygel.c +++ b/plugins/media/media-rygel.c @@ -15,13 +15,18 @@ * limitations under the License. */ +#define _GNU_SOURCE +#include +#include + #include "media-api.h" +#include "media-rygel.h" /* -------------- MEDIA RYGEL IMPLEMENTATION ---------------- */ /* --- PUBLIC FUNCTIONS --- */ -PUBLIC unsigned char _rygel_init (mediaCtxHandleT *ctx) { +unsigned char _rygel_init (mediaCtxHandleT *ctx) { GMainContext *loop; GUPnPContext *context; @@ -72,7 +77,7 @@ PUBLIC unsigned char _rygel_init (mediaCtxHandleT *ctx) { return 1; } -PUBLIC void _rygel_free (mediaCtxHandleT *ctx) { +void _rygel_free (mediaCtxHandleT *ctx) { dev_ctx_T *dev_ctx_c = (dev_ctx_T*)ctx->media_server; @@ -87,7 +92,7 @@ PUBLIC void _rygel_free (mediaCtxHandleT *ctx) { dev_ctx_c->content_res = NULL; } -PUBLIC json_object* _rygel_list (mediaCtxHandleT *ctx) { +json_object* _rygel_list (mediaCtxHandleT *ctx) { dev_ctx_T *dev_ctx_c = (dev_ctx_T*)ctx->media_server; json_object *json_o, *json_a; @@ -138,7 +143,7 @@ PUBLIC json_object* _rygel_list (mediaCtxHandleT *ctx) { return json_o; } -PUBLIC unsigned char _rygel_select (mediaCtxHandleT *ctx, unsigned int index) { +unsigned char _rygel_select (mediaCtxHandleT *ctx, unsigned int index) { dev_ctx_T *dev_ctx_c = (dev_ctx_T*)ctx->media_server; unsigned int count; @@ -156,7 +161,7 @@ PUBLIC unsigned char _rygel_select (mediaCtxHandleT *ctx, unsigned int index) { return 1; } -PUBLIC unsigned char _rygel_upload (mediaCtxHandleT *ctx, char *path) { +unsigned char _rygel_upload (mediaCtxHandleT *ctx, char *path) { dev_ctx_T *dev_ctx_c = (dev_ctx_T*)ctx->media_server; char *raw, *upload_id; @@ -174,7 +179,7 @@ PUBLIC unsigned char _rygel_upload (mediaCtxHandleT *ctx, char *path) { return _rygel_start_uploading (dev_ctx_c, path, upload_id); } -PUBLIC unsigned char _rygel_do (mediaCtxHandleT *ctx, State state, char *args) { +unsigned char _rygel_do (mediaCtxHandleT *ctx, State state, char *args) { dev_ctx_T *dev_ctx_c = (dev_ctx_T*)ctx->media_server; unsigned int index = ctx->index; @@ -197,7 +202,7 @@ PUBLIC unsigned char _rygel_do (mediaCtxHandleT *ctx, State state, char *args) { /* --- LOCAL HELPER FUNCTIONS --- */ -STATIC char* _rygel_list_raw (dev_ctx_T* dev_ctx_c, unsigned int *count) { +char* _rygel_list_raw (dev_ctx_T* dev_ctx_c, unsigned int *count) { GUPnPServiceProxy *content_dir_proxy; struct timeval tv_start, tv_now; @@ -230,7 +235,7 @@ STATIC char* _rygel_list_raw (dev_ctx_T* dev_ctx_c, unsigned int *count) { return dev_ctx_c->content_res; } -STATIC char* _rygel_find_upload_id (dev_ctx_T* dev_ctx_c, char *raw) { +char* _rygel_find_upload_id (dev_ctx_T* dev_ctx_c, char *raw) { char *found; char id[33]; @@ -245,7 +250,7 @@ STATIC char* _rygel_find_upload_id (dev_ctx_T* dev_ctx_c, char *raw) { return strdup (id); } -STATIC char* _rygel_find_id_for_index (dev_ctx_T* dev_ctx_c, char *raw, unsigned int index) { +char* _rygel_find_id_for_index (dev_ctx_T* dev_ctx_c, char *raw, unsigned int index) { char *found = raw; char id[33]; @@ -265,7 +270,7 @@ STATIC char* _rygel_find_id_for_index (dev_ctx_T* dev_ctx_c, char *raw, unsigned return strdup (id); } -STATIC char* _rygel_find_metadata_for_id (dev_ctx_T* dev_ctx_c, char *id) { +char* _rygel_find_metadata_for_id (dev_ctx_T* dev_ctx_c, char *id) { GUPnPServiceProxy *content_dir_proxy; struct timeval tv_start, tv_now; @@ -297,7 +302,7 @@ STATIC char* _rygel_find_metadata_for_id (dev_ctx_T* dev_ctx_c, char *id) { return dev_ctx_c->content_res; } -STATIC char* _rygel_find_uri_for_metadata (dev_ctx_T* dev_ctx_c, char *metadata) { +char* _rygel_find_uri_for_metadata (dev_ctx_T* dev_ctx_c, char *metadata) { char *start, *end, *uri = NULL; int length; @@ -325,7 +330,7 @@ STATIC char* _rygel_find_uri_for_metadata (dev_ctx_T* dev_ctx_c, char *metadata) return uri; } -STATIC char * _rygel_time_for_string (char *string) { +char * _rygel_time_for_string (char *string) { int total_seconds; unsigned int hours, minutes, seconds; @@ -341,7 +346,7 @@ STATIC char * _rygel_time_for_string (char *string) { return time; } -STATIC unsigned char _rygel_start_uploading (dev_ctx_T* dev_ctx_c, char *path, char *upload_id) { +unsigned char _rygel_start_uploading (dev_ctx_T* dev_ctx_c, char *path, char *upload_id) { GUPnPServiceProxy *content_dir_proxy; GUPnPDIDLLiteWriter *didl_writer; @@ -396,7 +401,7 @@ STATIC unsigned char _rygel_start_uploading (dev_ctx_T* dev_ctx_c, char *path, c return 1; } -STATIC unsigned char _rygel_start_doing (dev_ctx_T* dev_ctx_c, char *uri, char *metadata, State state, char *args) { +unsigned char _rygel_start_doing (dev_ctx_T* dev_ctx_c, char *uri, char *metadata, State state, char *args) { GUPnPServiceProxy *av_transport_proxy; struct timeval tv_start, tv_now; @@ -431,7 +436,7 @@ STATIC unsigned char _rygel_start_doing (dev_ctx_T* dev_ctx_c, char *uri, char * return 1; } -STATIC unsigned char _rygel_find_av_transport (dev_ctx_T* dev_ctx_c) { +unsigned char _rygel_find_av_transport (dev_ctx_T* dev_ctx_c) { GUPnPControlPoint *control_point; gint handler_cb; @@ -465,7 +470,7 @@ STATIC unsigned char _rygel_find_av_transport (dev_ctx_T* dev_ctx_c) { /* ---- LOCAL CALLBACK FUNCTIONS ---- */ -STATIC void _rygel_device_cb (GUPnPControlPoint *point, GUPnPDeviceProxy *proxy, +static void _rygel_device_cb (GUPnPControlPoint *point, GUPnPDeviceProxy *proxy, gpointer data) { mediaCtxHandleT *ctx = (mediaCtxHandleT*)data; @@ -497,7 +502,7 @@ STATIC void _rygel_device_cb (GUPnPControlPoint *point, GUPnPDeviceProxy *proxy, ctx->media_server = (void*)dev_ctx[client_count]; } -STATIC void _rygel_av_transport_cb (GUPnPControlPoint *point, GUPnPDeviceProxy *proxy, +static void _rygel_av_transport_cb (GUPnPControlPoint *point, GUPnPDeviceProxy *proxy, gpointer data) { dev_ctx_T *dev_ctx_c = (dev_ctx_T*)data; @@ -510,7 +515,7 @@ STATIC void _rygel_av_transport_cb (GUPnPControlPoint *point, GUPnPDeviceProxy * dev_ctx_c->av_transport = av_transport; } -STATIC void _rygel_content_cb (GUPnPServiceProxy *content_dir, GUPnPServiceProxyAction *action, +static void _rygel_content_cb (GUPnPServiceProxy *content_dir, GUPnPServiceProxyAction *action, gpointer data) { dev_ctx_T *dev_ctx_c = (dev_ctx_T*)data; @@ -553,7 +558,7 @@ STATIC void _rygel_content_cb (GUPnPServiceProxy *content_dir, GUPnPServiceProxy } } -STATIC void _rygel_metadata_cb (GUPnPServiceProxy *content_dir, GUPnPServiceProxyAction *action, +static void _rygel_metadata_cb (GUPnPServiceProxy *content_dir, GUPnPServiceProxyAction *action, gpointer data) { dev_ctx_T *dev_ctx_c = (dev_ctx_T*)data; @@ -567,7 +572,7 @@ STATIC void _rygel_metadata_cb (GUPnPServiceProxy *content_dir, GUPnPServiceProx dev_ctx_c->content_res = result; } -STATIC void _rygel_select_cb (GUPnPServiceProxy *av_transport, GUPnPServiceProxyAction *action, +static void _rygel_select_cb (GUPnPServiceProxy *av_transport, GUPnPServiceProxyAction *action, gpointer data) { @@ -621,7 +626,7 @@ STATIC void _rygel_select_cb (GUPnPServiceProxy *av_transport, GUPnPServiceProxy } } -STATIC void _rygel_upload_cb (GUPnPServiceProxy *content_dir, GUPnPServiceProxyAction *action, +static void _rygel_upload_cb (GUPnPServiceProxy *content_dir, GUPnPServiceProxyAction *action, gpointer data) { dev_ctx_T *dev_ctx_c = (dev_ctx_T*)data; @@ -675,7 +680,7 @@ STATIC void _rygel_upload_cb (GUPnPServiceProxy *content_dir, GUPnPServiceProxyA } } -STATIC void _rygel_transfer_cb (GUPnPServiceProxy *content_dir, GUPnPServiceProxyAction *action, +static void _rygel_transfer_cb (GUPnPServiceProxy *content_dir, GUPnPServiceProxyAction *action, gpointer data) { dev_ctx_T *dev_ctx_c = (dev_ctx_T*)data; @@ -690,7 +695,7 @@ STATIC void _rygel_transfer_cb (GUPnPServiceProxy *content_dir, GUPnPServiceProx dev_ctx_c->transfer_started = 1; } -STATIC void _rygel_do_cb (GUPnPServiceProxy *av_transport, GUPnPServiceProxyAction *action, +static void _rygel_do_cb (GUPnPServiceProxy *av_transport, GUPnPServiceProxyAction *action, gpointer data) { dev_ctx_T *dev_ctx_c = (dev_ctx_T*)data; diff --git a/plugins/media/media-rygel.h b/plugins/media/media-rygel.h index 1c097378..0cc84011 100644 --- a/plugins/media/media-rygel.h +++ b/plugins/media/media-rygel.h @@ -21,10 +21,11 @@ /* --------------- MEDIA RYGEL DEFINITIONS ------------------ */ #include +#include #include #include -#include "local-def.h" +#include "media-api.h" #define URN_MEDIA_SERVER "urn:schemas-upnp-org:device:MediaServer:1" #define URN_MEDIA_RENDERER "urn:schemas-upnp-org:device:MediaRenderer:1" @@ -49,22 +50,29 @@ struct dev_ctx { unsigned char transfer_started; }; -STATIC char* _rygel_list_raw (dev_ctx_T *, unsigned int *); -STATIC char* _rygel_find_upload_id (dev_ctx_T *, char *); -STATIC char* _rygel_find_id_for_index (dev_ctx_T *, char *, unsigned int); -STATIC char* _rygel_find_metadata_for_id (dev_ctx_T *, char *); -STATIC char* _rygel_find_uri_for_metadata (dev_ctx_T *, char *); -STATIC unsigned char _rygel_start_uploading (dev_ctx_T *, char *, char *); -STATIC unsigned char _rygel_start_doing (dev_ctx_T *, char *, char *, State, char *); -STATIC unsigned char _rygel_find_av_transport (dev_ctx_T *); -STATIC void _rygel_device_cb (GUPnPControlPoint *, GUPnPDeviceProxy *, gpointer); -STATIC void _rygel_av_transport_cb (GUPnPControlPoint *, GUPnPDeviceProxy *, gpointer); -STATIC void _rygel_content_cb (GUPnPServiceProxy *, GUPnPServiceProxyAction *, gpointer); -STATIC void _rygel_metadata_cb (GUPnPServiceProxy *, GUPnPServiceProxyAction *, gpointer); -STATIC void _rygel_select_cb (GUPnPServiceProxy *, GUPnPServiceProxyAction *, gpointer); -STATIC void _rygel_upload_cb (GUPnPServiceProxy *, GUPnPServiceProxyAction *, gpointer); -STATIC void _rygel_transfer_cb (GUPnPServiceProxy *, GUPnPServiceProxyAction *, gpointer); -STATIC void _rygel_do_cb (GUPnPServiceProxy *, GUPnPServiceProxyAction *, gpointer); +unsigned char _rygel_init (mediaCtxHandleT *); +void _rygel_free (mediaCtxHandleT *); +json_object* _rygel_list (mediaCtxHandleT *); +unsigned char _rygel_select (mediaCtxHandleT *, unsigned int); +unsigned char _rygel_upload (mediaCtxHandleT *, char *); +unsigned char _rygel_do (mediaCtxHandleT *, State, char *); + +char* _rygel_list_raw (dev_ctx_T *, unsigned int *); +char* _rygel_find_upload_id (dev_ctx_T *, char *); +char* _rygel_find_id_for_index (dev_ctx_T *, char *, unsigned int); +char* _rygel_find_metadata_for_id (dev_ctx_T *, char *); +char* _rygel_find_uri_for_metadata (dev_ctx_T *, char *); +unsigned char _rygel_start_uploading (dev_ctx_T *, char *, char *); +unsigned char _rygel_start_doing (dev_ctx_T *, char *, char *, State, char *); +unsigned char _rygel_find_av_transport (dev_ctx_T *); +static void _rygel_device_cb (GUPnPControlPoint *, GUPnPDeviceProxy *, gpointer); +static void _rygel_av_transport_cb (GUPnPControlPoint *, GUPnPDeviceProxy *, gpointer); +static void _rygel_content_cb (GUPnPServiceProxy *, GUPnPServiceProxyAction *, gpointer); +static void _rygel_metadata_cb (GUPnPServiceProxy *, GUPnPServiceProxyAction *, gpointer); +static void _rygel_select_cb (GUPnPServiceProxy *, GUPnPServiceProxyAction *, gpointer); +static void _rygel_upload_cb (GUPnPServiceProxy *, GUPnPServiceProxyAction *, gpointer); +static void _rygel_transfer_cb (GUPnPServiceProxy *, GUPnPServiceProxyAction *, gpointer); +static void _rygel_do_cb (GUPnPServiceProxy *, GUPnPServiceProxyAction *, gpointer); static unsigned int client_count = 0; static struct dev_ctx **dev_ctx = NULL; -- cgit 1.2.3-korg