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

Commit f79d40e3 authored by Ricardo Cerqueira's avatar Ricardo Cerqueira Committed by Gerrit Code Review
Browse files

Merge "More ifdefs for ICS audio blobs support" into cm-10.2

parents bb7cdef6 f5321854

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

}



}   // namespace android

services/audioflinger/AudioFlinger.cpp

+1 −1
Original line number Diff line number Diff line
@@ -862,6 +862,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);
@@ -878,7 +879,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