[vlc-commits] dbus: use the correct volume variables

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <rafael.carre at gmail.com> | Wed Jun 15 17:12:26 2011 -0400| [7f965d559691e7ed11fa84d7a0cc1a42450208c8] | committer: Rafaël Carré

dbus: use the correct volume variables

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

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

diff --git a/modules/control/dbus/dbus.c b/modules/control/dbus/dbus.c
index 6f34f15..6fe6b1d 100644
--- a/modules/control/dbus/dbus.c
+++ b/modules/control/dbus/dbus.c
@@ -236,8 +236,8 @@ static int Open( vlc_object_t *p_this )
 
     var_AddCallback( p_playlist, "item-current", AllCallback, p_intf );
     var_AddCallback( p_playlist, "intf-change", AllCallback, p_intf );
-    var_AddCallback( p_playlist, "volume-change", AllCallback, p_intf );
-    var_AddCallback( p_playlist, "volume-muted", AllCallback, p_intf );
+    var_AddCallback( p_playlist, "volume", AllCallback, p_intf );
+    var_AddCallback( p_playlist, "mute", AllCallback, p_intf );
     var_AddCallback( p_playlist, "playlist-item-append", AllCallback, p_intf );
     var_AddCallback( p_playlist, "playlist-item-deleted", AllCallback, p_intf );
     var_AddCallback( p_playlist, "random", AllCallback, p_intf );
@@ -289,8 +289,8 @@ static void Close   ( vlc_object_t *p_this )
 
     var_DelCallback( p_playlist, "item-current", AllCallback, p_intf );
     var_DelCallback( p_playlist, "intf-change", AllCallback, p_intf );
-    var_DelCallback( p_playlist, "volume-change", AllCallback, p_intf );
-    var_DelCallback( p_playlist, "volume-muted", AllCallback, p_intf );
+    var_DelCallback( p_playlist, "volume", AllCallback, p_intf );
+    var_DelCallback( p_playlist, "mute", AllCallback, p_intf );
     var_DelCallback( p_playlist, "playlist-item-append", AllCallback, p_intf );
     var_DelCallback( p_playlist, "playlist-item-deleted", AllCallback, p_intf );
     var_DelCallback( p_playlist, "random", AllCallback, p_intf );
@@ -1042,10 +1042,10 @@ static int AllCallback( vlc_object_t *p_this, const char *psz_var,
     if( !strcmp( "item-current", psz_var ) )
         info->signal = SIGNAL_ITEM_CURRENT;
 
-    else if( !strcmp( "volume-change", psz_var ) )
+    else if( !strcmp( "volume", psz_var ) )
         info->signal = SIGNAL_VOLUME_CHANGE;
 
-    else if( !strcmp( "volume-muted", psz_var ) )
+    else if( !strcmp( "mute", psz_var ) )
         info->signal = SIGNAL_VOLUME_MUTED;
 
     else if( !strcmp( "intf-change", psz_var ) )