diff --git a/src/engine/fileOps/fileOpsCommon.h b/src/engine/fileOps/fileOpsCommon.h index 306166c55..d3821bf3b 100644 --- a/src/engine/fileOps/fileOpsCommon.h +++ b/src/engine/fileOps/fileOpsCommon.h @@ -63,3 +63,34 @@ enum DivFurVariants: int { DIV_FUR_VARIANT_VANILLA=0, DIV_FUR_VARIANT_B=1, }; + +// MIDI-related +struct midibank_t { + String name; + uint8_t bankMsb, + bankLsb; +}; + +// Reused patch data structures + +// SBI and some other OPL containers + +struct sbi_t { + uint8_t Mcharacteristics, + Ccharacteristics, + Mscaling_output, + Cscaling_output, + Meg_AD, + Ceg_AD, + Meg_SR, + Ceg_SR, + Mwave, + Cwave, + FeedConnect; +}; + +//bool stringNotBlank(String& str); +// detune needs extra translation from register to furnace format +//uint8_t fmDtRegisterToFurnace(uint8_t&& dtNative); + +//void readSbiOpData(sbi_t& sbi, SafeReader& reader); diff --git a/src/engine/fileOps/importExport.h b/src/engine/fileOps/importExport.h deleted file mode 100644 index 5433c7445..000000000 --- a/src/engine/fileOps/importExport.h +++ /dev/null @@ -1,45 +0,0 @@ -/** - * Furnace Tracker - multi-system chiptune tracker - * Copyright (C) 2021-2024 tildearrow and contributors - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#pragma once - -#include "../dataErrors.h" -#include "../engine.h" -#include "../../ta-log.h" -#include "../instrument.h" -#include "../song.h" -#include -#include - -#define DIV_READ_SIZE 131072 -#define DIV_DMF_MAGIC ".DelekDefleMask." -#define DIV_FUR_MAGIC "-Furnace module-" -#define DIV_FTM_MAGIC "FamiTracker Module" -#define DIV_DN_FTM_MAGIC "Dn-FamiTracker Module" -#define DIV_FC13_MAGIC "SMOD" -#define DIV_FC14_MAGIC "FC14" -#define DIV_S3M_MAGIC "SCRM" -#define DIV_XM_MAGIC "Extended Module: " -#define DIV_IT_MAGIC "IMPM" -#define DIV_TFM_MAGIC "TFMfmtV2" - -enum DivFurVariants: int { - DIV_FUR_VARIANT_VANILLA=0, - DIV_FUR_VARIANT_B=1, -}; diff --git a/src/engine/fileOps/p.cpp b/src/engine/fileOps/p.cpp index 09d8adad2..205f79462 100644 --- a/src/engine/fileOps/p.cpp +++ b/src/engine/fileOps/p.cpp @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "shared.h" +#include "fileOpsCommon.h" #ifdef HAVE_GUI #include "../gui/gui.h" diff --git a/src/engine/fileOps/p86.cpp b/src/engine/fileOps/p86.cpp index 840d65d28..8a26a0ea2 100644 --- a/src/engine/fileOps/p86.cpp +++ b/src/engine/fileOps/p86.cpp @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "shared.h" +#include "fileOpsCommon.h" #ifdef HAVE_GUI #include "../gui/gui.h" diff --git a/src/engine/fileOps/pdx.cpp b/src/engine/fileOps/pdx.cpp index fa57b2006..de34a49c5 100644 --- a/src/engine/fileOps/pdx.cpp +++ b/src/engine/fileOps/pdx.cpp @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "shared.h" +#include "fileOpsCommon.h" #ifdef HAVE_GUI #include "../gui/gui.h" diff --git a/src/engine/fileOps/ppc.cpp b/src/engine/fileOps/ppc.cpp index a5555abca..35dd18467 100644 --- a/src/engine/fileOps/ppc.cpp +++ b/src/engine/fileOps/ppc.cpp @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "shared.h" +#include "fileOpsCommon.h" #ifdef HAVE_GUI #include "../gui/gui.h" diff --git a/src/engine/fileOps/pps.cpp b/src/engine/fileOps/pps.cpp index e491302b6..f9592e07b 100644 --- a/src/engine/fileOps/pps.cpp +++ b/src/engine/fileOps/pps.cpp @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "shared.h" +#include "fileOpsCommon.h" #ifdef HAVE_GUI #include "../gui/gui.h" diff --git a/src/engine/fileOps/pvi.cpp b/src/engine/fileOps/pvi.cpp index 8352ebf9e..d03d61c21 100644 --- a/src/engine/fileOps/pvi.cpp +++ b/src/engine/fileOps/pvi.cpp @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "shared.h" +#include "fileOpsCommon.h" #ifdef HAVE_GUI #include "../gui/gui.h" diff --git a/src/engine/fileOps/pzi.cpp b/src/engine/fileOps/pzi.cpp index 69bf15d87..7463cd23a 100644 --- a/src/engine/fileOps/pzi.cpp +++ b/src/engine/fileOps/pzi.cpp @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "shared.h" +#include "fileOpsCommon.h" #ifdef HAVE_GUI #include "../gui/gui.h" diff --git a/src/engine/fileOps/s3m.cpp b/src/engine/fileOps/s3m.cpp index 9e212d8d3..11d0f4fb4 100644 --- a/src/engine/fileOps/s3m.cpp +++ b/src/engine/fileOps/s3m.cpp @@ -19,21 +19,6 @@ #include "fileOpsCommon.h" -// SBI and some other OPL containers -struct sbi_t { - uint8_t Mcharacteristics, - Ccharacteristics, - Mscaling_output, - Cscaling_output, - Meg_AD, - Ceg_AD, - Meg_SR, - Ceg_SR, - Mwave, - Cwave, - FeedConnect; -}; - static void readSbiOpData(sbi_t& sbi, SafeReader& reader) { sbi.Mcharacteristics = reader.readC(); sbi.Ccharacteristics = reader.readC(); diff --git a/src/engine/fileOps/shared.h b/src/engine/fileOps/shared.h deleted file mode 100644 index 6abb5ed85..000000000 --- a/src/engine/fileOps/shared.h +++ /dev/null @@ -1,53 +0,0 @@ -/** - * Furnace Tracker - multi-system chiptune tracker - * Copyright (C) 2021-2024 tildearrow and contributors - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#pragma once - -#include "importExport.h" - -// MIDI-related -struct midibank_t { - String name; - uint8_t bankMsb, - bankLsb; -}; - -// Reused patch data structures - -// SBI and some other OPL containers - -struct sbi_t { - uint8_t Mcharacteristics, - Ccharacteristics, - Mscaling_output, - Cscaling_output, - Meg_AD, - Ceg_AD, - Meg_SR, - Ceg_SR, - Mwave, - Cwave, - FeedConnect; -}; - -bool stringNotBlank(String& str); -// detune needs extra translation from register to furnace format -uint8_t fmDtRegisterToFurnace(uint8_t&& dtNative); - -void readSbiOpData(sbi_t& sbi, SafeReader& reader); \ No newline at end of file