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

Commit 6d327d5e authored by Emerson Pinter's avatar Emerson Pinter Committed by Ricardo Cerqueira
Browse files

More ifdefs for ICS audio blobs support 

Change-Id: I1e01db9b7cb2da45a3e52aafe7574b689a9c57f4
parent b589eadf

media/libnbaio/AudioStreamOutSink.cpp

+4 −1
Original line number Diff line number Diff line
@@ -72,11 +72,14 @@ status_t AudioStreamOutSink::getNextWriteTimestamp(int64_t *timestamp) { 


    if (NULL == mStream)

        return INVALID_OPERATION;



#ifndef ICS_AUDIO_BLOB

    if (NULL == mStream->get_next_write_timestamp)

        return INVALID_OPERATION;



    return mStream->get_next_write_timestamp(mStream, timestamp);

#else

    return INVALID_OPERATION;

#endif

}



status_t AudioStreamOutSink::getTimestamp(AudioTimestamp& timestamp)

services/audioflinger/AudioFlinger.cpp

+1 −1
Original line number Diff line number Diff line
@@ -742,6 +742,7 @@ status_t AudioFlinger::setMasterMute(bool muted) 
    Mutex::Autolock _l(mLock);

    mMasterMute = muted;



#ifndef ICS_AUDIO_BLOB

    // Set master mute in the HALs which support it.

    for (size_t i = 0; i < mAudioHwDevs.size(); i++) {

        AutoMutex lock(mHardwareLock);
@@ -758,7 +759,6 @@ status_t AudioFlinger::setMasterMute(bool muted) 
    // assigned to HALs which do not have master mute support will apply master

    // mute during the mix operation.  Threads with HALs which do support master

    // mute will simply ignore the setting.

#ifndef ICS_AUDIO_BLOB

    for (size_t i = 0; i < mPlaybackThreads.size(); i++)

        mPlaybackThreads.valueAt(i)->setMasterMute(muted);

#endif