mix: Update logic to set ramp finished flag

- The ramp finished flag could not be set as TRUE although "left" is reached to 0.

[Version] 11.1-81
[Profile] Common
[Issue Type] Update

Change-Id: I8ac34723379b42e41d12b9f685395bb0c7af6bba
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>

diff --git a/packaging/pulseaudio.spec b/packaging/pulseaudio.spec
index 708a5b0..b72cc0e 100644 (file)
--- a/packaging/pulseaudio.spec
+++ b/packaging/pulseaudio.spec
@@ -3,7 +3,7 @@
 Name:             pulseaudio
 Summary:          Improved Linux sound server
 Version:          11.1
-Release:          80
+Release:          81
 Group:            Multimedia/Audio
 License:          LGPL-2.1
 URL:              http://pulseaudio.org

diff --git a/src/pulsecore/mix.c b/src/pulsecore/mix.c
index c3d3d2f..02f2729 100644 (file)
--- a/src/pulsecore/mix.c
+++ b/src/pulsecore/mix.c
@@ -833,14 +833,16 @@ static void calc_volume_ramps(pa_cvolume_ramp_int *ramp, float *vol)
     int i;
 
     for (i = 0; i < ramp->channels; i++) {
+        if (ramp->ramps[i].left > 0) {
+            vol[i] = ramp->ramps[i].curr = calc_volume_ramp_table[ramp->ramps[i].type] (&ramp->ramps[i]);
+            ramp->ramps[i].left--;
+        }
+
         if (ramp->ramps[i].left <= 0) {
             if (ramp->ramps[i].target == PA_VOLUME_NORM) {
                 vol[i] = 1.0;
             }
             ramp->finished = true;
-        } else {
-            vol[i] = ramp->ramps[i].curr = calc_volume_ramp_table[ramp->ramps[i].type] (&ramp->ramps[i]);
-            ramp->ramps[i].left--;
         }
     }
 }