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 | |
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 | |||
@@ -3,40 +3,39 @@ | |||
3 | ** This file may be distributed and/or modified under the terms of the | 3 | ** This file may be distributed and/or modified under the terms of the |
4 | ** GNU General Public License version 2 as published by the Free Software | 4 | ** GNU General Public License version 2 as published by the Free Software |
5 | ** Foundation and appearing in the file LICENSE.GPL included in the | 5 | ** Foundation and appearing in the file LICENSE.GPL included in the |
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) */ |