]> git.sesse.net Git - vlc/commitdiff
dbus: fix volume setting (fix #9628)
authorRémi Denis-Courmont <remi@remlab.net>
Wed, 9 Oct 2013 17:57:04 +0000 (20:57 +0300)
committerRémi Denis-Courmont <remi@remlab.net>
Wed, 9 Oct 2013 17:57:04 +0000 (20:57 +0300)
modules/control/dbus/dbus_player.c

index 88fc7e9a415ba0cde4a00bfebe816c2344e6e384..3d37e6a21bf67bd6ed88425de2c6104edb5f6d81 100644 (file)
@@ -179,10 +179,7 @@ DBUS_METHOD( VolumeSet )
     if( VLC_SUCCESS != DemarshalSetPropertyValue( p_from, &d_dbus_vol ) )
         return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 
-    d_dbus_vol *= AOUT_VOLUME_DEFAULT;
-    if( d_dbus_vol < 0. )
-        d_dbus_vol = 0.;
-    playlist_VolumeSet( PL, d_dbus_vol );
+    playlist_VolumeSet( PL, fmaxf( d_dbus_vol, 0.f ) );
 
     REPLY_SEND;
 }