dbus: fix volume setting (fix #9628)

593fa456 · Rémi Denis-Courmont · 67def288 · 593fa456
Commit 593fa456 authored Oct 09, 2013 by Rémi Denis-Courmont
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 4 deletions

modules/control/dbus/dbus_player.c modules/control/dbus/dbus_player.c +1 -4

No files found.
--- a/modules/control/dbus/dbus_player.c
+++ b/modules/control/dbus/dbus_player.c
@@ -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;
 }