Ensured that there is a subclass of file that is entrusted to load .O/.80 files, and that the code routes such files to it, noting that it should consider whether a ZX80 is required.

2024-06-25 18:30:07 +00:00 · 2017-06-04 16:37:03 -04:00 · 2017-06-04 16:37:03 -04:00 · 655809517c
commit 655809517c
parent 2190f60a89
5 changed files with 107 additions and 4 deletions
--- a/Signal.xcodeproj/project.pbxproj
+++ b/Signal.xcodeproj/project.pbxproj
@ -19,6 +19,7 @@
 		4B14145E1B5887AA00E04248 /* 6502AllRAM.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B1414591B58879D00E04248 /* 6502AllRAM.cpp */; };
 		4B1414601B58885000E04248 /* WolfgangLorenzTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B14145F1B58885000E04248 /* WolfgangLorenzTests.swift */; };
 		4B1414621B58888700E04248 /* KlausDormannTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B1414611B58888700E04248 /* KlausDormannTests.swift */; };
+		4B1497881EE4A1DA00CE2596 /* ZX80O.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B1497861EE4A1DA00CE2596 /* ZX80O.cpp */; };
 		4B1D08061E0F7A1100763741 /* TimeTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4B1D08051E0F7A1100763741 /* TimeTests.mm */; };
 		4B1E85751D170228001EF87D /* Typer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B1E85731D170228001EF87D /* Typer.cpp */; };
 		4B1E85811D176468001EF87D /* 6532Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B1E85801D176468001EF87D /* 6532Tests.swift */; };
@ -464,6 +465,8 @@
 		4B14145A1B58879D00E04248 /* 6502AllRAM.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = 6502AllRAM.hpp; sourceTree = "<group>"; };
 		4B14145F1B58885000E04248 /* WolfgangLorenzTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WolfgangLorenzTests.swift; sourceTree = "<group>"; };
 		4B1414611B58888700E04248 /* KlausDormannTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KlausDormannTests.swift; sourceTree = "<group>"; };
+		4B1497861EE4A1DA00CE2596 /* ZX80O.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ZX80O.cpp; sourceTree = "<group>"; };
+		4B1497871EE4A1DA00CE2596 /* ZX80O.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = ZX80O.hpp; sourceTree = "<group>"; };
 		4B1D08051E0F7A1100763741 /* TimeTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = TimeTests.mm; sourceTree = "<group>"; };
 		4B1E85731D170228001EF87D /* Typer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Typer.cpp; sourceTree = "<group>"; };
 		4B1E85741D170228001EF87D /* Typer.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Typer.hpp; sourceTree = "<group>"; };
@ -1349,6 +1352,8 @@
 				4B2BFC5E1D613E0200BA3AA9 /* TapePRG.hpp */,
 				4B59199A1DAC6C46005BB85C /* OricTAP.cpp */,
 				4B59199B1DAC6C46005BB85C /* OricTAP.hpp */,
+				4B1497861EE4A1DA00CE2596 /* ZX80O.cpp */,
+				4B1497871EE4A1DA00CE2596 /* ZX80O.hpp */,
 			);
 			path = Formats;
 			sourceTree = "<group>";
@ -2550,6 +2555,7 @@
 				4B5FADBA1DE3151600AEC565 /* FileHolder.cpp in Sources */,
 				4B6C73BD1D387AE500AFCFCA /* DiskController.cpp in Sources */,
 				4B643F3A1D77AD1900D431D6 /* CSStaticAnalyser.mm in Sources */,
+				4B1497881EE4A1DA00CE2596 /* ZX80O.cpp in Sources */,
 				4B4DC8281D2C2470003C5BF8 /* C1540.cpp in Sources */,
 				4B5A12571DD55862007A2231 /* Disassembler6502.cpp in Sources */,
 				4BE7C9181E3D397100A5496D /* TIA.cpp in Sources */,
--- a/OSBindings/Mac/Clock
+++ b/OSBindings/Mac/Clock
@ -104,7 +104,7 @@
 			<key>CFBundleTypeName</key>
 			<string>Commodore Disk</string>
 			<key>CFBundleTypeRole</key>
-			<string>Viewer</string>
+			<string>Editor</string>
 			<key>LSTypeIsPackage</key>
 			<integer>0</integer>
 			<key>NSDocumentClass</key>
@ -120,7 +120,7 @@
 			<key>CFBundleTypeName</key>
 			<string>Commodore 1540/1 Disk</string>
 			<key>CFBundleTypeRole</key>
-			<string>Viewer</string>
+			<string>Editor</string>
 			<key>LSTypeIsPackage</key>
 			<integer>0</integer>
 			<key>NSDocumentClass</key>
@ -140,7 +140,7 @@
 			<key>CFBundleTypeName</key>
 			<string>Electron/BBC Disk Image</string>
 			<key>CFBundleTypeRole</key>
-			<string>Viewer</string>
+			<string>Editor</string>
 			<key>NSDocumentClass</key>
 			<string>$(PRODUCT_MODULE_NAME).MachineDocument</string>
 		</dict>
