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

Commit c36f2274 authored by Steve Kondik's avatar Steve Kondik
Browse files

media: Fix merge issues 

Change-Id: I89ab96a1ae415822c6d35e244fb3ebed389a1de6
parent 1ae950a3

media/libmedia/AudioRecord.cpp

+1 −1
Original line number Diff line number Diff line
@@ -311,7 +311,7 @@ status_t AudioRecord::set( 
    mMarkerReached = false;

    mNewPosition = 0;

    mUpdatePeriod = 0;

#ifdef QCOM_HARDWARE

#ifndef QCOM_HARDWARE

    mInputSource = inputSource;

#endif

    mInput = input;

media/libmediaplayerservice/MediaPlayerService.h

+1 −0
Original line number Diff line number Diff line
@@ -215,6 +215,7 @@ class MediaPlayerService : public BnMediaPlayerService 
        virtual void            close() {}

                void            setAudioStreamType(audio_stream_type_t streamType) {}

                void            setVolume(float left, float right) {}

        virtual status_t        setPlaybackRatePermille(int32_t ratePermille) { return INVALID_OPERATION; }  

#ifndef QCOM_HARDWARE

                uint32_t        sampleRate() const { return mSampleRate; }

#endif