X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=plugins%2Fmedia%2Fmedia-rygel.c;h=93a5bce7e2bd4b1e30e85d6a86db8bca01025ac8;hb=423d86c6032c0a27f790a3766abd0c855726eab1;hp=be8cb96d635850a61bb81e5dfedd198d2ec8a2a5;hpb=d809e9b8fc03a0a08060034c6ddbd4b4c4176399;p=src%2Fapp-framework-binder.git diff --git a/plugins/media/media-rygel.c b/plugins/media/media-rygel.c index be8cb96d..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 . + * 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,7 +87,7 @@ 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; json_object *json_o, *json_a; @@ -136,7 +135,7 @@ PUBLIC char* _rygel_list (mediaCtxHandleT *ctx) { json_object_object_add (json_o, "list", json_a); - return (char*) json_object_to_json_string (json_o); + return json_o; } PUBLIC unsigned char _rygel_select (mediaCtxHandleT *ctx, unsigned int index) {