[Scummvm-cvs-logs] CVS: scummvm sdl.cpp,1.77,1.78
James Brown
ender at users.sourceforge.net
Sun Apr 7 00:12:15 CEST 2002
- Previous message: [Scummvm-cvs-logs] CVS: scummvm gameDetector.cpp,1.3,1.4 gameDetector.h,1.2,1.3 object.cpp,1.51,1.52 script.cpp,1.44,1.45 script_v1.cpp,1.71,1.72 script_v2.cpp,1.39,1.40 scummvm.cpp,1.102,1.103 sdl.cpp,1.76,1.77 vars.cpp,1.4,1.5
- Next message: [Scummvm-cvs-logs] CVS: scummvm scummvm.dsp,1.30,1.31
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv3054
Modified Files:
sdl.cpp
Log Message:
Add support for selecting CDROM drive for Loom/MI cd audio, fix midi support
Index: sdl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sdl.cpp,v
retrieving revision 1.77
retrieving revision 1.78
diff -C2 -d -r1.77 -r1.78
*** sdl.cpp 7 Apr 2002 04:29:15 -0000 1.77
--- sdl.cpp 7 Apr 2002 07:33:39 -0000 1.78
***************
*** 793,799 ****
if (SDL_InitSubSystem(SDL_INIT_CDROM) == -1)
cdrom = NULL;
! else
! cdrom = SDL_CDOpen(0);
!
/* Clean up on exit */
atexit(SDL_Quit);
--- 793,803 ----
if (SDL_InitSubSystem(SDL_INIT_CDROM) == -1)
cdrom = NULL;
! else {
! cdrom = SDL_CDOpen(s->_cdrom);
! /* Did if open? Check if cdrom is NULL */
! if(!cdrom){
! warning("Couldn't open drive: %s\n", SDL_GetError());
! }
! }
/* Clean up on exit */
atexit(SDL_Quit);
***************
*** 964,967 ****
--- 968,973 ----
scumm->_soundCardType = detector._soundCardType;
scumm->_noSubtitles = detector._noSubtitles;
+ scumm->_midi_driver = detector._midi_driver;
+ scumm->_cdrom = detector._cdrom;
scumm->delta=6;
- Previous message: [Scummvm-cvs-logs] CVS: scummvm gameDetector.cpp,1.3,1.4 gameDetector.h,1.2,1.3 object.cpp,1.51,1.52 script.cpp,1.44,1.45 script_v1.cpp,1.71,1.72 script_v2.cpp,1.39,1.40 scummvm.cpp,1.102,1.103 sdl.cpp,1.76,1.77 vars.cpp,1.4,1.5
- Next message: [Scummvm-cvs-logs] CVS: scummvm scummvm.dsp,1.30,1.31
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list