mirror/miniaudio
1
0
Fork 0
mirror of https://github.com/mackron/miniaudio.git synced 2026-04-23 16:54:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Reorder parameters in the callback.

Browse Source 
This swaps the order of the input and output pointers so that it's
consistent with the order used by memcpy().
This commit is contained in:
David Reid
2019-01-12 11:04:11 +10:00
parent 67db06350d
commit 4980fcf3c5
9 changed files with 76 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/mal_dithering.c
+2 -2
View File
@@ -30,7 +30,7 @@ mal_uint32 on_convert_samples_out(mal_format_converter* pConverter, mal_uint32 f
return (mal_uint32)mal_format_converter_read(pConverterIn, frameCount, pFrames, NULL);
}
void on_send_to_device__original(mal_device* pDevice, const void* pInput, void* pOutput, mal_uint32 frameCount)
void on_send_to_device__original(mal_device* pDevice, void* pOutput, const void* pInput, mal_uint32 frameCount)
{
mal_assert(pDevice->format == mal_format_f32);
mal_assert(pDevice->channels == 1);
@@ -41,7 +41,7 @@ void on_send_to_device__original(mal_device* pDevice, const void* pInput, void*
(void)pInput;
}
void on_send_to_device__dithered(mal_device* pDevice, const void* pInput, void* pOutput, mal_uint32 frameCount)
void on_send_to_device__dithered(mal_device* pDevice, void* pOutput, const void* pInput, mal_uint32 frameCount)
{
mal_assert(pDevice->channels == 1);
tests/mal_duplex.c
+47
View File
@@ -0,0 +1,47 @@
#include <stdio.h>
#define MINI_AL_IMPLEMENTATION
#include "../mini_al.h"
void on_stop(mal_device* pDevice)
{
(void)pDevice;
printf("STOPPED\n");
}
void data_callback(mal_device* pDevice, void* pOutput, const void* pInput, mal_uint32 frameCount)
{
/* In our this test the format and channel count is the same for both input and output which means we can just memcpy(). */
mal_copy_memory(pOutput, pInput, frameCount * mal_get_bytes_per_frame(pDevice->format, pDevice->channels));
}
int main(int argc, char** argv)
{
mal_result result;
(void)argc;
(void)argv;
mal_backend backend = mal_backend_wasapi;
mal_device_config config = mal_device_config_init_default(data_callback, NULL);
config.format = mal_format_f32;
config.channels = 2;
config.sampleRate = 44100;
config.onStopCallback = on_stop;
config.bufferSizeInFrames = 16384*4;
mal_device device;
result = mal_device_init_ex(&backend, 1, NULL, mal_device_type_playback, NULL, &config, &device);
if (result != MAL_SUCCESS) {
return result;
}
mal_device_start(&device);
printf("Press Enter to quit...\n");
getchar();
mal_device_uninit(&device);
return 0;
}
tests/mal_stop.c
+1 -1
View File
@@ -14,7 +14,7 @@ void on_stop(mal_device* pDevice)
printf("STOPPED\n");
}
void data_callback(mal_device* pDevice, const void* pInput, void* pOutput, mal_uint32 frameCount)
void data_callback(mal_device* pDevice, void* pOutput, const void* pInput, mal_uint32 frameCount)
{
(void)pInput; /* Not used yet. */
tests/mal_test_0.c
+1 -1
View File
@@ -2232,7 +2232,7 @@ typedef struct
mal_event endOfPlaybackEvent;
} playback_test_callback_data;
void on_send__playback_test(mal_device* pDevice, const void* pInput, void* pOutput, mal_uint32 frameCount)
void on_send__playback_test(mal_device* pDevice, void* pOutput, const void* pInput, mal_uint32 frameCount)
{
playback_test_callback_data* pData = (playback_test_callback_data*)pDevice->pUserData;
mal_assert(pData != NULL);
tests/mal_test_0.vcxproj
+14 -7
View File
@@ -319,12 +319,12 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="mal_duplex.c">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="mal_no_device_io.c">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
@@ -350,7 +350,14 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="mal_stop.c" />
<ClCompile Include="mal_stop.c">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="mal_test_0.c">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
tests/mal_unplugging.c
+2 -2
View File
@@ -23,12 +23,12 @@ void on_stop(mal_device* pDevice)
mal_event_signal(&g_stopEvent);
}
mal_uint32 on_send(mal_device* pDevice, mal_uint32 frameCount, void* pFramesOut)
void on_send(mal_device* pDevice, void* pFramesOut, const void* pFramesIn, mal_uint32 frameCount)
{
mal_assert(pDevice != NULL);
//printf("TESTING: %d\n", frameCount);
return (mal_uint32)mal_sine_wave_read_f32_ex(&g_sineWave, frameCount, pDevice->channels, mal_stream_layout_interleaved, (float**)&pFramesOut);
mal_sine_wave_read_f32_ex(&g_sineWave, frameCount, pDevice->channels, mal_stream_layout_interleaved, (float**)&pFramesOut);
}
int main()