Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SDL: allow to select input and output devices for sound like for open… #557

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

SDL: allow to select input and output devices for sound like for open… #557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/client/snd_dma.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ void S_Base_SoundInfo(void) {
} else {
Com_Printf("No background file.\n" );
}

SNDDMA_SoundInfo();
}
Com_Printf("----------------------\n" );
}
Expand Down
2 changes: 2 additions & 0 deletions code/client/snd_local.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,8 @@ void SNDDMA_BeginPainting (void);

void SNDDMA_Submit(void);

void SNDDMA_SoundInfo(void);

#ifdef USE_VOIP
void SNDDMA_StartCapture(void);
int SNDDMA_AvailableCaptureSamples(void);
Expand Down
56 changes: 51 additions & 5 deletions code/sdl/sdl_snd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@ cvar_t *s_sdlSpeed;
cvar_t *s_sdlChannels;
cvar_t *s_sdlDevSamps;
cvar_t *s_sdlMixSamps;
cvar_t *s_sdlDevice;
cvar_t *s_sdlInputDevice;
cvar_t *s_sdlAvailableDevices;
cvar_t *s_sdlAvailableInputDevices;

/* The audio callback. All the magic happens here. */
static int dmapos = 0;
Expand Down Expand Up @@ -178,6 +182,15 @@ static void SNDDMA_PrintAudiospec(const char *str, const SDL_AudioSpec *spec)
Com_Printf( " Channels: %d\n", (int) spec->channels );
}

void SNDDMA_SoundInfo(void) {
Com_Printf( "Output device: %s\n", s_sdlDevice->string );
Com_Printf( "Available Devices:\n%s", s_sdlAvailableDevices->string );
#ifdef USE_SDL_AUDIO_CAPTURE
Com_Printf( "Input Device: %s\n", s_sdlInputDevice->string );
Com_Printf( "Available Input Devices:\n%s", s_sdlAvailableInputDevices->string );
#endif
}

/*
===============
SNDDMA_Init
Expand All @@ -187,7 +200,10 @@ qboolean SNDDMA_Init(void)
{
SDL_AudioSpec desired;
SDL_AudioSpec obtained;
int tmp;
int tmp, count, i;
const char *device;
const char *inputdevice;
char devicenames[16384] = "";

if (snd_inited)
return qtrue;
Expand Down Expand Up @@ -240,10 +256,31 @@ qboolean SNDDMA_Init(void)
desired.samples = 2048; // (*shrug*)
}

count = SDL_GetNumAudioDevices(0);
for (i = 0; i < count; ++i) {
const char *name = SDL_GetAudioDeviceName(i, 0);
if (name) {
Q_strcat(devicenames, sizeof(devicenames), name);
Q_strcat(devicenames, sizeof(devicenames), "\n");
}
}
s_sdlAvailableDevices = Cvar_Get("s_sdlAvailableDevices", devicenames, CVAR_ROM | CVAR_NORESTART);

s_sdlInputDevice = Cvar_Get("s_sdlInputDevice", "", CVAR_ARCHIVE | CVAR_LATCH);
s_sdlDevice = Cvar_Get("s_sdlDevice", "", CVAR_ARCHIVE | CVAR_LATCH);

device = s_sdlDevice->string;
if (device && !*device)
device = NULL;

inputdevice = s_sdlInputDevice->string;
if (inputdevice && !*inputdevice)
inputdevice = NULL;

desired.channels = (int) s_sdlChannels->value;
desired.callback = SNDDMA_AudioCallback;

sdlPlaybackDevice = SDL_OpenAudioDevice(NULL, SDL_FALSE, &desired, &obtained, SDL_AUDIO_ALLOW_ANY_CHANGE);
sdlPlaybackDevice = SDL_OpenAudioDevice(device, SDL_FALSE, &desired, &obtained, SDL_AUDIO_ALLOW_ANY_CHANGE);
if (sdlPlaybackDevice == 0)
{
Com_Printf("SDL_OpenAudioDevice() failed: %s\n", SDL_GetError());
Expand Down Expand Up @@ -279,7 +316,6 @@ qboolean SNDDMA_Init(void)
dma.buffer = calloc(1, dmasize);

#ifdef USE_SDL_AUDIO_CAPTURE
// !!! FIXME: some of these SDL_OpenAudioDevice() values should be cvars.
s_sdlCapture = Cvar_Get( "s_sdlCapture", "1", CVAR_ARCHIVE | CVAR_LATCH );
if (!s_sdlCapture->integer)
{
Expand All @@ -293,14 +329,24 @@ qboolean SNDDMA_Init(void)
#endif
else
{
/* !!! FIXME: list available devices and let cvar specify one, like OpenAL does */
count = SDL_GetNumAudioDevices(1);
devicenames[0] = '\0';
for (i = 0; i < count; ++i) {
const char *name = SDL_GetAudioDeviceName(i, 1);
if (name) {
Q_strcat(devicenames, sizeof(devicenames), name);
Q_strcat(devicenames, sizeof(devicenames), "\n");
}
}
s_sdlAvailableInputDevices =
Cvar_Get("s_sdlAvailableInputDevices", devicenames, CVAR_ROM | CVAR_NORESTART);
SDL_AudioSpec spec;
SDL_zero(spec);
spec.freq = 48000;
spec.format = AUDIO_S16SYS;
spec.channels = 1;
spec.samples = VOIP_MAX_PACKET_SAMPLES * 4;
sdlCaptureDevice = SDL_OpenAudioDevice(NULL, SDL_TRUE, &spec, NULL, 0);
sdlCaptureDevice = SDL_OpenAudioDevice(inputdevice, SDL_TRUE, &spec, NULL, 0);
Com_Printf( "SDL capture device %s.\n",
(sdlCaptureDevice == 0) ? "failed to open" : "opened");
}
Expand Down