Mercurial > sdl-ios-xcode
annotate src/audio/SDL_wave.h @ 1258:b2283b0ded26
Date: Thu, 19 Jan 2006 20:02:29 +0200
From: Vassilis Virvilis <vasvir@iit.demokritos.gr>
Subject: [SDL] Request: Please reconsider adding tag in SDL_Event
Hi,
Patch in question:
--- include/SDL_events.h 20 Aug 2004 18:57:01 -0000 1.11
+++ include/SDL_events.h 19 Jan 2006 17:35:09 -0000
@@ -214,7 +214,7 @@
} SDL_SysWMEvent;
/* General event structure */
-typedef union {
+typedef union SDL_Event {
Uint8 type;
SDL_ActiveEvent active;
SDL_KeyboardEvent key;
Reasoning:
----------
1) Allows forward declaration of the SDL_Event union in C++. Please
note that in plain C it is possible to forward declare it.
2) Forward declaration is good because it allows encapsulation. It hides
the specific implementation and does not necessarily exposes SDL staff
to my appication's namespace
3) It can't harm plain C because tags are living in a different namespace
than typenames
4) It is already done like this in other places in SDL. Check for example
SDL_KeySym, and SDL_.*Event structures.
5) Right now I have to include SDL/event.h from a C++ header file. See 2)
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Fri, 20 Jan 2006 13:07:25 +0000 |
parents | b8d311d90021 |
children | c9b51268668f |
rev | line source |
---|---|
0 | 1 /* |
2 SDL - Simple DirectMedia Layer | |
769
b8d311d90021
Updated copyright information for 2004 (Happy New Year!)
Sam Lantinga <slouken@libsdl.org>
parents:
722
diff
changeset
|
3 Copyright (C) 1997-2004 Sam Lantinga |
0 | 4 |
5 This library is free software; you can redistribute it and/or | |
6 modify it under the terms of the GNU Library General Public | |
7 License as published by the Free Software Foundation; either | |
8 version 2 of the License, or (at your option) any later version. | |
9 | |
10 This library is distributed in the hope that it will be useful, | |
11 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
13 Library General Public License for more details. | |
14 | |
15 You should have received a copy of the GNU Library General Public | |
16 License along with this library; if not, write to the Free | |
17 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
18 | |
19 Sam Lantinga | |
252
e8157fcb3114
Updated the source with the correct e-mail address
Sam Lantinga <slouken@libsdl.org>
parents:
0
diff
changeset
|
20 slouken@libsdl.org |
0 | 21 */ |
22 | |
23 #ifdef SAVE_RCSID | |
24 static char rcsid = | |
25 "@(#) $Id$"; | |
26 #endif | |
27 | |
28 /* WAVE files are little-endian */ | |
29 | |
30 /*******************************************/ | |
31 /* Define values for Microsoft WAVE format */ | |
32 /*******************************************/ | |
33 #define RIFF 0x46464952 /* "RIFF" */ | |
34 #define WAVE 0x45564157 /* "WAVE" */ | |
35 #define FACT 0x74636166 /* "fact" */ | |
36 #define LIST 0x5453494c /* "LIST" */ | |
37 #define FMT 0x20746D66 /* "fmt " */ | |
38 #define DATA 0x61746164 /* "data" */ | |
39 #define PCM_CODE 0x0001 | |
40 #define MS_ADPCM_CODE 0x0002 | |
41 #define IMA_ADPCM_CODE 0x0011 | |
42 #define WAVE_MONO 1 | |
43 #define WAVE_STEREO 2 | |
44 | |
45 /* Normally, these three chunks come consecutively in a WAVE file */ | |
46 typedef struct WaveFMT { | |
47 /* Not saved in the chunk we read: | |
48 Uint32 FMTchunk; | |
49 Uint32 fmtlen; | |
50 */ | |
51 Uint16 encoding; | |
52 Uint16 channels; /* 1 = mono, 2 = stereo */ | |
53 Uint32 frequency; /* One of 11025, 22050, or 44100 Hz */ | |
54 Uint32 byterate; /* Average bytes per second */ | |
55 Uint16 blockalign; /* Bytes per sample block */ | |
56 Uint16 bitspersample; /* One of 8, 12, 16, or 4 for ADPCM */ | |
57 } WaveFMT; | |
58 | |
59 /* The general chunk found in the WAVE file */ | |
60 typedef struct Chunk { | |
61 Uint32 magic; | |
62 Uint32 length; | |
722
90dfd3f5782c
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
63 Uint8 *data; |
0 | 64 } Chunk; |
65 |