mirror of
https://github.com/mackron/miniaudio.git
synced 2026-04-22 00:06:59 +02:00
Fix the Android build.
This commit is contained in:
+4
-4
@@ -40685,8 +40685,8 @@ static void ma_device_uninit__aaudio(ma_device* pDevice)
|
|||||||
|
|
||||||
static ma_result ma_device_start_stream__aaudio(ma_device* pDevice, ma_AAudioStream* pStream)
|
static ma_result ma_device_start_stream__aaudio(ma_device* pDevice, ma_AAudioStream* pStream)
|
||||||
{
|
{
|
||||||
ma_device_state_aaudio* pDeviceStateAAudio = ma_device_get_backend_state__aaudio(pDevice);
|
/*ma_device_state_aaudio* pDeviceStateAAudio = ma_device_get_backend_state__aaudio(pDevice);*/
|
||||||
/*ma_context_state_aaudio* pContextStateAAudio = ma_context_get_backend_state__aaudio(ma_device_get_context(pDevice));*/
|
ma_context_state_aaudio* pContextStateAAudio = ma_context_get_backend_state__aaudio(ma_device_get_context(pDevice));
|
||||||
ma_aaudio_result_t resultAA;
|
ma_aaudio_result_t resultAA;
|
||||||
ma_aaudio_stream_state_t currentState;
|
ma_aaudio_stream_state_t currentState;
|
||||||
|
|
||||||
@@ -40723,8 +40723,8 @@ static ma_result ma_device_start_stream__aaudio(ma_device* pDevice, ma_AAudioStr
|
|||||||
|
|
||||||
static ma_result ma_device_stop_stream__aaudio(ma_device* pDevice, ma_AAudioStream* pStream)
|
static ma_result ma_device_stop_stream__aaudio(ma_device* pDevice, ma_AAudioStream* pStream)
|
||||||
{
|
{
|
||||||
ma_device_state_aaudio* pDeviceStateAAudio = ma_device_get_backend_state__aaudio(pDevice);
|
/*ma_device_state_aaudio* pDeviceStateAAudio = ma_device_get_backend_state__aaudio(pDevice);*/
|
||||||
/*ma_context_state_aaudio* pContextStateAAudio = ma_context_get_backend_state__aaudio(ma_device_get_context(pDevice));*/
|
ma_context_state_aaudio* pContextStateAAudio = ma_context_get_backend_state__aaudio(ma_device_get_context(pDevice));
|
||||||
ma_aaudio_result_t resultAA;
|
ma_aaudio_result_t resultAA;
|
||||||
ma_aaudio_stream_state_t currentState;
|
ma_aaudio_stream_state_t currentState;
|
||||||
|
|
||||||
|
|||||||
@@ -15,6 +15,12 @@ android {
|
|||||||
versionName = "1.0"
|
versionName = "1.0"
|
||||||
|
|
||||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||||
|
|
||||||
|
externalNativeBuild {
|
||||||
|
cmake {
|
||||||
|
cppFlags += "-Wall -Wextra -pedantic"
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
buildTypes {
|
buildTypes {
|
||||||
|
|||||||
@@ -34,6 +34,8 @@ static void data_callback(ma_device* pDevice, void* pFramesOut, const void* pFra
|
|||||||
auto* pAudioState = (audio_state_t*)pDevice->pUserData;
|
auto* pAudioState = (audio_state_t*)pDevice->pUserData;
|
||||||
assert(pAudioState != nullptr);
|
assert(pAudioState != nullptr);
|
||||||
|
|
||||||
|
(void)pFramesIn;
|
||||||
|
|
||||||
ma_waveform_read_pcm_frames(&pAudioState->waveform, pFramesOut, frameCount, nullptr);
|
ma_waveform_read_pcm_frames(&pAudioState->waveform, pFramesOut, frameCount, nullptr);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -56,6 +58,8 @@ Java_io_miniaud_miniaudiotester_MainActivity_UninitializeAudio(JNIEnv *env, jobj
|
|||||||
pAudioState->hasError = false;
|
pAudioState->hasError = false;
|
||||||
pAudioState->errorMessage = "";
|
pAudioState->errorMessage = "";
|
||||||
|
|
||||||
|
(void)env;
|
||||||
|
|
||||||
return (jlong)pAudioState;
|
return (jlong)pAudioState;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -114,6 +118,8 @@ Java_io_miniaud_miniaudiotester_MainActivity_PlayAudio(JNIEnv *env, jobject, jlo
|
|||||||
audio_state_set_error(pAudioState, (std::string("Failed to start device. ") + ma_result_description(result)).c_str());
|
audio_state_set_error(pAudioState, (std::string("Failed to start device. ") + ma_result_description(result)).c_str());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
(void)env;
|
||||||
|
|
||||||
return (jlong)pAudioState;
|
return (jlong)pAudioState;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -137,6 +143,8 @@ Java_io_miniaud_miniaudiotester_MainActivity_PauseAudio(JNIEnv *env, jobject, jl
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
(void)env;
|
||||||
|
|
||||||
return (jlong)pAudioState;
|
return (jlong)pAudioState;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -149,6 +157,8 @@ Java_io_miniaud_miniaudiotester_MainActivity_HasAudioError(JNIEnv *env, jobject,
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
(void)env;
|
||||||
|
|
||||||
return pAudioState->hasError;
|
return pAudioState->hasError;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user