[Scummvm-cvs-logs] CVS: scummvm Makefile,1.32,1.33 mp3_cd.cpp,1.3,1.4 sound.cpp,1.35,1.36 sound.h,1.11,1.12
James Brown
ender at users.sourceforge.net
Thu Apr 4 20:36:05 CEST 2002
Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv25225
Modified Files:
Makefile mp3_cd.cpp sound.cpp sound.h
Log Message:
Fix mp3_cd support
Index: Makefile
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** Makefile 25 Mar 2002 22:46:32 -0000 1.32
--- Makefile 5 Apr 2002 04:35:41 -0000 1.33
***************
*** 7,10 ****
--- 7,12 ----
INCLUDES:= `sdl-config --cflags` -I./ -I./sound
CPPFLAGS= $(DEFINES) $(INCLUDES)
+
+ # Add -lMAD for -DCOMPRESSED_SOUND_FILE
LIBS = `sdl-config --libs` -lncurses -lm
ZIPFILE := scummvm-`date '+%Y-%m-%d'`.zip
***************
*** 16,20 ****
sys.o verbs.o sdl.o script_v1.o script_v2.o debug.o gui.o \
sound/imuse.o sound/fmopl.o sound/adlib.o sound/gmidi.o debugrl.o \
! akos.o vars.o insane.o gameDetector.o init.o \
v3/resource_v3.o v4/resource_v4.o
--- 18,22 ----
sys.o verbs.o sdl.o script_v1.o script_v2.o debug.o gui.o \
sound/imuse.o sound/fmopl.o sound/adlib.o sound/gmidi.o debugrl.o \
! akos.o vars.o insane.o gameDetector.o init.o mp3_cd.o\
v3/resource_v3.o v4/resource_v4.o
Index: mp3_cd.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/mp3_cd.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** mp3_cd.cpp 5 Apr 2002 04:18:30 -0000 1.3
--- mp3_cd.cpp 5 Apr 2002 04:35:41 -0000 1.4
***************
*** 209,213 ****
if (!_mp3_track) {
warning("No CD and track %d not available in mp3 format", track);
! return FALSE;
}
--- 209,213 ----
if (!_mp3_track) {
warning("No CD and track %d not available in mp3 format", track);
! return false;
}
***************
*** 216,220 ****
track);
fclose(_mp3_track);
! return FALSE;
}
--- 216,220 ----
track);
fclose(_mp3_track);
! return false;
}
***************
*** 228,232 ****
fclose(_mp3_track);
_vbr_header.flags = 0;
! return FALSE;
}
}
--- 228,232 ----
fclose(_mp3_track);
_vbr_header.flags = 0;
! return false;
}
}
***************
*** 238,242 ****
if (!_mc) {
warning("No mixer channel available for MP3 music");
! return FALSE;
}
}
--- 238,242 ----
if (!_mc) {
warning("No mixer channel available for MP3 music");
! return false;
}
}
***************
*** 248,252 ****
_mc->type = MIXER_MP3_CDMUSIC;
_mc->sound_data.mp3_cdmusic.file = _mp3_track;
! _mc->sound_data.mp3_cdmusic.playing = FALSE;
_mc->sound_data.mp3_cdmusic.buffer_size = 200000;
_mc->_sfx_sound = malloc(_mc->sound_data.mp3_cdmusic.buffer_size);
--- 248,252 ----
_mc->type = MIXER_MP3_CDMUSIC;
_mc->sound_data.mp3_cdmusic.file = _mp3_track;
! _mc->sound_data.mp3_cdmusic.playing = false;
_mc->sound_data.mp3_cdmusic.buffer_size = 200000;
_mc->_sfx_sound = malloc(_mc->sound_data.mp3_cdmusic.buffer_size);
***************
*** 274,278 ****
if (start_frame < 0 || end_frame < 0) {
warning("Negative index in frame");
! return FALSE;
}
--- 274,278 ----
if (start_frame < 0 || end_frame < 0) {
warning("Negative index in frame");
! return false;
}
***************
*** 283,292 ****
fseek(_mp3_track, where, SEEK_SET);
! _mc->sound_data.mp3_cdmusic.playing = TRUE;
! return TRUE;
}
! return FALSE;
}
--- 283,292 ----
fseek(_mp3_track, where, SEEK_SET);
! _mc->sound_data.mp3_cdmusic.playing = true;
! return true;
}
! return false;
}
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** sound.cpp 4 Apr 2002 22:47:03 -0000 1.35
--- sound.cpp 5 Apr 2002 04:35:41 -0000 1.36
***************
*** 747,751 ****
sound_data.mp3_cdmusic.file);
if (!sound_data.mp3_cdmusic.size) {
! sound_data.mp3_cdmusic.playing = FALSE;
return;
}
--- 747,751 ----
sound_data.mp3_cdmusic.file);
if (!sound_data.mp3_cdmusic.size) {
! sound_data.mp3_cdmusic.playing = false;
return;
}
***************
*** 770,774 ****
if (!MAD_RECOVERABLE(sound_data.mp3_cdmusic.stream.error)) {
debug(1, "Unrecoverable error while skipping !");
! sound_data.mp3_cdmusic.playing = FALSE;
return;
}
--- 770,774 ----
if (!MAD_RECOVERABLE(sound_data.mp3_cdmusic.stream.error)) {
debug(1, "Unrecoverable error while skipping !");
! sound_data.mp3_cdmusic.playing = false;
return;
}
***************
*** 787,791 ****
}
else {
! sound_data.mp3_cdmusic.playing = FALSE;
return;
}
--- 787,791 ----
}
else {
! sound_data.mp3_cdmusic.playing = false;
return;
}
***************
*** 815,819 ****
mad_timer_add(&sound_data.mp3_cdmusic.duration, frame_duration);
if (mad_timer_compare(sound_data.mp3_cdmusic.duration, mad_timer_zero) < 0) {
! sound_data.mp3_cdmusic.playing = FALSE;
}
--- 815,819 ----
mad_timer_add(&sound_data.mp3_cdmusic.duration, frame_duration);
if (mad_timer_compare(sound_data.mp3_cdmusic.duration, mad_timer_zero) < 0) {
! sound_data.mp3_cdmusic.playing = false;
}
Index: sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** sound.h 5 Apr 2002 04:24:39 -0000 1.11
--- sound.h 5 Apr 2002 04:35:41 -0000 1.12
***************
*** 18,21 ****
--- 18,24 ----
* Change Log:
* $Log$
+ * Revision 1.12 2002/04/05 04:35:41 ender
+ * Fix mp3_cd support
+ *
* Revision 1.11 2002/04/05 04:24:39 ender
* Fix last BOOL
***************
*** 280,284 ****
uint16 speed_lo_counter;
! void initialize() { active = false; }
void on_timer();
};
--- 283,287 ----
uint16 speed_lo_counter;
! void initialize() { active = false; }
void on_timer();
};
More information about the Scummvm-git-logs
mailing list