From a4072246c513ad4d54588b763b7508fe6133e3cb Mon Sep 17 00:00:00 2001 From: David Reid Date: Tue, 15 Jul 2025 07:21:30 +1000 Subject: [PATCH] Rename some variables and try silencing a warning. --- extras/decoders/libopus/miniaudio_libopus.c | 5 +++-- extras/decoders/libvorbis/miniaudio_libvorbis.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/extras/decoders/libopus/miniaudio_libopus.c b/extras/decoders/libopus/miniaudio_libopus.c index df353359..f0c9ea1d 100644 --- a/extras/decoders/libopus/miniaudio_libopus.c +++ b/extras/decoders/libopus/miniaudio_libopus.c @@ -35,7 +35,7 @@ static ma_result ma_libopus_ds_get_length(ma_data_source* pDataSource, ma_uint64 return ma_libopus_get_length_in_pcm_frames((ma_libopus*)pDataSource, pLength); } -static ma_data_source_vtable g_ma_libopus_ds_vtable = +static ma_data_source_vtable ma_gDataSourceVTable_libopus = { ma_libopus_ds_read, ma_libopus_ds_seek, @@ -123,7 +123,7 @@ static ma_result ma_libopus_init_internal(const ma_decoding_backend_config* pCon } dataSourceConfig = ma_data_source_config_init(); - dataSourceConfig.vtable = &g_ma_libopus_ds_vtable; + dataSourceConfig.vtable = &ma_gDataSourceVTable_libopus; result = ma_data_source_init(&dataSourceConfig, &pOpus->ds); if (result != MA_SUCCESS) { @@ -174,6 +174,7 @@ MA_API ma_result ma_libopus_init(ma_read_proc onRead, ma_seek_proc onSeek, ma_te #else { /* libopus is disabled. */ + (void)ma_gDataSourceVTable_libopus; return MA_NOT_IMPLEMENTED; } #endif diff --git a/extras/decoders/libvorbis/miniaudio_libvorbis.c b/extras/decoders/libvorbis/miniaudio_libvorbis.c index 889787c9..d678888b 100644 --- a/extras/decoders/libvorbis/miniaudio_libvorbis.c +++ b/extras/decoders/libvorbis/miniaudio_libvorbis.c @@ -38,7 +38,7 @@ static ma_result ma_libvorbis_ds_get_length(ma_data_source* pDataSource, ma_uint return ma_libvorbis_get_length_in_pcm_frames((ma_libvorbis*)pDataSource, pLength); } -static ma_data_source_vtable g_ma_libvorbis_ds_vtable = +static ma_data_source_vtable ma_gDataSourceVTable_libvorbis = { ma_libvorbis_ds_read, ma_libvorbis_ds_seek, @@ -131,7 +131,7 @@ static ma_result ma_libvorbis_init_internal(const ma_decoding_backend_config* pC ma_data_source_config dataSourceConfig; dataSourceConfig = ma_data_source_config_init(); - dataSourceConfig.vtable = &g_ma_libvorbis_ds_vtable; + dataSourceConfig.vtable = &ma_gDataSourceVTable_libvorbis; result = ma_data_source_init(&dataSourceConfig, &pVorbis->ds); if (result != MA_SUCCESS) { @@ -149,6 +149,7 @@ static ma_result ma_libvorbis_init_internal(const ma_decoding_backend_config* pC #else { /* libvorbis is disabled. */ + (void)ma_gDataSourceVTable_libvorbis; (void)pAllocationCallbacks; return MA_NOT_IMPLEMENTED; }