Skip to content

V
vlc-2-2
Commit 50459be7 authored by Antoine Cellerier's avatar Antoine Cellerier
Browse files
Options

Fix dbus compilation

parent ea82a404
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 7 deletions
modules/control/dbus.c
View file @ 50459be7
...@@ -56,6 +56,7 @@ ...@@ -56,6 +56,7 @@
#include <vlc_interface.h> #include <vlc_interface.h>
#include <vlc_meta.h> #include <vlc_meta.h>
#include <vlc_input.h> #include <vlc_input.h>
#include <vlc_playlist.h>
/***************************************************************************** /*****************************************************************************
* Local prototypes. * Local prototypes.
...@@ -235,7 +236,7 @@ DBUS_METHOD( GetPlayingItem ) ...@@ -235,7 +236,7 @@ DBUS_METHOD( GetPlayingItem )
char *p_psz_no_input = &psz_no_input; char *p_psz_no_input = &psz_no_input;
playlist_t *p_playlist = pl_Yield( ((vlc_object_t*) p_this) ); playlist_t *p_playlist = pl_Yield( ((vlc_object_t*) p_this) );
input_thread_t *p_input = p_playlist->p_input; input_thread_t *p_input = p_playlist->p_input;
ADD_STRING( ( p_input ) ? &p_input->input.p_item->psz_name : ADD_STRING( ( p_input ) ? &input_GetItem(p_input)->psz_name :
&p_psz_no_input ); &p_psz_no_input );
pl_Release( ((vlc_object_t*) p_this) ); pl_Release( ((vlc_object_t*) p_this) );
REPLY_SEND; REPLY_SEND;
...@@ -475,7 +476,7 @@ DBUS_SIGNAL( ItemChangeSignal ) ...@@ -475,7 +476,7 @@ DBUS_SIGNAL( ItemChangeSignal )
OUT_ARGUMENTS; OUT_ARGUMENTS;
input_thread_t *p_input = (input_thread_t*) p_data; input_thread_t *p_input = (input_thread_t*) p_data;
ADD_STRING( &p_input->input.p_item->psz_name ); ADD_STRING( &input_GetItem(p_input)->psz_name );
SIGNAL_SEND; SIGNAL_SEND;
} }
......
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