Merge "MidiFile uses C++ Thread not createThreadEtc"

    // create playback thread

    {

        Mutex::Autolock l(mMutex);

        createThreadEtc(renderThread, this, "midithread", ANDROID_PRIORITY_AUDIO);

        mThread = new MidiFileThread(this);

        mThread->run("midithread", ANDROID_PRIORITY_AUDIO);

        mCondition.wait(mMutex);

        ALOGV("thread started");

    }

    return NO_ERROR;

}

int MidiFile::renderThread(void* p) {

    return ((MidiFile*)p)->render();

}

int MidiFile::render() {

    EAS_RESULT result = EAS_FAILURE;

    EAS_I32 count;

namespace android {

// Note that the name MidiFile is misleading; this actually represents a MIDI file player

class MidiFile : public MediaPlayerInterface {

public:

                        MidiFile();

private:

            status_t    createOutputTrack();

            status_t    reset_nosync();

    static  int         renderThread(void*);

            int         render();

            void        updateState(){ EAS_State(mEasData, mEasHandle, &mState); }

    bool                mPaused;

    volatile bool       mRender;

    pid_t               mTid;

    class MidiFileThread : public Thread {

    public:

        MidiFileThread(MidiFile *midiPlayer) : mMidiFile(midiPlayer) {

        }

    protected:

        virtual ~MidiFileThread() {}

    private:

        MidiFile *mMidiFile;

        bool threadLoop() {

            int result;

            result = mMidiFile->render();

            return false;

        }

        MidiFileThread(const MidiFileThread &);

        MidiFileThread &operator=(const MidiFileThread &);

    };

    sp<MidiFileThread> mThread;

};

}; // namespace android