author | waspe <waspe> | 2003-11-03 17:55:02 (UTC) |
---|---|---|
committer | waspe <waspe> | 2003-11-03 17:55:02 (UTC) |
commit | 6d7e3e8b04b63d92c61d1109c35163690f2c9948 (patch) (unidiff) | |
tree | 0b21b31e2ce6df2639469bc2b75d625203a2c298 /core/applets/vmemo | |
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 | 1 |
1 files changed, 0 insertions, 1 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 | |||
@@ -6,49 +6,48 @@ | |||
6 | ** packaging of this file. | 6 | ** packaging of this file. |
7 | ** | 7 | ** |
8 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 8 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
9 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 9 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
10 | ** | 10 | ** |
11 | ************************************************************************************/ | 11 | ************************************************************************************/ |
12 | // copyright 2002 Jeremy Cowgar <jc@cowgar.com> | 12 | // copyright 2002 Jeremy Cowgar <jc@cowgar.com> |
13 | /* | 13 | /* |
14 | * $Id$ | 14 | * $Id$ |
15 | */ | 15 | */ |
16 | // copyright 2002 and 2003 L.J.Potter <ljp@llornkcor.com> | 16 | // copyright 2002 and 2003 L.J.Potter <ljp@llornkcor.com> |
17 | 17 | ||
18 | extern "C" { | 18 | extern "C" { |
19 | #include "adpcm.h" | 19 | #include "adpcm.h" |
20 | } | 20 | } |
21 | 21 | ||
22 | #include <unistd.h> | 22 | #include <unistd.h> |
23 | #include <stdio.h> | 23 | #include <stdio.h> |
24 | #include <fcntl.h> | 24 | #include <fcntl.h> |
25 | #include <sys/ioctl.h> | 25 | #include <sys/ioctl.h> |
26 | #include <linux/soundcard.h> | 26 | #include <linux/soundcard.h> |
27 | 27 | ||
28 | #include <errno.h> | 28 | #include <errno.h> |
29 | 29 | ||
30 | |||
31 | typedef struct _waveheader { | 30 | typedef struct _waveheader { |
32 | u_long main_chunk; /* 'RIFF' */ | 31 | u_long main_chunk; /* 'RIFF' */ |
33 | u_long length; /* filelen */ | 32 | u_long length; /* filelen */ |
34 | u_long chunk_type; /* 'WAVE' */ | 33 | u_long chunk_type; /* 'WAVE' */ |
35 | u_long sub_chunk; /* 'fmt ' */ | 34 | u_long sub_chunk; /* 'fmt ' */ |
36 | u_long sc_len; /* length of sub_chunk, =16 | 35 | u_long sc_len; /* length of sub_chunk, =16 |
37 | (chunckSize) format len */ | 36 | (chunckSize) format len */ |
38 | u_short format; /* should be 1 for PCM-code (formatTag) */ | 37 | u_short format; /* should be 1 for PCM-code (formatTag) */ |
39 | 38 | ||
40 | u_short modus; /* 1 Mono, 2 Stereo (channels) */ | 39 | u_short modus; /* 1 Mono, 2 Stereo (channels) */ |
41 | u_long sample_fq; /* samples per second (samplesPerSecond) */ | 40 | u_long sample_fq; /* samples per second (samplesPerSecond) */ |
42 | u_long byte_p_sec; /* avg bytes per second (avgBytePerSecond) */ | 41 | u_long byte_p_sec; /* avg bytes per second (avgBytePerSecond) */ |
43 | u_short byte_p_spl; /* samplesize; 1 or 2 bytes (blockAlign) */ | 42 | u_short byte_p_spl; /* samplesize; 1 or 2 bytes (blockAlign) */ |
44 | u_short bit_p_spl; /* 8, 12 or 16 bit (bitsPerSample) */ | 43 | u_short bit_p_spl; /* 8, 12 or 16 bit (bitsPerSample) */ |
45 | 44 | ||
46 | u_long data_chunk; /* 'data' */ | 45 | u_long data_chunk; /* 'data' */ |
47 | 46 | ||
48 | u_long data_length;/* samplecount */ | 47 | u_long data_length;/* samplecount */ |
49 | } WaveHeader; | 48 | } WaveHeader; |
50 | 49 | ||
51 | #define RIFF 0x46464952 | 50 | #define RIFF 0x46464952 |
52 | #define WAVE 0x45564157 | 51 | #define WAVE 0x45564157 |
53 | #define FMT 0x20746D66 | 52 | #define FMT 0x20746D66 |
54 | #define DATA 0x61746164 | 53 | #define DATA 0x61746164 |