@ -154,6 +154,21 @@
 			<key>CFBundleTypeName</key>
 			<string>Disk Image</string>
 			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>NSDocumentClass</key>
+			<string>$(PRODUCT_MODULE_NAME).MachineDocument</string>
+		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>o</string>
+				<string>80</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>cassette</string>
+			<key>CFBundleTypeName</key>
+			<string>ZX80 Tape Image</string>
+			<key>CFBundleTypeRole</key>
 			<string>Viewer</string>
 			<key>NSDocumentClass</key>
 			<string>$(PRODUCT_MODULE_NAME).MachineDocument</string>
--- a/StaticAnalyser/StaticAnalyser.cpp
+++ b/StaticAnalyser/StaticAnalyser.cpp
@ -32,13 +32,15 @@
 #include "../Storage/Tape/Formats/OricTAP.hpp"
 #include "../Storage/Tape/Formats/TapePRG.hpp"
 #include "../Storage/Tape/Formats/TapeUEF.hpp"
+#include "../Storage/Tape/Formats/ZX80O.hpp"

 typedef int TargetPlatformType;
 enum class TargetPlatform: TargetPlatformType {
 	Acorn		=	1 << 0,
 	Atari2600	=	1 << 1,
 	Commodore	=	1 << 2,
-	Oric		=	1 << 3
+	Oric		=	1 << 3,
+	ZX80		=	1 << 4,
 };

 using namespace StaticAnalyser;
@ -86,6 +88,7 @@ std::list<Target> StaticAnalyser::GetTargets(const char *file_name)

 	if(lowercase_extension)
 	{
+		Format("80", tapes, Tape::ZX80O, TargetPlatform::ZX80)							// 80
 		Format("a26", cartridges, Cartridge::BinaryDump, TargetPlatform::Atari2600)		// A26
 		Format("adf", disks, Disk::AcornADF, TargetPlatform::Acorn)						// ADF
 		Format("bin", cartridges, Cartridge::BinaryDump, TargetPlatform::Atari2600)		// BIN
@ -93,6 +96,7 @@ std::list<Target> StaticAnalyser::GetTargets(const char *file_name)
 		Format("dsd", disks, Disk::SSD, TargetPlatform::Acorn)							// DSD
 		Format("dsk", disks, Disk::OricMFMDSK, TargetPlatform::Oric)					// DSK
 		Format("g64", disks, Disk::G64, TargetPlatform::Commodore)						// G64
+		Format("o", tapes, Tape::ZX80O, TargetPlatform::ZX80)							// O

 		// PRG
 		if(!strcmp(lowercase_extension, "prg"))
--- a/Storage/Tape/Formats/ZX80O.cpp
+++ b/Storage/Tape/Formats/ZX80O.cpp
@ -0,0 +1,32 @@
+//
+//  ZX80O.cpp
+//  Clock Signal
+//
+//  Created by Thomas Harte on 04/06/2017.
+//  Copyright © 2017 Thomas Harte. All rights reserved.
+//
+
+#include "ZX80O.hpp"
+
+using namespace Storage::Tape;
+
+ZX80O::ZX80O(const char *file_name) :
+	Storage::FileHolder(file_name) {
+
+	// then rewind and start again
+	virtual_reset();
+}
+
+void ZX80O::virtual_reset() {
+	fseek(file_, 0, SEEK_SET);
+}
+
+bool ZX80O::is_at_end() {
+	return feof(file_);
+}
+
+Tape::Pulse ZX80O::virtual_get_next_pulse() {
+	Tape::Pulse pulse;
+
+	return pulse;
+}
--- a/Storage/Tape/Formats/ZX80O.hpp
+++ b/Storage/Tape/Formats/ZX80O.hpp
@ -0,0 +1,46 @@
+//
+//  ZX80O.hpp
+//  Clock Signal
+//
+//  Created by Thomas Harte on 04/06/2017.
+//  Copyright © 2017 Thomas Harte. All rights reserved.
+//
+
+#ifndef ZX80O_hpp
+#define ZX80O_hpp
+
+#include "../Tape.hpp"
+#include "../../FileHolder.hpp"
+#include <cstdint>
+
+namespace Storage {
+namespace Tape {
+
+/*!
+	Provides a @c Tape containing a ZX80-format .O tape image, which is a byte stream capture.
+*/
+class ZX80O: public Tape, public Storage::FileHolder {
+	public:
+		/*!
+			Constructs an @c ZX80O containing content from the file with name @c file_name.
+
+			@throws ErrorNotZX80O if this file could not be opened and recognised as a valid ZX80-format .O.
+		*/
+		ZX80O(const char *file_name);
+
+		enum {
+			ErrorNotZX80O
+		};
+
+		// implemented to satisfy @c Tape
+		bool is_at_end();
+
+	private:
+		void virtual_reset();
+		Pulse virtual_get_next_pulse();
+};
+
+}
+}
+
+#endif /* ZX80O_hpp */