Merge "oboe: permit use from C" (8526d86a) · Commits · e / os / android_frameworks_av

media/liboboe/include/oboe/OboeAudio.h

+8 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,10 @@

		#include "OboeDefinitions.h"

		#ifdef __cplusplus
		extern "C" {
		#endif

		typedef int32_t OboeDeviceId;
		typedef oboe_handle_t OboeStream;
		typedef oboe_handle_t OboeStreamBuilder;
		@@ -533,4 +537,8 @@ oboe_result_t OboeStream_getTimestamp(OboeStream stream,
		oboe_position_frames_t *framePosition,
		oboe_nanoseconds_t *timeNanoseconds);

		#ifdef __cplusplus
		}
		#endif

		#endif //NATIVEOBOE_OBOEAUDIO_H

+9 −1

Original line number	Diff line number	Diff line
		@@ -19,7 +19,11 @@

		#include <stdint.h>

		typedef int32_t oboe_handle_t;
		#ifdef __cplusplus
		extern "C" {
		#endif

		typedef int32_t oboe_handle_t; // negative handles are error codes
		typedef int32_t oboe_result_t;
		typedef int32_t oboe_sample_rate_t;
		/** This is used for small quantities such as the number of frames in a buffer. */
		@@ -174,4 +178,8 @@ typedef enum {
		OBOE_SHARING_MODE_COUNT // This should always be last.
		} oboe_sharing_mode_t;

		#ifdef __cplusplus
		}
		#endif

		#endif // OBOE_OBOEDEFINITIONS_H