diff options
| author | Joachim Koenig <joachim_koenig@users.sourceforge.net> | 2001-06-05 16:58:47 +0000 |
|---|---|---|
| committer | Joachim Koenig <joachim_koenig@users.sourceforge.net> | 2001-06-05 16:58:47 +0000 |
| commit | 2ecd5d83c5e63e4885aeb112d5c1859d3acb116c (patch) | |
| tree | 517da5eaeb61f20dcd6d6f4bb36455538255b60a /src | |
| parent | 6bdf5b09f6cd3733d13ae860f71cb45754f4bab9 (diff) | |
| download | xine-lib-2ecd5d83c5e63e4885aeb112d5c1859d3acb116c.tar.gz xine-lib-2ecd5d83c5e63e4885aeb112d5c1859d3acb116c.tar.bz2 | |
some copyrights and devices now configurable
CVS patchset: 127
CVS date: 2001/06/05 16:58:47
Diffstat (limited to 'src')
| -rw-r--r-- | src/audio_out/audio_alsa_out.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/src/audio_out/audio_alsa_out.c b/src/audio_out/audio_alsa_out.c index 3e7187b7a..a30dc3965 100644 --- a/src/audio_out/audio_alsa_out.c +++ b/src/audio_out/audio_alsa_out.c @@ -17,7 +17,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: audio_alsa_out.c,v 1.6 2001/06/01 07:25:26 f1rmb Exp $ + * for the SPDIF AC3 sync part + * (c) 2000 Andy Lo A Foe <andy@alsaplayer.org> + * + * $Id: audio_alsa_out.c,v 1.7 2001/06/05 16:58:47 joachim_koenig Exp $ */ #ifdef HAVE_CONFIG_H @@ -481,10 +484,16 @@ ao_functions_t *init_audio_out_plugin (config_values_t *config) { int card; int dev; int err; + char *pcm_device; + char *ac3_device; this = (alsa_functions_t *) malloc (sizeof (alsa_functions_t)); - - strcpy(this->audio_dev,"plug:0,0"); + + pcm_device = config->lookup_str(config,"alsa_pcm_device", "plug:0,0"); + ac3_device = config->lookup_str(config,"alsa_ac3_device", "plug:0,2"); + + + strcpy(this->audio_dev,pcm_device); /* * find best device driver/channel @@ -511,7 +520,7 @@ ao_functions_t *init_audio_out_plugin (config_values_t *config) { this->capabilities = AO_CAP_MODE_STEREO; if (config->lookup_int (config, "ac3_pass_through", 0)) { this->capabilities |= AO_CAP_MODE_AC3; - strcpy(this->audio_dev,"plug:0,2"); + strcpy(this->audio_dev,ac3_device); printf("AC3 pass through activated\n"); } |