Mercurial > sdl-ios-xcode
view src/cdrom/SDL_syscdrom.h @ 3877:81f66f258d77 SDL-1.2
Fixed bug #281
------- Comment #2 From Christian Walther 2006-07-23 07:37 [reply] -------
Wow, that was an interesting bug to chase. It was a timing issue: it seems that
for some reason, a certain time must pass between ShowMenuBar() being called in
QZ_UnsetVideoMode() and the application quitting. Before rev. 1885, this delay
was provided by the slow hand-coded fade. With the asynchronous Core Graphics
fading introduced in rev. 1885, that delay was no longer present (most of the
time) and the bug became apparent. Adding an SDL_Delay(100) somewhere between
ShowMenuBar() and the end of QZ_VideoQuit() lowered the frequency of the bug
appearing from "almost every time" to "very rarely" here.
However, there is another solution: doing the ShowMenuBar() before releasing
the captured display instead of afterwards. Apparently, no delay is necessary
in that case, and it looks nicer to me anyway because it is the reverse order
of the way things are set up in the beginning: capture display - set video mode
- hide menu bar - ... - show menu bar - reset video mode - release captured
display. So, this is what the attached patch does.
In addition, I've taken the liberty of
- removing some unused code that I forgot to remove in rev. 1885,
- fixing two warnings about undeclared functions in SDL_QuartzVideo.m by
including OpenGL.h (whose name is a bit misleading - it only declares CGL
stuff, so there's no interference with SDL_opengl.h).
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Sun, 24 Sep 2006 01:27:40 +0000 |
| parents | d910939febfa |
| children | 782fd950bd46 c121d94672cb a1b03ba2fcd0 |
line wrap: on
line source
/* SDL - Simple DirectMedia Layer Copyright (C) 1997-2006 Sam Lantinga This library is SDL_free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Sam Lantinga slouken@libsdl.org */ #include "SDL_config.h" /* This is the system specific header for the SDL CD-ROM API */ /* Structure of CD audio control functions */ extern struct CDcaps { /* Get the name of the specified drive */ const char *(*Name)(int drive); /* Open the specified drive, returning a drive id, or -1 on error */ int (*Open)(int drive); /* Get table-of-contents (number of tracks + track info) for disk. The TOC information should be stored in the cdrom structure. This function should return 0 on success, or -1 on error. */ int (*GetTOC)(SDL_CD *cdrom); /* Return the current status and play position, in frames, of the drive. 'position' may be NULL, and if so, should be ignored. */ CDstatus (*Status)(SDL_CD *cdrom, int *position); /* Play from frame 'start' to 'start+len' */ int (*Play)(SDL_CD *cdrom, int start, int len); /* Pause play */ int (*Pause)(SDL_CD *cdrom); /* Resume play */ int (*Resume)(SDL_CD *cdrom); /* Stop play */ int (*Stop)(SDL_CD *cdrom); /* Eject the current disk */ int (*Eject)(SDL_CD *cdrom); /* Close the specified drive */ void (*Close)(SDL_CD *cdrom); } SDL_CDcaps; /* The number of available CD-ROM drives on the system */ extern int SDL_numcds; /* Function to scan the system for CD-ROM drives and fill SDL_CDcaps. * This function should set SDL_numcds to the number of available CD * drives. Drive 0 should be the system default CD-ROM. * It should return 0, or -1 on an unrecoverable fatal error. */ extern int SDL_SYS_CDInit(void); /* Function to perform any system-specific CD-ROM related cleanup */ extern void SDL_SYS_CDQuit(void);