[MPlayer-dev-eng] [PATCH] ALSA 1.x support

[Bernhard Rosenkraenzer]

On Thu, 20 Nov 2003, Jindrich Makovicka wrote:

> here is a patch which makes MPlayer work with ALSA 1.0pre version. 
> Besides the autodetection stuff, ALSA changed API a bit so the patch 
> adds separate audio in/out drivers for ALSA 1.0. The changes are rather 
> cosmetical and eventually just adding some #ifdefs to ao_alsa9 would be 
> enough, I don't know what would you consider worse or better. Any comments?

Works nicely for output -- for input (e.g. tv:// w/o immediatemode), the 
alsa option is missing (patch [needed in addition to yours] attached).

It still segfaults when using mencoder -tv alsa [....] tv:// though 
(ai_alsa9 works).

LLaP
bero

-- 
Ark Linux - Linux for the masses
http://www.arklinux.org/

Redistribution and processing of this message is subject to
http://www.arklinux.org/terms.php
-------------- next part --------------
--- mplayer/cfg-common.h.ark	2003-11-23 23:25:43.000000000 +0100
+++ mplayer/cfg-common.h	2003-11-23 23:25:58.000000000 +0100
@@ -342,7 +342,7 @@
 	{"mjpeg", &tv_param_mjpeg, CONF_TYPE_FLAG, 0, 0, 1, NULL},
 	{"decimation", &tv_param_decimation, CONF_TYPE_INT, CONF_RANGE, 1, 4, NULL},
 	{"quality", &tv_param_quality, CONF_TYPE_INT, CONF_RANGE, 0, 100, NULL},
-#ifdef HAVE_ALSA9
+#if defined(HAVE_ALSA9) || defined(HAVE_ALSA1X)
 	{"alsa", &tv_param_alsa, CONF_TYPE_FLAG, 0, 0, 1, NULL},
 #endif
 	{"adevice", &tv_param_adevice, CONF_TYPE_STRING, 0, 0, 0, NULL},