[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx:[700] trunk/FuseImporter/ LibspectrumMetadata
Brought to you by:
fredm
Menu
▾
▴
[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx:[700] trunk/FuseImporter/ LibspectrumMetadataImporter.m
|
From: <fr...@us...> - 2012-11-02 10:22:42
|
Revision: 700
http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=700&view=rev
Author: fredm
Date: 2012-11-02 10:22:35 +0000 (Fri, 02 Nov 2012)
Log Message:
-----------
Convert to modern Objective-C syntax.
Modified Paths:
--------------
trunk/FuseImporter/LibspectrumMetadataImporter.m
Modified: trunk/FuseImporter/LibspectrumMetadataImporter.m
===================================================================
--- trunk/FuseImporter/LibspectrumMetadataImporter.m 2012-10-29 12:28:20 UTC (rev 699)
+++ trunk/FuseImporter/LibspectrumMetadataImporter.m 2012-11-02 10:22:35 UTC (rev 700)
@@ -37,6 +37,10 @@
#include <libspectrum.h>
+static libspectrum_error
+libspectrum_importer_error_function( libspectrum_error error,
+ const char *format, va_list ap );
+
static char fsrep[MAXPATHLEN+1];
static int
@@ -87,30 +91,24 @@
case 0:
switch( id ) {
case 0:
- [machines addObject:[NSString stringWithUTF8String:
- libspectrum_machine_name(LIBSPECTRUM_MACHINE_16)]];
+ [machines addObject:@(libspectrum_machine_name(LIBSPECTRUM_MACHINE_16))];
return;
case 1:
- [machines addObject:[NSString stringWithUTF8String:
- libspectrum_machine_name(LIBSPECTRUM_MACHINE_48)]];
+ [machines addObject:@(libspectrum_machine_name(LIBSPECTRUM_MACHINE_48))];
return;
case 2:
[machines addObject:[NSString stringWithFormat:@"%s (Issue 1)",
libspectrum_machine_name(LIBSPECTRUM_MACHINE_48)]];
return;
case 3:
- [machines addObject:[NSString stringWithUTF8String:
- libspectrum_machine_name(LIBSPECTRUM_MACHINE_128)]];
+ [machines addObject:@(libspectrum_machine_name(LIBSPECTRUM_MACHINE_128))];
return;
case 4:
- [machines addObject:[NSString stringWithUTF8String:
- libspectrum_machine_name(LIBSPECTRUM_MACHINE_PLUS2)]];
+ [machines addObject:@(libspectrum_machine_name(LIBSPECTRUM_MACHINE_PLUS2))];
return;
case 5:
- [machines addObject:[NSString stringWithUTF8String:
- libspectrum_machine_name(LIBSPECTRUM_MACHINE_PLUS2A)]];
- [machines addObject:[NSString stringWithUTF8String:
- libspectrum_machine_name(LIBSPECTRUM_MACHINE_PLUS3)]];
+ [machines addObject:@(libspectrum_machine_name(LIBSPECTRUM_MACHINE_PLUS2A))];
+ [machines addObject:@(libspectrum_machine_name(LIBSPECTRUM_MACHINE_PLUS3))];
return;
default:
[machines addObject:@"Unknown machine"];
@@ -154,7 +152,7 @@
}
}
-libspectrum_error
+static libspectrum_error
libspectrum_importer_error_function( libspectrum_error error,
const char *format, va_list ap )
{
@@ -190,8 +188,7 @@
return NO;
}
- [attributes setObject:[NSNumber numberWithInt:1]
- forKey:(NSString *)kMDItemAudioChannelCount];
+ attributes[(NSString *)kMDItemAudioChannelCount] = @1;
block = libspectrum_tape_iterator_init( &iterator, tape );
@@ -259,44 +256,37 @@
switch( libspectrum_tape_block_ids( block, i ) ) {
case 0:
- [attributes setObject:[NSString stringWithCString:
+ attributes[(NSString *)kMDItemTitle] = [NSString stringWithCString:
(const char *)libspectrum_tape_block_texts( block, i )
- encoding:NSWindowsCP1252StringEncoding]
- forKey:(NSString *)kMDItemTitle];
+ encoding:NSWindowsCP1252StringEncoding];
break;
case 1:
info = [NSString stringWithCString:
(const char *)libspectrum_tape_block_texts( block, i )
encoding:NSWindowsCP1252StringEncoding];
- [attributes setObject:[info componentsSeparatedByString:@"\n"]
- forKey:(NSString *)kMDItemPublishers];
+ attributes[(NSString *)kMDItemPublishers] = [info componentsSeparatedByString:@"\n"];
break;
case 2:
info = [NSString stringWithCString:
(const char *)libspectrum_tape_block_texts( block, i )
encoding:NSWindowsCP1252StringEncoding];
- [attributes setObject:[info componentsSeparatedByString:@"\n"]
- forKey:(NSString *)kMDItemAuthors];
+ attributes[(NSString *)kMDItemAuthors] = [info componentsSeparatedByString:@"\n"];
break;
case 3:
- [attributes setObject:[NSNumber numberWithInt:
- [[NSString stringWithCString:
+ attributes[(NSString *)kMDItemRecordingYear] = @([[NSString stringWithCString:
(const char *)libspectrum_tape_block_texts( block, i )
- encoding:NSWindowsCP1252StringEncoding] intValue]]
- forKey:(NSString *)kMDItemRecordingYear];
+ encoding:NSWindowsCP1252StringEncoding] intValue]);
break;
case 4: // We will want to translate from "English" etc.
info = [NSString stringWithCString:
(const char *)libspectrum_tape_block_texts( block, i )
encoding:NSWindowsCP1252StringEncoding];
- [attributes setObject:[info componentsSeparatedByString:@"\n"]
- forKey:(NSString *)kMDItemLanguages];
+ attributes[(NSString *)kMDItemLanguages] = [info componentsSeparatedByString:@"\n"];
break;
case 5:
- [attributes setObject:[NSString stringWithCString:
+ attributes[@"net_sourceforge_projects_fuse_emulator_Category"] = [NSString stringWithCString:
(const char *)libspectrum_tape_block_texts( block, i )
- encoding:NSWindowsCP1252StringEncoding]
- forKey:@"net_sourceforge_projects_fuse_emulator_Category"];
+ encoding:NSWindowsCP1252StringEncoding];
break;
case 6:
{
@@ -318,27 +308,23 @@
options:NSCaseInsensitiveSearch
range:NSMakeRange(0, [priceString length])];
// Also should consider UKP from some TZX Vault info blocks?
- [attributes setObject:priceString
- forKey:@"net_sourceforge_projects_fuse_emulator_Price"];
+ attributes[@"net_sourceforge_projects_fuse_emulator_Price"] = priceString;
}
break;
case 7:
- [attributes setObject:[NSString stringWithCString:
+ attributes[@"net_sourceforge_projects_fuse_emulator_Loader"] = [NSString stringWithCString:
(const char *)libspectrum_tape_block_texts( block, i )
- encoding:NSWindowsCP1252StringEncoding]
- forKey:@"net_sourceforge_projects_fuse_emulator_Loader"];
+ encoding:NSWindowsCP1252StringEncoding];
break;
case 8:
- [attributes setObject:[NSString stringWithCString:
+ attributes[@"net_sourceforge_projects_fuse_emulator_Origin"] = [NSString stringWithCString:
(const char *)libspectrum_tape_block_texts( block, i )
- encoding:NSWindowsCP1252StringEncoding]
- forKey:@"net_sourceforge_projects_fuse_emulator_Origin"];
+ encoding:NSWindowsCP1252StringEncoding];
break;
case 255:
- [attributes setObject:[NSString stringWithCString:
+ attributes[(NSString *)kMDItemComment] = [NSString stringWithCString:
(const char *)libspectrum_tape_block_texts( block, i )
- encoding:NSWindowsCP1252StringEncoding]
- forKey:(NSString *)kMDItemComment];
+ encoding:NSWindowsCP1252StringEncoding];
break;
default: NSLog(@"(Unknown string): %s",
(const char *)libspectrum_tape_block_texts( block, i ));
@@ -364,12 +350,10 @@
}
}
if( [machines count] ) {
- [attributes setObject:machines
- forKey:@"net_sourceforge_projects_fuse_emulator_Machines"];
+ attributes[@"net_sourceforge_projects_fuse_emulator_Machines"] = machines;
}
if( [peripherals count] ) {
- [attributes setObject:peripherals
- forKey:@"net_sourceforge_projects_fuse_emulator_Peripherals"];
+ attributes[@"net_sourceforge_projects_fuse_emulator_Peripherals"] = peripherals;
}
break;
@@ -395,8 +379,7 @@
float duration = tstates_total/3500000.0;
- [attributes setObject:[NSNumber numberWithFloat:duration]
- forKey:(NSString *)kMDItemDurationSeconds];
+ attributes[(NSString *)kMDItemDurationSeconds] = @(duration);
error = libspectrum_tape_free( tape );
if( error != LIBSPECTRUM_ERROR_NONE ) {
@@ -416,15 +399,10 @@
if( !libspectrum_snap_issue2(snap) &&
(libspectrum_snap_machine(snap) == LIBSPECTRUM_MACHINE_48 ||
libspectrum_snap_machine(snap) == LIBSPECTRUM_MACHINE_16) ) {
- [attributes setObject:[NSArray arrayWithObject:
- [NSString stringWithFormat:@"%s (Issue 1)",
- libspectrum_machine_name(libspectrum_snap_machine(snap))]]
- forKey:@"net_sourceforge_projects_fuse_emulator_Machines"];
+ attributes[@"net_sourceforge_projects_fuse_emulator_Machines"] = @[[NSString stringWithFormat:@"%s (Issue 1)",
+ libspectrum_machine_name(libspectrum_snap_machine(snap))]];
} else {
- [attributes setObject:[NSArray arrayWithObject:
- [NSString stringWithUTF8String:
- libspectrum_machine_name(libspectrum_snap_machine(snap))]]
- forKey:@"net_sourceforge_projects_fuse_emulator_Machines"];
+ attributes[@"net_sourceforge_projects_fuse_emulator_Machines"] = @[@(libspectrum_machine_name(libspectrum_snap_machine(snap)))];
}
if( libspectrum_snap_joystick_active_count( snap ) ) {
@@ -463,8 +441,7 @@
}
if( [peripherals count] ) {
- [attributes setObject:peripherals
- forKey:@"net_sourceforge_projects_fuse_emulator_Peripherals"];
+ attributes[@"net_sourceforge_projects_fuse_emulator_Peripherals"] = peripherals;
}
return error ? NO : YES;
@@ -560,16 +537,12 @@
return NO;
}
- [attributes setObject:[NSNumber numberWithInt:width]
- forKey:(NSString *)kMDItemPixelWidth];
- [attributes setObject:[NSNumber numberWithInt:192]
- forKey:(NSString *)kMDItemPixelHeight];
- [attributes setObject:[NSNumber numberWithInt:0]
- forKey:(NSString *)kMDItemOrientation];
- [attributes setObject:@"RGB" forKey:(NSString *)kMDItemColorSpace];
+ attributes[(NSString *)kMDItemPixelWidth] = @(width);
+ attributes[(NSString *)kMDItemPixelHeight] = @192;
+ attributes[(NSString *)kMDItemOrientation] = @0;
+ attributes[(NSString *)kMDItemColorSpace] = @"RGB";
- [attributes setObject:mode
- forKey:@"net_sourceforge_projects_fuse_emulator_GraphicsMode"];
+ attributes[@"net_sourceforge_projects_fuse_emulator_GraphicsMode"] = mode;
return YES;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
