1 files changed, 26 insertions, 10 deletions

diff --git a/plugins/alsa/alsa-effect-ramp.c b/plugins/alsa/alsa-effect-ramp.c
index 312bdfa..e51879d 100644
--- a/plugins/alsa/alsa-effect-ramp.c
+++ b/plugins/alsa/alsa-effect-ramp.c
@@ -84,7 +84,7 @@ PUBLIC int AlsaVolRampApply(SoftMixerT *mixer, AlsaSndCtlT *sndcard, AlsaStreamA
     long curvol, newvol;
     const char *uid, *volS;
     json_object *volJ;
-    int error, index;
+	int error;
     uint64_t usec;
     int count = 0;
 
@@ -93,7 +93,9 @@ PUBLIC int AlsaVolRampApply(SoftMixerT *mixer, AlsaSndCtlT *sndcard, AlsaStreamA
             , "volume", &volJ
             );
     if (error) {
-        AFB_ApiError(mixer->api, "AlsaVolRampApply:mixer=%s stream=%s invalid-json should {uid:ramp, vol:[+,-,=]value} ramp=%s", mixer->uid, stream->uid, json_object_get_string(rampJ));
+		AFB_ApiError(mixer->api,
+					 "%s: mixer=%s stream=%s invalid-json should {uid:ramp, vol:[+,-,=]value} ramp=%s",
+					 __func__, mixer->uid, stream->uid, json_object_get_string(rampJ));
         goto OnErrorExit;
     }
 
@@ -125,7 +127,9 @@ PUBLIC int AlsaVolRampApply(SoftMixerT *mixer, AlsaSndCtlT *sndcard, AlsaStreamA
             }
             
             if (count != 1) {
-                AFB_ApiError(mixer->api, "AlsaVolRampApply:mixer=%s stream=%s invalid-numeric expect {uid:%s, vol:[+,-,=]value} get vol:%s", mixer->uid, stream->uid, uid, json_object_get_string(volJ));
+				AFB_ApiError(mixer->api,
+							 "%s: mixer=%s stream=%s invalid-numeric expect {uid:%s, vol:[+,-,=]value} get vol:%s",
+							 __func__, mixer->uid, stream->uid, uid, json_object_get_string(volJ));
                 goto OnErrorExit;                
             }
             break;
@@ -134,35 +138,47 @@ PUBLIC int AlsaVolRampApply(SoftMixerT *mixer, AlsaSndCtlT *sndcard, AlsaStreamA
             break;
 
         default:
-            AFB_ApiError(mixer->api, "AlsaVolRampApply:mixer=%s stream=%s invalid-type expect {uid:%s, vol:[+,-,=]value} get vol:%s", mixer->uid, stream->uid, uid, json_object_get_string(volJ));
+			AFB_ApiError(mixer->api,
+						 "%s :mixer=%s stream=%s invalid-type expect {uid:%s, vol:[+,-,=]value} get vol:%s",
+						 __func__, mixer->uid, stream->uid, uid, json_object_get_string(volJ));
             goto OnErrorExit;
 
     }
 
     error = AlsaCtlNumidGetLong(mixer, sndcard, stream->volume, &curvol);
     if (error) {
-        AFB_ApiError(mixer->api, "AlsaVolRampApply:mixer=%s stream=%s ramp=%s Fail to get volume from numid=%d", mixer->uid, stream->uid, uid, stream->volume);
+		AFB_ApiError(mixer->api,
+					 "%s: mixer=%s stream=%s ramp=%s Fail to get volume from numid=%d",
+					 __func__, mixer->uid, stream->uid, uid, stream->volume);
         goto OnErrorExit;
     }
     
     // search for ramp uid in mixer
-    for (index=0; index<= mixer->max.ramps; index++) {
-        if (!strcasecmp(mixer->ramps[index]->uid, uid)) {
+	AlsaVolRampT * ramp;
+	bool found = false;
+	cds_list_for_each_entry(ramp, &mixer->ramps.list, list) {
+		if (ramp->uid && !strcasecmp(ramp->uid, uid)) {
             break;
         }
     }
     
-    if (index == mixer->max.ramps) {
-        AFB_ApiError(mixer->api, "AlsaVolRampApply:mixer=%s stream=%s ramp=%s does not exit", mixer->uid, stream->uid, uid);
+	if (!found) {
+		AFB_ApiError(mixer->api,
+					 "%s: mixer=%s stream=%s ramp=%s does not exit",
+					 __func__, mixer->uid, stream->uid, uid);
         goto OnErrorExit;        
     }
 
     VolRampHandleT *rHandle = calloc(1, sizeof (VolRampHandleT));
+	if (rHandle == NULL) {
+		SOFTMIXER_NOMEM(mixer->api);
+		goto OnErrorExit;
+	}
     rHandle->uid = stream->uid;
     rHandle->numid = stream->volume;
     rHandle->sndcard = sndcard;
     rHandle->mixer = mixer;
-    rHandle->ramp = mixer->ramps[index];
+	rHandle->ramp = ramp;
     rHandle->target = newvol;
     rHandle->current = curvol;
     rHandle->sdLoop = mixer->sdLoop;