comparison cfg-common.h @ 27390:9d95dc936e66

Introduce CONFIG_ALSA preprocessor directive for ALSA 0.9 and 1.x. Use it in all the places that checked for either ALSA 0.9 or 1.x.
author diego
date Wed, 06 Aug 2008 23:19:29 +0000
parents eb7bdbd98210
children 6a89c6949c08
comparison
equal deleted inserted replaced
27389:f5f36f035807 27390:9d95dc936e66
117 {"forceaudio", &stream_tv_defaults.force_audio, CONF_TYPE_FLAG, 0, 0, 1, NULL}, 117 {"forceaudio", &stream_tv_defaults.force_audio, CONF_TYPE_FLAG, 0, 0, 1, NULL},
118 {"buffersize", &stream_tv_defaults.buffer_size, CONF_TYPE_INT, CONF_RANGE, 16, 1024, NULL}, 118 {"buffersize", &stream_tv_defaults.buffer_size, CONF_TYPE_INT, CONF_RANGE, 16, 1024, NULL},
119 {"mjpeg", &stream_tv_defaults.mjpeg, CONF_TYPE_FLAG, 0, 0, 1, NULL}, 119 {"mjpeg", &stream_tv_defaults.mjpeg, CONF_TYPE_FLAG, 0, 0, 1, NULL},
120 {"decimation", &stream_tv_defaults.decimation, CONF_TYPE_INT, CONF_RANGE, 1, 4, NULL}, 120 {"decimation", &stream_tv_defaults.decimation, CONF_TYPE_INT, CONF_RANGE, 1, 4, NULL},
121 {"quality", &stream_tv_defaults.quality, CONF_TYPE_INT, CONF_RANGE, 0, 100, NULL}, 121 {"quality", &stream_tv_defaults.quality, CONF_TYPE_INT, CONF_RANGE, 0, 100, NULL},
122 #if defined(CONFIG_ALSA9) || defined(CONFIG_ALSA1X) 122 #ifdef CONFIG_ALSA
123 {"alsa", &stream_tv_defaults.alsa, CONF_TYPE_FLAG, 0, 0, 1, NULL}, 123 {"alsa", &stream_tv_defaults.alsa, CONF_TYPE_FLAG, 0, 0, 1, NULL},
124 #endif /* defined(CONFIG_ALSA9) || defined(CONFIG_ALSA1X) */ 124 #endif /* CONFIG_ALSA */
125 #endif /* defined(CONFIG_TV_V4L) || defined(CONFIG_TV_V4L2) */ 125 #endif /* defined(CONFIG_TV_V4L) || defined(CONFIG_TV_V4L2) */
126 {"adevice", &stream_tv_defaults.adevice, CONF_TYPE_STRING, 0, 0, 0, NULL}, 126 {"adevice", &stream_tv_defaults.adevice, CONF_TYPE_STRING, 0, 0, 0, NULL},
127 #ifdef CONFIG_TV_TELETEXT 127 #ifdef CONFIG_TV_TELETEXT
128 {"tdevice", &stream_tv_defaults.tdevice, CONF_TYPE_STRING, 0, 0, 0, NULL}, 128 {"tdevice", &stream_tv_defaults.tdevice, CONF_TYPE_STRING, 0, 0, 0, NULL},
129 {"tpage", &stream_tv_defaults.tpage, CONF_TYPE_INT, CONF_RANGE, 100, 899, NULL}, 129 {"tpage", &stream_tv_defaults.tpage, CONF_TYPE_INT, CONF_RANGE, 100, 899, NULL},