summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/formats/ti99_dsk.cpp
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2020-04-13 19:14:36 +1000
committer Vas Crabb <vas@vastheman.com>2020-04-13 19:14:36 +1000
commitde72f97b90b885e7fa5b0aa237098c945e02f1b5 (patch)
treeccdebacc984f5298783ca8aa7b4ecfa38af23983 /src/lib/formats/ti99_dsk.cpp
parent404e7321a63548d2e77e50ec0dc7572b3298d5f4 (diff)
(nw) formats: reduce dependencies on libemu
The only link dependency left is emu_fatalerror. The format handlers really shouldn't be throwing fatal errors at all - they should just fail to load an image they can't handle. Maybe the interface should be enhanced to allow better propagation of errors up from the format handlers so they can be displayed in a UI rather than just logged. The only other two dependencies are on logmacro.h (pure macros) and the PAIR type from emucore.h (possibly worth moving to util).
Diffstat (limited to 'src/lib/formats/ti99_dsk.cpp')
-rw-r--r--src/lib/formats/ti99_dsk.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/lib/formats/ti99_dsk.cpp b/src/lib/formats/ti99_dsk.cpp
index a82600feaa6..9ab4f5fb4b3 100644
--- a/src/lib/formats/ti99_dsk.cpp
+++ b/src/lib/formats/ti99_dsk.cpp
@@ -40,18 +40,18 @@
********************************************************************/
+#include "ti99_dsk.h"
+#include "imageutl.h"
+
+#include "osdcore.h" // osd_printf_* (in osdcore.h)
+
#include <cstring>
#include <ctime>
#include <cassert>
#include <iomanip>
-#include "emu.h" // osd_printf_* (in osdcore.h)
-#include "imageutl.h"
-#include "ti99_dsk.h"
-
#define SECTOR_SIZE 256
-#undef LOG_OUTPUT_FUNC
#define LOG_OUTPUT_FUNC osd_printf_info
#define LOG_WARN (1U<<1) // Warnings
@@ -64,8 +64,10 @@
#define VERBOSE ( LOG_WARN )
+#define __EMU_H__ // logmacro wasn't really intended to be used outside stuff that uses libemu
#include "logmacro.h"
+
// ====================================================
// Common methods for both formats.
// ====================================================