vlc | branch: master | Mirsal Ennaime <[email protected]> | Sun Mar 18 18:43:47 2012 +0100| [6707159eedaf6cd9b2a62df0b48cbe9acecf9d37] | committer: Mirsal Ennaime
dbus: remove useless callback and fix warnings > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6707159eedaf6cd9b2a62df0b48cbe9acecf9d37 --- modules/control/dbus/dbus.c | 18 ++---------------- 1 files changed, 2 insertions(+), 16 deletions(-) diff --git a/modules/control/dbus/dbus.c b/modules/control/dbus/dbus.c index 5ea1d04..be9f0bd 100644 --- a/modules/control/dbus/dbus.c +++ b/modules/control/dbus/dbus.c @@ -97,10 +97,6 @@ static void Run ( intf_thread_t * ); static int TrackChange( intf_thread_t * ); static int AllCallback( vlc_object_t*, const char*, vlc_value_t, vlc_value_t, void* ); -static void dispatch_status_cb( DBusConnection *p_conn, - DBusDispatchStatus i_status, - void *p_data); - static dbus_bool_t add_timeout ( DBusTimeout *p_timeout, void *p_data ); static dbus_bool_t add_watch ( DBusWatch *p_watch, void *p_data ); @@ -233,10 +229,6 @@ static int Open( vlc_object_t *p_this ) var_AddCallback( p_playlist, "loop", AllCallback, p_intf ); var_AddCallback( p_playlist, "fullscreen", AllCallback, p_intf ); - dbus_connection_set_dispatch_status_function( p_conn, - dispatch_status_cb, - p_intf, NULL ); - if( !dbus_connection_set_timeout_functions( p_conn, add_timeout, remove_timeout, @@ -313,14 +305,6 @@ static void Close ( vlc_object_t *p_this ) free( p_sys ); } -static void dispatch_status_cb( DBusConnection *p_conn, - DBusDispatchStatus i_status, - void *p_data) -{ - (void) p_conn; - -} - static dbus_bool_t add_timeout( DBusTimeout *p_timeout, void *p_data ) { intf_thread_t *p_intf = (intf_thread_t*) p_data; @@ -617,6 +601,8 @@ static void ProcessWatches( intf_thread_t *p_intf, DBusWatch **p_watches, int i_watches, struct pollfd *p_fds, int i_fds ) { + VLC_UNUSED(p_intf); + /* Process watches */ for( int i = 0; i < i_watches; i++ ) { _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
