Commit 757a4c12 authored by David Reid's avatar David Reid

Merge branch 'dev' of https://github.com/dr-soft/mini_al into dev

parents 986dac45 11d23efc
...@@ -8510,8 +8510,8 @@ static struct ...@@ -8510,8 +8510,8 @@ static struct
const char* name; const char* name;
float scale; float scale;
} g_malDefaultBufferSizeScalesALSA[] = { } g_malDefaultBufferSizeScalesALSA[] = {
{"bcm2835 IEC958/HDMI", 20}, {"bcm2835 IEC958/HDMI", 8.0f},
{"bcm2835 ALSA", 20} {"bcm2835 ALSA", 8.0f}
}; };
float mal_find_default_buffer_size_scale__alsa(const char* deviceName) float mal_find_default_buffer_size_scale__alsa(const char* deviceName)
...@@ -8541,7 +8541,7 @@ mal_format mal_convert_alsa_format_to_mal_format(mal_snd_pcm_format_t formatALSA ...@@ -8541,7 +8541,7 @@ mal_format mal_convert_alsa_format_to_mal_format(mal_snd_pcm_format_t formatALSA
case MAL_SND_PCM_FORMAT_U8: return mal_format_u8; case MAL_SND_PCM_FORMAT_U8: return mal_format_u8;
case MAL_SND_PCM_FORMAT_S16_LE: return mal_format_s16; case MAL_SND_PCM_FORMAT_S16_LE: return mal_format_s16;
case MAL_SND_PCM_FORMAT_S24_3LE: return mal_format_s24; case MAL_SND_PCM_FORMAT_S24_3LE: return mal_format_s24;
//MAL_SND_PCM_FORMAT_S24_LE, return mal_format_s24_32 //case MAL_SND_PCM_FORMAT_S24_LE: return mal_format_s24_32
case MAL_SND_PCM_FORMAT_S32_LE: return mal_format_s32; case MAL_SND_PCM_FORMAT_S32_LE: return mal_format_s32;
case MAL_SND_PCM_FORMAT_FLOAT_LE: return mal_format_f32; case MAL_SND_PCM_FORMAT_FLOAT_LE: return mal_format_f32;
default: return mal_format_unknown; default: return mal_format_unknown;
...@@ -20514,7 +20514,7 @@ float mal_calculate_cpu_speed_factor() ...@@ -20514,7 +20514,7 @@ float mal_calculate_cpu_speed_factor()
float f = 1000; float f = 1000;
// Experiment: Reduce the factor a little when debug mode is used to reduce a blowout. // Experiment: Reduce the factor a little when debug mode is used to reduce a blowout.
#ifndef NDEBUG #if !defined(NDEBUG) || defined(_DEBUG)
f /= 2; f /= 2;
#endif #endif
......
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