diff options
| -rw-r--r-- | README.ja.md | 6 | ||||
| -rw-r--r-- | README.md | 8 | ||||
| -rw-r--r-- | common/fmplayer_drumrom_unix.c | 2 | ||||
| -rw-r--r-- | gtk/Makefile.am | 22 | ||||
| -rw-r--r-- | gtk/main.c | 4 | ||||
| -rw-r--r-- | win32/about.c | 2 | ||||
| -rw-r--r-- | win32/fmplayer.mak | 2 | ||||
| -rw-r--r-- | win32/main.c | 2 |
8 files changed, 24 insertions, 24 deletions
diff --git a/README.ja.md b/README.ja.md index f7a3279..31e343b 100644 --- a/README.ja.md +++ b/README.ja.md @@ -1,4 +1,4 @@ -# Fmplayer (仮) +# 98Fmplayer (仮) PC-98用のFM音源ドライバエミュレーション(予定) ## 現在の状況: @@ -30,9 +30,9 @@ $ cd gtk $ autoreconf -i $ ./configure $ make -$ ./fmplayer +$ ./98fmplayer ``` -`$HOME/.local/share/fmplayer/ym2608_adpcm_rom.bin`からMAME互換のドラムサンプルを読み込みます。 +`$HOME/.local/share/98fmplayer/ym2608_adpcm_rom.bin`からMAME互換のドラムサンプルを読み込みます。 ### WIN32 版の仮 UI Releases: @@ -1,4 +1,4 @@ -# Fmplayer (beta) +# 98Fmplayer (beta) PC-98 FM driver emulation (very early version)   @@ -23,9 +23,9 @@ $ cd gtk $ autoreconf -i $ ./configure $ make -$ ./fmplayer +$ ./98fmplayer ``` -Reads drum sample from `$HOME/.local/share/fmplayer/ym2608_adpcm_rom.bin` (same format as MAME). +Reads drum sample from `$HOME/.local/share/98fmplayer/ym2608_adpcm_rom.bin` (same format as MAME). ### win32 Releases: @@ -36,5 +36,5 @@ Uses MinGW-w64 to compile. $ cd win32/x86 $ make ``` -Reads drum sample from the directory in which `fmplayer.exe` is placed. +Reads drum sample from the directory in which `98fmplayer.exe` is placed. Uses DirectSound (WinMM if there is no DirectSound) to output sound. This works on Windows 2000, so it is theoretically possible to run this on a real PC-98. (But it was too heavy for my PC-9821V12 which only has P5 Pentium 120MHz, or on PC-9821Ra300 with P6 Mendocino Celeron 300MHz) diff --git a/common/fmplayer_drumrom_unix.c b/common/fmplayer_drumrom_unix.c index 587be20..cef2d4a 100644 --- a/common/fmplayer_drumrom_unix.c +++ b/common/fmplayer_drumrom_unix.c @@ -9,7 +9,7 @@ static struct { bool loaded; } g; -#define DATADIR "/.local/share/fmplayer/" +#define DATADIR "/.local/share/98fmplayer/" static void loadfile(void) { const char *path = "ym2608_adpcm_rom.bin"; diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 0b3e8bc..5370746 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -1,4 +1,4 @@ -bin_PROGRAMS=fmplayer +bin_PROGRAMS=98fmplayer LIBOPNA_SRC=../libopna/opnaadpcm.c \ ../libopna/opnadrum.c \ @@ -31,29 +31,29 @@ if ENABLE_ALSA SOUNDOUT_SRC+=../soundout/alsaout.c endif -#fmplayer_CFLAGS=$(CFLAGS) +#98fmplayer_CFLAGS=$(CFLAGS) #CFLAGS= -fmplayer_CPPFLAGS=-Wall -Wextra -pedantic \ +98fmplayer_CPPFLAGS=-Wall -Wextra -pedantic \ -I$(top_srcdir)/.. -I$(top_srcdir)/../soundout \ $(GTK3_CFLAGS) $(JACK_CFLAGS) $(PULSE_CFLAGS) $(ALSA_CFLAGS) $(SNDFILE_CFLAGS) \ -DPACC_GL_3 -DLIBOPNA_ENABLE_LEVELDATA -DLIBOPNA_ENABLE_OSCILLO -fmplayer_LDADD=$(GTK3_LIBS) $(JACK_LIBS) $(PULSE_LIBS) $(ALSA_LIBS) $(SNDFILE_LIBS) -lm -lpthread +98fmplayer_LDADD=$(GTK3_LIBS) $(JACK_LIBS) $(PULSE_LIBS) $(ALSA_LIBS) $(SNDFILE_LIBS) -lm -lpthread if ENABLE_NEON LIBOPNA_SRC+=../libopna/opnassg-sinc-neon.s FMDSP_SRC+=../fmdsp/fmdsp-vramlookup-neon.s -fmplayer_CCASFLAGS=-march=armv8-a -mfpu=crypto-neon-fp-armv8 +98fmplayer_CCASFLAGS=-march=armv8-a -mfpu=crypto-neon-fp-armv8 endif if ENABLE_SSE noinst_LIBRARIES=libsse.a -fmplayer_LDADD+=libsse.a +98fmplayer_LDADD+=libsse.a libsse_a_SOURCES=../libopna/opnassg-sinc-sse2.c -libsse_a_CPPFLAGS=$(fmplayer_CPPFLAGS) +libsse_a_CPPFLAGS=$(98fmplayer_CPPFLAGS) libsse_a_CFLAGS=-msse2 endif -fmplayer_SOURCES=main.c \ +98fmplayer_SOURCES=main.c \ toneview.c \ wavesave.c \ ../tonedata/tonedata.c \ @@ -70,8 +70,8 @@ fmplayer_SOURCES=main.c \ configdialog.c if ENABLE_OPENGL -fmplayer_SOURCES+=oscilloview-gl.c -fmplayer_LDADD+=-lGL +98fmplayer_SOURCES+=oscilloview-gl.c +98fmplayer_LDADD+=-lGL else -fmplayer_SOURCES+=oscilloview.c +98fmplayer_SOURCES+=oscilloview.c endif @@ -184,7 +184,7 @@ static bool openfile(const char *uri) { goto err; } if (!g.ss) { - g.ss = sound_init("FMPlayer", SRATE, soundout_cb, &g.opna_timer); + g.ss = sound_init("98FMPlayer", SRATE, soundout_cb, &g.opna_timer); if (!g.ss) { msgbox_err("cannot open audio stream"); goto err; @@ -551,7 +551,7 @@ int main(int argc, char **argv) { GtkWidget *w = gtk_window_new(GTK_WINDOW_TOPLEVEL); g.mainwin = w; gtk_window_set_resizable(GTK_WINDOW(w), FALSE); - gtk_window_set_title(GTK_WINDOW(w), "FMPlayer"); + gtk_window_set_title(GTK_WINDOW(w), "98FMPlayer"); g_signal_connect(w, "destroy", G_CALLBACK(on_destroy), 0); g.root_box_widget = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); gtk_container_add(GTK_CONTAINER(w), g.root_box_widget); diff --git a/win32/about.c b/win32/about.c index c6c1e7c..ff8f165 100644 --- a/win32/about.c +++ b/win32/about.c @@ -105,7 +105,7 @@ static bool on_create(HWND hwnd, const CREATESTRUCT *cs) { hwnd, 0, g.hinst, 0); SetWindowFont(g.static_help, g.font, TRUE); g.static_main = CreateWindowEx(0, L"static", - L"FMPlayer/Win32 " ABOUT_ARCH " v" FMPLAYER_VERSION_STR, + L"98FMPlayer/Win32 " ABOUT_ARCH " v" FMPLAYER_VERSION_STR, WS_CHILD | WS_VISIBLE, 150, 10, 400, 40, hwnd, 0, g.hinst, 0); diff --git a/win32/fmplayer.mak b/win32/fmplayer.mak index 383186b..8bbf8ae 100644 --- a/win32/fmplayer.mak +++ b/win32/fmplayer.mak @@ -1,4 +1,4 @@ -TARGET=fmplayer.exe +TARGET=98fmplayer.exe ICON=../fmplayer.ico ICONFILES=../fmplayer.png ../fmplayer32.png diff --git a/win32/main.c b/win32/main.c index 8bee805..fa7d7e2 100644 --- a/win32/main.c +++ b/win32/main.c @@ -818,7 +818,7 @@ int CALLBACK wWinMain(HINSTANCE hinst, HINSTANCE hpinst, #endif g.mainwnd = CreateWindowEx( exStyle, - (wchar_t*)((uintptr_t)wcatom), L"FMPlayer/Win32 " WIN64STR "v" FMPLAYER_VERSION_STR, + (wchar_t*)((uintptr_t)wcatom), L"98FMPlayer/Win32 " WIN64STR "v" FMPLAYER_VERSION_STR, style, CW_USEDEFAULT, CW_USEDEFAULT, wr.right-wr.left, wr.bottom-wr.top, |