Replaced RomFileProxy by MediaFileProxy

Emulator/Components/C64.cpp

@@ -1421,7 +1421,7 @@ C64::loadRom(const string &path)
 }
 
 void
-C64::loadRom(const RomFile &file)
+C64::loadRom(const MediaFile &file)
 {
     switch (file.type()) {
 
@@ -1449,13 +1449,13 @@ C64::loadRom(const RomFile &file)
 
         case FILETYPE_VC1541_ROM:
 
-            drive8.mem.loadRom(file.data, file.size);
-            drive9.mem.loadRom(file.data, file.size);
+            drive8.mem.loadRom(file.getData(), file.getSize());
+            drive9.mem.loadRom(file.getData(), file.getSize());
             debug(MEM_DEBUG, "VC1541 Rom flashed\n");
             break;
 
         default:
-            fatalError;
+            throw VC64Error(ERROR_FILE_TYPE_MISMATCH);
     }
 }
 

Emulator/Components/C64.h

@@ -698,7 +698,7 @@ class C64 final : public CoreComponent, public Inspectable<C64Info> {
 
     // Installs a Rom
     void loadRom(const string &path) throws;
-    void loadRom(const RomFile &file);
+    void loadRom(const MediaFile &file);
 
     // Erases an installed Rom
     void deleteRom(RomType type);

Emulator/Media/AnyFile.h

@@ -85,6 +85,17 @@ class AnyFile : public CoreObject, public MediaFile {
     void init(FILE *file) throws;
 
 
+    //
+    // Methods from MediaFile
+    //
+
+    // Returns the size of this file
+    virtual isize getSize() const override { return size; }
+
+    // Returns a pointer to the file data
+    virtual u8 *getData() const override { return data; }
+
+
     //
     // Accessing
     //

Emulator/Media/MediaFile.h

@@ -48,6 +48,12 @@ class MediaFile {
     // Returns the media type of this file
     virtual FileType type() const { return FILETYPE_UNKNOWN; }
 
+    // Returns the size of this file
+    virtual isize getSize() const = 0;
+
+    // Returns a pointer to the file data
+    virtual u8 *getData() const = 0;
+
     // Returns the logical name of this file
     virtual string name() const = 0;
 

Emulator/VirtualC64.cpp

@@ -456,7 +456,7 @@ VirtualC64::C64API::loadRom(const string &path)
 }
 
 void 
-VirtualC64::C64API::loadRom(const RomFile &file)
+VirtualC64::C64API::loadRom(const MediaFile &file)
 {
     c64->loadRom(file);
     c64->markAsDirty();

Emulator/VirtualC64.h

@@ -480,7 +480,7 @@ class VirtualC64 : API {
 
         /** @brief  Loads a ROM, provided by a RomFile object
          */
-        void loadRom(const RomFile &file);
+        void loadRom(const MediaFile &file);
 
         /** @brief  Removes an installed ROM
          *          The ROM contents is overwritten with zeroes.

GUI/Panels/Configuration/Configuration.swift

@@ -551,7 +551,7 @@ class Configuration {
         func load(_ url: URL?, type: vc64.FileType) {
 
             if url != nil {
-                if let file = try? RomFileProxy.make(with: url!) {
+                if let file = try? MediaFileProxy.make(with: url!) {
                     if file.type == type { emu.loadRom(file) }
                 }
             }

GUI/Panels/Configuration/RomConf.swift

@@ -154,13 +154,13 @@ extension ConfigurationController {
         let c = NSData(data: NSDataAsset(name: "chargen_openroms")!.data)
         let k = NSData(data: NSDataAsset(name: "kernal_generic")!.data)
 
-        if let rom = try? RomFileProxy.makeWith(buffer: b.bytes, length: b.length) {
+        if let rom = try? MediaFileProxy.makeWith(buffer: b.bytes, length: b.length, type: .BASIC_ROM) {
             emu.loadRom(rom)
         }
-        if let rom = try? RomFileProxy.makeWith(buffer: c.bytes, length: c.length) {
+        if let rom = try? MediaFileProxy.makeWith(buffer: c.bytes, length: c.length, type: .CHAR_ROM) {
             emu.loadRom(rom)
         }
-        if let rom = try? RomFileProxy.makeWith(buffer: k.bytes, length: k.length) {
+        if let rom = try? MediaFileProxy.makeWith(buffer: k.bytes, length: k.length, type: .KERNAL_ROM) {
             emu.loadRom(rom)
         }
 

GUI/Panels/Configuration/RomDropView.swift

@@ -71,7 +71,7 @@ class RomDropView: DropView {
 
         do {
 
-            let rom = try RomFileProxy.make(with: url)
+            let rom = try MediaFileProxy.make(with: url)
             emu.loadRom(rom)
 
             return true

Proxy/EmulatorProxy.h

@@ -44,7 +44,7 @@ using namespace vc64;
 @class PRGFileProxy;
 @class RecorderProxy;
 @class RetroShellProxy;
-@class RomFileProxy;
+// @class RomFileProxy;
 @class ScriptProxy;
 @class SIDProxy;
 // @class SnapshotProxy;
@@ -221,7 +221,7 @@ using namespace vc64;
 - (BOOL)isRom:(RomType)type url:(NSURL *)url;
 
 - (void)loadRom:(NSURL *)url exception:(ExceptionWrapper *)ex;
-- (void)loadRom:(RomFileProxy *)proxy;
+- (void)loadRom:(MediaFileProxy *)proxy;
 - (void)saveRom:(RomType)type url:(NSURL *)url exception:(ExceptionWrapper *)ex;
 - (void)deleteRom:(RomType)type;
 
@@ -754,13 +754,14 @@ struct GuardInfo {
 // RomFile
 //
 
+/*
 @interface RomFileProxy : AnyFileProxy <MakeWithFile, MakeWithBuffer> { }
 
 + (instancetype)makeWithFile:(NSString *)path exception:(ExceptionWrapper *)ex;
 + (instancetype)makeWithBuffer:(const void *)buf length:(NSInteger)len exception:(ExceptionWrapper *)ex;
  
 @end
-
+*/
 
 //
 // CRTFile

Proxy/EmulatorProxy.mm

@@ -1451,6 +1451,7 @@ - (void)execute:(EmulatorProxy *)proxy
 // RomFile proxy
 //
 
+/*
 @implementation RomFileProxy
 
 + (instancetype)make:(RomFile *)file
@@ -1471,6 +1472,7 @@ + (instancetype)makeWithBuffer:(const void *)buf length:(NSInteger)len exception
 }
 
 @end
+*/
 
 
 //
@@ -2480,9 +2482,9 @@ - (void) loadRom:(NSURL *)url exception:(ExceptionWrapper *)e
     catch (VC64Error &error) { [e save:error]; }
 }
 
-- (void) loadRom:(RomFileProxy *)proxy
+- (void) loadRom:(MediaFileProxy *)proxy
 {
-    [self emu]->c64.loadRom(*(RomFile *)proxy->obj);
+    [self emu]->c64.loadRom(*(MediaFile *)proxy->obj);
 }
 
 - (void) saveRom:(RomType)type url:(NSURL *)url exception:(ExceptionWrapper *)e