X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=plugins%2Fmedia%2Fmedia-rygel.c;h=003277955e81d57dbc34a56b67ac10f3c0d5bcf0;hb=refs%2Fchanges%2F61%2F5961%2F1;hp=539b6189f5dedbcb33bb549c39ee6f4dc35e7524;hpb=c9a33351febfbafb58f477b1bbc9bf14a4e35d05;p=src%2Fapp-framework-binder.git
diff --git a/plugins/media/media-rygel.c b/plugins/media/media-rygel.c
index 539b6189..00327795 100644
--- a/plugins/media/media-rygel.c
+++ b/plugins/media/media-rygel.c
@@ -2,27 +2,43 @@
* Copyright (C) 2016 "IoT.bzh"
* Author "Manuel Bachmann"
*
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
+#define _GNU_SOURCE
+#include
+#include
+
#include "media-api.h"
+#include "media-rygel.h"
+
+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;
/* -------------- MEDIA RYGEL IMPLEMENTATION ---------------- */
/* --- PUBLIC FUNCTIONS --- */
-PUBLIC unsigned char _rygel_init (mediaCtxHandleT *ctx) {
+unsigned char _rygel_init (mediaCtxHandleT *ctx) {
GMainContext *loop;
GUPnPContext *context;
@@ -65,6 +81,7 @@ PUBLIC unsigned char _rygel_init (mediaCtxHandleT *ctx) {
dev_ctx[client_count]->av_transport = NULL;
dev_ctx[client_count]->state = STOP;
dev_ctx[client_count]->target_state = STOP;
+ dev_ctx[client_count]->action_args = NULL;
dev_ctx[client_count]->transfer_started = 0;
client_count++;
@@ -72,7 +89,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,10 +104,11 @@ PUBLIC void _rygel_free (mediaCtxHandleT *ctx) {
dev_ctx_c->content_res = NULL;
}
-PUBLIC char* _rygel_list (mediaCtxHandleT *ctx) {
+json_object* _rygel_list (mediaCtxHandleT *ctx) {
dev_ctx_T *dev_ctx_c = (dev_ctx_T*)ctx->media_server;
- char *raw, *start, *end, *title, *result = NULL;
+ json_object *json_o, *json_a;
+ char *raw, *start, *end, *id, *title;
int length, i = 0;
if (!dev_ctx_c)
@@ -104,27 +122,40 @@ PUBLIC char* _rygel_list (mediaCtxHandleT *ctx) {
if (!start)
return NULL;
- result = strdup("");
+ json_o = json_object_new_object ();
+ json_a = json_object_new_array ();
while (start) {
+ json_object *json_i, *json_id, *json_title;
+
start = strstr (start, "");
if (!start) break;
end = strstr (start, "");
start += 10;
length = end - start;
+ asprintf (&id, "%02d", i);
+
title = (char*) malloc (length+1);
strncpy (title, start, length);
title[length] = '\0';
- asprintf (&result, "%s%02d:%s::", result, i, title);
+ json_i = json_object_new_object ();
+ json_id = json_object_new_string (id);
+ json_title = json_object_new_string (title);
+ json_object_object_add (json_i, "id", json_id);
+ json_object_object_add (json_i, "title", json_title);
+ json_object_array_add (json_a, json_i);
- free (title); i++;
+ free (id); free (title);
+ i++;
}
- return result;
+ json_object_object_add (json_o, "list", json_a);
+
+ return json_o;
}
-PUBLIC unsigned char _rygel_choose (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;
@@ -142,7 +173,7 @@ PUBLIC unsigned char _rygel_choose (mediaCtxHandleT *ctx, unsigned int index) {
return 1;
}
-PUBLIC unsigned char _rygel_upload (mediaCtxHandleT *ctx, char *path) {
+unsigned char _rygel_upload (mediaCtxHandleT *ctx, const char *path, void (*oncompletion)(void*,int), void *closure) {
dev_ctx_T *dev_ctx_c = (dev_ctx_T*)ctx->media_server;
char *raw, *upload_id;
@@ -157,10 +188,10 @@ PUBLIC unsigned char _rygel_upload (mediaCtxHandleT *ctx, char *path) {
/* for now, we always use the same upload container id */
upload_id = _rygel_find_upload_id (dev_ctx_c, raw);
- return _rygel_start_uploading (dev_ctx_c, path, upload_id);
+ return _rygel_start_uploading (dev_ctx_c, strdup(path), upload_id);
}
-PUBLIC unsigned char _rygel_do (mediaCtxHandleT *ctx, State state) {
+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;
@@ -178,12 +209,12 @@ PUBLIC unsigned char _rygel_do (mediaCtxHandleT *ctx, State state) {
metadata = _rygel_find_metadata_for_id (dev_ctx_c, id);
uri = _rygel_find_uri_for_metadata (dev_ctx_c, metadata);
- return _rygel_start_doing (dev_ctx_c, uri, metadata, state);
+ return _rygel_start_doing (dev_ctx_c, uri, metadata, state, 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;
@@ -216,7 +247,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];
@@ -231,7 +262,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];
@@ -251,7 +282,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;
@@ -283,7 +314,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;
@@ -311,7 +342,23 @@ STATIC char* _rygel_find_uri_for_metadata (dev_ctx_T* dev_ctx_c, char *metadata)
return uri;
}
-STATIC unsigned char _rygel_start_uploading (dev_ctx_T* dev_ctx_c, char *path, char *upload_id) {
+char * _rygel_time_for_string (char *string) {
+
+ int total_seconds;
+ unsigned int hours, minutes, seconds;
+ char *time;
+
+ total_seconds = atoi (string);
+ hours = total_seconds / 3600;
+ minutes = (total_seconds / 60) - (hours * 60);
+ seconds = total_seconds - (hours * 3600) - (minutes * 60);
+
+ asprintf (&time, "%u:%02u:%02u", hours, minutes, seconds);
+
+ return time;
+}
+
+unsigned char _rygel_start_uploading (dev_ctx_T* dev_ctx_c, char *path, char *upload_id) {
GUPnPServiceProxy *content_dir_proxy;
GUPnPDIDLLiteWriter *didl_writer;
@@ -366,7 +413,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) {
+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;
@@ -376,6 +423,7 @@ STATIC unsigned char _rygel_start_doing (dev_ctx_T* dev_ctx_c, char *uri, char *
return 0;
}
dev_ctx_c->target_state = state;
+ dev_ctx_c->action_args = args;
av_transport_proxy = GUPNP_SERVICE_PROXY (dev_ctx_c->av_transport);
gupnp_service_proxy_begin_action (av_transport_proxy, "SetAVTransportURI", _rygel_select_cb, dev_ctx_c,
@@ -400,7 +448,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;
@@ -434,7 +482,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;
@@ -466,7 +514,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;
@@ -479,7 +527,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;
@@ -522,7 +570,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;
@@ -536,13 +584,14 @@ 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)
{
dev_ctx_T *dev_ctx_c = (dev_ctx_T*)data;
GUPnPServiceProxy *av_transport_proxy;
GError *error;
+ char *time;
struct timeval tv_start, tv_now;
av_transport_proxy = GUPNP_SERVICE_PROXY (av_transport);
@@ -566,6 +615,13 @@ STATIC void _rygel_select_cb (GUPnPServiceProxy *av_transport, GUPnPServiceProxy
"InstanceID", G_TYPE_UINT, 0,
NULL);
break;
+ case SEEK:
+ time = _rygel_time_for_string (dev_ctx_c->action_args);
+ gupnp_service_proxy_begin_action (av_transport_proxy, "Seek", _rygel_do_cb, dev_ctx_c,
+ "InstanceID", G_TYPE_UINT, 0,
+ "Unit", G_TYPE_STRING, "ABS_TIME",
+ "Target", G_TYPE_STRING, time,
+ NULL);
default:
break;
}
@@ -582,7 +638,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;
@@ -636,7 +692,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;
@@ -651,7 +707,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;