From abee80062051164aa4931527a54c07046dbc1394 Mon Sep 17 00:00:00 2001 From: Wohlstand Date: Tue, 6 Dec 2016 20:13:02 +0300 Subject: Added Nuked OPL3 emulator (which is more accurate than DosBox's) Also: - Fixed warnings in the CLang code model plugin for Qt Creator - Fixed bend coefficient which caused incorrect hi-hats in DMX banks --- make.rules | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'make.rules') diff --git a/make.rules b/make.rules index cb36973..a2174c8 100644 --- a/make.rules +++ b/make.rules @@ -100,14 +100,17 @@ directories: ${MKDIR} obj ${MKDIR} bin -libadlmidi.so: obj/adlmidi.o obj/dbopl.o obj/adldata.o +libadlmidi.so: obj/adlmidi.o obj/nukedopl3.o obj/adldata.o $(CXXLINK) $^ $(DEBUG) -shared -o bin/$@ $(LDLIBS) obj/adlmidi.o: src/adlmidi.cpp src/adlmidi.h src/dbopl.h src/adldata.hh $(CXX) $(CPPFLAGS) $< $(DEBUG) -c -fPIC -o $@ obj/dbopl.o: src/dbopl.cpp src/dbopl.h - $(CXX) $(CPPFLAGS) $< $(DEBUG) -c -fPIC -o $@ + $(CXX) $(CPPFLAGS) $< $(DEBUG) -DADLMIDI_USE_DOSBOX_OPL -c -fPIC -o $@ + +obj/nukedopl3.o: src/nukedopl3.c src/nukedopl3.h + $(CC) $(CFLAGS) $< $(DEBUG) -c -fPIC -o $@ obj/adldata.o: src/adldata.cpp src/adldata.hh $(CXX) $(CPPFLAGS) $< $(DEBUG) -c -fPIC -o $@ -- cgit v1.2.3 From b2890608189a69695a5119e1be771b89278dce9b Mon Sep 17 00:00:00 2001 From: Wohlstand Date: Mon, 16 Jan 2017 08:24:19 +0300 Subject: Split adlmidi.cpp now keeps API functions only other code has been moved into separated files --- make.rules | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) (limited to 'make.rules') diff --git a/make.rules b/make.rules index a2174c8..e50623f 100644 --- a/make.rules +++ b/make.rules @@ -5,6 +5,7 @@ NOGZIPARCHIVES=1 ARCHFILES=\ src/adlmidi.cpp src/adlmidi.h \ + src/adlmidi_load.cpp src/adlmidi_midiplay.cpp src/adlmidi_opl3.cpp src/adlmidi_private.cpp \ src/dbopl.cpp src/dbopl.h \ src/adldata.cpp src/adldata.hh \ src/dumpbank/dumpbank.cc src/dumpmiles/dumpmiles.cc \ @@ -100,10 +101,22 @@ directories: ${MKDIR} obj ${MKDIR} bin -libadlmidi.so: obj/adlmidi.o obj/nukedopl3.o obj/adldata.o +libadlmidi.so: obj/adlmidi.o obj/adlmidi_load.o obj/adlmidi_midiplay.o obj/adlmidi_opl3.o obj/adlmidi_private.o obj/nukedopl3.o obj/adldata.o $(CXXLINK) $^ $(DEBUG) -shared -o bin/$@ $(LDLIBS) -obj/adlmidi.o: src/adlmidi.cpp src/adlmidi.h src/dbopl.h src/adldata.hh +obj/adlmidi.o: src/adlmidi.cpp src/adlmidi.h src/dbopl.h src/nukedopl3.h src/adldata.hh + $(CXX) $(CPPFLAGS) $< $(DEBUG) -c -fPIC -o $@ + +obj/adlmidi_load.o: src/adlmidi_load.cpp src/adlmidi_private.hpp src/adlmidi.h src/adldata.hh + $(CXX) $(CPPFLAGS) $< $(DEBUG) -c -fPIC -o $@ + +obj/adlmidi_midiplay.o: src/adlmidi_midiplay.cpp src/adlmidi_private.hpp src/adlmidi.h src/adldata.hh + $(CXX) $(CPPFLAGS) $< $(DEBUG) -c -fPIC -o $@ + +obj/adlmidi_opl3.o: src/adlmidi_opl3.cpp src/adlmidi_private.hpp src/adlmidi.h src/adldata.hh + $(CXX) $(CPPFLAGS) $< $(DEBUG) -c -fPIC -o $@ + +obj/adlmidi_private.o: src/adlmidi_private.cpp src/adlmidi_private.hpp src/adlmidi.h src/adldata.hh $(CXX) $(CPPFLAGS) $< $(DEBUG) -c -fPIC -o $@ obj/dbopl.o: src/dbopl.cpp src/dbopl.h @@ -113,25 +126,25 @@ obj/nukedopl3.o: src/nukedopl3.c src/nukedopl3.h $(CC) $(CFLAGS) $< $(DEBUG) -c -fPIC -o $@ obj/adldata.o: src/adldata.cpp src/adldata.hh - $(CXX) $(CPPFLAGS) $< $(DEBUG) -c -fPIC -o $@ + $(CXX) $(CPPFLAGS) $< $(DEBUG) -c -fPIC -o $@ gen_adldata: obj/gen_adldata.o obj/dbopl.o $(CXXLINK) $^ $(DEBUG) -o bin/$@ $(LDLIBS) obj/gen_adldata.o: src/gen_adldata/gen_adldata.cc src/dbopl.h - $(CXX) $(CPPFLAGS) $< $(DEBUG) -c -o $@ + $(CXX) $(CPPFLAGS) $< $(DEBUG) -c -o $@ dumpmiles: obj/dumpmiles.o $(CXXLINK) $^ $(DEBUG) -o bin/$@ $(LDLIBS) obj/dumpmiles.o: src/dumpmiles/dumpmiles.cc - $(CXX) $(CPPFLAGS) $< $(DEBUG) -c -o $@ + $(CXX) $(CPPFLAGS) $< $(DEBUG) -c -o $@ dumpbank: obj/dumpbank.o $(CXXLINK) $^ $(DEBUG) -o bin/$@ $(LDLIBS) obj/dumpbank.o: src/dumpbank/dumpbank.cc - $(CXX) $(CPPFLAGS) $< $(DEBUG) -c -o $@ + $(CXX) $(CPPFLAGS) $< $(DEBUG) -c -o $@ .PHONY: clean -- cgit v1.2.3 From 9cd892706bf782c8a0e47731bd71e629d505c5cf Mon Sep 17 00:00:00 2001 From: Wohlstand Date: Wed, 15 Feb 2017 16:19:08 +0300 Subject: Fixed logarithmic volumes flag and added support for XMI and MUS formats MUS playing was totally invalid: the MUS data are completely different from regular MIDI data. Now is added a right converter which results a MIDI data which can be played correctly. --- make.rules | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'make.rules') diff --git a/make.rules b/make.rules index e50623f..a8a6cb9 100644 --- a/make.rules +++ b/make.rules @@ -101,7 +101,7 @@ directories: ${MKDIR} obj ${MKDIR} bin -libadlmidi.so: obj/adlmidi.o obj/adlmidi_load.o obj/adlmidi_midiplay.o obj/adlmidi_opl3.o obj/adlmidi_private.o obj/nukedopl3.o obj/adldata.o +libadlmidi.so: obj/adlmidi.o obj/adlmidi_load.o obj/adlmidi_midiplay.o obj/adlmidi_opl3.o obj/adlmidi_private.o obj/adlmidi_xmi2mid.o obj/adlmidi_mus2mid.o obj/nukedopl3.o obj/adldata.o $(CXXLINK) $^ $(DEBUG) -shared -o bin/$@ $(LDLIBS) obj/adlmidi.o: src/adlmidi.cpp src/adlmidi.h src/dbopl.h src/nukedopl3.h src/adldata.hh @@ -125,6 +125,12 @@ obj/dbopl.o: src/dbopl.cpp src/dbopl.h obj/nukedopl3.o: src/nukedopl3.c src/nukedopl3.h $(CC) $(CFLAGS) $< $(DEBUG) -c -fPIC -o $@ +obj/adlmidi_xmi2mid.o: src/adlmidi_xmi2mid.c src/adlmidi_xmi2mid.h + $(CC) $(CFLAGS) $< $(DEBUG) -c -fPIC -o $@ + +obj/adlmidi_mus2mid.o: src/adlmidi_mus2mid.c src/adlmidi_mus2mid.h + $(CC) $(CFLAGS) $< $(DEBUG) -c -fPIC -o $@ + obj/adldata.o: src/adldata.cpp src/adldata.hh $(CXX) $(CPPFLAGS) $< $(DEBUG) -c -fPIC -o $@ -- cgit v1.2.3