Skip to content

V
vlc-gpu
Commit 2a079e5c authored by Mirsal Ennaime's avatar Mirsal Ennaime Committed by Jean-Baptiste Kempf
Browse files
Options

dbus: Move DBus property marshaling code to separate functions 

(cherry picked from commit afbf044935584488d8a86233ab969574a7ec1c4c)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 98e662b3
Show whitespace changes
Inline Side-by-side
Showing with 125 additions and 46 deletions
modules/control/dbus/dbus_root.c
View file @ 2a079e5c
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
* dbus-root.c : dbus control module (mpris v1.0) - root object * dbus-root.c : dbus control module (mpris v1.0) - root object
***************************************************************************** *****************************************************************************
* Copyright © 2006-2008 Rafaël Carré * Copyright © 2006-2008 Rafaël Carré
* Copyright © 2007-2010 Mirsal Ennaime * Copyright © 2007-2011 Mirsal Ennaime
* Copyright © 2009-2010 The VideoLAN team * Copyright © 2009-2011 The VideoLAN team
* $Id$ * $Id$
* *
* Authors: Mirsal Ennaime <mirsal at mirsal fr> * Authors: Mirsal Ennaime <mirsal at mirsal fr>
...@@ -68,17 +68,25 @@ static const char const ppsz_supported_mime_types[][26] = { ...@@ -68,17 +68,25 @@ static const char const ppsz_supported_mime_types[][26] = {
"application/xspf+xml" "application/xspf+xml"
}; };
static int
MarshalIdentity( intf_thread_t *p_intf, DBusMessageIter *container )
{
VLC_UNUSED( p_intf );
const char *psz_id = _("VLC media player");
dbus_message_iter_append_basic( container, DBUS_TYPE_STRING, &psz_id );
return VLC_SUCCESS;
}
DBUS_METHOD( Identity ) DBUS_METHOD( Identity )
{ {
VLC_UNUSED(p_this);
REPLY_INIT; REPLY_INIT;
OUT_ARGUMENTS; OUT_ARGUMENTS;
const char *psz_identity = _("VLC media player");
DBusMessageIter v; DBusMessageIter v;
dbus_message_iter_open_container( &args, DBUS_TYPE_VARIANT, "s", &v ); dbus_message_iter_open_container( &args, DBUS_TYPE_VARIANT, "s", &v );
dbus_message_iter_append_basic( &v, DBUS_TYPE_STRING, &psz_identity );
MarshalIdentity( p_this, &v );
if( !dbus_message_iter_close_container( &args, &v ) ) if( !dbus_message_iter_close_container( &args, &v ) )
return DBUS_HANDLER_RESULT_NEED_MEMORY; return DBUS_HANDLER_RESULT_NEED_MEMORY;
...@@ -86,17 +94,25 @@ DBUS_METHOD( Identity ) ...@@ -86,17 +94,25 @@ DBUS_METHOD( Identity )
REPLY_SEND; REPLY_SEND;
} }
static int
MarshalCanQuit( intf_thread_t *p_intf, DBusMessageIter *container )
{
VLC_UNUSED( p_intf );
const dbus_bool_t b_ret = TRUE;
dbus_message_iter_append_basic( container, DBUS_TYPE_BOOLEAN, &b_ret );
return VLC_SUCCESS;
}
DBUS_METHOD( CanQuit ) DBUS_METHOD( CanQuit )
{ {
VLC_UNUSED( p_this );
REPLY_INIT; REPLY_INIT;
OUT_ARGUMENTS; OUT_ARGUMENTS;
const dbus_bool_t b_ret = TRUE;
DBusMessageIter v; DBusMessageIter v;
dbus_message_iter_open_container( &args, DBUS_TYPE_VARIANT, "b", &v ); dbus_message_iter_open_container( &args, DBUS_TYPE_VARIANT, "b", &v );
dbus_message_iter_append_basic( &v, DBUS_TYPE_BOOLEAN, &b_ret );
MarshalCanQuit( p_this, &v );
if( !dbus_message_iter_close_container( &args, &v ) ) if( !dbus_message_iter_close_container( &args, &v ) )
return DBUS_HANDLER_RESULT_NEED_MEMORY; return DBUS_HANDLER_RESULT_NEED_MEMORY;
...@@ -104,17 +120,25 @@ DBUS_METHOD( CanQuit ) ...@@ -104,17 +120,25 @@ DBUS_METHOD( CanQuit )
REPLY_SEND; REPLY_SEND;
} }
static int
MarshalCanRaise( intf_thread_t *p_intf, DBusMessageIter *container )
{
VLC_UNUSED( p_intf );
const dbus_bool_t b_ret = FALSE;
dbus_message_iter_append_basic( container, DBUS_TYPE_BOOLEAN, &b_ret );
return VLC_SUCCESS;
}
DBUS_METHOD( CanRaise ) DBUS_METHOD( CanRaise )
{ {
VLC_UNUSED( p_this );
REPLY_INIT; REPLY_INIT;
OUT_ARGUMENTS; OUT_ARGUMENTS;
const dbus_bool_t b_ret = FALSE;
DBusMessageIter v; DBusMessageIter v;
dbus_message_iter_open_container( &args, DBUS_TYPE_VARIANT, "b", &v ); dbus_message_iter_open_container( &args, DBUS_TYPE_VARIANT, "b", &v );
dbus_message_iter_append_basic( &v, DBUS_TYPE_BOOLEAN, &b_ret );
MarshalCanRaise( p_this, &v );
if( !dbus_message_iter_close_container( &args, &v ) ) if( !dbus_message_iter_close_container( &args, &v ) )
return DBUS_HANDLER_RESULT_NEED_MEMORY; return DBUS_HANDLER_RESULT_NEED_MEMORY;
...@@ -122,17 +146,25 @@ DBUS_METHOD( CanRaise ) ...@@ -122,17 +146,25 @@ DBUS_METHOD( CanRaise )
REPLY_SEND; REPLY_SEND;
} }
static int
MarshalHasTrackList( intf_thread_t *p_intf, DBusMessageIter *container )
{
VLC_UNUSED( p_intf );
const dbus_bool_t b_ret = FALSE;
dbus_message_iter_append_basic( container, DBUS_TYPE_BOOLEAN, &b_ret );
return VLC_SUCCESS;
}
DBUS_METHOD( HasTrackList ) DBUS_METHOD( HasTrackList )
{ {
VLC_UNUSED( p_this );
REPLY_INIT; REPLY_INIT;
OUT_ARGUMENTS; OUT_ARGUMENTS;
const dbus_bool_t b_ret = FALSE;
DBusMessageIter v; DBusMessageIter v;
dbus_message_iter_open_container( &args, DBUS_TYPE_VARIANT, "b", &v ); dbus_message_iter_open_container( &args, DBUS_TYPE_VARIANT, "b", &v );
dbus_message_iter_append_basic( &v, DBUS_TYPE_BOOLEAN, &b_ret );
MarshalHasTrackList( p_this, &v );
if( !dbus_message_iter_close_container( &args, &v ) ) if( !dbus_message_iter_close_container( &args, &v ) )
return DBUS_HANDLER_RESULT_NEED_MEMORY; return DBUS_HANDLER_RESULT_NEED_MEMORY;
...@@ -140,17 +172,25 @@ DBUS_METHOD( HasTrackList ) ...@@ -140,17 +172,25 @@ DBUS_METHOD( HasTrackList )
REPLY_SEND; REPLY_SEND;
} }
static int
MarshalDesktopEntry( intf_thread_t *p_intf, DBusMessageIter *container )
{
VLC_UNUSED( p_intf );
const char* psz_ret = PACKAGE;
dbus_message_iter_append_basic( container, DBUS_TYPE_STRING, &psz_ret );
return VLC_SUCCESS;
}
DBUS_METHOD( DesktopEntry ) DBUS_METHOD( DesktopEntry )
{ {
VLC_UNUSED( p_this );
REPLY_INIT; REPLY_INIT;
OUT_ARGUMENTS; OUT_ARGUMENTS;
const char* psz_ret = PACKAGE;
DBusMessageIter v; DBusMessageIter v;
dbus_message_iter_open_container( &args, DBUS_TYPE_VARIANT, "s", &v ); dbus_message_iter_open_container( &args, DBUS_TYPE_VARIANT, "s", &v );
dbus_message_iter_append_basic( &v, DBUS_TYPE_STRING, &psz_ret );
MarshalDesktopEntry( p_this, &v );
if( !dbus_message_iter_close_container( &args, &v ) ) if( !dbus_message_iter_close_container( &args, &v ) )
return DBUS_HANDLER_RESULT_NEED_MEMORY; return DBUS_HANDLER_RESULT_NEED_MEMORY;
...@@ -158,25 +198,44 @@ DBUS_METHOD( DesktopEntry ) ...@@ -158,25 +198,44 @@ DBUS_METHOD( DesktopEntry )
REPLY_SEND; REPLY_SEND;
} }
DBUS_METHOD( SupportedMimeTypes ) static int
MarshalSupportedMimeTypes( intf_thread_t *p_intf, DBusMessageIter *container )
{ {
VLC_UNUSED( p_this ); VLC_UNUSED( p_intf );
REPLY_INIT; DBusMessageIter ret;
OUT_ARGUMENTS;
DBusMessageIter ret, v; size_t i_len = sizeof( ppsz_supported_mime_types ) /
dbus_message_iter_open_container( &args, DBUS_TYPE_VARIANT, "s", &v ); sizeof( *ppsz_supported_mime_types );
size_t i_len = sizeof( ppsz_supported_mime_types ) / sizeof( char* );
if( !dbus_message_iter_open_container( &v, DBUS_TYPE_ARRAY, "s", &ret ) ) if( !dbus_message_iter_open_container( container,
return DBUS_HANDLER_RESULT_NEED_MEMORY; DBUS_TYPE_ARRAY, "s",
&ret ) )
return VLC_ENOMEM;
for( size_t i = 0; i < i_len; ++i ) for( size_t i = 0; i < i_len; ++i )
{
const char* const psz_mime_type = ppsz_supported_mime_types[i];
if( !dbus_message_iter_append_basic( &ret, DBUS_TYPE_STRING, if( !dbus_message_iter_append_basic( &ret, DBUS_TYPE_STRING,
&ppsz_supported_mime_types[i] ) ) &psz_mime_type ) )
return DBUS_HANDLER_RESULT_NEED_MEMORY; return VLC_ENOMEM;
}
if( !dbus_message_iter_close_container( container, &ret ) )
return VLC_ENOMEM;
if( !dbus_message_iter_close_container( &v, &ret ) ) return VLC_SUCCESS;
}
DBUS_METHOD( SupportedMimeTypes )
{
REPLY_INIT;
OUT_ARGUMENTS;
DBusMessageIter v;
dbus_message_iter_open_container( &args, DBUS_TYPE_VARIANT, "as", &v );
if( VLC_SUCCESS != MarshalSupportedMimeTypes( p_this, &v ) )
return DBUS_HANDLER_RESULT_NEED_MEMORY; return DBUS_HANDLER_RESULT_NEED_MEMORY;
if( !dbus_message_iter_close_container( &args, &v ) ) if( !dbus_message_iter_close_container( &args, &v ) )
...@@ -185,25 +244,45 @@ DBUS_METHOD( SupportedMimeTypes ) ...@@ -185,25 +244,45 @@ DBUS_METHOD( SupportedMimeTypes )
REPLY_SEND; REPLY_SEND;
} }
DBUS_METHOD( SupportedUriSchemes ) static int
MarshalSupportedUriSchemes( intf_thread_t *p_intf, DBusMessageIter *container )
{ {
VLC_UNUSED( p_this ); VLC_UNUSED( p_intf );
REPLY_INIT; DBusMessageIter ret;
OUT_ARGUMENTS;
DBusMessageIter ret, v; size_t i_len = sizeof( ppsz_supported_uri_schemes ) /
dbus_message_iter_open_container( &args, DBUS_TYPE_VARIANT, "s", &v ); sizeof( *ppsz_supported_uri_schemes );
size_t i_len = sizeof( ppsz_supported_uri_schemes ) / sizeof( char* );
if( !dbus_message_iter_open_container( &v, DBUS_TYPE_ARRAY, "s", &ret ) ) if( !dbus_message_iter_open_container( container,
return DBUS_HANDLER_RESULT_NEED_MEMORY; DBUS_TYPE_ARRAY, "s",
&ret ) )
return VLC_ENOMEM;
for( size_t i = 0; i < i_len; ++i ) for( size_t i = 0; i < i_len; ++i )
{
const char* const psz_scheme = ppsz_supported_uri_schemes[i];
if( !dbus_message_iter_append_basic( &ret, DBUS_TYPE_STRING, if( !dbus_message_iter_append_basic( &ret, DBUS_TYPE_STRING,
&ppsz_supported_uri_schemes[i] ) ) &psz_scheme ) )
return DBUS_HANDLER_RESULT_NEED_MEMORY; return VLC_ENOMEM;
}
if( !dbus_message_iter_close_container( container, &ret ) )
return VLC_ENOMEM;
return VLC_SUCCESS;
}
DBUS_METHOD( SupportedUriSchemes )
{
VLC_UNUSED( p_this );
REPLY_INIT;
OUT_ARGUMENTS;
DBusMessageIter v;
dbus_message_iter_open_container( &args, DBUS_TYPE_VARIANT, "as", &v );
if( !dbus_message_iter_close_container( &v, &ret ) ) if( VLC_SUCCESS != MarshalSupportedUriSchemes( p_this, &v ) )
return DBUS_HANDLER_RESULT_NEED_MEMORY; return DBUS_HANDLER_RESULT_NEED_MEMORY;
if( !dbus_message_iter_close_container( &args, &v ) ) if( !dbus_message_iter_close_container( &args, &v ) )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment