X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=plugins%2Fmedia%2Fmedia-rygel.c;h=93a5bce7e2bd4b1e30e85d6a86db8bca01025ac8;hb=f1b901ed676b2d45ec8e6ae3d6ef2f94d79f9ee6;hp=9e94a9e7a228446dfd8ac2637faa082bc8e40666;hpb=e3320f303c4eb8f7fe0fac69bfa9ce36d9916930;p=src%2Fapp-framework-binder.git

diff --git a/plugins/media/media-rygel.c b/plugins/media/media-rygel.c
index 9e94a9e7..93a5bce7 100644
--- a/plugins/media/media-rygel.c
+++ b/plugins/media/media-rygel.c
@@ -2,18 +2,17 @@
  * 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 <http://www.gnu.org/licenses/>.
+ * 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.
  */
 
 #include "media-api.h"
@@ -88,10 +87,11 @@ PUBLIC void _rygel_free (mediaCtxHandleT *ctx) {
     dev_ctx_c->content_res = NULL;
 }
 
-PUBLIC char* _rygel_list (mediaCtxHandleT *ctx) {
+PUBLIC 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)
@@ -105,24 +105,37 @@ 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, "<dc:title>");
         if (!start) break;
         end = strstr (start, "</dc:title>");
         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_select (mediaCtxHandleT *ctx, unsigned int index) {