[xiph-commits] r16829 - in trunk/ao/src: . plugins/alsa05 plugins/alsa09 plugins/arts plugins/dsound plugins/esd plugins/irix plugins/macosx plugins/nas plugins/oss plugins/pulse plugins/solaris plugins/sun
xiphmont at svn.xiph.org
xiphmont at svn.xiph.org
Tue Jan 26 21:59:19 PST 2010
Author: xiphmont
Date: 2010-01-26 21:59:19 -0800 (Tue, 26 Jan 2010)
New Revision: 16829
Modified:
trunk/ao/src/ao_aixs.c
trunk/ao/src/ao_au.c
trunk/ao/src/ao_null.c
trunk/ao/src/ao_raw.c
trunk/ao/src/ao_wav.c
trunk/ao/src/ao_wmm.c
trunk/ao/src/audio_out.c
trunk/ao/src/config.c
trunk/ao/src/plugins/alsa05/ao_alsa.c
trunk/ao/src/plugins/alsa09/ao_alsa09.c
trunk/ao/src/plugins/arts/ao_arts.c
trunk/ao/src/plugins/dsound/ao_dsound.c
trunk/ao/src/plugins/esd/ao_esd.c
trunk/ao/src/plugins/irix/ao_irix.c
trunk/ao/src/plugins/macosx/ao_macosx.c
trunk/ao/src/plugins/nas/ao_nas.c
trunk/ao/src/plugins/oss/ao_oss.c
trunk/ao/src/plugins/pulse/ao_pulse.c
trunk/ao/src/plugins/solaris/ao_solaris.c
trunk/ao/src/plugins/sun/ao_sun.c
Log:
Set properties and add modification header
Modified: trunk/ao/src/ao_aixs.c
===================================================================
--- trunk/ao/src/ao_aixs.c 2010-01-27 05:31:48 UTC (rev 16828)
+++ trunk/ao/src/ao_aixs.c 2010-01-27 05:59:19 UTC (rev 16829)
@@ -18,8 +18,12 @@
* along with GNU Make; see the file COPYING. If not, write to
* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
*
- */
+ ********************************************************************
+ last mod: $Id$
+
+ ********************************************************************/
+
#ifdef HAVE_SYS_AUDIO_H
#include <sys/types.h>
Property changes on: trunk/ao/src/ao_aixs.c
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/ao/src/ao_au.c
===================================================================
--- trunk/ao/src/ao_au.c 2010-01-27 05:31:48 UTC (rev 16828)
+++ trunk/ao/src/ao_au.c 2010-01-27 05:59:19 UTC (rev 16829)
@@ -21,8 +21,12 @@
* along with GNU Make; see the file COPYING. If not, write to
* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
*
- */
+ ********************************************************************
+ last mod: $Id$
+
+ ********************************************************************/
+
#include <stdio.h>
#include <string.h>
#include <sys/types.h>
Property changes on: trunk/ao/src/ao_au.c
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/ao/src/ao_null.c
===================================================================
--- trunk/ao/src/ao_null.c 2010-01-27 05:31:48 UTC (rev 16828)
+++ trunk/ao/src/ao_null.c 2010-01-27 05:59:19 UTC (rev 16829)
@@ -22,8 +22,12 @@
* along with GNU Make; see the file COPYING. If not, write to
* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
*
- */
+ ********************************************************************
+ last mod: $Id$
+
+ ********************************************************************/
+
#include <stdio.h>
#include <string.h>
#include <ao/ao.h>
Property changes on: trunk/ao/src/ao_null.c
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/ao/src/ao_raw.c
===================================================================
--- trunk/ao/src/ao_raw.c 2010-01-27 05:31:48 UTC (rev 16828)
+++ trunk/ao/src/ao_raw.c 2010-01-27 05:59:19 UTC (rev 16829)
@@ -21,8 +21,12 @@
* along with GNU Make; see the file COPYING. If not, write to
* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
*
- */
+ ********************************************************************
+ last mod: $Id$
+
+ ********************************************************************/
+
#include <stdio.h>
#include <string.h>
#include <errno.h>
Property changes on: trunk/ao/src/ao_raw.c
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/ao/src/ao_wav.c
===================================================================
--- trunk/ao/src/ao_wav.c 2010-01-27 05:31:48 UTC (rev 16828)
+++ trunk/ao/src/ao_wav.c 2010-01-27 05:59:19 UTC (rev 16829)
@@ -4,6 +4,7 @@
*
* Original Copyright (C) Aaron Holtzman - May 1999
* Modifications Copyright (C) Stan Seibert - July 2000, July 2001
+ * Copyright (C) Monty - January 2010
*
* This file is part of libao, a cross-platform audio output library. See
* README for a history of this source code.
@@ -22,21 +23,26 @@
* along with GNU Make; see the file COPYING. If not, write to
* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
*
- */
+ ********************************************************************
+ last mod: $Id$
+ ********************************************************************/
+
+
#include <stdio.h>
#include <errno.h>
#include <string.h>
#include <signal.h>
#include <ao/ao.h>
-#define WAVE_FORMAT_PCM 0x0001
-#define FORMAT_MULAW 0x0101
-#define IBM_FORMAT_ALAW 0x0102
-#define IBM_FORMAT_ADPCM 0x0103
+#define WAVE_FORMAT_PCM 0x0001
+#define FORMAT_MULAW 0x0101
+#define IBM_FORMAT_ALAW 0x0102
+#define IBM_FORMAT_ADPCM 0x0103
+#define WAVE_FORMAT_EXTENSIBLE 0xfffe
-#define WAV_HEADER_LEN 44
+#define WAV_HEADER_MAXLEN 68
#define WRITE_U32(buf, x) *(buf) = (unsigned char)(x&0xff);\
*((buf)+1) = (unsigned char)((x>>8)&0xff);\
@@ -68,7 +74,10 @@
unsigned int dwSamplesPerSec;
unsigned int dwAvgBytesPerSec;
unsigned short wBlockAlign;
- unsigned short wBitsPerSample; /* Only for PCM */
+ unsigned short wBitsPerSample;
+ unsigned short cbSize;
+ unsigned int dwChannelMask;
+ unsigned short subFormat;
};
struct wave_header
Property changes on: trunk/ao/src/ao_wav.c
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/ao/src/ao_wmm.c
===================================================================
--- trunk/ao/src/ao_wmm.c 2010-01-27 05:31:48 UTC (rev 16828)
+++ trunk/ao/src/ao_wmm.c 2010-01-27 05:59:19 UTC (rev 16829)
@@ -21,8 +21,12 @@
* along with GNU Make; see the file COPYING. If not, write to
* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
*
- */
+ ********************************************************************
+ last mod: $Id$
+
+ ********************************************************************/
+
//#define PREPARE_EACH
#define _CRT_SECURE_NO_DEPRECATE
Property changes on: trunk/ao/src/ao_wmm.c
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/ao/src/audio_out.c
===================================================================
--- trunk/ao/src/audio_out.c 2010-01-27 05:31:48 UTC (rev 16828)
+++ trunk/ao/src/audio_out.c 2010-01-27 05:59:19 UTC (rev 16829)
@@ -22,8 +22,12 @@
* along with GNU Make; see the file COPYING. If not, write to
* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
*
- */
+ ********************************************************************
+ last mod: $Id$
+
+ ********************************************************************/
+
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
Property changes on: trunk/ao/src/audio_out.c
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/ao/src/config.c
===================================================================
--- trunk/ao/src/config.c 2010-01-27 05:31:48 UTC (rev 16828)
+++ trunk/ao/src/config.c 2010-01-27 05:59:19 UTC (rev 16829)
@@ -21,8 +21,12 @@
* along with GNU Make; see the file COPYING. If not, write to
* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
*
- */
+ ********************************************************************
+ last mod: $Id$
+
+ ********************************************************************/
+
#include "ao.h"
#include <stdio.h>
#include <stdlib.h>
Property changes on: trunk/ao/src/config.c
___________________________________________________________________
Added: svn:keywords
+ Id
Property changes on: trunk/ao/src/plugins/alsa05/ao_alsa.c
___________________________________________________________________
Added: svn:keywords
+ Id
Property changes on: trunk/ao/src/plugins/alsa09/ao_alsa09.c
___________________________________________________________________
Added: svn:keywords
+ Id
Property changes on: trunk/ao/src/plugins/arts/ao_arts.c
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/ao/src/plugins/dsound/ao_dsound.c
===================================================================
--- trunk/ao/src/plugins/dsound/ao_dsound.c 2010-01-27 05:31:48 UTC (rev 16828)
+++ trunk/ao/src/plugins/dsound/ao_dsound.c 2010-01-27 05:59:19 UTC (rev 16829)
@@ -1,5 +1,5 @@
/*
- * $Id: ao_dsound.c,v 1.1 2001/09/05 19:28:07 cwolf Exp $
+ * $Id$
* $Name: $
*
* Skeleton DirectSound plugin, just a place holder until test code
Property changes on: trunk/ao/src/plugins/dsound/ao_dsound.c
___________________________________________________________________
Added: svn:keywords
+ Id
Property changes on: trunk/ao/src/plugins/esd/ao_esd.c
___________________________________________________________________
Added: svn:keywords
+ Id
Property changes on: trunk/ao/src/plugins/irix/ao_irix.c
___________________________________________________________________
Added: svn:keywords
+ Id
Property changes on: trunk/ao/src/plugins/macosx/ao_macosx.c
___________________________________________________________________
Added: svn:keywords
+ Id
Property changes on: trunk/ao/src/plugins/nas/ao_nas.c
___________________________________________________________________
Added: svn:keywords
+ Id
Property changes on: trunk/ao/src/plugins/oss/ao_oss.c
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/ao/src/plugins/pulse/ao_pulse.c
===================================================================
--- trunk/ao/src/plugins/pulse/ao_pulse.c 2010-01-27 05:31:48 UTC (rev 16828)
+++ trunk/ao/src/plugins/pulse/ao_pulse.c 2010-01-27 05:59:19 UTC (rev 16829)
@@ -1,4 +1,4 @@
-/* $Id: ao_pulse.c 36 2006-07-14 00:05:13Z lennart $ */
+/* $Id$ */
/***
This file is part of libao-pulse.
Property changes on: trunk/ao/src/plugins/pulse/ao_pulse.c
___________________________________________________________________
Added: svn:keywords
+ Id
Property changes on: trunk/ao/src/plugins/solaris/ao_solaris.c
___________________________________________________________________
Added: svn:keywords
+ Id
Property changes on: trunk/ao/src/plugins/sun/ao_sun.c
___________________________________________________________________
Added: svn:keywords
+ Id
More information about the commits
mailing list