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

Commit 9d4b193d authored by Glenn Kasten's avatar Glenn Kasten Committed by android-build-merger
Browse files

Merge "Replace AAUDIO_DEVICE_UNSPECIFIED by AAUDIO_UNSPECIFIED" into oc-dev am: be9c9d5a 

am: 6cc4fa18

Change-Id: Ib56556fe778316967757e4d270abc3a18239530e
parents 8f779cf3 6cc4fa18

media/libaaudio/include/aaudio/AAudio.h

+2 −3
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ extern "C" { 
 * and would accept whatever it was given.

 */

#define AAUDIO_UNSPECIFIED           0

#define AAUDIO_DEVICE_UNSPECIFIED    0



enum {

    AAUDIO_DIRECTION_OUTPUT,
@@ -191,11 +190,11 @@ AAUDIO_API aaudio_result_t AAudio_createStreamBuilder(AAudioStreamBuilder** buil 
 * Request an audio device identified device using an ID.

 * On Android, for example, the ID could be obtained from the Java AudioManager.

 *

 * The default, if you do not call this function, is AAUDIO_DEVICE_UNSPECIFIED,

 * The default, if you do not call this function, is AAUDIO_UNSPECIFIED,

 * in which case the primary device will be used.

 *

 * @param builder reference provided by AAudio_createStreamBuilder()

 * @param deviceId device identifier or AAUDIO_DEVICE_UNSPECIFIED

 * @param deviceId device identifier or AAUDIO_UNSPECIFIED

 */

AAUDIO_API void AAudioStreamBuilder_setDeviceId(AAudioStreamBuilder* builder,

                                                     int32_t deviceId);

media/libaaudio/src/binding/AAudioStreamConfiguration.h

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ public: 
    void dump() const;



private:

    int32_t               mDeviceId        = AAUDIO_DEVICE_UNSPECIFIED;

    int32_t               mDeviceId        = AAUDIO_UNSPECIFIED;

    int32_t               mSampleRate      = AAUDIO_UNSPECIFIED;

    int32_t               mSamplesPerFrame = AAUDIO_UNSPECIFIED;

    aaudio_sharing_mode_t mSharingMode     = AAUDIO_SHARING_MODE_SHARED;

media/libaaudio/src/core/AudioStreamBuilder.h

+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ public: 
private:

    int32_t                    mSamplesPerFrame = AAUDIO_UNSPECIFIED;

    int32_t                    mSampleRate = AAUDIO_UNSPECIFIED;

    int32_t                    mDeviceId = AAUDIO_DEVICE_UNSPECIFIED;

    int32_t                    mDeviceId = AAUDIO_UNSPECIFIED;

    aaudio_sharing_mode_t      mSharingMode = AAUDIO_SHARING_MODE_SHARED;

    bool                       mSharingModeMatchRequired = false; // must match sharing mode requested

    aaudio_format_t            mFormat = AAUDIO_FORMAT_UNSPECIFIED;