Backed out changeset e3fcdad257fc - testaudiocapture.c already does what we want
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206
diff --git a/test/Makefile.in b/test/Makefile.in
index f92c936..68f0d3d 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -9,7 +9,6 @@ LIBS = @LIBS@
TARGETS = \
checkkeys$(EXE) \
- loopbackaudio$(EXE) \
loopwave$(EXE) \
loopwavequeue$(EXE) \
testatomic$(EXE) \
@@ -76,9 +75,6 @@ Makefile: $(srcdir)/Makefile.in
checkkeys$(EXE): $(srcdir)/checkkeys.c
$(CC) -o $@ $^ $(CFLAGS) $(LIBS)
-loopbackaudio$(EXE): $(srcdir)/loopbackaudio.c
- $(CC) -o $@ $^ $(CFLAGS) $(LIBS)
-
loopwave$(EXE): $(srcdir)/loopwave.c
$(CC) -o $@ $^ $(CFLAGS) $(LIBS)
diff --git a/test/README b/test/README
index 8464219..f6282be 100644
--- a/test/README
+++ b/test/README
@@ -2,7 +2,6 @@
These are test programs for the SDL library:
checkkeys Watch the key events to check the keyboard
- loopbackaudio Audio test -- record from the microphone and play it back immediately
loopwave Audio test -- loop playing a WAV file
loopwavequeue Audio test -- loop playing a WAV file with SDL_QueueAudio
testaudioinfo Lists audio device capabilities
diff --git a/test/loopbackaudio.c b/test/loopbackaudio.c
deleted file mode 100644
index 11ba1a3..0000000
--- a/test/loopbackaudio.c
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- Copyright (C) 1997-2017 Sam Lantinga <slouken@libsdl.org>
-
- This software is provided 'as-is', without any express or implied
- warranty. In no event will the authors be held liable for any damages
- arising from the use of this software.
-
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely.
-*/
-
-/* Program to record audio from the microphone and play it back immediately */
-
-#include "SDL_config.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#if HAVE_SIGNAL_H
-#include <signal.h>
-#endif
-
-#ifdef __EMSCRIPTEN__
-#include <emscripten/emscripten.h>
-#endif
-
-#include "SDL.h"
-
-static SDL_AudioDeviceID device;
-static SDL_AudioDeviceID capture;
-
-static void SDLCALL
-fillerup(void *unused, Uint8 * stream, int len)
-{
- SDL_QueueAudio(device, stream, len);
-}
-
-/* Call this instead of exit(), so we can clean up SDL: atexit() is evil. */
-static void
-quit(int rc)
-{
- SDL_Quit();
- exit(rc);
-}
-
-static void
-close_audio()
-{
- if (capture != 0) {
- SDL_CloseAudioDevice(capture);
- capture = 0;
- }
- if (device != 0) {
- SDL_CloseAudioDevice(device);
- device = 0;
- }
-}
-
-static void
-open_audio()
-{
- SDL_AudioSpec spec;
-
- SDL_zero(spec);
- spec.freq = 44100;
- spec.format = AUDIO_S16;
- spec.channels = 1;
- spec.samples = 1024;
- spec.callback = fillerup;
-
- capture = SDL_OpenAudioDevice(NULL, SDL_TRUE, &spec, &spec, SDL_AUDIO_ALLOW_ANY_CHANGE);
- if (!capture) {
- SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't open microphone: %s\n", SDL_GetError());
- quit(2);
- }
-
- spec.callback = NULL;
-
- device = SDL_OpenAudioDevice(NULL, SDL_FALSE, &spec, NULL, 0);
- if (!device) {
- SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't open audio: %s\n", SDL_GetError());
- quit(2);
- }
-
- /* Let the audio run */
- SDL_PauseAudioDevice(capture, SDL_FALSE);
- SDL_PauseAudioDevice(device, SDL_FALSE);
-}
-
-static void reopen_audio()
-{
- close_audio();
- open_audio();
-}
-
-
-static int done = 0;
-void
-poked(int sig)
-{
- done = 1;
-}
-
-#ifdef __EMSCRIPTEN__
-void
-loop()
-{
- if(done || (SDL_GetAudioDeviceStatus(capture) != SDL_AUDIO_PLAYING) || (SDL_GetAudioDeviceStatus(device) != SDL_AUDIO_PLAYING))
- emscripten_cancel_main_loop();
-}
-#endif
-
-int
-main(int argc, char *argv[])
-{
- int i;
-
- /* Enable standard application logging */
- SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
-
- /* Load the SDL library */
- if (SDL_Init(SDL_INIT_AUDIO|SDL_INIT_EVENTS) < 0) {
- SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't initialize SDL: %s\n", SDL_GetError());
- return (1);
- }
-
- /* Show the list of available drivers */
- SDL_Log("Available audio drivers:");
- for (i = 0; i < SDL_GetNumAudioDrivers(); ++i) {
- SDL_Log("%i: %s", i, SDL_GetAudioDriver(i));
- }
-
- SDL_Log("Using audio driver: %s\n", SDL_GetCurrentAudioDriver());
-
- open_audio();
-
- SDL_FlushEvents(SDL_AUDIODEVICEADDED, SDL_AUDIODEVICEREMOVED);
-
-#ifdef __EMSCRIPTEN__
- emscripten_set_main_loop(loop, 0, 1);
-#else
- while (!done) {
- SDL_Event event;
-
- while (SDL_PollEvent(&event) > 0) {
- if (event.type == SDL_QUIT) {
- done = 1;
- }
- if (event.type == SDL_AUDIODEVICEADDED ||
- (event.type == SDL_AUDIODEVICEREMOVED && event.adevice.iscapture && event.adevice.which == capture) ||
- (event.type == SDL_AUDIODEVICEREMOVED && !event.adevice.iscapture && event.adevice.which == device)) {
- reopen_audio();
- }
- }
- SDL_Delay(100);
- }
-#endif
-
- /* Clean up on signal */
- close_audio();
- SDL_Quit();
- return (0);
-}
-
-/* vi: set ts=4 sw=4 expandtab: */