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

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

Revert "Use AudioTrack::event_type not int in callback" 

This reverts commit 2225e4b7049fa3fb9d39a068b8268b63c952d7c1
parent 013b5a67

include/media/AudioTrack.h

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ public: 
     *          - EVENT_BUFFER_END: unused.

     */



    typedef void (*callback_t)(event_type event, void* user, void *info);

    typedef void (*callback_t)(int event, void* user, void *info);



    /* Returns the minimum frame count required for the successful creation of

     * an AudioTrack object.

include/media/ToneGenerator.h

+1 −1
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ private: 
    unsigned int mProcessSize;  // Size of audio blocks generated at a time by audioCallback() (in PCM frames).



    bool initAudioTrack();

    static void audioCallback(AudioTrack::event_type event, void* user, void *info);

    static void audioCallback(int event, void* user, void *info);

    bool prepareWave();

    unsigned int numWaves(unsigned int segmentIdx);

    void clearWaveGens();

include/media/stagefright/AudioPlayer.h

+2 −3
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 


#define AUDIO_PLAYER_H_



#include <media/AudioTrack.h>

#include <media/MediaPlayerInterface.h>

#include <media/stagefright/MediaBuffer.h>

#include <media/stagefright/TimeSource.h>
@@ -96,8 +95,8 @@ private: 
    sp<MediaPlayerBase::AudioSink> mAudioSink;

    AwesomePlayer *mObserver;



    static void AudioCallback(AudioTrack::event_type event, void *user, void *info);

    void AudioCallback(AudioTrack::event_type event, void *info);

    static void AudioCallback(int event, void *user, void *info);

    void AudioCallback(int event, void *info);



    static size_t AudioSinkCallback(

            MediaPlayerBase::AudioSink *audioSink,

media/libmedia/ToneGenerator.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1076,7 +1076,7 @@ initAudioTrack_exit: 
//        returned value: always true.

//

////////////////////////////////////////////////////////////////////////////////

void ToneGenerator::audioCallback(AudioTrack::event_type event, void* user, void *info) {

void ToneGenerator::audioCallback(int event, void* user, void *info) {



    if (event != AudioTrack::EVENT_MORE_DATA) return;

media/libmediaplayerservice/MediaPlayerService.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1454,7 +1454,7 @@ status_t MediaPlayerService::AudioOutput::attachAuxEffect(int effectId) 


// static

void MediaPlayerService::AudioOutput::CallbackWrapper(

        AudioTrack::event_type event, void *cookie, void *info) {

        int event, void *cookie, void *info) {

    //LOGV("callbackwrapper");

    if (event != AudioTrack::EVENT_MORE_DATA) {

        return;