[vlc-devel] [PATCH 9/9] dbus: Cosmetics
Mirsal Ennaime
mirsal at mirsal.fr
Tue Feb 8 22:36:04 CET 2011
* Fix slight whitespace issues
* Update my e-mail address
---
modules/control/dbus/dbus.c | 15 ++++++++++++---
modules/control/dbus/dbus.h | 2 +-
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/modules/control/dbus/dbus.c b/modules/control/dbus/dbus.c
index c78ac33..ac64d15 100644
--- a/modules/control/dbus/dbus.c
+++ b/modules/control/dbus/dbus.c
@@ -7,7 +7,7 @@
* $Id$
*
* Authors: Rafaël Carré <funman at videolanorg>
- * Mirsal Ennaime <mirsal dot ennaime at gmail dot com>
+ * Mirsal Ennaime <mirsal at mirsal fr>
*
* 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
@@ -929,37 +929,45 @@ static int AllCallback( vlc_object_t *p_this, const char *psz_var,
{
(void)p_this;
(void)oldval;
- intf_thread_t *p_intf = (intf_thread_t*)p_data;
+ intf_thread_t *p_intf = (intf_thread_t*)p_data;
callback_info_t *info = malloc( sizeof( callback_info_t ) );
+
if( !info )
return VLC_ENOMEM;
-
vlc_mutex_lock( &p_intf->p_sys->lock );
// Wich event is it ?
if( !strcmp( "item-current", psz_var ) )
info->signal = SIGNAL_ITEM_CURRENT;
+
else if( !strcmp( "intf-change", psz_var ) )
info->signal = SIGNAL_INTF_CHANGE;
+
else if( !strcmp( "playlist-item-append", psz_var ) )
{
info->signal = SIGNAL_PLAYLIST_ITEM_APPEND;
info->i_node = ((playlist_add_t*)newval.p_address)->i_node;
}
+
else if( !strcmp( "playlist-item-deleted", psz_var ) )
info->signal = SIGNAL_PLAYLIST_ITEM_DELETED;
+
else if( !strcmp( "random", psz_var ) )
info->signal = SIGNAL_RANDOM;
+
else if( !strcmp( "repeat", psz_var ) )
info->signal = SIGNAL_REPEAT;
+
else if( !strcmp( "loop", psz_var ) )
info->signal = SIGNAL_LOOP;
+
else if( !strcmp( "intf-event", psz_var ) )
{
int i_res;
i_res = InputIntfEventCallback( p_intf, p_this, newval.i_int, info );
+
if( VLC_SUCCESS != i_res )
{
vlc_mutex_unlock( &p_intf->p_sys->lock );
@@ -968,6 +976,7 @@ static int AllCallback( vlc_object_t *p_this, const char *psz_var,
return i_res;
}
}
+
else
assert(0);
diff --git a/modules/control/dbus/dbus.h b/modules/control/dbus/dbus.h
index 7a6a5e5..0a5ac8a 100644
--- a/modules/control/dbus/dbus.h
+++ b/modules/control/dbus/dbus.h
@@ -7,7 +7,7 @@
* $Id$
*
* Authors: Rafaël Carré <funman at videolanorg>
- * Mirsal ENNAIME <mirsal dot ennaime at gmail dot com>
+ * Mirsal Ennaime <mirsal at mirsal fr>
*
* 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
--
1.7.1
More information about the vlc-devel
mailing list