cpp/openttd-patchpack/source Changeset - r532:99f68246c0ce

Changeset - r532:99f68246c0ce

Parent rev.

Child rev.

[Not reviewed]

master

1 1 1

bjarni - 20 years ago 2004-12-01 19:44:39
bjarni@openttd.org

(svn r877) Moved bemidi.cpp correctly this time

3 files changed with 59 insertions and 58 deletions:

Makefile

bemidi.cpp

os/beos/bemidi.cpp

0 comments (0 inline, 0 general)

Makefile

➞

Show inline comments

@@ @@ -543,7 +543,8 @@ endif @@
 ttd_OBJS = $(C_SOURCES:%.c=%.o) $(CXX_SOURCES:%.cpp=%.o)
 ifdef BEOS
 CXX_SOURCES += bemidi.cpp
 CXX_SOURCES += os/beos/bemidi.cpp
 CFLAGS += -I.
 endif
 ifdef WIN32
@@ @@ -745,6 +746,6 @@ DEPS_MAGIC := $(shell mkdir .deps > /dev @@
 		>> .deps/$(*F).P; \
 	rm .deps/$(*F).pp
 # For DirectMusic build
+# For DirectMusic build and BeOS specific parts
 %.o: %.cpp  $(MAKE_CONFIG)
 	$(CXX_BUILD) $<
+	$(CXX_BUILD) $< -o $@

bemidi.cpp

➞

Show inline comments

deleted file

os/beos/bemidi.cpp

➞

Show inline comments

@@ new file 100644 @@
 #ifdef __BEOS__
 #include "stdafx.h"
 #include "ttd.h"
 #include "hal.h"
 // BeOS System Includes
 #include <MidiSynthFile.h>
 BMidiSynthFile midiSynthFile;
 static char *bemidi_start(char **parm)
+{
 	return NULL;
+}
 static void bemidi_stop(void)
+{
 	midiSynthFile.UnloadFile();
+}
 static void bemidi_play_song(const char *filename)
+{
 	bemidi_stop();
 	entry_ref midiRef;
 	get_ref_for_path(filename, &midiRef);
 	midiSynthFile.LoadFile(&midiRef);
 	midiSynthFile.Start();
+}
 static void bemidi_stop_song(void)
+{
 	midiSynthFile.UnloadFile();
+}
 static bool bemidi_is_playing(void)
+{
 	return !midiSynthFile.IsFinished();
+}
 static void bemidi_set_volume(byte vol)
+{
 	fprintf(stderr, "BeMidi: Set volume not implemented\n");
+}
 const HalMusicDriver _bemidi_music_driver = {
 	bemidi_start,
 	bemidi_stop,
 	bemidi_play_song,
 	bemidi_stop_song,
 	bemidi_is_playing,
 	bemidi_set_volume,
 };
 #endif // __BEOS__

0 comments (0 inline, 0 general)