author | waspe <waspe> | 2003-11-03 17:55:02 (UTC) |
---|---|---|
committer | waspe <waspe> | 2003-11-03 17:55:02 (UTC) |
commit | 6d7e3e8b04b63d92c61d1109c35163690f2c9948 (patch) (side-by-side diff) | |
tree | 0b21b31e2ce6df2639469bc2b75d625203a2c298 /core/applets | |
parent | ea385e81e3de3ee100a5789a8a8d1b807d89efe0 (diff) | |
download | opie-6d7e3e8b04b63d92c61d1109c35163690f2c9948.zip opie-6d7e3e8b04b63d92c61d1109c35163690f2c9948.tar.gz opie-6d7e3e8b04b63d92c61d1109c35163690f2c9948.tar.bz2 |
reolved merge conflict
-rw-r--r-- | core/applets/vmemo/vmemo.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp index 6ec4583..83c148f 100644 --- a/core/applets/vmemo/vmemo.cpp +++ b/core/applets/vmemo/vmemo.cpp @@ -1,54 +1,53 @@ /************************************************************************************ ** ** This file may be distributed and/or modified under the terms of the ** GNU General Public License version 2 as published by the Free Software ** Foundation and appearing in the file LICENSE.GPL included in the ** packaging of this file. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. ** ************************************************************************************/ // copyright 2002 Jeremy Cowgar <jc@cowgar.com> /* * $Id$ - */ +*/ // copyright 2002 and 2003 L.J.Potter <ljp@llornkcor.com> extern "C" { #include "adpcm.h" } #include <unistd.h> #include <stdio.h> #include <fcntl.h> #include <sys/ioctl.h> #include <linux/soundcard.h> #include <errno.h> - typedef struct _waveheader { u_long main_chunk; /* 'RIFF' */ u_long length; /* filelen */ u_long chunk_type; /* 'WAVE' */ u_long sub_chunk; /* 'fmt ' */ u_long sc_len; /* length of sub_chunk, =16 (chunckSize) format len */ u_short format; /* should be 1 for PCM-code (formatTag) */ u_short modus; /* 1 Mono, 2 Stereo (channels) */ u_long sample_fq; /* samples per second (samplesPerSecond) */ u_long byte_p_sec; /* avg bytes per second (avgBytePerSecond) */ u_short byte_p_spl; /* samplesize; 1 or 2 bytes (blockAlign) */ u_short bit_p_spl; /* 8, 12 or 16 bit (bitsPerSample) */ u_long data_chunk; /* 'data' */ u_long data_length;/* samplecount */ } WaveHeader; #define RIFF 0x46464952 #define WAVE 0x45564157 #define FMT 0x20746D66 #define DATA 0x61746164 |