alsabat: add default device name for playback and capture

Add default name for the playback and capture devices, in case
they were not set by user through '-D', '-P' or '-C' options.
Previously, if no device be specified, the alsabat will start
a playback thread and a capture thread, and then exit the
threads with error log.
If only one of playback and capture is specified, the alsabat
will work on single line mode as before, where only one thread
(playback or capture) will be started.
The patch was tested on Ubuntu and Chrome OS.

Signed-off-by: Lu, Han <han.lu@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/bat/alsa.c b/bat/alsa.c
index 5eaa25b6145632cb32a8457c9b783ac7672f91c8..5775748daf2eb29d7cfe4093641724bf9390c6e9 100644 (file)
--- a/bat/alsa.c
+++ b/bat/alsa.c
@@ -377,12 +377,6 @@ void *playback_alsa(struct bat *bat)
        retval_play = 0;
        memset(&sndpcm, 0, sizeof(sndpcm));
 
-       if (bat->playback.device == NULL) {
-               fprintf(bat->err, _("No PCM device for playback: exit\n"));
-               retval_play = 1;
-               goto exit1;
-       }
-
        err = snd_pcm_open(&sndpcm.handle, bat->playback.device,
                        SND_PCM_STREAM_PLAYBACK, 0);
        if (err != 0) {
@@ -533,12 +527,6 @@ void *record_alsa(struct bat *bat)
        retval_record = 0;
        memset(&sndpcm, 0, sizeof(sndpcm));
 
-       if (bat->capture.device == NULL) {
-               fprintf(bat->err, _("No PCM device for capture: exit\n"));
-               retval_record = 1;
-               goto exit1;
-       }
-
        err = snd_pcm_open(&sndpcm.handle, bat->capture.device,
                        SND_PCM_STREAM_CAPTURE, 0);
        if (err != 0) {

diff --git a/bat/bat.c b/bat/bat.c
index ddb60b7530090e8f4152ded45db7cf42c228ff8c..9c637f2ac5f657d04af699a71e1a1f5daffa7e7b 100644 (file)
--- a/bat/bat.c
+++ b/bat/bat.c
@@ -473,6 +473,10 @@ static int bat_init(struct bat *bat)
                        return err;
        }
 
+       /* Set default playback and capture devices */
+       if (bat->playback.device == NULL && bat->capture.device == NULL)
+               bat->playback.device = bat->capture.device = DEFAULT_DEV_NAME;
+
        /* Determine capture file */
        if (bat->local) {
                bat->capture.file = bat->playback.file;

diff --git a/bat/common.h b/bat/common.h
index 7346d9fab682b598273d08211aa3b0136b6543d7..5417c0e5092a6d40f552320d67dfe1d7bb579613 100644 (file)
--- a/bat/common.h
+++ b/bat/common.h
@@ -16,6 +16,7 @@
 #include <alsa/asoundlib.h>
 
 #define TEMP_RECORD_FILE_NAME          "/tmp/bat.wav.XXXXXX"
+#define DEFAULT_DEV_NAME               "default"
 
 #define OPT_BASE                       300
 #define OPT_LOG                                (OPT_BASE + 1)