This is vAmiga 2.6.1

dirkwhoffmann · dirkwhoffmann · commit 1e6baa1b8b2e · 2024-06-28T11:21:53.000+02:00
diff --git a/Emulator/config.h b/Emulator/config.h
@@ -16,7 +16,7 @@
 // Version number
 #define VER_MAJOR 2
 #define VER_MINOR 6
-#define VER_SUBMINOR 0
+#define VER_SUBMINOR 1
 #define VER_BETA 0
 
 // Snapshot version number
diff --git a/GUI/MyController.swift b/GUI/MyController.swift
@@ -186,19 +186,16 @@ extension MyController {
         renderer = Renderer(view: metal,
                             device: MTLCreateSystemDefaultDevice()!,
                             controller: self)
-        
-        // Apply all GUI related user defaults
-        pref.applyUserDefaults()
-        config.applyUserDefaults()
 
         // Setup window
         configureWindow()
 
         // Launch the emulator
         launch()
 
-        // Add media file (if provided on startup)
-        mydocument.addMedia()
+        // Apply all GUI related user defaults
+        pref.applyUserDefaults()
+        config.applyUserDefaults()
 
         do {
             // Switch the Amiga on
@@ -220,6 +217,9 @@ extension MyController {
             }
         }
 
+        // Add media file (if provided on startup)
+        if let url = mydocument.launchUrl { try? mydocument.addMedia(url: url) }
+
         // Create speed monitor
         speedometer = Speedometer()
         
diff --git a/GUI/MyDocument.swift b/GUI/MyDocument.swift
@@ -131,6 +131,9 @@ class MyDocument: NSDocument {
              
         debug(.media)
 
+        launchUrl = url
+        
+        /*
         let types: [FileType] =
         [ .SNAPSHOT, .SCRIPT, .ADF, .EADF, .HDF, .IMG, .ST, .DMS, .EXE, .DIR ]
 
@@ -141,20 +144,18 @@ class MyDocument: NSDocument {
             
             throw NSError(error: error)
         }
+        */
     }
     
     override open func revert(toContentsOf url: URL, ofType typeName: String) throws {
         
         debug(.media)
         
         do {
-            let proxy = try createFileProxy(from: url, allowedTypes: [.SNAPSHOT])
-            if let snapshot = proxy as? SnapshotProxy {
-                try processSnapshotFile(snapshot)
-            }
-            
+            try addMedia(url: url, allowedTypes: [.SNAPSHOT])
+
         } catch let error as VAError {
-            
+
             throw NSError(error: error)
         }
     }
@@ -186,13 +187,6 @@ class MyDocument: NSDocument {
     // Handling media files
     //
 
-    func addMedia() {
-
-        if let url = launchUrl {
-            try? addMedia(url: url)
-        }
-    }
-
     func addMedia(url: URL,
                   allowedTypes types: [FileType] = FileType.all,
                   df: Int = 0,
diff --git a/Proxy/TypeExtensions.swift b/Proxy/TypeExtensions.swift
@@ -62,14 +62,18 @@ extension EventSlot: CustomStringConvertible {
 }
 
 extension FileType {
-    
+
     init?(url: URL?) {
         self = url == nil ? .UNKNOWN : AmigaFileProxy.type(of: url)
     }
 
     static var all: [FileType] {
         return [ .SNAPSHOT, .SCRIPT, .ADF, .EADF, .HDF, .IMG, .DMS, .EXE, .DIR ]
     }
+
+    static var draggable: [FileType] {
+        return [ .SNAPSHOT, .SCRIPT, .ADF, .EADF, .HDF, .IMG, .DMS, .EXE, .DIR ]
+    }
 }
 
 extension FSVolumeType: CustomStringConvertible {
diff --git a/vAmiga.xcodeproj/project.pbxproj b/vAmiga.xcodeproj/project.pbxproj
@@ -2794,7 +2794,7 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 240627;
+				CURRENT_PROJECT_VERSION = 240628;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_APP_SANDBOX = NO;
@@ -2815,7 +2815,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = 2.6;
+				MARKETING_VERSION = 2.6.1;
 				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 c++20";
 				PRODUCT_BUNDLE_IDENTIFIER = dirkwhoffmann.vAmiga;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -2844,7 +2844,7 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 240627;
+				CURRENT_PROJECT_VERSION = 240628;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_APP_SANDBOX = NO;
@@ -2863,7 +2863,7 @@
 				);
 				LLVM_LTO = YES_THIN;
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = 2.6;
+				MARKETING_VERSION = 2.6.1;
 				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 c++20";
 				PRODUCT_BUNDLE_IDENTIFIER = dirkwhoffmann.vAmiga;
 				PRODUCT_NAME = "$(TARGET_NAME)";
diff --git a/vAmiga.xcodeproj/xcuserdata/hoff.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/vAmiga.xcodeproj/xcuserdata/hoff.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -181,51 +181,5 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "FA4E6262-6A0C-4C1F-A83A-B86C42D59C09"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "Emulator/Components/Amiga.cpp"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "130"
-            endingLineNumber = "130"
-            landmarkName = "Amiga::reset(hard)"
-            landmarkType = "7">
-            <Locations>
-               <Location
-                  uuid = "FA4E6262-6A0C-4C1F-A83A-B86C42D59C09 - 68f9eb612d69a278"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "vamiga::Amiga::reset(bool)"
-                  moduleName = "vAmiga"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/hoff/Retro/vAmiga/Emulator/Components/Amiga.cpp"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "130"
-                  endingLineNumber = "130">
-               </Location>
-               <Location
-                  uuid = "FA4E6262-6A0C-4C1F-A83A-B86C42D59C09 - 8e520e09464a4cea"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "vamiga::Amiga::reset(bool)::$_0::operator()(vamiga::CoreComponent*) const"
-                  moduleName = "vAmiga"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/hoff/Retro/vAmiga/Emulator/Components/Amiga.cpp"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "130"
-                  endingLineNumber = "130">
-               </Location>
-            </Locations>
-         </BreakpointContent>
-      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

Original file line number	Diff line number	Diff line change
`@@ -62,14 +62,18 @@ extension EventSlot: CustomStringConvertible {`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`extension FileType {`
`65`		`-`
	`65`	`+`
`66`	`66`	`init?(url: URL?) {`
`67`	`67`	`self = url == nil ? .UNKNOWN : AmigaFileProxy.type(of: url)`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`static var all: [FileType] {`
`71`	`71`	`return [ .SNAPSHOT, .SCRIPT, .ADF, .EADF, .HDF, .IMG, .DMS, .EXE, .DIR ]`
`72`	`72`	`}`
	`73`	`+`
	`74`	`+ static var draggable: [FileType] {`
	`75`	`+ return [ .SNAPSHOT, .SCRIPT, .ADF, .EADF, .HDF, .IMG, .DMS, .EXE, .DIR ]`
	`76`	`+ }`
`73`	`77`	`}`
`74`	`78`
`75`	`79`	`extension FSVolumeType: CustomStringConvertible {`