[vlc-commits] dbus: remove useless intf_sys_t.b_unique

Rémi Denis-Courmont git at videolan.org
Tue Feb 7 21:17:52 CET 2012


vlc/vlc-2.0 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Feb  6 22:30:43 2012 +0200| [fa585eda57c64ed0b6e3d2a9f90126f67ceb1eaf] | committer: Rémi Denis-Courmont

dbus: remove useless intf_sys_t.b_unique

(cherry picked from commit b740301ca1847714f7c625b350379c859b99292d)

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

 modules/control/dbus/dbus.c        |    3 +--
 modules/control/dbus/dbus_common.h |    1 -
 2 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/modules/control/dbus/dbus.c b/modules/control/dbus/dbus.c
index a5e8e69..7166e8f 100644
--- a/modules/control/dbus/dbus.c
+++ b/modules/control/dbus/dbus.c
@@ -179,8 +179,7 @@ static int Open( vlc_object_t *p_this )
     }
 
     char psz_service_name[sizeof(DBUS_MPRIS_BUS_NAME) + 12];
-    p_sys->b_unique = var_CreateGetBool( p_intf, "dbus-unique-service-id" );
-    if( p_sys->b_unique )
+    if( var_InheritBool( p_intf, "dbus-unique-service-id" ) )
         snprintf( psz_service_name, sizeof( psz_service_name ),
                   DBUS_MPRIS_BUS_NAME"-%d", getpid() );
     else
diff --git a/modules/control/dbus/dbus_common.h b/modules/control/dbus/dbus_common.h
index 22e550e..dd1f011 100644
--- a/modules/control/dbus/dbus_common.h
+++ b/modules/control/dbus/dbus_common.h
@@ -103,7 +103,6 @@ struct intf_sys_t
     input_thread_t *p_input;
     mtime_t         i_last_input_pos; /* Only access it from the input thread */
     mtime_t         i_last_input_pos_event; /* idem */
-    bool            b_unique;
 };
 
 enum



More information about the vlc-commits mailing list