diff --git a/projects/Makefile b/projects/Makefile index f735c9d7..60ae5081 100644 --- a/projects/Makefile +++ b/projects/Makefile @@ -152,8 +152,8 @@ DUMMYMIDIDIRS := \ BITTBOYDIRS := $(DINGUXDIRS) $(DINGUXAUDIODIRS) DINGOODIRS := $(DINGUXDIRS) $(DINGUXAUDIODIRS) $(DUMMYMIDIDIRS) MIYOODIRS := $(DINGUXDIRS) $(DUMMYMIDIDIRS) -GARLICDIRS := $(MIYOODIRS) -GARLICPLUSDIRS := $(GARLICDIRS) +GARLICDIRS := $(DINGUXDIRS) $(RTMIDIDIRS) +GARLICPLUSDIRS := $(MIYOODIRS) RS97DIRS := $(DINGUXDIRS) $(DINGUXAUDIODIRS) GP2XDIRS := \ @@ -413,8 +413,8 @@ MIYOOFILES := \ MIYOOSystem.o \ SDLAudio.o -GARLICFILES = $(MIYOOFILES) -GARLICPLUSFILES = $(GARLICFILES) +GARLICFILES = $(DINGUXFILES) $(RTMIDIFILES) MIYOOSystem.o SDLAudio.o +GARLICPLUSFILES = $(MIYOOFILES) NDSFILES := \ NDSmain.o \ diff --git a/projects/Makefile.GARLIC b/projects/Makefile.GARLIC index 657f6abe..f0bb75bc 100644 --- a/projects/Makefile.GARLIC +++ b/projects/Makefile.GARLIC @@ -6,7 +6,10 @@ DEFINES := \ -DCPP_MEMORY \ -D_NDEBUG \ -DHAVE_STDINT_H \ - -D_NO_JACK_ + -DRTMIDI \ + -D_NO_JACK_ \ + -D__LINUX_ALSA__ \ + -D__LINUX_ALSASEQ__ DEVKIT = /opt/miyoo/ CROSS_COMPILE=$(DEVKIT)bin/arm-miyoo-linux-uclibcgnueabi- @@ -25,7 +28,7 @@ PREFIX := arm-linux-gnueabihf- INCLUDES:= -Iinclude $(SDL_CFLAGS) -I$(PWD)/../sources CFLAGS := $(DEFINES) $(INCLUDES) $(OPT_FLAGS) -Wall CXXFLAGS:= $(CFLAGS) -std=gnu++03 -LIBS := $(SDL_LIBS) -lpthread +LIBS := $(SDL_LIBS) -lpthread -lasound LIBDIRS := $(DEKVIT)/usr/lib LIBDIRS += $(DEKVIT)/usr/include OUTPUT := ../lgpt-garlic diff --git a/sources/Adapters/DINGOO/System/MIYOOSystem.cpp b/sources/Adapters/DINGOO/System/MIYOOSystem.cpp index b786e426..4bdfc2eb 100644 --- a/sources/Adapters/DINGOO/System/MIYOOSystem.cpp +++ b/sources/Adapters/DINGOO/System/MIYOOSystem.cpp @@ -5,7 +5,11 @@ #include "Adapters/SDL/GUI/SDLEventManager.h" #include "Adapters/SDL/Process/SDLProcess.h" #include "Adapters/SDL/Audio/SDLAudio.h" +#ifdef _NO_MIDI_ #include "Adapters/Dummy/Midi/DummyMidi.h" +#elif RTMIDI +#include "Adapters/RTMidi/RTMidiService.h" +#endif #include "Externals/TinyXML/tinyxml.h" #include "Application/Model/Config.h" #include "Application/Controllers/ControlRoom.h" @@ -72,9 +76,14 @@ void GPSDLSystem::Boot(int argc,char **argv) { Audio::Install(new SDLAudio(hint)); // Install Midi - MidiService::Install(new DummyMidi()); - - // Install Threads +#ifdef _NO_MIDI_ + Trace::Log("System","Installing DUMMY MIDI") ; + MidiService::Install(new DummyMidi()); +#elif RTMIDI + Trace::Log("System","Installing RT MIDI") ; + MidiService::Install(new RTMidiService()) ; +#endif +// Install Threads SysProcessFactory::Install(new SDLProcessFactory()); if (SDL_Init(SDL_INIT_EVENTTHREAD | SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_TIMER) < 0) { return; diff --git a/sources/Application/Model/Project.h b/sources/Application/Model/Project.h index 3a3c6d68..4b93274b 100644 --- a/sources/Application/Model/Project.h +++ b/sources/Application/Model/Project.h @@ -20,7 +20,7 @@ #define PROJECT_NUMBER "1" #define PROJECT_RELEASE "6" -#define BUILD_COUNT "0-bacon1" +#define BUILD_COUNT "0-garlicmidi" #define MAX_TAP 3