diff options
| -rw-r--r-- | src/audio_out/audio_alsa_out.c | 9 | ||||
| -rwxr-xr-x | src/audio_out/audio_directx_out.c | 4 | ||||
| -rw-r--r-- | src/audio_out/audio_esd_out.c | 4 | ||||
| -rw-r--r-- | src/audio_out/audio_none_out.c | 4 | ||||
| -rw-r--r-- | src/audio_out/audio_oss_out.c | 10 | ||||
| -rw-r--r-- | src/audio_out/audio_sun_out.c | 4 |
6 files changed, 22 insertions, 13 deletions
diff --git a/src/audio_out/audio_alsa_out.c b/src/audio_out/audio_alsa_out.c index 1c732467a..5ae678586 100644 --- a/src/audio_out/audio_alsa_out.c +++ b/src/audio_out/audio_alsa_out.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000-2002 the xine project + * Copyright (C) 2000-2003 the xine project * * This file is part of xine, a free video player. * @@ -26,7 +26,7 @@ * (c) 2001 James Courtier-Dutton <James@superbug.demon.co.uk> * * - * $Id: audio_alsa_out.c,v 1.112 2003/10/04 22:49:58 jcdutton Exp $ + * $Id: audio_alsa_out.c,v 1.113 2003/10/06 15:27:10 mroi Exp $ */ #ifdef HAVE_CONFIG_H @@ -284,7 +284,9 @@ static int ao_alsa_open(ao_driver_t *this_gen, uint32_t bits, uint32_t rate, int snd_pcm_uframes_t period_size_max; snd_pcm_uframes_t buffer_size_min; snd_pcm_uframes_t buffer_size_max; +#if 0 uint32_t periods; +#endif uint32_t buffer_time=BUFFER_TIME; snd_pcm_uframes_t buffer_time_to_size; int err, dir; @@ -623,6 +625,8 @@ static int ao_alsa_delay (ao_driver_t *this_gen) { return delay; } + +#if 0 /* * Handle over/under-run */ @@ -655,6 +659,7 @@ static void xrun(alsa_driver_t *this) return; /* ok, data should be accepted again */ } } +#endif /* * Write audio data to output buffer (blocking using snd_pcm_wait) diff --git a/src/audio_out/audio_directx_out.c b/src/audio_out/audio_directx_out.c index 7f6550701..cc218d543 100755 --- a/src/audio_out/audio_directx_out.c +++ b/src/audio_out/audio_directx_out.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000-2001 the xine project + * Copyright (C) 2001-2003 the xine project * * This file is part of xine, a unix video player. * @@ -19,6 +19,8 @@ * * audio_directx_out.c, direct sound audio output plugin for xine * by Matthew Grooms <elon@altavista.com> + * + * $Id: audio_directx_out.c,v 1.4 2003/10/06 15:27:10 mroi Exp $ */ typedef unsigned char boolean; diff --git a/src/audio_out/audio_esd_out.c b/src/audio_out/audio_esd_out.c index 34f7b985a..402858e11 100644 --- a/src/audio_out/audio_esd_out.c +++ b/src/audio_out/audio_esd_out.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000-2002 the xine project + * Copyright (C) 2000-2003 the xine project * * This file is part of xine, a free video player. * @@ -17,7 +17,7 @@ * 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_esd_out.c,v 1.26 2003/02/14 22:32:41 f1rmb Exp $ + * $Id: audio_esd_out.c,v 1.27 2003/10/06 15:27:10 mroi Exp $ */ #ifdef HAVE_CONFIG_H diff --git a/src/audio_out/audio_none_out.c b/src/audio_out/audio_none_out.c index 2f93d5702..1db1cbbe8 100644 --- a/src/audio_out/audio_none_out.c +++ b/src/audio_out/audio_none_out.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000-2002 the xine project + * Copyright (C) 2000-2003 the xine project * * This file is part of xine, a free video player. * @@ -17,7 +17,7 @@ * 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_none_out.c,v 1.3 2003/05/31 13:33:10 miguelfreitas Exp $ + * $Id: audio_none_out.c,v 1.4 2003/10/06 15:27:10 mroi Exp $ */ #ifdef HAVE_CONFIG_H diff --git a/src/audio_out/audio_oss_out.c b/src/audio_out/audio_oss_out.c index afd6d03c9..f14064fd3 100644 --- a/src/audio_out/audio_oss_out.c +++ b/src/audio_out/audio_oss_out.c @@ -17,18 +17,20 @@ * 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_oss_out.c,v 1.90 2003/06/02 16:41:10 mroi Exp $ + * $Id: audio_oss_out.c,v 1.91 2003/10/06 15:27:10 mroi Exp $ * * 20-8-2001 First implementation of Audio sync and Audio driver separation. * Copyright (C) 2001 James Courtier-Dutton James@superbug.demon.co.uk * * General Programming Guidelines: - * New concept of an "audio_frame". - * An audio_frame consists of all the samples required to fill every audio channel to a full amount of bits. - * So, it does not mater how many bits per sample, or how many audio channels are being used, the number of audio_frames is the same. + * An audio_frame consists of all the samples required to fill every audio channel + * to a full amount of bits. So, it does not matter how many bits per sample, + * or how many audio channels are being used, the number of audio_frames is the same. * E.g. 16 bit stereo is 4 bytes, but one frame. * 16 bit 5.1 surround is 12 bytes, but one frame. - * The purpose of this is to make the audio_sync code a lot more readable, rather than having to multiply by the amount of channels all the time + * The purpose of this is to make the audio_sync code a lot more readable, + * rather than having to multiply by the amount of channels all the time * when dealing with audio_bytes instead of audio_frames. * * The number of samples passed to/from the audio driver is also sent in units of audio_frames. diff --git a/src/audio_out/audio_sun_out.c b/src/audio_out/audio_sun_out.c index 982704d39..07835a455 100644 --- a/src/audio_out/audio_sun_out.c +++ b/src/audio_out/audio_sun_out.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2002 the xine project + * Copyright (C) 2001-2003 the xine project * * This file is part of xine, a free video player. * @@ -17,7 +17,7 @@ * 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_sun_out.c,v 1.29 2003/03/07 20:28:42 jkeil Exp $ + * $Id: audio_sun_out.c,v 1.30 2003/10/06 15:27:10 mroi Exp $ */ #ifdef HAVE_CONFIG_H |