Commit dd26ad9d authored by David Reid's avatar David Reid

Fix the Android build and fix a few typos.

parent 7fb3a304
...@@ -149,9 +149,12 @@ extern "C" { ...@@ -149,9 +149,12 @@ extern "C" {
#endif #endif
#else #else
#define MAL_POSIX #define MAL_POSIX
#if !defined(MAL_NO_ALSA) && defined(__linux__) #if !defined(MAL_NO_ALSA) && defined(__linux__) && !defined(__ANDROID__)
#define MAL_ENABLE_ALSA #define MAL_ENABLE_ALSA
#endif #endif
#ifdef __ANDROID__
#define MAL_ENABLE_OPENSLES
#endif
#include <pthread.h> // Unfortunate #include, but needed for pthread_t, pthread_mutex_t and pthread_cond_t types. #include <pthread.h> // Unfortunate #include, but needed for pthread_t, pthread_mutex_t and pthread_cond_t types.
#endif #endif
...@@ -469,7 +472,7 @@ void mal_device_set_stop_callback(mal_device* pDevice, mal_stop_proc proc); ...@@ -469,7 +472,7 @@ void mal_device_set_stop_callback(mal_device* pDevice, mal_stop_proc proc);
// recording. // recording.
// //
// For a playback device, this will retrieve an initial chunk of audio data from the client before // For a playback device, this will retrieve an initial chunk of audio data from the client before
// returning. This reason for this is to ensure there is valid audio data in the buffer, which needs // returning. The reason for this is to ensure there is valid audio data in the buffer, which needs
// to be done _before_ the device starts playing back audio. // to be done _before_ the device starts playing back audio.
// //
// Return Value: // Return Value:
...@@ -564,7 +567,7 @@ mal_uint32 mal_device_get_available_rewind_amount(mal_device* pDevice); ...@@ -564,7 +567,7 @@ mal_uint32 mal_device_get_available_rewind_amount(mal_device* pDevice);
// This currently waits on a mutex for thread-safety, but should otherwise be fairly efficient. // This currently waits on a mutex for thread-safety, but should otherwise be fairly efficient.
mal_uint32 mal_device_rewind(mal_device* pDevice, mal_uint32 framesToRewind); mal_uint32 mal_device_rewind(mal_device* pDevice, mal_uint32 framesToRewind);
// Retrieves the size of the in bytes for the given device. // Retrieves the size of the buffer in bytes for the given device.
// //
// Thread Safety: SAFE // Thread Safety: SAFE
// This is calculated from constant values which are set at initialization time and never change. // This is calculated from constant values which are set at initialization time and never change.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment