[Scummvm-cvs-logs] CVS: scummvm/sky logic.h,1.18,1.19 module.mk,1.11,1.12 sky.cpp,1.39,1.40 sky.h,1.25,1.26 adlibchannel.cpp,1.2,NONE adlibchannel.h,1.2,NONE adlibmusic.cpp,1.2,NONE adlibmusic.h,1.2,NONE gmchannel.cpp,1.3,NONE gmchannel.h,1.3,NONE gmmusic.cpp,1.4,NONE gmmusic.h,1.2,NONE mt32music.cpp,1.1,NONE mt32music.h,1.1,NONE musicbase.cpp,1.5,NONE musicbase.h,1.4,NONE
Robert G?ffringmann
lavosspawn at users.sourceforge.net
Wed May 28 16:32:04 CEST 2003
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/sky/music - New directory
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sky/music adlibchannel.cpp,NONE,1.1 adlibchannel.h,NONE,1.1 adlibmusic.cpp,NONE,1.1 adlibmusic.h,NONE,1.1 gmchannel.cpp,NONE,1.1 gmchannel.h,NONE,1.1 gmmusic.cpp,NONE,1.1 gmmusic.h,NONE,1.1 mt32music.cpp,NONE,1.1 mt32music.h,NONE,1.1 musicbase.cpp,NONE,1.1 musicbase.h,NONE,1.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1:/tmp/cvs-serv7207/sky
Modified Files:
logic.h module.mk sky.cpp sky.h
Removed Files:
adlibchannel.cpp adlibchannel.h adlibmusic.cpp adlibmusic.h
gmchannel.cpp gmchannel.h gmmusic.cpp gmmusic.h mt32music.cpp
mt32music.h musicbase.cpp musicbase.h
Log Message:
moved music drivers into seperated directory, added music support for diskdemo's adlib driver version.
(maybe other sky versions also have this older adlib driver?)
Index: logic.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/logic.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- logic.h 27 May 2003 16:42:20 -0000 1.18
+++ logic.h 28 May 2003 23:31:42 -0000 1.19
@@ -26,7 +26,7 @@
#include "sky/disk.h"
#include "sky/grid.h"
#include "sky/autoroute.h"
-#include "sky/musicbase.h"
+#include "sky/music/musicbase.h"
#include "sky/mouse.h"
#include "sky/screen.h"
Index: module.mk
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/module.mk,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- module.mk 14 May 2003 22:45:49 -0000 1.11
+++ module.mk 28 May 2003 23:31:42 -0000 1.12
@@ -1,15 +1,11 @@
MODULE := sky
MODULE_OBJS = \
- sky/adlibchannel.o \
- sky/adlibmusic.o \
sky/autoroute.o \
sky/cd_intro.o \
sky/compact.o \
sky/debug.o \
sky/disk.o \
- sky/gmchannel.o \
- sky/gmmusic.o \
sky/grid.o \
sky/intro.o \
sky/logic.o \
@@ -20,6 +16,10 @@
sky/sky.o \
sky/sound.o \
sky/text.o \
+ sky/music/adlibchannel.o \
+ sky/music/adlibmusic.o \
+ sky/music/gmchannel.o \
+ sky/music/gmmusic.o \
# Include common rules
include common.rules
Index: sky.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sky.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- sky.cpp 28 May 2003 21:29:50 -0000 1.39
+++ sky.cpp 28 May 2003 23:31:43 -0000 1.40
@@ -158,13 +158,14 @@
_skyDisk = new SkyDisk(_gameDataPath);
_skySound = new SkySound(_mixer, _skyDisk);
+ _gameVersion = _skyDisk->determineGameVersion();
+
if (_detector->getMidiDriverType() == MD_ADLIB) {
- _skyMusic = new SkyAdlibMusic(_mixer, _skyDisk);
+ _skyMusic = new SkyAdlibMusic(_mixer, _skyDisk, _gameVersion);
} else {
- _skyMusic = new SkyGmMusic(_detector->createMidi(), _skyDisk);
+ _skyMusic = new SkyGmMusic(_detector->createMidi(), _skyDisk, _gameVersion);
}
- _gameVersion = _skyDisk->determineGameVersion();
_skyText = new SkyText(_skyDisk, _gameVersion, _language);
_skyMouse = new SkyMouse(_skyDisk);
_skyScreen = new SkyScreen(_system, _skyDisk);
Index: sky.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sky.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- sky.h 27 May 2003 16:42:20 -0000 1.25
+++ sky.h 28 May 2003 23:31:43 -0000 1.26
@@ -33,10 +33,10 @@
#include "sky/struc.h"
#include "sky/grid.h"
#include "sky/screen.h"
-#include "sky/musicbase.h"
-#include "sky/adlibmusic.h"
-#include "sky/gmmusic.h"
-#include "sky/mt32music.h"
+#include "sky/music/musicbase.h"
+#include "sky/music/adlibmusic.h"
+#include "sky/music/gmmusic.h"
+#include "sky/music/mt32music.h"
#include "sky/mouse.h"
class SkyLogic;
--- adlibchannel.cpp DELETED ---
--- adlibchannel.h DELETED ---
--- adlibmusic.cpp DELETED ---
--- adlibmusic.h DELETED ---
--- gmchannel.cpp DELETED ---
--- gmchannel.h DELETED ---
--- gmmusic.cpp DELETED ---
--- gmmusic.h DELETED ---
--- mt32music.cpp DELETED ---
--- mt32music.h DELETED ---
--- musicbase.cpp DELETED ---
--- musicbase.h DELETED ---
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/sky/music - New directory
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sky/music adlibchannel.cpp,NONE,1.1 adlibchannel.h,NONE,1.1 adlibmusic.cpp,NONE,1.1 adlibmusic.h,NONE,1.1 gmchannel.cpp,NONE,1.1 gmchannel.h,NONE,1.1 gmmusic.cpp,NONE,1.1 gmmusic.h,NONE,1.1 mt32music.cpp,NONE,1.1 mt32music.h,NONE,1.1 musicbase.cpp,NONE,1.1 musicbase.h,NONE,1.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list