=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/aucat/aucat.c,v retrieving revision 1.102 retrieving revision 1.103 diff -u -r1.102 -r1.103 --- src/usr.bin/aucat/aucat.c 2010/07/31 08:48:01 1.102 +++ src/usr.bin/aucat/aucat.c 2010/08/19 06:31:06 1.103 @@ -1,4 +1,4 @@ -/* $OpenBSD: aucat.c,v 1.102 2010/07/31 08:48:01 ratchov Exp $ */ +/* $OpenBSD: aucat.c,v 1.103 2010/08/19 06:31:06 ratchov Exp $ */ /* * Copyright (c) 2008 Alexandre Ratchov * @@ -277,10 +277,7 @@ struct cfstr *cs; unsigned hdr; - if (strcmp(path, "-") == 0) { - path = NULL; - hdr = HDR_RAW; - } else if (templ->hdr == HDR_AUTO) { + if (templ->hdr == HDR_AUTO) { len = strlen(path); if (len >= 4 && strcasecmp(path + len - 4, ".wav") == 0) hdr = HDR_WAV; @@ -722,6 +719,8 @@ SLIST_REMOVE_HEAD(&cd->ins, entry); if (!cs->mmc) autostart = 1; + if (strcmp(cs->path, "-") == 0) + cs->path = NULL; if (!wav_new_in(&wav_ops, d, cs->mode & MODE_PLAY, cs->path, cs->hdr, &cs->ipar, cs->xrun, cs->vol, cs->mmc, cs->join)) @@ -733,6 +732,8 @@ SLIST_REMOVE_HEAD(&cd->outs, entry); if (!cs->mmc) autostart = 1; + if (strcmp(cs->path, "-") == 0) + cs->path = NULL; if (!wav_new_out(&wav_ops, d, cs->mode & MODE_RECMASK, cs->path, cs->hdr, &cs->opar, cs->xrun, cs->mmc, cs->join))