Remove obsolete -audio-in and -audio-out options.

Use -audio <backend> to select the audio driver.

Change-Id: I71c837e4c78241711be5f38ef9b03294a69145bd

6 files changed, 0 insertions, 138 deletions

diff --git a/android/cmdline-options.h b/android/cmdline-options.h
index 3ee5f45..104de7e 100644
--- a/android/cmdline-options.h
+++ b/android/cmdline-options.h
@@ -108,8 +108,6 @@ OPT_PARAM( logcat, "<tags>", "enable logcat output with given tags" )
 OPT_FLAG ( no_audio, "disable audio support" )
 OPT_FLAG ( noaudio,  "same as -no-audio" )
 OPT_PARAM( audio,    "<backend>", "use specific audio backend" )
-OPT_PARAM( audio_in, "<backend>", "use specific audio input backend" )
-OPT_PARAM( audio_out,"<backend>", "use specific audio output backend" )
 
 OPT_FLAG ( raw_keys, "disable Unicode keyboard reverse-mapping" )
 OPT_PARAM( radio, "<device>", "redirect radio modem interface to character device" )
diff --git a/android/help.c b/android/help.c
index f226cf6..c49f3ff 100644
--- a/android/help.c
+++ b/android/help.c
@@ -889,71 +889,11 @@ help_audio(stralloc_t*  out)
     "  the '-audio <backend>' option allows you to select a specific backend\n"
     "  to be used to both play and record audio in the Android emulator.\n\n"
 
-    "  this is equivalent to calling both '-audio-in <backend>' and\n"
-    "  '-audio-out <backend>' at the same time.\n\n"
-
-    "  use '-help-audio-out' to see a list of valid output <backend> values.\n"
-    "  use '-help-audio-in'  to see a list of valid input <backend> values.\n"
     "  use '-audio none' to disable audio completely.\n\n"
     );
 }
 
 static void
