Remove newlines from log messages
This commit is contained in:
committed by
Sam Lantinga
parent
17625e20df
commit
718034f5fa
@@ -23,28 +23,30 @@ print_devices(bool recording)
|
||||
SDL_AudioDeviceID *devices = recording ? SDL_GetAudioRecordingDevices(&n) : SDL_GetAudioPlaybackDevices(&n);
|
||||
|
||||
if (!devices) {
|
||||
SDL_Log(" Driver failed to report %s devices: %s\n\n", typestr, SDL_GetError());
|
||||
SDL_Log(" Driver failed to report %s devices: %s", typestr, SDL_GetError());
|
||||
SDL_Log("%s", "");
|
||||
} else if (n == 0) {
|
||||
SDL_Log(" No %s devices found.\n\n", typestr);
|
||||
SDL_Log(" No %s devices found.", typestr);
|
||||
SDL_Log("%s", "");
|
||||
} else {
|
||||
int i;
|
||||
SDL_Log("Found %d %s device%s:\n", n, typestr, n != 1 ? "s" : "");
|
||||
SDL_Log("Found %d %s device%s:", n, typestr, n != 1 ? "s" : "");
|
||||
for (i = 0; i < n; i++) {
|
||||
const char *name = SDL_GetAudioDeviceName(devices[i]);
|
||||
if (name) {
|
||||
SDL_Log(" %d: %s\n", i, name);
|
||||
SDL_Log(" %d: %s", i, name);
|
||||
} else {
|
||||
SDL_Log(" %d Error: %s\n", i, SDL_GetError());
|
||||
SDL_Log(" %d Error: %s", i, SDL_GetError());
|
||||
}
|
||||
|
||||
if (SDL_GetAudioDeviceFormat(devices[i], &spec, &frames)) {
|
||||
SDL_Log(" Sample Rate: %d\n", spec.freq);
|
||||
SDL_Log(" Channels: %d\n", spec.channels);
|
||||
SDL_Log(" SDL_AudioFormat: %X\n", spec.format);
|
||||
SDL_Log(" Buffer Size: %d frames\n", frames);
|
||||
SDL_Log(" Sample Rate: %d", spec.freq);
|
||||
SDL_Log(" Channels: %d", spec.channels);
|
||||
SDL_Log(" SDL_AudioFormat: %X", spec.format);
|
||||
SDL_Log(" Buffer Size: %d frames", frames);
|
||||
}
|
||||
}
|
||||
SDL_Log("\n");
|
||||
SDL_Log("%s", "");
|
||||
}
|
||||
SDL_free(devices);
|
||||
}
|
||||
@@ -70,45 +72,47 @@ int main(int argc, char **argv)
|
||||
|
||||
/* Load the SDL library */
|
||||
if (!SDL_Init(SDL_INIT_AUDIO)) {
|
||||
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't initialize SDL: %s\n", SDL_GetError());
|
||||
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't initialize SDL: %s", SDL_GetError());
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* Print available audio drivers */
|
||||
n = SDL_GetNumAudioDrivers();
|
||||
if (n == 0) {
|
||||
SDL_Log("No built-in audio drivers\n\n");
|
||||
SDL_Log("No built-in audio drivers");
|
||||
SDL_Log("%s", "");
|
||||
} else {
|
||||
SDL_Log("Built-in audio drivers:\n");
|
||||
SDL_Log("Built-in audio drivers:");
|
||||
for (i = 0; i < n; ++i) {
|
||||
SDL_Log(" %d: %s\n", i, SDL_GetAudioDriver(i));
|
||||
SDL_Log(" %d: %s", i, SDL_GetAudioDriver(i));
|
||||
}
|
||||
SDL_Log("Select a driver with the SDL_AUDIO_DRIVER environment variable.\n");
|
||||
SDL_Log("Select a driver with the SDL_AUDIO_DRIVER environment variable.");
|
||||
}
|
||||
|
||||
SDL_Log("Using audio driver: %s\n\n", SDL_GetCurrentAudioDriver());
|
||||
SDL_Log("Using audio driver: %s", SDL_GetCurrentAudioDriver());
|
||||
SDL_Log("%s", "");
|
||||
|
||||
print_devices(false);
|
||||
print_devices(true);
|
||||
|
||||
if (SDL_GetAudioDeviceFormat(SDL_AUDIO_DEVICE_DEFAULT_PLAYBACK, &spec, &frames)) {
|
||||
SDL_Log("Default Playback Device:\n");
|
||||
SDL_Log("Sample Rate: %d\n", spec.freq);
|
||||
SDL_Log("Channels: %d\n", spec.channels);
|
||||
SDL_Log("SDL_AudioFormat: %X\n", spec.format);
|
||||
SDL_Log("Buffer Size: %d frames\n", frames);
|
||||
SDL_Log("Default Playback Device:");
|
||||
SDL_Log("Sample Rate: %d", spec.freq);
|
||||
SDL_Log("Channels: %d", spec.channels);
|
||||
SDL_Log("SDL_AudioFormat: %X", spec.format);
|
||||
SDL_Log("Buffer Size: %d frames", frames);
|
||||
} else {
|
||||
SDL_Log("Error when calling SDL_GetAudioDeviceFormat(default playback): %s\n", SDL_GetError());
|
||||
SDL_Log("Error when calling SDL_GetAudioDeviceFormat(default playback): %s", SDL_GetError());
|
||||
}
|
||||
|
||||
if (SDL_GetAudioDeviceFormat(SDL_AUDIO_DEVICE_DEFAULT_RECORDING, &spec, &frames)) {
|
||||
SDL_Log("Default Recording Device:\n");
|
||||
SDL_Log("Sample Rate: %d\n", spec.freq);
|
||||
SDL_Log("Channels: %d\n", spec.channels);
|
||||
SDL_Log("SDL_AudioFormat: %X\n", spec.format);
|
||||
SDL_Log("Buffer Size: %d frames\n", frames);
|
||||
SDL_Log("Default Recording Device:");
|
||||
SDL_Log("Sample Rate: %d", spec.freq);
|
||||
SDL_Log("Channels: %d", spec.channels);
|
||||
SDL_Log("SDL_AudioFormat: %X", spec.format);
|
||||
SDL_Log("Buffer Size: %d frames", frames);
|
||||
} else {
|
||||
SDL_Log("Error when calling SDL_GetAudioDeviceFormat(default recording): %s\n", SDL_GetError());
|
||||
SDL_Log("Error when calling SDL_GetAudioDeviceFormat(default recording): %s", SDL_GetError());
|
||||
}
|
||||
|
||||
SDL_Quit();
|
||||
|
||||
Reference in New Issue
Block a user