From c4915c5bd99fb82c338d0ba4a3cbe136e5c305d1 Mon Sep 17 00:00:00 2001 From: Magnus Auvinen Date: Sat, 15 Dec 2007 14:30:22 +0000 Subject: added airjump sound. added the option to choose sound device --- src/engine/client/ec_snd.c | 18 ++++++++++++++++-- src/engine/e_config_variables.h | 1 + 2 files changed, 17 insertions(+), 2 deletions(-) (limited to 'src/engine') diff --git a/src/engine/client/ec_snd.c b/src/engine/client/ec_snd.c index 89e18cb8..152eac53 100644 --- a/src/engine/client/ec_snd.c +++ b/src/engine/client/ec_snd.c @@ -208,7 +208,6 @@ static void mix(short *final_out, unsigned frames) } } - /* release the lock */ lock_release(sound_lock); @@ -249,9 +248,24 @@ int snd_init() mixing_rate = config.snd_rate; - params.device = Pa_GetDefaultOutputDevice(); + { + int num = Pa_GetDeviceCount(); + int i; + const PaDeviceInfo *info; + + for(i = 0; i < num; i++) + { + info = Pa_GetDeviceInfo(i); + dbg_msg("snd", "device #%d name='%s'", i, info->name); + } + } + + params.device = config.snd_device; + if(params.device == -1) + params.device = Pa_GetDefaultOutputDevice(); if(params.device < 0) return 1; + dbg_msg("snd", "device = %d", params.device); params.channelCount = 2; params.sampleFormat = paInt16; params.suggestedLatency = Pa_GetDeviceInfo(params.device)->defaultLowOutputLatency; diff --git a/src/engine/e_config_variables.h b/src/engine/e_config_variables.h index 51ee7376..1aa6b799 100644 --- a/src/engine/e_config_variables.h +++ b/src/engine/e_config_variables.h @@ -22,6 +22,7 @@ MACRO_CONFIG_INT(b_max_requests, 10, 0, 1000) MACRO_CONFIG_INT(snd_rate, 48000, 0, 0) MACRO_CONFIG_INT(snd_enable, 1, 0, 1) MACRO_CONFIG_INT(snd_volume, 100, 0, 100) +MACRO_CONFIG_INT(snd_device, -1, 0, 0) MACRO_CONFIG_INT(gfx_screen_width, 800, 0, 0) MACRO_CONFIG_INT(gfx_screen_height, 600, 0, 0) -- cgit 1.4.1