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

Commit e063c308 authored by Glenn Kasten's avatar Glenn Kasten Committed by Android (Google) Code Review
Browse files

Merge "Whitespace"

parents 0fe43154 d2027336

include/media/AudioTrack.h

+1 −1
Original line number Diff line number Diff line
@@ -560,7 +560,6 @@ public: 
     *  frameCount  currently ignored but recommend to set to actual number of frames filled

     *  size        actual number of bytes filled, must be multiple of frameSize

     *  raw         ignored

     *

     */

    // FIXME make private when obtainBuffer() for TRANSFER_OBTAIN is removed

            void        releaseBuffer(const Buffer* audioBuffer);
@@ -774,6 +773,7 @@ protected: 
    bool                    mMarkerReached;

    uint32_t                mNewPosition;           // in frames

    uint32_t                mUpdatePeriod;          // in frames, zero means no EVENT_NEW_POS



    uint32_t                mServer;                // in frames, last known mProxy->getPosition()

                                                    // which is count of frames consumed by server,

                                                    // reset by new IAudioTrack,

media/libmedia/IMediaHTTPConnection.cpp

+1 −2
Original line number Diff line number Diff line
@@ -179,4 +179,3 @@ IMPLEMENT_META_INTERFACE( 
        MediaHTTPConnection, "android.media.IMediaHTTPConnection");



} // namespace android

media/libmedia/IMediaHTTPService.cpp

+1 −2
Original line number Diff line number Diff line
@@ -55,4 +55,3 @@ IMPLEMENT_META_INTERFACE( 
        MediaHTTPService, "android.media.IMediaHTTPService");



} // namespace android

include/media/AudioRecord.h

+4 −4

File changed.

Contains only whitespace changes.