From 7974b9627514f048ebd6c25cfb8d0f796a7122a5 Mon Sep 17 00:00:00 2001 From: tildearrow Date: Sun, 18 Aug 2024 02:30:30 -0500 Subject: [PATCH] fixes --- src/engine/fileOps/p.cpp | 5 ----- src/engine/fileOps/p86.cpp | 5 ----- src/engine/fileOps/pdx.cpp | 5 ----- src/engine/fileOps/ppc.cpp | 5 ----- src/engine/fileOps/pps.cpp | 5 ----- src/engine/fileOps/pvi.cpp | 5 ----- src/engine/fileOps/pzi.cpp | 5 ----- src/engine/fileOpsSample.cpp | 4 +--- 8 files changed, 1 insertion(+), 38 deletions(-) diff --git a/src/engine/fileOps/p.cpp b/src/engine/fileOps/p.cpp index 205f79462..9ba650c0e 100644 --- a/src/engine/fileOps/p.cpp +++ b/src/engine/fileOps/p.cpp @@ -19,11 +19,6 @@ #include "fileOpsCommon.h" -#ifdef HAVE_GUI -#include "../gui/gui.h" -extern FurnaceGUI g; -#endif - class DivEngine; //P VOX ADPCM sample bank diff --git a/src/engine/fileOps/p86.cpp b/src/engine/fileOps/p86.cpp index 8a26a0ea2..560867007 100644 --- a/src/engine/fileOps/p86.cpp +++ b/src/engine/fileOps/p86.cpp @@ -19,11 +19,6 @@ #include "fileOpsCommon.h" -#ifdef HAVE_GUI -#include "../gui/gui.h" -extern FurnaceGUI g; -#endif - class DivEngine; //P86 8-bit PCM sample bank diff --git a/src/engine/fileOps/pdx.cpp b/src/engine/fileOps/pdx.cpp index de34a49c5..cd03369a7 100644 --- a/src/engine/fileOps/pdx.cpp +++ b/src/engine/fileOps/pdx.cpp @@ -19,11 +19,6 @@ #include "fileOpsCommon.h" -#ifdef HAVE_GUI -#include "../gui/gui.h" -extern FurnaceGUI g; -#endif - class DivEngine; //PDX 8-bit OKI ADPCM sample bank diff --git a/src/engine/fileOps/ppc.cpp b/src/engine/fileOps/ppc.cpp index 35dd18467..3c5144dbd 100644 --- a/src/engine/fileOps/ppc.cpp +++ b/src/engine/fileOps/ppc.cpp @@ -19,11 +19,6 @@ #include "fileOpsCommon.h" -#ifdef HAVE_GUI -#include "../gui/gui.h" -extern FurnaceGUI g; -#endif - class DivEngine; //PPC PMD's YM2608 ADPCM-B sample bank diff --git a/src/engine/fileOps/pps.cpp b/src/engine/fileOps/pps.cpp index f9592e07b..39c573342 100644 --- a/src/engine/fileOps/pps.cpp +++ b/src/engine/fileOps/pps.cpp @@ -19,11 +19,6 @@ #include "fileOpsCommon.h" -#ifdef HAVE_GUI -#include "../gui/gui.h" -extern FurnaceGUI g; -#endif - class DivEngine; //PPS AY-3-8910 sample bank diff --git a/src/engine/fileOps/pvi.cpp b/src/engine/fileOps/pvi.cpp index d03d61c21..4181ea60d 100644 --- a/src/engine/fileOps/pvi.cpp +++ b/src/engine/fileOps/pvi.cpp @@ -19,11 +19,6 @@ #include "fileOpsCommon.h" -#ifdef HAVE_GUI -#include "../gui/gui.h" -extern FurnaceGUI g; -#endif - class DivEngine; //PVI YM2608 ADPCM-B sample bank diff --git a/src/engine/fileOps/pzi.cpp b/src/engine/fileOps/pzi.cpp index 7463cd23a..906e1f43b 100644 --- a/src/engine/fileOps/pzi.cpp +++ b/src/engine/fileOps/pzi.cpp @@ -19,11 +19,6 @@ #include "fileOpsCommon.h" -#ifdef HAVE_GUI -#include "../gui/gui.h" -extern FurnaceGUI g; -#endif - class DivEngine; //PZI 8-bit PCM sample bank diff --git a/src/engine/fileOpsSample.cpp b/src/engine/fileOpsSample.cpp index 560eb7870..5008392f8 100644 --- a/src/engine/fileOpsSample.cpp +++ b/src/engine/fileOpsSample.cpp @@ -24,8 +24,6 @@ #include "sfWrapper.h" #endif -#define _LE(string) (string) - std::vector DivEngine::sampleFromFile(const char* path) { std::vector ret; @@ -113,7 +111,7 @@ std::vector DivEngine::sampleFromFile(const char* path) { buf=new unsigned char[len]; if (fread(buf,1,len,f)!=(size_t)len) { logW("did not read entire sample bank file buffer!"); - lastError=_LE("did not read entire sample bank file!"); + lastError=_("did not read entire sample bank file!"); delete[] buf; return ret; }