mirror of https://github.com/ksherlock/ample.git
add -rewind support, increase size of media and slots
rewind saves the state before each step.
This commit is contained in:
parent
b58a859398
commit
139ab22f2a
|
@ -31,7 +31,7 @@
|
||||||
<autoresizingMask key="autoresizingMask"/>
|
<autoresizingMask key="autoresizingMask"/>
|
||||||
<subviews>
|
<subviews>
|
||||||
<customView id="P9d-sS-qEb" customClass="FlippedView">
|
<customView id="P9d-sS-qEb" customClass="FlippedView">
|
||||||
<rect key="frame" x="302" y="105" width="316" height="363"/>
|
<rect key="frame" x="302" y="105" width="326" height="363"/>
|
||||||
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
|
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
|
||||||
</customView>
|
</customView>
|
||||||
<tabView initialItem="zUN-Qs-haG" id="l8R-bg-6Zm">
|
<tabView initialItem="zUN-Qs-haG" id="l8R-bg-6Zm">
|
||||||
|
@ -237,6 +237,17 @@
|
||||||
<binding destination="-2" name="selectedTag" keyPath="self.mameSpeed" id="nFG-yA-KC1"/>
|
<binding destination="-2" name="selectedTag" keyPath="self.mameSpeed" id="nFG-yA-KC1"/>
|
||||||
</connections>
|
</connections>
|
||||||
</popUpButton>
|
</popUpButton>
|
||||||
|
<button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="knB-Rn-1Cm">
|
||||||
|
<rect key="frame" x="15" y="40" width="67" height="18"/>
|
||||||
|
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
|
||||||
|
<buttonCell key="cell" type="check" title="Rewind" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="Y7b-jN-HCc">
|
||||||
|
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
|
||||||
|
<font key="font" metaFont="system"/>
|
||||||
|
</buttonCell>
|
||||||
|
<connections>
|
||||||
|
<binding destination="-2" name="value" keyPath="self.mameRewind" id="Hw5-n7-O27"/>
|
||||||
|
</connections>
|
||||||
|
</button>
|
||||||
</subviews>
|
</subviews>
|
||||||
</view>
|
</view>
|
||||||
</tabViewItem>
|
</tabViewItem>
|
||||||
|
@ -386,7 +397,7 @@
|
||||||
</connections>
|
</connections>
|
||||||
</tabView>
|
</tabView>
|
||||||
<customView fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="J9O-xI-P5J" customClass="FlippedView">
|
<customView fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="J9O-xI-P5J" customClass="FlippedView">
|
||||||
<rect key="frame" x="664" y="107" width="316" height="331"/>
|
<rect key="frame" x="654" y="107" width="326" height="331"/>
|
||||||
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
|
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
|
||||||
</customView>
|
</customView>
|
||||||
<scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" horizontalScrollElasticity="none" id="2ue-XT-byh">
|
<scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" horizontalScrollElasticity="none" id="2ue-XT-byh">
|
||||||
|
@ -424,7 +435,7 @@
|
||||||
</scroller>
|
</scroller>
|
||||||
</scrollView>
|
</scrollView>
|
||||||
<searchField wantsLayer="YES" verticalHuggingPriority="750" textCompletion="NO" id="pNl-g4-ZLh" customClass="AutocompleteControl">
|
<searchField wantsLayer="YES" verticalHuggingPriority="750" textCompletion="NO" id="pNl-g4-ZLh" customClass="AutocompleteControl">
|
||||||
<rect key="frame" x="664" y="446" width="316" height="22"/>
|
<rect key="frame" x="654" y="446" width="326" height="22"/>
|
||||||
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
|
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
|
||||||
<searchFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" borderStyle="bezel" placeholderString="Software List" usesSingleLineMode="YES" bezelStyle="round" id="sMi-a3-XEn">
|
<searchFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" borderStyle="bezel" placeholderString="Software List" usesSingleLineMode="YES" bezelStyle="round" id="sMi-a3-XEn">
|
||||||
<font key="font" metaFont="system"/>
|
<font key="font" metaFont="system"/>
|
||||||
|
|
|
@ -49,6 +49,7 @@ static NSString *kContextMachine = @"kContextMachine";
|
||||||
@property BOOL mameMouse;
|
@property BOOL mameMouse;
|
||||||
@property BOOL mameSamples;
|
@property BOOL mameSamples;
|
||||||
@property BOOL mameBGFX;
|
@property BOOL mameBGFX;
|
||||||
|
@property BOOL mameRewind;
|
||||||
|
|
||||||
@property BOOL mameAVI;
|
@property BOOL mameAVI;
|
||||||
@property BOOL mameWAV;
|
@property BOOL mameWAV;
|
||||||
|
@ -149,6 +150,7 @@ static int EffectsIndex(NSString *str) {
|
||||||
[self setMameSamples: NO];
|
[self setMameSamples: NO];
|
||||||
[self setMameSquarePixels: NO];
|
[self setMameSquarePixels: NO];
|
||||||
[self setMameDebug: NO];
|
[self setMameDebug: NO];
|
||||||
|
[self setMameRewind: NO];
|
||||||
[self setMameWindowMode: 1]; // default = 1x window.
|
[self setMameWindowMode: 1]; // default = 1x window.
|
||||||
|
|
||||||
[self setMameBackend: 0];
|
[self setMameBackend: 0];
|
||||||
|
@ -214,7 +216,7 @@ static void AddSubview(NSView *parent, NSView *child) {
|
||||||
//@"mameMachine", // - handled
|
//@"mameMachine", // - handled
|
||||||
@"mameSquarePixels", @"mameWindowMode",
|
@"mameSquarePixels", @"mameWindowMode",
|
||||||
@"mameMouse", @"mameSamples",
|
@"mameMouse", @"mameSamples",
|
||||||
@"mameDebug",
|
@"mameDebug", @"mameRewind",
|
||||||
@"mameSpeed",
|
@"mameSpeed",
|
||||||
@"mameAVI", @"mameAVIPath",
|
@"mameAVI", @"mameAVIPath",
|
||||||
@"mameWAV", @"mameWAVPath",
|
@"mameWAV", @"mameWAVPath",
|
||||||
|
@ -460,7 +462,7 @@ static NSString *ShellQuote(NSString *s) {
|
||||||
[argv addObject: @"-nosamples"];
|
[argv addObject: @"-nosamples"];
|
||||||
|
|
||||||
if (_mameDebug) [argv addObject: @"-debug"];
|
if (_mameDebug) [argv addObject: @"-debug"];
|
||||||
|
if (_mameRewind) [argv addObject: @"-rewind"];
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -874,6 +876,7 @@ static NSString *ShellQuote(NSString *s) {
|
||||||
#define _(a,b) n = [d objectForKey: a]; if ([n isKindOfClass: NumberClass]) [self b : [n boolValue]]
|
#define _(a,b) n = [d objectForKey: a]; if ([n isKindOfClass: NumberClass]) [self b : [n boolValue]]
|
||||||
|
|
||||||
_(@"debug", setMameDebug);
|
_(@"debug", setMameDebug);
|
||||||
|
_(@"rewind", setMameRewind);
|
||||||
_(@"squarePixels", setMameSquarePixels);
|
_(@"squarePixels", setMameSquarePixels);
|
||||||
_(@"mouse", setMameMouse);
|
_(@"mouse", setMameMouse);
|
||||||
_(@"samples", setMameSamples);
|
_(@"samples", setMameSamples);
|
||||||
|
@ -948,6 +951,7 @@ static NSString *ShellQuote(NSString *s) {
|
||||||
#define _(v,k) [dict setObject: v ? (NSObject *)kCFBooleanTrue : (NSObject *)kCFBooleanFalse forKey: k]
|
#define _(v,k) [dict setObject: v ? (NSObject *)kCFBooleanTrue : (NSObject *)kCFBooleanFalse forKey: k]
|
||||||
|
|
||||||
_(_mameDebug, @"debug");
|
_(_mameDebug, @"debug");
|
||||||
|
_(_mameRewind, @"rewind");
|
||||||
_(_mameSquarePixels, @"squarePixels");
|
_(_mameSquarePixels, @"squarePixels");
|
||||||
_(_mameMouse, @"mouse");
|
_(_mameMouse, @"mouse");
|
||||||
_(_mameSamples, @"samples");
|
_(_mameSamples, @"samples");
|
||||||
|
|
Loading…
Reference in New Issue