[Scummvm-git-logs] scummvm master -> 9bd91b4131d4db9258d8df2eb49dea2b80c592d2
sev-
noreply at scummvm.org
Sun Apr 19 23:47:42 UTC 2026
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
cae814dc42 COMMON: Introduce FORCE_TEXT_CONSOLE
20da9f4388 AUDIO: Introduce print_rate
9bd91b4131 BACKENDS: ATARI: Remove atari_debug
Commit: cae814dc42b070019e9997ee986123c8b88288ad
https://github.com/scummvm/scummvm/commit/cae814dc42b070019e9997ee986123c8b88288ad
Author: Miro Kropacek (miro.kropacek at gmail.com)
Date: 2026-04-20T01:47:37+02:00
Commit Message:
COMMON: Introduce FORCE_TEXT_CONSOLE
This is useful for debug outputs which are important enough to override
DISABLE_TEXT_CONSOLE.
Changed paths:
common/debug.cpp
common/debug.h
common/textconsole.cpp
common/textconsole.h
diff --git a/common/debug.cpp b/common/debug.cpp
index 743e24e4863..8785e00dd4b 100644
--- a/common/debug.cpp
+++ b/common/debug.cpp
@@ -19,6 +19,8 @@
*
*/
+#define FORCE_TEXT_CONSOLE
+
#include "common/debug.h"
#include "common/debug-channels.h"
#include "common/system.h"
@@ -189,7 +191,8 @@ bool debugChannelSet(int level, uint32 debugChannel) {
}
-#ifndef DISABLE_TEXT_CONSOLE
+// Intentionally always compiled to support FORCE_TEXT_CONSOLE
+//#ifndef DISABLE_TEXT_CONSOLE
static void debugHelper(const char *s, va_list va, int level, uint32 debugChannel, bool caret = true) {
Common::String buf = Common::String::vformat(s, va);
@@ -304,4 +307,4 @@ void debugCN(uint32 debugChannel, const char *s, ...) {
va_end(va);
}
-#endif
+//#endif
diff --git a/common/debug.h b/common/debug.h
index 2f5c10fea89..c76272407e1 100644
--- a/common/debug.h
+++ b/common/debug.h
@@ -22,18 +22,22 @@
#ifndef COMMON_DEBUG_H
#define COMMON_DEBUG_H
+#ifdef FORCE_TEXT_CONSOLE
+#undef DISABLE_TEXT_CONSOLE
+#endif
+
#include "common/scummsys.h"
#ifdef DISABLE_TEXT_CONSOLE
-inline void debug(const char *s, ...) {}
-inline void debug(int level, const char *s, ...) {}
-inline void debugN(const char *s, ...) {}
-inline void debugN(int level, const char *s, ...) {}
-inline void debugC(int level, uint32 debugChannel, const char *s, ...) {}
-inline void debugC(uint32 debugChannel, const char *s, ...) {}
-inline void debugCN(int level, uint32 debugChannel, const char *s, ...) {}
-inline void debugCN(uint32 debugChannel, const char *s, ...) {}
+static inline void debug(const char *s, ...) {}
+static inline void debug(int level, const char *s, ...) {}
+static inline void debugN(const char *s, ...) {}
+static inline void debugN(int level, const char *s, ...) {}
+static inline void debugC(int level, uint32 debugChannel, const char *s, ...) {}
+static inline void debugC(uint32 debugChannel, const char *s, ...) {}
+static inline void debugCN(int level, uint32 debugChannel, const char *s, ...) {}
+static inline void debugCN(uint32 debugChannel, const char *s, ...) {}
#else
diff --git a/common/textconsole.cpp b/common/textconsole.cpp
index 88e6d7fcc65..8e6f3b9686d 100644
--- a/common/textconsole.cpp
+++ b/common/textconsole.cpp
@@ -20,6 +20,7 @@
*/
#define FORBIDDEN_SYMBOL_EXCEPTION_exit
+#define FORCE_TEXT_CONSOLE
#include "common/textconsole.h"
#include "common/system.h"
@@ -53,7 +54,8 @@ void setErrorHandler(ErrorHandler handler) {
} // End of namespace Common
-#ifndef DISABLE_TEXT_CONSOLE
+// Intentionally always compiled to support FORCE_TEXT_CONSOLE
+//#ifndef DISABLE_TEXT_CONSOLE
void warning(const char *s, ...) {
Common::String output;
@@ -74,7 +76,7 @@ void warning(const char *s, ...) {
// any OSystem yet.
}
-#endif
+//#endif
void NORETURN_PRE error(const char *s, ...) {
// We don't use String::vformat here, as that require
diff --git a/common/textconsole.h b/common/textconsole.h
index 65d539d4371..0ed0fec5663 100644
--- a/common/textconsole.h
+++ b/common/textconsole.h
@@ -22,6 +22,10 @@
#ifndef COMMON_CONSOLE_H
#define COMMON_CONSOLE_H
+#ifdef FORCE_TEXT_CONSOLE
+#undef DISABLE_TEXT_CONSOLE
+#endif
+
#include "common/scummsys.h"
namespace Common {
@@ -84,7 +88,7 @@ void NORETURN_PRE error(MSVC_PRINTF const char *s, ...) GCC_PRINTF(1, 2) NORETUR
#ifdef DISABLE_TEXT_CONSOLE
-inline void GCC_PRINTF(1, 2) warning(MSVC_PRINTF const char *s, ...) {}
+static inline void GCC_PRINTF(1, 2) warning(MSVC_PRINTF const char *s, ...) {}
#else
Commit: 20da9f4388e3ffbc4590b7c0c9eaac6d1101cb6d
https://github.com/scummvm/scummvm/commit/20da9f4388e3ffbc4590b7c0c9eaac6d1101cb6d
Author: Miro Kropacek (miro.kropacek at gmail.com)
Date: 2026-04-20T01:47:37+02:00
Commit Message:
AUDIO: Introduce print_rate
This is useful on weaker platforms to fine-tune the mixer's frequency to
given game.
Changed paths:
R backends/platform/atari/patches/print_rate.patch
audio/rate.cpp
backends/platform/atari/build-release.sh
backends/platform/atari/build-release030.sh
backends/platform/atari/readme.txt
backends/platform/atari/readme.txt.in
common/debug.cpp
common/debug.h
diff --git a/audio/rate.cpp b/audio/rate.cpp
index 7f0c50f9250..aa50346b0df 100644
--- a/audio/rate.cpp
+++ b/audio/rate.cpp
@@ -27,9 +27,13 @@
* improvements over the original code were made.
*/
+#define FORCE_TEXT_CONSOLE
+
#include "audio/audiostream.h"
#include "audio/rate.h"
#include "audio/mixer.h"
+#include "common/config-manager.h"
+#include "common/debug.h"
#include "common/util.h"
namespace Audio {
@@ -80,6 +84,26 @@ private:
int simpleConvert(AudioStream &input, st_sample_t *outBuffer, st_size_t numSamples, st_volume_t vol_l, st_volume_t vol_r);
int interpolateConvert(AudioStream &input, st_sample_t *outBuffer, st_size_t numSamples, st_volume_t vol_l, st_volume_t vol_r);
+ // keep a single printConvertType shared across all RateConverter_Impl specializations
+ struct PrintContext {
+ st_rate_t previousInRate = 0;
+ Common::String previousGameId;
+ };
+ void printConvertType(const char *name, PrintContext &ctx) const {
+ const Common::String activeDomain = ConfMan.getActiveDomainName();
+ if (!activeDomain.empty() &&
+ (ctx.previousInRate != _inRate ||
+ ctx.previousGameId != activeDomain)) {
+ ctx.previousInRate = _inRate;
+ ctx.previousGameId = activeDomain;
+ debugC(kDebugLevelGAudio, "RateConverter_Impl::%s[%s]: inRate %d Hz (%s) => outRate %d Hz (%s)",
+ name, activeDomain.c_str(),
+ _inRate, inStereo ? "stereo" : "mono", _outRate, outStereo ? "stereo" : "mono");
+ }
+ }
+ #define PRINT_OUTPUT_RATE \
+ do { static PrintContext _ctx; printConvertType(__FUNCTION__, _ctx); } while (0)
+
public:
RateConverter_Impl(st_rate_t inputRate, st_rate_t outputRate);
virtual ~RateConverter_Impl() {}
@@ -97,6 +121,8 @@ public:
template<bool inStereo, bool outStereo, bool reverseStereo>
int RateConverter_Impl<inStereo, outStereo, reverseStereo>::copyConvert(AudioStream &input, st_sample_t *outBuffer, st_size_t numSamples, st_volume_t volL, st_volume_t volR) {
+ PRINT_OUTPUT_RATE;
+
st_sample_t *outStart, *outEnd;
outStart = outBuffer;
@@ -143,6 +169,8 @@ int RateConverter_Impl<inStereo, outStereo, reverseStereo>::copyConvert(AudioStr
template<bool inStereo, bool outStereo, bool reverseStereo>
int RateConverter_Impl<inStereo, outStereo, reverseStereo>::simpleConvert(AudioStream &input, st_sample_t *outBuffer, st_size_t numSamples, st_volume_t volL, st_volume_t volR) {
+ PRINT_OUTPUT_RATE;
+
// How much to increment _outPos by
frac_t outPos_inc = _inRate / _outRate;
@@ -202,6 +230,8 @@ int RateConverter_Impl<inStereo, outStereo, reverseStereo>::simpleConvert(AudioS
template<bool inStereo, bool outStereo, bool reverseStereo>
int RateConverter_Impl<inStereo, outStereo, reverseStereo>::interpolateConvert(AudioStream &input, st_sample_t *outBuffer, st_size_t numSamples, st_volume_t volL, st_volume_t volR) {
+ PRINT_OUTPUT_RATE;
+
// How much to increment _outPosFrac by
frac_t outPos_inc = (_inRate << FRAC_BITS_LOW) / _outRate;
diff --git a/backends/platform/atari/build-release.sh b/backends/platform/atari/build-release.sh
index 098d0e7eb30..ad09628fd83 100755
--- a/backends/platform/atari/build-release.sh
+++ b/backends/platform/atari/build-release.sh
@@ -23,7 +23,6 @@ fi
if [ ! -f ../backends/platform/atari/.patched ]
then
- cd .. && cat backends/platform/atari/patches/print_rate.patch | patch -p1 && cd -
cd .. && cat backends/platform/atari/patches/tooltips.patch | patch -p1 && cd -
touch ../backends/platform/atari/.patched
fi
diff --git a/backends/platform/atari/build-release030.sh b/backends/platform/atari/build-release030.sh
index 1c988a8d12e..446d09b9740 100755
--- a/backends/platform/atari/build-release030.sh
+++ b/backends/platform/atari/build-release030.sh
@@ -23,7 +23,6 @@ fi
if [ ! -f ../backends/platform/atari/.patched ]
then
- cd .. && cat backends/platform/atari/patches/print_rate.patch | patch -p1 && cd -
cd .. && cat backends/platform/atari/patches/tooltips.patch | patch -p1 && cd -
touch ../backends/platform/atari/.patched
fi
diff --git a/backends/platform/atari/patches/print_rate.patch b/backends/platform/atari/patches/print_rate.patch
deleted file mode 100644
index e83b6826e71..00000000000
--- a/backends/platform/atari/patches/print_rate.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-commit 21a79a50b54df8b3c377f275e1d7bfa76ee50899
-Author: Miro Kropacek <miro.kropacek at gmail.com>
-Date: Tue Oct 31 23:48:25 2023 +0100
-
- Introduce "print_rate"
-
- This will never go to upstream.
-
-diff --git a/audio/rate.cpp b/audio/rate.cpp
-index 7f0c50f9250..83dde41462f 100644
---- a/audio/rate.cpp
-+++ b/audio/rate.cpp
-@@ -30,6 +30,8 @@
- #include "audio/audiostream.h"
- #include "audio/rate.h"
- #include "audio/mixer.h"
-+#include "backends/platform/atari/atari-debug.h"
-+#include "common/config-manager.h"
- #include "common/util.h"
-
- namespace Audio {
-@@ -80,6 +82,20 @@ private:
- int simpleConvert(AudioStream &input, st_sample_t *outBuffer, st_size_t numSamples, st_volume_t vol_l, st_volume_t vol_r);
- int interpolateConvert(AudioStream &input, st_sample_t *outBuffer, st_size_t numSamples, st_volume_t vol_l, st_volume_t vol_r);
-
-+ void printConvertType(const Common::String &name) {
-+ const Common::ConfigManager::Domain *activeDomain = ConfMan.getActiveDomain();
-+ if (activeDomain && ConfMan.getBool("print_rate")) {
-+ static st_rate_t previousInRate, previousOutRate;
-+ if (previousInRate != _inRate || previousOutRate != _outRate) {
-+ previousInRate = _inRate;
-+ previousOutRate = _outRate;
-+ atari_debug("RateConverter_Impl::%s[%s]: inRate %d Hz (%s) => outRate %d Hz (%s)",
-+ name.c_str(), activeDomain->getValOrDefault("gameid").c_str(),
-+ _inRate, inStereo ? "stereo" : "mono", _outRate, outStereo ? "stereo" : "mono");
-+ }
-+ }
-+ }
-+
- public:
- RateConverter_Impl(st_rate_t inputRate, st_rate_t outputRate);
- virtual ~RateConverter_Impl() {}
-@@ -99,6 +115,8 @@ template<bool inStereo, bool outStereo, bool reverseStereo>
- int RateConverter_Impl<inStereo, outStereo, reverseStereo>::copyConvert(AudioStream &input, st_sample_t *outBuffer, st_size_t numSamples, st_volume_t volL, st_volume_t volR) {
- st_sample_t *outStart, *outEnd;
-
-+ printConvertType("copyConvert");
-+
- outStart = outBuffer;
- outEnd = outBuffer + numSamples * (outStereo ? 2 : 1);
-
-@@ -148,6 +166,8 @@ int RateConverter_Impl<inStereo, outStereo, reverseStereo>::simpleConvert(AudioS
-
- st_sample_t *outStart, *outEnd;
-
-+ printConvertType("simpleConvert");
-+
- outStart = outBuffer;
- outEnd = outBuffer + numSamples * (outStereo ? 2 : 1);
-
-@@ -209,6 +229,8 @@ int RateConverter_Impl<inStereo, outStereo, reverseStereo>::interpolateConvert(A
- outStart = outBuffer;
- outEnd = outBuffer + numSamples * (outStereo ? 2 : 1);
-
-+ printConvertType("interpolateConvert");
-+
- while (outBuffer < outEnd) {
- // Read enough input samples so that _outPosFrac < 0
- while ((frac_t)FRAC_ONE_LOW <= _outPosFrac) {
diff --git a/backends/platform/atari/readme.txt b/backends/platform/atari/readme.txt
index c1793472d02..9e90ef09f6e 100644
--- a/backends/platform/atari/readme.txt
+++ b/backends/platform/atari/readme.txt
@@ -469,8 +469,6 @@ Changes to upstream
There are a few features that have been disabled or changed and are not
possible / plausible to merge into upstream:
-- The aforementioned "print_rate" feature, too invasive for other platforms
-
- This port contains an implementation of much faster tooltips in the overlay.
However, there is a minor rendering bug which sometimes corrupts the
background. But since its impact is huge, I left it in.
diff --git a/backends/platform/atari/readme.txt.in b/backends/platform/atari/readme.txt.in
index c50f06e6a7b..e3a0fbc5758 100644
--- a/backends/platform/atari/readme.txt.in
+++ b/backends/platform/atari/readme.txt.in
@@ -469,8 +469,6 @@ Changes to upstream
There are a few features that have been disabled or changed and are not
possible / plausible to merge into upstream:
-- The aforementioned "print_rate" feature, too invasive for other platforms
-
- This port contains an implementation of much faster tooltips in the overlay.
However, there is a minor rendering bug which sometimes corrupts the
background. But since its impact is huge, I left it in.
diff --git a/common/debug.cpp b/common/debug.cpp
index 8785e00dd4b..784932c89af 100644
--- a/common/debug.cpp
+++ b/common/debug.cpp
@@ -40,6 +40,7 @@ const DebugChannelDef gDebugChannels[] = {
{ kDebugLevelMacGUI, "macgui", "debug messages for MacGUI" },
{ kDebugLevelGGraphics, "ggraphics", "debug messages for global graphics" },
{ kDebugLevelGVideo, "gvideo", "debug messages for global video" },
+ { kDebugLevelGAudio, "gaudio", "debug messages for global audio" },
DEBUG_CHANNEL_END
};
namespace Common {
diff --git a/common/debug.h b/common/debug.h
index c76272407e1..37736306349 100644
--- a/common/debug.h
+++ b/common/debug.h
@@ -169,6 +169,7 @@ enum GlobalDebugLevels {
kDebugLevelMacGUI,
kDebugLevelGGraphics,
kDebugLevelGVideo,
+ kDebugLevelGAudio,
};
/** @} */
Commit: 9bd91b4131d4db9258d8df2eb49dea2b80c592d2
https://github.com/scummvm/scummvm/commit/9bd91b4131d4db9258d8df2eb49dea2b80c592d2
Author: Miro Kropacek (miro.kropacek at gmail.com)
Date: 2026-04-20T01:47:37+02:00
Commit Message:
BACKENDS: ATARI: Remove atari_debug
Changed paths:
R backends/platform/atari/atari-debug.cpp
R backends/platform/atari/atari-debug.h
backends/graphics/atari/atari-cursor.cpp
backends/graphics/atari/atari-cursor.h
backends/graphics/atari/atari-graphics.cpp
backends/graphics/atari/atari-pendingscreenchanges.cpp
backends/graphics/atari/atari-screen.cpp
backends/graphics/atari/atari-surface.cpp
backends/mixer/atari/atari-mixer.cpp
backends/platform/atari/module.mk
backends/platform/atari/osystem_atari.cpp
diff --git a/backends/graphics/atari/atari-cursor.cpp b/backends/graphics/atari/atari-cursor.cpp
index 28597229fe6..626af54dc86 100644
--- a/backends/graphics/atari/atari-cursor.cpp
+++ b/backends/graphics/atari/atari-cursor.cpp
@@ -19,11 +19,13 @@
*
*/
+#define FORCE_TEXT_CONSOLE
+
#include "atari-cursor.h"
#include "atari-supervidel.h"
#include "atari-surface.h"
-//#include "backends/platform/atari/atari-debug.h"
+//#include "common/debug.h"
bool Cursor::_globalSurfaceChanged;
@@ -94,7 +96,7 @@ void Cursor::update() {
}
void Cursor::updatePosition(int deltaX, int deltaY) {
- //atari_debug("Cursor::updatePosition: %d, %d", deltaX, deltaX);
+ //debug("Cursor::updatePosition: %d, %d", deltaX, deltaX);
if (deltaX == 0 && deltaY == 0)
return;
@@ -251,7 +253,7 @@ void Cursor::saveBackground() {
// having different dimensions than the source surface
const Graphics::Surface &dstSurface = *_screenSurf;
- //atari_debug("Cursor::saveBackground: %d %d %d %d", _savedRect.left, _savedRect.top, _savedRect.width(), _savedRect.height());
+ //debug("Cursor::saveBackground: %d %d %d %d", _savedRect.left, _savedRect.top, _savedRect.width(), _savedRect.height());
// save native bitplanes or pixels, so it must be a Graphics::Surface to copy from
if (_savedBackground.w != _savedRect.width()
@@ -267,7 +269,7 @@ void Cursor::draw() {
AtariSurface &dstSurface = *_screenSurf;
const int dstBitsPerPixel = dstSurface.getBitsPerPixel();
- //atari_debug("Cursor::draw: %d %d %d %d", _dstRect.left, _dstRect.top, _dstRect.width(), _dstRect.height());
+ //debug("Cursor::draw: %d %d %d %d", _dstRect.left, _dstRect.top, _dstRect.width(), _dstRect.height());
if (_globalSurfaceChanged) {
convertSurfaceTo(dstSurface.format);
@@ -304,7 +306,7 @@ void Cursor::restoreBackground() {
assert(_savedBackground.getPixels());
- //atari_debug("Cursor::restoreBackground: %d %d %d %d", _savedRect.left, _savedRect.top, _savedRect.width(), _savedRect.height());
+ //debug("Cursor::restoreBackground: %d %d %d %d", _savedRect.left, _savedRect.top, _savedRect.width(), _savedRect.height());
// as this is used only for direct rendering, we don't need to worry about offsettedSurf
// having different dimensions than the source surface
diff --git a/backends/graphics/atari/atari-cursor.h b/backends/graphics/atari/atari-cursor.h
index 5daf26470af..044513ae41a 100644
--- a/backends/graphics/atari/atari-cursor.h
+++ b/backends/graphics/atari/atari-cursor.h
@@ -72,7 +72,7 @@ struct Cursor {
return Common::Point(_x, _y);
}
void setPosition(int x, int y) {
- //atari_debug("Cursor::setPosition: %d, %d", x, y);
+ //debug("Cursor::setPosition: %d, %d", x, y);
if (_x == x && _y == y)
return;
diff --git a/backends/graphics/atari/atari-graphics.cpp b/backends/graphics/atari/atari-graphics.cpp
index 48fd626ce85..5b568d4368c 100644
--- a/backends/graphics/atari/atari-graphics.cpp
+++ b/backends/graphics/atari/atari-graphics.cpp
@@ -20,6 +20,7 @@
*/
#define FORBIDDEN_SYMBOL_EXCEPTION_FILE // atari-graphics.h's unordered_set
+#define FORCE_TEXT_CONSOLE
#include "atari-graphics.h"
@@ -27,10 +28,11 @@
#include <mint/falcon.h>
#include <mint/sysvars.h>
-#include "backends/platform/atari/atari-debug.h"
#include "backends/keymapper/action.h"
#include "backends/keymapper/keymap.h"
#include "common/config-manager.h"
+#include "common/debug.h"
+#include "common/textconsole.h"
#include "common/translation.h"
#include "gui/ThemeEngine.h"
@@ -196,7 +198,7 @@ void AtariGraphicsShutdown() {
AtariGraphicsManager::AtariGraphicsManager()
: _pendingScreenChanges(this) {
- atari_debug("AtariGraphicsManager()");
+ debug("AtariGraphicsManager()");
enum {
VDO_NO_ATARI_HW = 0xffff,
@@ -300,7 +302,7 @@ AtariGraphicsManager::AtariGraphicsManager()
}
AtariGraphicsManager::~AtariGraphicsManager() {
- atari_debug("~AtariGraphicsManager()");
+ debug("~AtariGraphicsManager()");
g_system->getEventManager()->getEventDispatcher()->unregisterObserver(this);
@@ -316,14 +318,14 @@ AtariGraphicsManager::~AtariGraphicsManager() {
bool AtariGraphicsManager::hasFeature(OSystem::Feature f) const {
switch (f) {
case OSystem::Feature::kFeatureAspectRatioCorrection:
- //atari_debug("hasFeature(kFeatureAspectRatioCorrection): %d", !_tt);
+ //debug("hasFeature(kFeatureAspectRatioCorrection): %d", !_tt);
return !_tt;
case OSystem::Feature::kFeatureCursorPalette:
// FIXME: pretend to have cursor palette at all times, this function
// can get (and it is) called any time, before and after showOverlay()
// (overlay cursor uses the cross if kFeatureCursorPalette returns false
// here too soon)
- //atari_debug("hasFeature(kFeatureCursorPalette): %d", isOverlayVisible());
+ //debug("hasFeature(kFeatureCursorPalette): %d", isOverlayVisible());
//return isOverlayVisible();
return true;
default:
@@ -341,7 +343,7 @@ void AtariGraphicsManager::setFeatureState(OSystem::Feature f, bool enable) {
switch (f) {
case OSystem::Feature::kFeatureAspectRatioCorrection:
- //atari_debug("setFeatureState(kFeatureAspectRatioCorrection): %d", enable);
+ //debug("setFeatureState(kFeatureAspectRatioCorrection): %d", enable);
if (_aspectRatioCorrection != enable) {
_aspectRatioCorrection = enable;
@@ -361,10 +363,10 @@ void AtariGraphicsManager::setFeatureState(OSystem::Feature f, bool enable) {
bool AtariGraphicsManager::getFeatureState(OSystem::Feature f) const {
switch (f) {
case OSystem::Feature::kFeatureAspectRatioCorrection:
- //atari_debug("getFeatureState(kFeatureAspectRatioCorrection): %d", _aspectRatioCorrection);
+ //debug("getFeatureState(kFeatureAspectRatioCorrection): %d", _aspectRatioCorrection);
return _aspectRatioCorrection;
case OSystem::Feature::kFeatureCursorPalette:
- //atari_debug("getFeatureState(kFeatureCursorPalette): %d", isOverlayVisible());
+ //debug("getFeatureState(kFeatureCursorPalette): %d", isOverlayVisible());
//return isOverlayVisible();
return true;
default:
@@ -373,7 +375,7 @@ bool AtariGraphicsManager::getFeatureState(OSystem::Feature f) const {
}
bool AtariGraphicsManager::setGraphicsMode(int mode, uint flags) {
- atari_debug("setGraphicsMode: %d, %d", mode, flags);
+ debug("setGraphicsMode: %d, %d", mode, flags);
_pendingState.mode = mode;
@@ -385,7 +387,7 @@ bool AtariGraphicsManager::setGraphicsMode(int mode, uint flags) {
}
void AtariGraphicsManager::initSize(uint width, uint height, const Graphics::PixelFormat *format) {
- atari_debug("initSize: %d, %d, %d", width, height, format ? format->bytesPerPixel : 1);
+ debug("initSize: %d, %d, %d", width, height, format ? format->bytesPerPixel : 1);
_pendingState.width = width;
_pendingState.height = height;
@@ -403,7 +405,7 @@ void AtariGraphicsManager::initSize(uint width, uint height, const Graphics::Pix
}
void AtariGraphicsManager::beginGFXTransaction() {
- atari_debug("beginGFXTransaction");
+ debug("beginGFXTransaction");
_pendingState = GraphicsState();
_pendingState.inTransaction = true;
@@ -411,7 +413,7 @@ void AtariGraphicsManager::beginGFXTransaction() {
}
OSystem::TransactionError AtariGraphicsManager::endGFXTransaction() {
- atari_debug("endGFXTransaction");
+ debug("endGFXTransaction");
_pendingState.inTransaction = false;
_ignoreCursorChanges = false;
@@ -435,7 +437,7 @@ OSystem::TransactionError AtariGraphicsManager::endGFXTransaction() {
|| (!hasPendingGraphicsMode && _currentState.mode == kDirectRendering))
&& _pendingState.width % 16 != 0
&& !g_hasSuperVidel) {
- atari_warning("Engine surfaces not divisible by 16, aborting");
+ warning("Engine surfaces not divisible by 16, aborting");
error |= OSystem::TransactionError::kTransactionSizeChangeFailed;
} else if (_currentState.width != _pendingState.width || _currentState.height != _pendingState.height) {
hasPendingSize = true;
@@ -447,7 +449,7 @@ OSystem::TransactionError AtariGraphicsManager::endGFXTransaction() {
error |= OSystem::TransactionError::kTransactionFormatNotSupported;
if (error != OSystem::TransactionError::kTransactionSuccess) {
- atari_warning("endGFXTransaction failed: %02x", error);
+ warning("endGFXTransaction failed: %02x", error);
_pendingScreenChanges.clearTransaction();
return static_cast<OSystem::TransactionError>(error);
}
@@ -519,7 +521,7 @@ OSystem::TransactionError AtariGraphicsManager::endGFXTransaction() {
}
void AtariGraphicsManager::setPalette(const byte *colors, uint start, uint num) {
- //atari_debug("setPalette: %d, %d", start, num);
+ //debug("setPalette: %d, %d", start, num);
if (_tt) {
uint16 *pal = &_palette.tt[start];
@@ -543,7 +545,7 @@ void AtariGraphicsManager::setPalette(const byte *colors, uint start, uint num)
}
void AtariGraphicsManager::grabPalette(byte *colors, uint start, uint num) const {
- //atari_debug("grabPalette: %d, %d", start, num);
+ //debug("grabPalette: %d, %d", start, num);
if (_tt) {
const uint16 *pal = &_palette.tt[start];
@@ -565,7 +567,7 @@ void AtariGraphicsManager::grabPalette(byte *colors, uint start, uint num) const
}
void AtariGraphicsManager::copyRectToScreen(const void *buf, int pitch, int x, int y, int w, int h) {
- //atari_debug("copyRectToScreen: %d, %d, %d(%d), %d", x, y, w, pitch, h);
+ //debug("copyRectToScreen: %d, %d, %d(%d), %d", x, y, w, pitch, h);
Graphics::Surface &dstSurface = *lockScreen();
@@ -586,7 +588,7 @@ void AtariGraphicsManager::copyRectToScreen(const void *buf, int pitch, int x, i
}
Graphics::Surface *AtariGraphicsManager::lockScreen() {
- //atari_debug("lockScreen");
+ //debug("lockScreen");
return _currentState.mode == kDirectRendering
? _screen[kFrontBuffer]->offsettedSurf->surfacePtr()
@@ -596,7 +598,7 @@ Graphics::Surface *AtariGraphicsManager::lockScreen() {
void AtariGraphicsManager::unlockScreen() {
const Graphics::Surface &dstSurface = *lockScreen();
- //atari_debug("unlockScreen: %d x %d", dstSurface.w, dstSurface.h);
+ //debug("unlockScreen: %d x %d", dstSurface.w, dstSurface.h);
addDirtyRectToScreens(
dstSurface,
@@ -605,7 +607,7 @@ void AtariGraphicsManager::unlockScreen() {
}
void AtariGraphicsManager::fillScreen(uint32 col) {
- //atari_debug("fillScreen: %d", col);
+ //debug("fillScreen: %d", col);
Graphics::Surface &dstSurface = *lockScreen();
@@ -618,7 +620,7 @@ void AtariGraphicsManager::fillScreen(uint32 col) {
}
void AtariGraphicsManager::fillScreen(const Common::Rect &r, uint32 col) {
- //atari_debug("fillScreen: %dx%d %d", r.width(), r.height(), col);
+ //debug("fillScreen: %dx%d %d", r.width(), r.height(), col);
Graphics::Surface &dstSurface = *lockScreen();
@@ -631,9 +633,9 @@ void AtariGraphicsManager::fillScreen(const Common::Rect &r, uint32 col) {
}
void AtariGraphicsManager::updateScreen() {
- //atari_debug("updateScreen");
+ //debug("updateScreen");
- // avoid falling into the atari_debugger (screen may not not initialized yet)
+ // avoid falling into the debugger (screen may not not initialized yet)
Common::setErrorHandler(nullptr);
Screen *workScreen = nullptr;
@@ -656,7 +658,7 @@ void AtariGraphicsManager::updateScreen() {
srcSurface = &_chunkySurface;
break;
default:
- atari_warning("Unknown graphics mode %d", _currentState.mode);
+ warning("Unknown graphics mode %d", _currentState.mode);
}
}
@@ -714,11 +716,11 @@ void AtariGraphicsManager::updateScreen() {
set_sysvar_to_short(vblsem, 1); // unlock vbl
- //atari_debug("end of updateScreen");
+ //debug("end of updateScreen");
}
void AtariGraphicsManager::setShakePos(int shakeXOffset, int shakeYOffset) {
- //atari_debug("setShakePos: %d, %d", shakeXOffset, shakeYOffset);
+ //debug("setShakePos: %d, %d", shakeXOffset, shakeYOffset);
if (_tt) {
// as TT can't horizontally shake anything, do it at least vertically
@@ -732,7 +734,7 @@ void AtariGraphicsManager::setShakePos(int shakeXOffset, int shakeYOffset) {
}
void AtariGraphicsManager::showOverlay(bool inGUI) {
- atari_debug("showOverlay (state: %d, inGUI: %d)", _overlayState, inGUI);
+ debug("showOverlay (state: %d, inGUI: %d)", _overlayState, inGUI);
if (_overlayState == kOverlayVisible)
return;
@@ -762,7 +764,7 @@ void AtariGraphicsManager::showOverlay(bool inGUI) {
}
void AtariGraphicsManager::hideOverlay() {
- atari_debug("hideOverlay (ignore: %d, state: %d)", _ignoreHideOverlay, _overlayState);
+ debug("hideOverlay (ignore: %d, state: %d)", _ignoreHideOverlay, _overlayState);
assert(_overlayState != kOverlayIgnoredHide);
@@ -803,7 +805,7 @@ void AtariGraphicsManager::clearOverlay() {
if (isOverlayDirectRendering())
return;
- atari_debug("clearOverlay");
+ debug("clearOverlay");
if (!isOverlayVisible())
return;
@@ -881,7 +883,7 @@ void AtariGraphicsManager::clearOverlay() {
}
void AtariGraphicsManager::grabOverlay(Graphics::Surface &surface) const {
- atari_debug("grabOverlay: %d(%d), %d", surface.w, surface.pitch, surface.h);
+ debug("grabOverlay: %d(%d), %d", surface.w, surface.pitch, surface.h);
if (isOverlayDirectRendering()) {
memset(surface.getPixels(), 0, surface.h * surface.pitch);
@@ -895,7 +897,7 @@ void AtariGraphicsManager::grabOverlay(Graphics::Surface &surface) const {
}
void AtariGraphicsManager::copyRectToOverlay(const void *buf, int pitch, int x, int y, int w, int h) {
- //atari_debug("copyRectToOverlay: %d, %d, %d(%d), %d", x, y, w, pitch, h);
+ //debug("copyRectToOverlay: %d, %d, %d(%d), %d", x, y, w, pitch, h);
Graphics::Surface &dstSurface = *lockOverlay();
@@ -917,7 +919,7 @@ void AtariGraphicsManager::copyRectToOverlay(const void *buf, int pitch, int x,
}
Graphics::Surface *AtariGraphicsManager::lockOverlay() {
- //atari_debug("lockOverlay");
+ //debug("lockOverlay");
return isOverlayDirectRendering()
? _screen[kOverlayBuffer]->offsettedSurf->surfacePtr()
@@ -925,7 +927,7 @@ Graphics::Surface *AtariGraphicsManager::lockOverlay() {
}
bool AtariGraphicsManager::showMouse(bool visible) {
- //atari_debug("showMouse: %d; ignored: %d", visible, _ignoreCursorChanges);
+ //debug("showMouse: %d; ignored: %d", visible, _ignoreCursorChanges);
if (_ignoreCursorChanges)
return visible;
@@ -950,7 +952,7 @@ bool AtariGraphicsManager::showMouse(bool visible) {
}
void AtariGraphicsManager::warpMouse(int x, int y) {
- //atari_debug("warpMouse: %d, %d", x, y);
+ //debug("warpMouse: %d, %d", x, y);
if (isOverlayVisible()) {
_screen[kOverlayBuffer]->cursor.setPosition(x, y);
@@ -965,14 +967,14 @@ void AtariGraphicsManager::warpMouse(int x, int y) {
void AtariGraphicsManager::setMouseCursor(const void *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor,
bool dontScale, const Graphics::PixelFormat *format, const byte *mask) {
- //atari_debug("setMouseCursor: %d, %d, %d, %d, %d, %d; ignored: %d",
+ //debug("setMouseCursor: %d, %d, %d, %d, %d, %d; ignored: %d",
// w, h, hotspotX, hotspotY, keycolor, format ? format->bytesPerPixel : 1, _ignoreCursorChanges);
if (_ignoreCursorChanges)
return;
if (mask)
- atari_warning("AtariGraphicsManager::setMouseCursor: Masks are not supported");
+ warning("AtariGraphicsManager::setMouseCursor: Masks are not supported");
if (format)
assert(*format == PIXELFORMAT_CLUT8);
@@ -989,7 +991,7 @@ void AtariGraphicsManager::setMouseCursor(const void *buf, uint w, uint h, int h
}
void AtariGraphicsManager::setCursorPalette(const byte *colors, uint start, uint num) {
- atari_debug("setCursorPalette: %d, %d", start, num);
+ debug("setCursorPalette: %d, %d", start, num);
Cursor::setPalette(colors, start, num);
@@ -998,7 +1000,7 @@ void AtariGraphicsManager::setCursorPalette(const byte *colors, uint start, uint
}
void AtariGraphicsManager::updateMousePosition(int deltaX, int deltaY) {
- //atari_debug("updateMousePosition: %d, %d", deltaX, deltaY);
+ //debug("updateMousePosition: %d, %d", deltaX, deltaY);
if (isOverlayVisible()) {
_screen[kOverlayBuffer]->cursor.updatePosition(deltaX, deltaY);
@@ -1098,7 +1100,7 @@ void AtariGraphicsManager::addDirtyRectToScreens(const Graphics::Surface &dstSur
}
bool AtariGraphicsManager::updateScreenInternal(Screen *dstScreen, const Graphics::Surface *srcSurface) {
- //atari_debug("updateScreenInternal");
+ //debug("updateScreenInternal");
const Screen::DirtyRects &dirtyRects = dstScreen->dirtyRects;
auto &dstSurface = *dstScreen->offsettedSurf;
diff --git a/backends/graphics/atari/atari-pendingscreenchanges.cpp b/backends/graphics/atari/atari-pendingscreenchanges.cpp
index b4c3c1ad7c9..5f561011d94 100644
--- a/backends/graphics/atari/atari-pendingscreenchanges.cpp
+++ b/backends/graphics/atari/atari-pendingscreenchanges.cpp
@@ -19,12 +19,14 @@
*
*/
+#define FORCE_TEXT_CONSOLE
+
#include "atari-pendingscreenchanges.h"
#include <cassert>
#include <mint/falcon.h>
-#include "backends/platform/atari/atari-debug.h"
+#include "common/debug.h"
#include "graphics/surface.h"
#include "atari-graphics.h"
@@ -151,7 +153,7 @@ void PendingScreenChanges::processVideoMode(const Screen &screen) {
if (_resetSuperVidel)
VsetMode(SVEXT | SVEXT_BASERES(0) | COL80 | BPS8C); // resync to proper 640x480
- atari_debug("VsetMode: %04x", _mode);
+ debug("VsetMode: %04x", _mode);
VsetMode(_mode);
}
}
diff --git a/backends/graphics/atari/atari-screen.cpp b/backends/graphics/atari/atari-screen.cpp
index 9df7b421add..14071a692a0 100644
--- a/backends/graphics/atari/atari-screen.cpp
+++ b/backends/graphics/atari/atari-screen.cpp
@@ -19,13 +19,15 @@
*
*/
+#define FORCE_TEXT_CONSOLE
+
#include "atari-screen.h"
#include <mint/falcon.h>
#include "atari-graphics.h" // MAX_HZ_SHAKE, MAX_V_SHAKE
#include "atari-supervidel.h" // g_hasSuperVidel
-//#include "backends/platform/atari/atari-debug.h"
+//#include "common/debug.h"
Screen::Screen(bool tt, int width, int height, const Graphics::PixelFormat &format, const Palette *palette_)
: palette(palette_)
@@ -140,7 +142,7 @@ void Screen::addDirtyRect(const Graphics::Surface &srcSurface, int x, int y, int
if ((w == srcSurface.w && h == srcSurface.h)
|| dirtyRects.size() == 128) { // 320x200 can hold at most 250 16x16 rectangles
- //atari_debug("addDirtyRect[%d]: purge %d x %d", (int)dirtyRects.size(), srcSurface.w, srcSurface.h);
+ //debug("addDirtyRect[%d]: purge %d x %d", (int)dirtyRects.size(), srcSurface.w, srcSurface.h);
dirtyRects.clear();
// even if srcSurface.w != _offsettedSurf.w, alignRect would lead to the same result
diff --git a/backends/graphics/atari/atari-surface.cpp b/backends/graphics/atari/atari-surface.cpp
index fbd998d07bb..8fb2a6427a6 100644
--- a/backends/graphics/atari/atari-surface.cpp
+++ b/backends/graphics/atari/atari-surface.cpp
@@ -19,6 +19,8 @@
*
*/
+#define FORCE_TEXT_CONSOLE
+
#include "atari-surface.h"
#include "graphics/surface.h"
@@ -32,8 +34,8 @@
#include "backends/graphics/atari/atari-c2p-asm.h"
#include "backends/graphics/atari/atari-graphics-asm.h"
#include "backends/graphics/atari/atari-supervidel.h"
-#include "backends/platform/atari/atari-debug.h"
#include "backends/platform/atari/dlmalloc.h"
+#include "common/debug.h"
#include "common/textconsole.h" // error()
static struct MemoryPool {
@@ -42,7 +44,7 @@ static struct MemoryPool {
_mspace = create_mspace_with_base((void *)base, size, 0);
if (_mspace)
- atari_debug("Allocated mspace at 0x%08lx (%ld bytes)", base, size);
+ debug("Allocated mspace at 0x%08lx (%ld bytes)", base, size);
else
error("mspace allocation failed at 0x%08lx (%ld bytes)", base, size);
}
@@ -294,15 +296,15 @@ void AtariSurfaceInit() {
#ifdef USE_SV_BLITTER
g_superVidelFwVersion = *SV_VERSION & 0x01ff;
- atari_debug("SuperVidel FW Revision: %d, using %s", g_superVidelFwVersion,
+ debug("SuperVidel FW Revision: %d, using %s", g_superVidelFwVersion,
g_superVidelFwVersion >= 9 ? "fast async FIFO" : "slower sync blitting");
#else
- atari_debug("SuperVidel FW Revision: %d, SuperBlitter not used", *SV_VERSION & 0x01ff);
+ debug("SuperVidel FW Revision: %d, SuperBlitter not used", *SV_VERSION & 0x01ff);
#endif
if (Supexec(hasSvRamBoosted))
- atari_debug("SV_XBIOS has the pmmu boost enabled");
+ debug("SV_XBIOS has the pmmu boost enabled");
else
- atari_warning("SV_XBIOS has the pmmu boost disabled, set 'pmmu_boost = true' in C:\\SV.INF");
+ warning("SV_XBIOS has the pmmu boost disabled, set 'pmmu_boost = true' in C:\\SV.INF");
#ifdef USE_SV_BLITTER
s_blitterPool.size = ct60_vmalloc(-1) - (16 * 1024 * 1024); // SV XBIOS seems to forget the initial 16 MB ST RAM mirror
diff --git a/backends/mixer/atari/atari-mixer.cpp b/backends/mixer/atari/atari-mixer.cpp
index 5dbf04e29cf..c03c8a4ec6b 100644
--- a/backends/mixer/atari/atari-mixer.cpp
+++ b/backends/mixer/atari/atari-mixer.cpp
@@ -19,6 +19,8 @@
*
*/
+#define FORCE_TEXT_CONSOLE
+
#include "backends/mixer/atari/atari-mixer.h"
#include <math.h>
@@ -27,8 +29,9 @@
#include <mint/ostruct.h>
#include <usound.h> // https://github.com/mikrosk/usound
-#include "backends/platform/atari/atari-debug.h"
#include "common/config-manager.h"
+#include "common/debug.h"
+#include "common/textconsole.h"
#ifdef DISABLE_FANCY_THEMES
#define DEFAULT_OUTPUT_RATE 11025
@@ -59,7 +62,7 @@ static void __attribute__((interrupt)) timerA(void)
}
AtariMixerManager::AtariMixerManager() : MixerManager() {
- atari_debug("AtariMixerManager()");
+ debug("AtariMixerManager()");
suspendAudio();
@@ -82,7 +85,7 @@ AtariMixerManager::AtariMixerManager() : MixerManager() {
}
AtariMixerManager::~AtariMixerManager() {
- atari_debug("~AtariMixerManager()");
+ debug("~AtariMixerManager()");
g_system->getEventManager()->getEventDispatcher()->unregisterObserver(this);
@@ -124,9 +127,9 @@ void AtariMixerManager::init() {
ConfMan.setInt("output_channels", _outputChannels, Common::ConfigManager::kApplicationDomain);
ConfMan.setInt("audio_buffer_size", _samples, Common::ConfigManager::kApplicationDomain);
- atari_debug("setting %d Hz mixing frequency (%d-bit, %s)",
+ debug("setting %d Hz mixing frequency (%d-bit, %s)",
_outputRate, obtained.format == AudioFormatSigned8 ? 8 : 16, _outputChannels == 1 ? "mono" : "stereo");
- atari_debug("sample buffer size: %d", _samples);
+ debug("sample buffer size: %d", _samples);
ConfMan.flushToDisk();
@@ -150,7 +153,7 @@ void AtariMixerManager::init() {
}
void AtariMixerManager::suspendAudio() {
- atari_debug("suspendAudio");
+ debug("suspendAudio");
Buffoper(0x00);
muted = true;
@@ -158,7 +161,7 @@ void AtariMixerManager::suspendAudio() {
}
int AtariMixerManager::resumeAudio() {
- atari_debug("resumeAudio");
+ debug("resumeAudio");
_audioSuspended = false;
update();
@@ -172,7 +175,7 @@ bool AtariMixerManager::notifyEvent(const Common::Event &event) {
if (!muted) {
Buffoper(0x00);
muted = true;
- atari_debug("silencing the mixer");
+ debug("silencing the mixer");
}
return false;
default:
@@ -253,6 +256,6 @@ void AtariMixerManager::update() {
}
if (processed > 0 && processed != _samples) {
- atari_warning("processed: %d, _samples: %d", processed, _samples);
+ warning("processed: %d, _samples: %d", processed, _samples);
}
}
diff --git a/backends/platform/atari/atari-debug.cpp b/backends/platform/atari/atari-debug.cpp
deleted file mode 100644
index e5a95041773..00000000000
--- a/backends/platform/atari/atari-debug.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * 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 3 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, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "backends/platform/atari/atari-debug.h"
-
-#ifdef DISABLE_TEXT_CONSOLE
-
-void atari_debug(const char *s, ...) {
- va_list va;
-
- va_start(va, s);
-
- Common::String buf = Common::String::vformat(s, va);
- buf += '\n';
-
- if (g_system)
- g_system->logMessage(LogMessageType::kDebug, buf.c_str());
-
- va_end(va);
-}
-
-#endif
diff --git a/backends/platform/atari/atari-debug.h b/backends/platform/atari/atari-debug.h
deleted file mode 100644
index 6132449d4d0..00000000000
--- a/backends/platform/atari/atari-debug.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * 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 3 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, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef PLATFORM_ATARI_DEBUG_H
-#define PLATFORM_ATARI_DEBUG_H
-
-#include "common/debug.h"
-#include "common/str.h"
-#include "common/system.h"
-#include "common/textconsole.h"
-
-#ifdef DISABLE_TEXT_CONSOLE
-
-void atari_debug(const char *s, ...);
-#define atari_warning atari_debug
-
-#else
-
-#define atari_debug debug
-#define atari_warning warning
-
-#endif
-
-#endif
diff --git a/backends/platform/atari/module.mk b/backends/platform/atari/module.mk
index 033fca681ee..015ae50f7eb 100644
--- a/backends/platform/atari/module.mk
+++ b/backends/platform/atari/module.mk
@@ -2,7 +2,6 @@ MODULE := backends/platform/atari
MODULE_OBJS := \
osystem_atari.o \
- atari-debug.o \
atari_ikbd.o \
native_features.o \
dlmalloc.o
diff --git a/backends/platform/atari/osystem_atari.cpp b/backends/platform/atari/osystem_atari.cpp
index 412f8868ff1..527f7b10001 100644
--- a/backends/platform/atari/osystem_atari.cpp
+++ b/backends/platform/atari/osystem_atari.cpp
@@ -19,6 +19,8 @@
*
*/
+#define FORCE_TEXT_CONSOLE
+
#include <stdio.h>
#include <stdlib.h>
#include <time.h>
@@ -48,10 +50,10 @@
#include "backends/keymapper/hardware-input.h"
#include "backends/mixer/atari/atari-mixer.h"
#include "backends/mutex/null/null-mutex.h"
-#include "backends/platform/atari/atari-debug.h"
#include "backends/saves/default/default-saves.h"
#include "backends/timer/default/default-timer.h"
#include "base/main.h"
+#include "common/debug.h"
#define INPUT_ACTIVE
@@ -124,7 +126,7 @@ static long atari_200hz_shutdown(void)
}
static void critical_restore() {
- //atari_debug("critical_restore()");
+ //debug("critical_restore()");
Supexec(atari_200hz_shutdown);
@@ -159,7 +161,7 @@ static void critical_restore() {
// called on normal program termination (via exit() or returning from main())
static void exit_restore() {
// causes a crash upon termination
- //atari_debug("exit_restore()");
+ //debug("exit_restore()");
if (!s_dtor_already_called)
g_system->destroy();
@@ -228,7 +230,7 @@ OSystem_Atari::OSystem_Atari() {
}
OSystem_Atari::~OSystem_Atari() {
- atari_debug("OSystem_Atari::~OSystem_Atari()");
+ debug("OSystem_Atari::~OSystem_Atari()");
s_dtor_already_called = true;
@@ -282,7 +284,7 @@ OSystem_Atari::~OSystem_Atari() {
}
void OSystem_Atari::initBackend() {
- atari_debug("OSystem_Atari::initBackend()");
+ debug("OSystem_Atari::initBackend()");
s_app_id = appl_init();
if (s_app_id != -1) {
@@ -354,13 +356,13 @@ void OSystem_Atari::initBackend() {
}
void OSystem_Atari::engineInit() {
- //atari_debug("engineInit");
+ //debug("engineInit");
g_gameEngineActive = true;
}
void OSystem_Atari::engineDone() {
- //atari_debug("engineDone");
+ //debug("engineDone");
g_gameEngineActive = false;
}
@@ -382,7 +384,7 @@ void OSystem_Atari::delayMillis(uint msecs) {
}
void OSystem_Atari::getTimeAndDate(TimeDate &td, bool skipRecord) const {
- //atari_debug("getTimeAndDate");
+ //debug("getTimeAndDate");
time_t curTime = time(0);
struct tm t = *localtime(&curTime);
td.tm_sec = t.tm_sec;
@@ -412,7 +414,7 @@ Common::HardwareInputSet *OSystem_Atari::getHardwareInputSet() {
}
void OSystem_Atari::quit() {
- atari_debug("OSystem_Atari::quit()");
+ debug("OSystem_Atari::quit()");
if (!s_dtor_already_called)
destroy();
@@ -421,7 +423,7 @@ void OSystem_Atari::quit() {
}
void OSystem_Atari::fatalError() {
- atari_debug("OSystem_Atari::fatalError()");
+ debug("OSystem_Atari::fatalError()");
if (!s_dtor_already_called)
destroy();
More information about the Scummvm-git-logs
mailing list