-help_audio_out(stralloc_t*  out)
-{
-    int  nn;
-
-    PRINTF(
-        "  the  '-audio-out <backend>' option allows you to select a specific\n"
-        "  backend to play audio in the Android emulator. this is mostly useful\n"
-        "  on Linux\n\n"
-
-        "  on this system, output <backend> can be one of the following:\n\n"
-    );
-    for ( nn = 0; ; nn++ ) {
-        char  name[512];
-        char  descr[4096];
-        if (android_core_audio_get_backend_name(0, nn, name, sizeof(name),
-                                                descr, sizeof(descr))) {
-            break;
-        }
-        PRINTF( "    %-10s %s\n", name, descr );
-    }
-    PRINTF( "\n" );
-}
-
-static void
-help_audio_in(stralloc_t*  out)
-{
-    int  nn;
-
-    PRINTF(
-        "  the  '-audio-in <backend>' option allows you to select a specific\n"
-        "  backend to play audio in the Android emulator. this is mostly useful\n"
-        "  on Linux\n\n"
-
-        "  IMPORTANT NOTE:\n"
-        "     on some Linux systems, broken Esd/ALSA/driver implementations will\n"
-        "     make your emulator freeze and become totally unresponsive when\n"
-        "     using audio recording. the only way to avoid this is to use\n"
-        "     '-audio-in none' to disable it\n\n"
-
-        "  on this system, input <backend> can be one of:\n\n"
-    );
-    for ( nn = 0; ; nn++ ) {
-        char  name[512];
-        char  descr[4096];
-        if (android_core_audio_get_backend_name(1, nn, name, sizeof(name),
-                                                descr, sizeof(descr))) {
-            break;
-        }
-        PRINTF( "    %-10s %s\n", name, descr );
-    }
-    PRINTF( "\n" );
-}
-
-
-static void
 help_scale(stralloc_t*  out)
 {
     PRINTF(
diff --git a/android/main-ui.c b/android/main-ui.c
index 043a9a8..688c529 100644
--- a/android/main-ui.c
+++ b/android/main-ui.c
@@ -1472,15 +1472,6 @@ int main(int argc, char **argv)
         args[n++] = opts->audio;
     }
 
-    if (opts->audio_in) {
-        args[n++] = "-audio-in";
-        args[n++] = opts->audio_in;
-    }
-    if (opts->audio_out) {
-        args[n++] = "-audio-out";
-        args[n++] = opts->audio_out;
-    }
-
     if (opts->cpu_delay) {
         args[n++] = "-cpu-delay";
         args[n++] = opts->cpu_delay;
diff --git a/android/main.c b/android/main.c
index 0eebffb..1244c13 100644
--- a/android/main.c
+++ b/android/main.c
@@ -1240,15 +1240,6 @@ int main(int argc, char **argv)
         args[n++] = opts->audio;
     }
 
-    if (opts->audio_in) {
-        args[n++] = "-audio-in";
-        args[n++] = opts->audio_in;
-    }
-    if (opts->audio_out) {
-        args[n++] = "-audio-out";
-        args[n++] = opts->audio_out;
-    }
-
     if (opts->cpu_delay) {
         args[n++] = "-cpu-delay";
         args[n++] = opts->cpu_delay;
diff --git a/qemu-options.hx b/qemu-options.hx
index aee7b6b..bd5934b 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -1653,12 +1653,6 @@ DEF("gps", HAS_ARG, QEMU_OPTION_gps, \
 DEF("audio", HAS_ARG, QEMU_OPTION_audio, \
     "-audio <backend> use specific audio backend\n")
 
-DEF("audio-in", HAS_ARG, QEMU_OPTION_audio_in, \
-    "-audio-in <backend> use specific audio input backend\n")
-
-DEF("audio-out", HAS_ARG, QEMU_OPTION_audio_out, \
-    "-audio-out <backend> use specific audio output backend\n")
-
 DEF("cpu-delay", HAS_ARG, QEMU_OPTION_cpu_delay, \
     "-cpu-delay <cpudelay> throttle CPU emulation\n")
 
diff --git a/vl-android.c b/vl-android.c
index 1b79404..57be79c 100644
--- a/vl-android.c
+++ b/vl-android.c
@@ -350,12 +350,6 @@ char* android_op_gps = NULL;
 /* -audio option value. */
 char* android_op_audio = NULL;
 
-/* -audio-in option value. */
-char* android_op_audio_in = NULL;
-
-/* -audio-out option value. */
-char* android_op_audio_out = NULL;
-
 /* -cpu-delay option value. */
 char* android_op_cpu_delay = NULL;
 
@@ -4601,14 +4595,6 @@ int main(int argc, char **argv, char **envp)
                 android_op_audio = (char*)optarg;
                 break;
 
-            case QEMU_OPTION_audio_in:
-                android_op_audio_in = (char*)optarg;
-                break;
-
-            case QEMU_OPTION_audio_out:
-                android_op_audio_out = (char*)optarg;
-                break;
-
             case QEMU_OPTION_cpu_delay:
                 android_op_cpu_delay = (char*)optarg;
                 break;
@@ -4788,48 +4774,10 @@ int main(int argc, char **argv, char **envp)
 
     /* Initialize audio. */
     if (android_op_audio) {
-        if (android_op_audio_in || android_op_audio_out) {
-            PANIC("you can't use -audio with -audio-in or -audio-out");
-        }
         if ( !audio_check_backend_name( 0, android_op_audio ) ) {
             PANIC("'%s' is not a valid audio output backend. see -help-audio-out",
                     android_op_audio);
         }
-        android_op_audio_out = android_op_audio;
-        android_op_audio_in  = android_op_audio;
-
-        if ( !audio_check_backend_name( 1, android_op_audio ) ) {
-            fprintf(stdout,
-                    "emulator: warning: '%s' is not a valid audio input backend. audio record disabled\n",
-                    android_op_audio);
-            android_op_audio_in = "none";
-        }
-    }
-
-    if (android_op_audio_in) {
-        static char  env[64]; /* note: putenv needs a static unique string buffer */
-        if ( !audio_check_backend_name( 1, android_op_audio_in ) ) {
-            PANIC("'%s' is not a valid audio input backend. see -help-audio-in",
-                    android_op_audio_in);
-        }
-        bufprint( env, env+sizeof(env), "QEMU_AUDIO_IN_DRV=%s", android_op_audio_in );
-        putenv( env );
-
-        if (!android_hw->hw_audioInput) {
-            fprintf(stdout, "Emulated hardware doesn't have audio input.\n");
-        }
-    }
-    if (android_op_audio_out) {
-        static char  env[64]; /* note: putenv needs a static unique string buffer */
-        if ( !audio_check_backend_name( 0, android_op_audio_out ) ) {
-            PANIC("'%s' is not a valid audio output backend. see -help-audio-out",
-                    android_op_audio_out);
-        }
-        bufprint( env, env+sizeof(env), "QEMU_AUDIO_OUT_DRV=%s", android_op_audio_out );
-        putenv( env );
-        if (!android_hw->hw_audioOutput) {
-            fprintf(stdout, "Emulated hardware doesn't have audio output\n");
-        }
     }
 
     if (android_op_cpu_delay) {