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

Commit feee33ce authored by Chih-hung Hsieh's avatar Chih-hung Hsieh Committed by Gerrit Code Review
Browse files

Merge "Fix google-explicit-constructor warnings in soundpool."

parents cfc9f5d0 ae1aadc0

media/jni/soundpool/SoundPool.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -37,7 +37,7 @@ class SoundPool; 
// for queued events

// for queued events

class SoundPoolEvent {

class SoundPoolEvent {

public:

public:

    SoundPoolEvent(int msg, int arg1=0, int arg2=0) :

    explicit SoundPoolEvent(int msg, int arg1=0, int arg2=0) :

        mMsg(msg), mArg1(arg1), mArg2(arg2) {}

        mMsg(msg), mArg1(arg1), mArg2(arg2) {}

    int         mMsg;

    int         mMsg;

    int         mArg1;

    int         mArg1;

media/jni/soundpool/SoundPoolThread.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -40,7 +40,7 @@ public: 
 */

 */

class SoundPoolThread {

class SoundPoolThread {

public:

public:

    SoundPoolThread(SoundPool* SoundPool);

    explicit SoundPoolThread(SoundPool* SoundPool);

    ~SoundPoolThread();

    ~SoundPoolThread();

    void loadSample(int sampleID);

    void loadSample(int sampleID);

    void quit();

    void quit();