[Scummvm-cvs-logs] CVS: scummvm Makefile,1.41,1.42 gameDetector.cpp,1.67,1.68 readme.txt,1.60,1.61

Nicolas Noble pixels at users.sourceforge.net
Wed May 15 23:47:03 CEST 2002


Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv10990

Modified Files:
	Makefile gameDetector.cpp readme.txt 
Log Message:
Added an ALSA sequencer support. Updated readme.txt to explain it, and
Makefile to allow the user to enable it. I also reorganised the Makefile
a bit, since there is now one more optionnal library. BBrox, I also
merged your Makefile.x11 in it, just take a look at it!


Index: Makefile
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- Makefile	27 Apr 2002 16:58:28 -0000	1.41
+++ Makefile	16 May 2002 06:46:50 -0000	1.42
@@ -1,16 +1,38 @@
 # $Header$
 
-CC      = g++
-CFLAGS  = -g -O -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar 
-DEFINES = -DUNIX
+CC       = g++
+CFLAGS   = -g -O -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar
+DEFINES  = -DUNIX
 LDFLAGS :=
 INCLUDES:= `sdl-config --cflags` -I./ -I./sound
-CPPFLAGS= $(DEFINES) $(INCLUDES)
+LIBS	 = -lncurses
 
-# Add -lmad for -DCOMPRESSED_SOUND_FILE
-LIBS	= `sdl-config --libs` -lncurses
+# Uncomment this to activate the MAD lib for compressed sound files
+# DEFINES += -DCOMPRESSED_SOUND_FILE
+# LIBS    += -lmad
 
-OBJS	= sdl.o
+# Uncomment this to activate the ALSA lib for midi
+# DEFINES += -DUSE_ALSA
+# LIBS    += -lasound
+
+
+# Now, please choose a graphical output system between SDL and X11.
+# Beware, only define one of them, otherwise the compilation will blow up.
+
+# Comment this if you want to disable SDL output
+OBJS	 = sdl.o
+INCLUDE += `sdl-config --cflags`
+LIBS    += `sdl-config --libs`
+
+# Uncomment this if you rather want X11 output
+# OBJS     = x11.o
+# DEFINES += -DUNIX_X11
+# LDFLAGS := -L/usr/X11R6/lib -L/usr/local/lib
+# INCLUDES+= -I/usr/X11R6/include
+# LIBS    += -lpthread
+
+
+CPPFLAGS= $(DEFINES) $(INCLUDES)
 
 include Makefile.common
 

Index: gameDetector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gameDetector.cpp,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- gameDetector.cpp	14 May 2002 23:50:09 -0000	1.67
+++ gameDetector.cpp	16 May 2002 06:46:50 -0000	1.68
@@ -320,6 +320,7 @@
 		{"core",MD_COREAUDIO},
 		{"amidi",MD_AMIDI},
 		{"midiemu",MD_MIDIEMU},
+		{"alsa", MD_ALSA},
 		{"adlib",-1},
 	};
 
@@ -607,6 +608,9 @@
 #endif
 #if defined(__APPLE__)
 	case MD_COREAUDIO:	return MidiDriver_CORE_create();
+#endif
+#if defined(UNIX) && defined(USE_ALSA)
+	case MD_ALSA:		return MidiDriver_ALSA_create();
 #endif
 	}
 

Index: readme.txt
===================================================================
RCS file: /cvsroot/scummvm/scummvm/readme.txt,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- readme.txt	14 May 2002 18:14:15 -0000	1.60
+++ readme.txt	16 May 2002 06:46:50 -0000	1.61
@@ -320,6 +320,7 @@
         -eqt        - Quicktime sound, for Macintosh users.
         -ecore      - CoreAudio sound, for MacOS X users.
         -eamidi     - Uses the MorphOS MIDI system, for MorphOS users
+	-ealsa      - Output using ALSA sequencer device. See below.
         -enull      - Null output. Don't play any music.
         
 
@@ -330,6 +331,7 @@
 best compatability between machines and games. However, Sam and Max does not
 include Adlib emulation.
 
+
 Playing sound with MIDI emulation:
 ----------------------------------
 Until recently, some games (particually Sam and Max) were only able to run
@@ -341,12 +343,14 @@
 very buggy and the emulation is not perfect. If you are capable of using
 native midi, we recommend using one of the MIDI modes below.
 
+
 Playing sound with Native MIDI:
 -------------------------------
 Use the appropriate -e<mode> command line option from the list above to
 select your preferred MIDI device. For example, if you wish to use the
 Windows MIDI driver, use the -ewindows option.
 
+
 Playing sound with Sequencer MIDI:              [UNIX ONLY]
 ----------------------------------
 If your soundcard driver supports a sequencer, you may set the environment
@@ -360,6 +364,48 @@
 systems where sequencer support does not work, you can always fall back on
 either of those methods.
 
+
+Playing sound with ALSA sequencer:              [UNIX ONLY]
+----------------------------------
+If you have installed the ALSA driver with the sequencer support, then
+set the environment variable "SCUMMVM_PORT" to your sequencer port - eg 65:0
+
+Here is a little howto on how to use the ALSA sequencer with your soundcard.
+In all cases, to have a list of all the sequencer ports you have, try the
+command "aconnect -o -l". On my system it gives me the output:
+client 64: 'External MIDI 0' [type=kernel]
+    0 'MIDI 0-0        '
+client 65: 'Emu10k1 WaveTable' [type=kernel]
+    0 'Emu10k1 Port 0  '
+    1 'Emu10k1 Port 1  '
+    2 'Emu10k1 Port 2  '
+    3 'Emu10k1 Port 3  '
+client 128: 'Client-128' [type=user]
+    0 'TiMidity port 0 '
+    1 'TiMidity port 1 '
+
+It means the external MIDI output of my sound card is located on the
+port 64:0, that I've got four WaveTable MIDI outputs in 65:0, 65:1, 65:2
+and 65:3, and that I've got two TiMidity ports, located at 128:0 and 128:1.
+
+If you have a FM-chip on your card, like the SB16, then you have to load
+the soundfonts using the sbiload software. Example:
+  sbiload -p 65:0 /etc/std.o3 /etc/drums.o3
+
+If you have a WaveTable capable sound card, you have to load a sbk or sf2
+soundfont using the sfxload software. If you manage to do so, please mail
+me since I managed to get it working only once, and never again.
+
+If you don't have a MIDI capable soundcard, or if you want to take
+advantage of your TiMidity samples, then you can ask TiMidity to become an
+alsa sequencer output. Here is a quick way to do so:
+  timidity -iAqqq -B2,8 -Os1S -s 44100 &
+
+Then the TiMidity port will be visible from the 'aconnect -o -l' list. You
+should launch it beeing as root, since it will try to set up some real time
+priority.
+
+
 Using MP3 files for CD audio:
 -----------------------------
 Use LAME or some other mp3 encoder to rip the cd audio tracks to files. Name
@@ -456,7 +502,7 @@
         Daniel Schepler    - Final MI1 CD music support
         Tim 'realmz'       - Initial MI1 CD music support
         Jonathan 'khalek'  - Expert weaver in the Loom
-        Nicolas Noble      - Config file support
+        Nicolas Noble      - Config file and ALSA support
         Pawel Kolodziejski - Added missing Dig SMUSH codecs
         Felix Jakschitsc   - His hard work on Zak256
 





More information about the Scummvm-git-logs mailing list