- use nearest integer value from integer division (i.e. round() ) in volume and time...

diff --git a/src/control/audio.c b/src/control/audio.c
index 3f39582434831f922db09d37be77e5802ea77c57..95dc77bb5532261e88c7540f27ff830346b38114 100644 (file)
--- a/src/control/audio.c
+++ b/src/control/audio.c
@@ -79,7 +79,7 @@ int libvlc_audio_get_volume( libvlc_instance_t *p_instance,
 
     aout_VolumeGet( p_instance->p_libvlc_int, &i_volume );
 
-    return i_volume*200/AOUT_VOLUME_MAX;
+    return (i_volume*200+AOUT_VOLUME_MAX/2)/AOUT_VOLUME_MAX;
 }
 
 
@@ -91,7 +91,8 @@ void libvlc_audio_set_volume( libvlc_instance_t *p_instance, int i_volume,
 {
     if( i_volume >= 0 && i_volume <= 200 )
     {
-        i_volume = i_volume * AOUT_VOLUME_MAX / 200;
+        i_volume = (i_volume * AOUT_VOLUME_MAX + 100) / 200;
+
         aout_VolumeSet( p_instance->p_libvlc_int, i_volume );
     }
     else

diff --git a/src/control/input.c b/src/control/input.c
index 12ba648920c8af6b5f263c59ea9c3b4316ecc862..d9166092ba6db8d64a17f63919e3664e523a26f4 100644 (file)
--- a/src/control/input.c
+++ b/src/control/input.c
@@ -68,7 +68,7 @@ vlc_int64_t libvlc_input_get_length( libvlc_input_t *p_input,
     var_Get( p_input_thread, "length", &val );
     vlc_object_release( p_input_thread );
 
-    return val.i_time/1000LL;
+    return (val.i_time+500LL)/1000LL;
 }
 
 vlc_int64_t libvlc_input_get_time( libvlc_input_t *p_input,
@@ -82,7 +82,7 @@ vlc_int64_t libvlc_input_get_time( libvlc_input_t *p_input,
 
     var_Get( p_input_thread , "time", &val );
     vlc_object_release( p_input_thread );
-    return val.i_time/1000LL;
+    return (val.i_time+500LL)/1000LL;
 }
 
 void libvlc_input_set_time( libvlc_input_t *p_input, vlc_int64_t time,