Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fba380a0 authored by Glenn Kasten's avatar Glenn Kasten
Browse files

setActiveTrack and setBufferProvider can't fail 

Return void, not status_t, from setActiveTrack and setBufferProvider.

These methods returned status_t, but the callers never checked the
return value.  Since these aren't externally visible APIs, they now
return void, and assert on bad input parameters.

Change-Id: I530ed29484596ae41e8659826ca425149c51c2a1
parent eebeceec

services/audioflinger/AudioMixer.cpp

+7 −8
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#define LOG_TAG "AudioMixer"

//#define LOG_NDEBUG 0



#include <assert.h>

#include <stdint.h>

#include <string.h>

#include <stdlib.h>
@@ -169,13 +170,12 @@ status_t AudioMixer::disable(int name) 
    return NO_ERROR;

}



status_t AudioMixer::setActiveTrack(int track)

void AudioMixer::setActiveTrack(int track)

{

    if (uint32_t(track-TRACK0) >= MAX_NUM_TRACKS) {

        return BAD_VALUE;

    }

    mActiveTrack = track - TRACK0;

    return NO_ERROR;

    // this also catches track < TRACK0

    track -= TRACK0;

    assert(uint32_t(track) < MAX_NUM_TRACKS);

    mActiveTrack = track;

}



status_t AudioMixer::setParameter(int target, int name, void *value)
@@ -332,10 +332,9 @@ void AudioMixer::track_t::adjustVolumeRamp(bool aux) 
}





status_t AudioMixer::setBufferProvider(AudioBufferProvider* buffer)

void AudioMixer::setBufferProvider(AudioBufferProvider* buffer)

{

    mState.tracks[ mActiveTrack ].bufferProvider = buffer;

    return NO_ERROR;

}

services/audioflinger/AudioMixer.h

+2 −2
Original line number Diff line number Diff line
@@ -81,10 +81,10 @@ public: 
    status_t    enable(int name);

    status_t    disable(int name);



    status_t    setActiveTrack(int track);

    void        setActiveTrack(int track);

    status_t    setParameter(int target, int name, void *value);



    status_t    setBufferProvider(AudioBufferProvider* bufferProvider);

    void        setBufferProvider(AudioBufferProvider* bufferProvider);

    void        process();



    uint32_t    trackNames() const { return mTrackNames; }