From 1f5449687ff364e4ece478077e5898125bea43f7 Mon Sep 17 00:00:00 2001 From: kichikuou Date: Sun, 16 Feb 2020 14:31:49 +0900 Subject: [PATCH] Clean up MAKO code --- src/CMakeLists.txt | 23 ++++++------------- src/android/mako.cpp | 25 +++++++++++++++++++++ src/emscripten/mako.cpp | 25 +++++++++++++++++++++ src/sys/mako.h | 50 +++++------------------------------------ 4 files changed, 62 insertions(+), 61 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index eabc1e2..103727b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -14,8 +14,7 @@ add_library(common INTERFACE) if (ANDROID) add_library(system3 SHARED) - set(SRC_MAKO sys/mako_midi.cpp) - set(SRC_PLATFORM + target_sources(common INTERFACE linux/nact_linux.cpp android/mako.cpp ) @@ -24,8 +23,7 @@ if (ANDROID) elseif (EMSCRIPTEN) add_executable(system3) - set(SRC_MAKO sys/mako_midi.cpp) - set(SRC_PLATFORM + target_sources(common INTERFACE linux/nact_linux.cpp emscripten/mako.cpp ) @@ -54,21 +52,14 @@ else() # NOT (ANDROID OR EMSCRIPTEN) pkg_check_modules(SDL2MIXER REQUIRED IMPORTED_TARGET SDL2_mixer) set(DEFAULT_FONT_PATH ${CMAKE_INSTALL_PREFIX}/share/system3/fonts/) - set(SRC_MAKO - sys/mako.cpp - sys/mako_midi.cpp - ) + target_sources(common INTERFACE sys/mako.cpp) if (CMAKE_SYSTEM_NAME STREQUAL "Windows") - set(SRC_PLATFORM - win/nact_win.cpp - ) + target_sources(common INTERFACE win/nact_win.cpp) set(RES1 res1/Script1.rc) set(RES3 res3/Script1.rc) target_link_libraries(common INTERFACE winmm) else() - set(SRC_PLATFORM - linux/nact_linux.cpp - ) + target_sources(common INTERFACE linux/nact_linux.cpp) endif() add_executable(system1) @@ -94,7 +85,7 @@ else() # NOT (ANDROID OR EMSCRIPTEN) endif() -set(SRC_COMMON +target_sources(common INTERFACE sdlmain.cpp fileio.cpp utfsjis.cpp @@ -106,6 +97,7 @@ set(SRC_COMMON sys/ags_vsp.cpp sys/ags_window.cpp sys/dri.cpp + sys/mako_midi.cpp sys/nact.cpp sys/nact_crc32.cpp sys/nact_input.cpp @@ -115,7 +107,6 @@ target_compile_definitions(common INTERFACE $<$:_DEBUG_CONSOLE> DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH}") target_include_directories(common INTERFACE . sys) -target_sources(common INTERFACE ${SRC_COMMON} ${SRC_PLATFORM} ${SRC_MAKO}) target_sources(system3 PRIVATE sys/nact_sys3.cpp ${RES3} sys/ags_bmp.cpp sys/ags_pms.cpp) target_compile_definitions(system3 PRIVATE _SYSTEM3) target_link_libraries(system3 PRIVATE common) diff --git a/src/android/mako.cpp b/src/android/mako.cpp index ab90e9c..bb9e6da 100644 --- a/src/android/mako.cpp +++ b/src/android/mako.cpp @@ -41,6 +41,8 @@ MAKO::MAKO(NACT* parent, const char* playlist) : cd_track[i] = 0; } +MAKO::~MAKO() {} + void MAKO::play_music(int page) { if (current_music == page) @@ -105,3 +107,26 @@ void MAKO::stop_music() current_music = 0; } + +bool MAKO::check_music() +{ + return current_music != 0; +} + +void MAKO::get_mark(int* mark, int* loop) +{ + WARNING("not implemented"); + *mark = *loop = 0; +} + +void MAKO::play_pcm(int page, bool loop) +{ + WARNING("not implemented"); +} + +void MAKO::stop_pcm() {} + +bool MAKO::check_pcm() +{ + return false; +} diff --git a/src/emscripten/mako.cpp b/src/emscripten/mako.cpp index 4e000c3..7eabf85 100644 --- a/src/emscripten/mako.cpp +++ b/src/emscripten/mako.cpp @@ -18,6 +18,8 @@ MAKO::MAKO(NACT* parent, const char* playlist) : cd_track[i] = 0; } +MAKO::~MAKO() {} + void MAKO::play_music(int page) { if (current_music == page) @@ -56,3 +58,26 @@ void MAKO::stop_music() current_music = 0; } + +bool MAKO::check_music() +{ + return current_music != 0; +} + +void MAKO::get_mark(int* mark, int* loop) +{ + WARNING("not implemented"); + *mark = *loop = 0; +} + +void MAKO::play_pcm(int page, bool loop) +{ + WARNING("not implemented"); +} + +void MAKO::stop_pcm() {} + +bool MAKO::check_pcm() +{ + return false; +} diff --git a/src/sys/mako.h b/src/sys/mako.h index c07b5cd..cc448e2 100644 --- a/src/sys/mako.h +++ b/src/sys/mako.h @@ -16,6 +16,7 @@ #if !defined(__EMSCRIPTEN__) && !defined(__ANDROID__) #include +#endif class MAKO { @@ -32,12 +33,6 @@ public: void stop_pcm(); bool check_pcm(); - void initialize_midi(); - void release_midi(); - void stop_midi(); - void start_midi(); - void play_midi(); - // AMUS.DAT, AMSE.DAT _TCHAR amus[16]; _TCHAR amse[16]; @@ -47,51 +42,16 @@ public: int cd_track[100]; // Z private: + NACT* nact; + +#if !defined(__EMSCRIPTEN__) && !defined(__ANDROID__) bool load_playlist(const char* path); - NACT* nact; std::vector playlist; std::vector smf; Mix_Music *mix_music; Mix_Chunk *mix_chunk; +#endif }; -#else // Emscripten or Android - -class MAKO { -public: - MAKO(NACT* parent, const char* playlist); - - void play_music(int page); - void stop_music(); - bool check_music() { return current_music != 0; } - void get_mark(int* mark, int* loop) {} - - void play_pcm(int page, bool loop) {} - void stop_pcm() {} - bool check_pcm() { return false; } - - void initialize_midi() {} - void release_midi() {} - void stop_midi() {} - void start_midi() {} - void play_midi() {} - - bool load_mml(int page) { return false; } - void load_mda(int page) {} - - // AMUS.DAT, AMSE.DAT - _TCHAR amus[16]; - _TCHAR amse[16]; - - int current_music; - int next_loop; // Y19 - int cd_track[100]; // Z - -private: - NACT* nact; -}; - -#endif // EMSCRIPTEN - #endif