[svn-commits] sruffell: tools/trunk r6720 - /tools/trunk/wavformat.h

[SVN commits to the Digium repositories]

Author: sruffell
Date: Thu Jun 25 10:12:54 2009
New Revision: 6720

URL: http://svn.asterisk.org/svn-view/dahdi?view=rev&rev=6720
Log:
dahdi_monitor: Remove a duplicate block from wavformat.h.

Modified:
    tools/trunk/wavformat.h

Modified: tools/trunk/wavformat.h
URL: http://svn.asterisk.org/svn-view/dahdi/tools/trunk/wavformat.h?view=diff&rev=6720&r1=6719&r2=6720
==============================================================================
--- tools/trunk/wavformat.h (original)
+++ tools/trunk/wavformat.h Thu Jun 25 10:12:54 2009
@@ -39,7 +39,6 @@
 	uint32_t  fmt_avg_bytes_per_sec;
 	uint16_t fmt_block_align;
 	uint16_t fmt_significant_bps;
-	//uint16_t fmt_extra_format_bytes;	/* sox doesn't ouput this for PCM uncompressed */
 
 	/* data chunk */
 	char data_chunk_id[4];
@@ -47,52 +46,3 @@
 } __attribute__((packed));
 
 #endif
-/*
- * wavformat.h -- data structures and associated definitions for wav files
- *
- * By Michael Spiceland (mspiceland at digium.com)
- *
- * (C) 2009 Digium, Inc.
- */
-
-/*
- * See http://www.asterisk.org for more information about
- * the Asterisk project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
- *
- * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2 as published by the
- * Free Software Foundation. See the LICENSE file included with
- * this program for more details.
- */
-
-#ifndef WAVFORMAT_H
-#define WAVFORMAT_H
-
-#include <stdint.h>
-
-struct wavheader {
-	/* riff type chunk */
-	char riff_chunk_id[4];
-	uint32_t riff_chunk_size;
-	char riff_type[4];
-
-	/* format chunk */
-	char  fmt_chunk_id[4];
-	uint32_t  fmt_data_size;
-	uint16_t fmt_compression_code;
-	uint16_t fmt_num_channels;
-	uint32_t  fmt_sample_rate;
-	uint32_t  fmt_avg_bytes_per_sec;
-	uint16_t fmt_block_align;
-	uint16_t fmt_significant_bps;
-	//uint16_t fmt_extra_format_bytes;	/* sox doesn't ouput this for PCM uncompressed */
-
-	/* data chunk */
-	char data_chunk_id[4];
-	uint32_t data_data_size;
-} __attribute__((packed));
-
-#endif