summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/vmemo/vmemo.cpp3
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,62 +1,61 @@
1/************************************************************************************ 1/************************************************************************************
2 ** 2 **
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
18extern "C" { 18extern "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
31typedef struct _waveheader { 30typedef 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
55#define PCM_CODE 1 54#define PCM_CODE 1
56#define WAVE_MONO 1 55#define WAVE_MONO 1
57#define WAVE_STEREO 2 56#define WAVE_STEREO 2
58 57
59struct adpcm_state encoder_state; 58struct adpcm_state encoder_state;
60//struct adpcm_state decoder_state; 59//struct adpcm_state decoder_state;
61 60
62#define WAVE_FORMAT_DVI_ADPCM (0x0011) 61#define WAVE_FORMAT_DVI_ADPCM (0x0011)