From 30e23cc766d25fb3253f16a0ac93031a933bcd60 Mon Sep 17 00:00:00 2001 From: Takamichi Horikawa Date: Sun, 10 Sep 2017 14:29:25 +0900 Subject: fmdsp-pacc: added everything except fft and levelmeter --- sdl/main.c | 2 +- sdl/osx/Makefile | 2 +- sdl/unix/Makefile | 2 +- sdl/win/Makefile | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'sdl') diff --git a/sdl/main.c b/sdl/main.c index 01c2437..410ed88 100644 --- a/sdl/main.c +++ b/sdl/main.c @@ -51,7 +51,6 @@ static void openfile(const char *path) { g.fmfile = file; fmplayer_init_work_opna(&g.work, &g.ppz8, &g.opna, &g.timer, &g.adpcmram); fmplayer_file_load(&g.work, g.fmfile, 1); - fmdsp_pacc_set(g.fp, &g.work, &g.opna); SDL_UnlockAudioDevice(g.adev); SDL_PauseAudioDevice(g.adev, 0); } @@ -141,6 +140,7 @@ int main(int argc, char **argv) { SDL_Quit(); return 1; } + fmdsp_pacc_set(g.fp, &g.work, &g.opna); SDL_EventState(SDL_DROPFILE, SDL_ENABLE); diff --git a/sdl/osx/Makefile b/sdl/osx/Makefile index e52fb78..73bea70 100644 --- a/sdl/osx/Makefile +++ b/sdl/osx/Makefile @@ -8,7 +8,7 @@ XCRUN:=xcrun --sdk /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.p CC:=$(XCRUN) cc OBJS:=main.o OBJS+=pacc-gl.o -OBJS+=fmdsp-pacc.o font_fmdsp_small.o +OBJS+=fmdsp-pacc.o font_fmdsp_small.o fmdsp_platform_unix.o OBJS+=opna.o opnafm.o opnassg.o opnadrum.o opnaadpcm.o opnatimer.o opnassg-sinc-c.o opnassg-sinc-sse2.o OBJS+=fmdriver_pmd.o fmdriver_fmp.o ppz8.o fmdriver_common.o OBJS+=fmplayer_file.o fmplayer_work_opna.o fmplayer_file_unix.o fmplayer_drumrom_unix.o diff --git a/sdl/unix/Makefile b/sdl/unix/Makefile index 686943f..9786031 100644 --- a/sdl/unix/Makefile +++ b/sdl/unix/Makefile @@ -7,7 +7,7 @@ vpath %.c ../../fmdriver SDLCONFIG:=sdl2-config OBJS:=main.o OBJS+=pacc-gl.o -OBJS+=fmdsp-pacc.o font_fmdsp_small.o +OBJS+=fmdsp-pacc.o font_fmdsp_small.o fmdsp_platform_unix.o OBJS+=opna.o opnafm.o opnassg.o opnadrum.o opnaadpcm.o opnatimer.o opnassg-sinc-c.o opnassg-sinc-sse2.o OBJS+=fmdriver_pmd.o fmdriver_fmp.o ppz8.o fmdriver_common.o OBJS+=fmplayer_file.o fmplayer_work_opna.o fmplayer_file_unix.o fmplayer_drumrom_unix.o diff --git a/sdl/win/Makefile b/sdl/win/Makefile index 587bac8..e804dfc 100644 --- a/sdl/win/Makefile +++ b/sdl/win/Makefile @@ -8,7 +8,7 @@ SDLCONFIG:=i686-w64-mingw32-sdl2-config CC:=i686-w64-mingw32-gcc OBJS:=main.o OBJS+=pacc-gl.o -OBJS+=fmdsp-pacc.o font_fmdsp_small.o +OBJS+=fmdsp-pacc.o font_fmdsp_small.o fmdsp_platform_win.o OBJS+=opna.o opnafm.o opnassg.o opnadrum.o opnaadpcm.o opnatimer.o opnassg-sinc-c.o opnassg-sinc-sse2.o OBJS+=fmdriver_pmd.o fmdriver_fmp.o ppz8.o fmdriver_common.o OBJS+=fmplayer_file.o fmplayer_work_opna.o fmplayer_file_win.o fmplayer_drumrom_win.o @@ -16,7 +16,7 @@ TARGET:=fmplayersdl.exe CFLAGS:=-Wall -Wextra -O2 CFLAGS+=-DFMPLAYER_FILE_WIN_UTF8 -#CFLAGS+=-DPACC_GL_3 +CFLAGS+=-DPACC_GL_3 #CFLAGS+=-DPACC_GL_ES #CFLAGS+=-DPACC_GL_ES -DPACC_GL_3 CFLAGS+=-I.. -I../.. -- cgit v1.2.3