[Scummvm-cvs-logs] CVS: scummvm/sound imuse.cpp,1.11,1.12
James Brown
ender at users.sourceforge.net
Sun Mar 10 20:38:03 CET 2002
Update of /cvsroot/scummvm/scummvm/sound
In directory usw-pr-cvs1:/tmp/cvs-serv30640
Modified Files:
imuse.cpp
Log Message:
Remove last Sam and Max #ifdef
Index: imuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/imuse.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** imuse.cpp 7 Mar 2002 08:11:48 -0000 1.11
--- imuse.cpp 11 Mar 2002 04:37:06 -0000 1.12
***************
*** 41,49 ****
#define COMMAND_ID 1
! #ifdef SAMNMAX
! #define MDHD_TAG "MDpg"
! #else
! #define MDHD_TAG "MDhd"
! #endif
int clamp(int val, int min, int max) {
--- 41,46 ----
#define COMMAND_ID 1
! #define MDPG_TAG "MDpg"
! #define MDHD_TAG "MDhd"
int clamp(int val, int min, int max) {
***************
*** 181,188 ****
void *mdhd;
! mdhd = findTag(sound, MDHD_TAG, 0);
! if (!mdhd) {
! warning("SE::start_sound failed: Couldn't find %s", MDHD_TAG);
! return false;
}
player = allocate_player(128);
--- 178,188 ----
void *mdhd;
! mdhd = findTag(sound, MDHD_TAG, 0);
! if (!mdhd) {
! mdhd = findTag(sound, MDPG_TAG, 0);
! if (!mdhd) {
! warning("SE::start_sound failed: Couldn't find %s", MDHD_TAG);
! return false;
! }
}
player = allocate_player(128);
***************
*** 1020,1025 ****
mdhd = _se->findTag(sound, MDHD_TAG, 0);
if (mdhd==NULL) {
! warning("P::start_sound failed: Couldn't find %s", MDHD_TAG);
! return false;
}
_parts = NULL;
--- 1020,1028 ----
mdhd = _se->findTag(sound, MDHD_TAG, 0);
if (mdhd==NULL) {
! mdhd = _se->findTag(sound, MDPG_TAG, 0);
! if (mdhd==NULL) {
! warning("P::start_sound failed: Couldn't find %s", MDHD_TAG);
! return false;
! }
}
_parts = NULL;
More information about the Scummvm-git-logs
mailing list