X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=plugins%2Fmedia%2Fmedia-rygel.h;h=951c6b8946475e8d139b1d2bb8fcd5c467d257ee;hb=39c2ebc125fcc694ac349ae196b62729c7f05037;hp=1c09737891e9e452486981244cbd3ead02dbb7fc;hpb=3d28e7d00cd8641bf600d47ed0e3e7e57cb5b439;p=src%2Fapp-framework-binder.git

diff --git a/plugins/media/media-rygel.h b/plugins/media/media-rygel.h
index 1c097378..951c6b89 100644
--- a/plugins/media/media-rygel.h
+++ b/plugins/media/media-rygel.h
@@ -21,10 +21,11 @@
 /* --------------- MEDIA RYGEL DEFINITIONS ------------------ */
 
 #include <sys/time.h>
+#include <json-c/json.h>
 #include <libgupnp/gupnp-control-point.h>
 #include <libgupnp-av/gupnp-av.h>
 
-#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,24 +50,19 @@ 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);
-
-static unsigned int client_count = 0;
-static struct dev_ctx **dev_ctx = NULL;
+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 *ctx, const char *path, void (*oncompletion)(void*,int), void *closure);
+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 *);
 #endif /* MEDIA_RYGEL_H */