[vlc-devel] commit: DBus: don't use access object ( Rafaël Carré )

git version control git at videolan.org
Wed Mar 26 03:27:14 CET 2008


vlc | branch: master | Rafaël Carré <funman at videolan.org> | Wed Mar 26 03:17:08 2008 +0100| [00e497bb2cdd63ef3d3d3dcbbfc6464e28113b35]

DBus: don't use access object

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=00e497bb2cdd63ef3d3d3dcbbfc6464e28113b35
---

 modules/control/dbus.c |   16 ++++------------
 1 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/modules/control/dbus.c b/modules/control/dbus.c
index cbd6c55..55e86d0 100644
--- a/modules/control/dbus.c
+++ b/modules/control/dbus.c
@@ -54,7 +54,6 @@
 #include <vlc_input.h>
 #include <vlc_playlist.h>
 #include <vlc_demux.h>
-#include <vlc_access.h>
 
 /*****************************************************************************
  * Local prototypes.
@@ -990,20 +989,13 @@ static int UpdateCaps( intf_thread_t* p_intf )
 
     if( p_playlist->p_input )
     {
-        access_t *p_access = (access_t*)vlc_object_find( p_playlist->p_input,
-            VLC_OBJECT_ACCESS, FIND_CHILD );
-        if( p_access && p_access->pf_control )
-        {
-            vlc_bool_t b_can_pause;
-            if( !access2_Control( p_access, ACCESS_CAN_PAUSE, &b_can_pause ) &&
-                    b_can_pause )
-                i_caps |= CAPS_CAN_PAUSE;
-            vlc_object_release( p_access );
-        }
+        if( var_GetBoolean( p_playlist->p_input, "can-pause" ) )
+            i_caps |= CAPS_CAN_PAUSE;
+
         demux_t *p_demux = (demux_t*)vlc_object_find( p_playlist->p_input,
             VLC_OBJECT_DEMUX, FIND_CHILD );
         if( p_demux )
-        {   /* XXX: is: demux can seek and access can not a possibility ? */
+        {
             vlc_bool_t b_can_seek;
             if( !stream_Control( p_demux->s, STREAM_CAN_SEEK, &b_can_seek ) &&
                     b_can_seek )




More information about the vlc-devel mailing list