Mercurial > sdl-ios-xcode
annotate src/cdrom/SDL_syscdrom.h @ 4427:eada7e321df6 SDL-1.2
Fixed bug #943
Ozkan Sezer 2010-02-06 12:31:06 PST
Hi:
Here are some small fixes for compiling SDL against mingw-w64.
(see http://mingw-w64.sourceforge.net/ . Despite the name, it
supports both win32 and win64.) Two patches, one for SDL-1.2
and one for SDL-1.3 attached.
src/audio/windx5/directx.h and src/video/windx5/directx.h (both
SDL-1.2 and SDL-1.3.) I get compilation errors about some union
not having a member named u1 and alike, because of other system
headers being included before this one and them already defining
DUMMYUNIONNAME and stuff. This header probably assumes that those
stuff are defined in windef.h, but mingw-w64 headers define them
in _mingw.h. Easily fixed by moving NONAMELESSUNION definition to
the top of the file. SDL_dx5yuv.c (SDL-1.2-only) also needs to
include the header before SDL_video.h to avoid the same problem.
src/thread/win32/SDL_systhread.c (both SDL-1.2 and SDL-1.3.) :
The __GNUC__ case for pfnSDL_CurrentBeginThread is 32-bit centric
because _beginthreadex returns uintptr_t, not unsigned long which
is 32 bits in win64. Changing the return type to uintptr_t fixes
it.
Hope these are useful. Thanks.
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Wed, 10 Mar 2010 15:04:13 +0000 |
| parents | a1b03ba2fcd0 |
| children |
| rev | line source |
|---|---|
| 0 | 1 /* |
| 2 SDL - Simple DirectMedia Layer | |
| 4159 | 3 Copyright (C) 1997-2009 Sam Lantinga |
| 0 | 4 |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1312
diff
changeset
|
5 This library is SDL_free software; you can redistribute it and/or |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
6 modify it under the terms of the GNU Lesser General Public |
| 0 | 7 License as published by the Free Software Foundation; either |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
8 version 2.1 of the License, or (at your option) any later version. |
| 0 | 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 | |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
13 Lesser General Public License for more details. |
| 0 | 14 |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
15 You should have received a copy of the GNU Lesser General Public |
|
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
16 License along with this library; if not, write to the Free Software |
|
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
17 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
| 0 | 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 */ |
|
1402
d910939febfa
Use consistent identifiers for the various platforms we support.
Sam Lantinga <slouken@libsdl.org>
parents:
1336
diff
changeset
|
22 #include "SDL_config.h" |
| 0 | 23 |
| 24 /* This is the system specific header for the SDL CD-ROM API */ | |
| 25 | |
| 26 /* Structure of CD audio control functions */ | |
| 27 extern struct CDcaps { | |
| 28 /* Get the name of the specified drive */ | |
| 29 const char *(*Name)(int drive); | |
| 30 | |
| 31 /* Open the specified drive, returning a drive id, or -1 on error */ | |
| 32 int (*Open)(int drive); | |
| 33 | |
| 34 /* Get table-of-contents (number of tracks + track info) for disk. | |
| 35 The TOC information should be stored in the cdrom structure. | |
| 36 This function should return 0 on success, or -1 on error. | |
| 37 */ | |
| 38 int (*GetTOC)(SDL_CD *cdrom); | |
| 39 | |
| 40 /* Return the current status and play position, in frames, of the | |
| 41 drive. 'position' may be NULL, and if so, should be ignored. | |
| 42 */ | |
| 43 CDstatus (*Status)(SDL_CD *cdrom, int *position); | |
| 44 | |
| 45 /* Play from frame 'start' to 'start+len' */ | |
| 46 int (*Play)(SDL_CD *cdrom, int start, int len); | |
| 47 | |
| 48 /* Pause play */ | |
| 49 int (*Pause)(SDL_CD *cdrom); | |
| 50 | |
| 51 /* Resume play */ | |
| 52 int (*Resume)(SDL_CD *cdrom); | |
| 53 | |
| 54 /* Stop play */ | |
| 55 int (*Stop)(SDL_CD *cdrom); | |
| 56 | |
| 57 /* Eject the current disk */ | |
| 58 int (*Eject)(SDL_CD *cdrom); | |
| 59 | |
| 60 /* Close the specified drive */ | |
| 61 void (*Close)(SDL_CD *cdrom); | |
| 62 } SDL_CDcaps; | |
| 63 | |
| 64 /* The number of available CD-ROM drives on the system */ | |
| 65 extern int SDL_numcds; | |
| 66 | |
| 67 /* Function to scan the system for CD-ROM drives and fill SDL_CDcaps. | |
| 68 * This function should set SDL_numcds to the number of available CD | |
| 69 * drives. Drive 0 should be the system default CD-ROM. | |
| 70 * It should return 0, or -1 on an unrecoverable fatal error. | |
| 71 */ | |
| 72 extern int SDL_SYS_CDInit(void); | |
| 73 | |
| 74 /* Function to perform any system-specific CD-ROM related cleanup */ | |
| 75 extern void SDL_SYS_CDQuit(void); | |
| 76 |