summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2013-07-09 08:55:41 +0000
committerSND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2013-07-09 08:55:41 +0000
commita2e6c179be60efa937f1f51a45c53919bb44083d (patch)
tree12b572eebb64e367294c315d0c43b8426d3c0ea0
parent59fabe735ceec97744859484ad4cd9c52f73d938 (diff)
downloadpcsxr-a2e6c179be60efa937f1f51a45c53919bb44083d.tar.gz
Some more work on PCSXR's logging on OS X.
More fiddling with the configuration window. git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@85935 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat
-rw-r--r--macosx/English.lproj/Configuration.xib225
-rwxr-xr-xmacosx/PcsxrController.h5
-rwxr-xr-xmacosx/PcsxrController.m5
-rwxr-xr-xmacosx/main.m95
4 files changed, 198 insertions, 132 deletions
diff --git a/macosx/English.lproj/Configuration.xib b/macosx/English.lproj/Configuration.xib
index 3f5ab45b..95b8d4cc 100644
--- a/macosx/English.lproj/Configuration.xib
+++ b/macosx/English.lproj/Configuration.xib
@@ -76,14 +76,14 @@
<string key="NSFrame">{{13, 10}, {525, 391}}</string>
<reference key="NSSuperview" ref="644483536"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="494923943"/>
+ <reference key="NSNextKeyView" ref="309207255"/>
<array class="NSMutableArray" key="NSTabViewItems">
<object class="NSTabViewItem" id="150404821">
<object class="NSMutableString" key="NSIdentifier">
<characters key="NS.bytes">1</characters>
</object>
<object class="NSView" key="NSView" id="309207255">
- <nil key="NSNextResponder"/>
+ <reference key="NSNextResponder" ref="145760790"/>
<int key="NSvFlags">256</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="NSBox" id="324328678">
@@ -97,12 +97,13 @@
<object class="NSMatrix" id="260387224">
<reference key="NSNextResponder" ref="501435377"/>
<int key="NSvFlags">274</int>
- <string key="NSFrame">{{20, 41}, {135, 128}}</string>
+ <string key="NSFrame">{{20, 42}, {135, 172}}</string>
<reference key="NSSuperview" ref="501435377"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="197815183"/>
<bool key="NSEnabled">YES</bool>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- <int key="NSNumRows">6</int>
+ <int key="NSNumRows">8</int>
<int key="NSNumCols">1</int>
<array class="NSMutableArray" key="NSCells">
<object class="NSButtonCell" id="1001969866">
@@ -243,6 +244,34 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
+ <object class="NSButtonCell" id="772916223">
+ <int key="NSCellFlags">67108864</int>
+ <int key="NSCellFlags2">0</int>
+ <string key="NSContents">Logging</string>
+ <reference key="NSSupport" ref="113129670"/>
+ <reference key="NSControlView" ref="260387224"/>
+ <int key="NSTag">-1</int>
+ <int key="NSButtonFlags">1211912448</int>
+ <int key="NSButtonFlags2">2</int>
+ <reference key="NSAlternateImage" ref="890331736"/>
+ <string key="NSAlternateContents"/>
+ <int key="NSPeriodicDelay">200</int>
+ <int key="NSPeriodicInterval">25</int>
+ </object>
+ <object class="NSButtonCell" id="85343827">
+ <int key="NSCellFlags">-2080374784</int>
+ <int key="NSCellFlags2">0</int>
+ <string key="NSContents">Fast boot</string>
+ <reference key="NSSupport" ref="113129670"/>
+ <reference key="NSControlView" ref="260387224"/>
+ <int key="NSTag">-1</int>
+ <int key="NSButtonFlags">1211912448</int>
+ <int key="NSButtonFlags2">2</int>
+ <reference key="NSAlternateImage" ref="890331736"/>
+ <string key="NSAlternateContents"/>
+ <int key="NSPeriodicDelay">200</int>
+ <int key="NSPeriodicInterval">25</int>
+ </object>
</array>
<string key="NSCellSize">{135, 18}</string>
<string key="NSIntercellSpacing">{4, 4}</string>
@@ -315,9 +344,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
<object class="NSPopUpButton" id="197815183">
<reference key="NSNextResponder" ref="501435377"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{17, 9}, {137, 26}}</string>
+ <int key="NSvFlags">290</int>
+ <string key="NSFrame">{{19, 10}, {137, 26}}</string>
<reference key="NSSuperview" ref="501435377"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="715888890"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="27092767">
@@ -425,13 +455,15 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
</array>
- <string key="NSFrame">{{2, 2}, {175, 179}}</string>
+ <string key="NSFrame">{{2, 2}, {175, 224}}</string>
<reference key="NSSuperview" ref="324328678"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="260387224"/>
</object>
</array>
- <string key="NSFrame">{{17, 143}, {179, 196}}</string>
+ <string key="NSFrame">{{17, 98}, {179, 241}}</string>
<reference key="NSSuperview" ref="309207255"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="501435377"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
@@ -476,6 +508,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<int key="NSvFlags">306</int>
<string key="NSFrame">{{18, 16}, {238, 40}}</string>
<reference key="NSSuperview" ref="593482660"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="776429699"/>
<bool key="NSEnabled">YES</bool>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
@@ -543,11 +576,13 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</array>
<string key="NSFrame">{{2, 2}, {273, 74}}</string>
<reference key="NSSuperview" ref="715888890"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="263292685"/>
</object>
</array>
<string key="NSFrame">{{212, 248}, {277, 91}}</string>
<reference key="NSSuperview" ref="309207255"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="593482660"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
@@ -580,7 +615,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{18, 16}, {232, 40}}</string>
<reference key="NSSuperview" ref="584348218"/>
- <reference key="NSNextKeyView" ref="145760790"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView"/>
<bool key="NSEnabled">YES</bool>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<int key="NSNumRows">2</int>
@@ -682,11 +718,13 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</array>
<string key="NSFrame">{{2, 2}, {273, 74}}</string>
<reference key="NSSuperview" ref="776429699"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="874213588"/>
</object>
</array>
- <string key="NSFrame">{{212, 143}, {277, 91}}</string>
+ <string key="NSFrame">{{212, 98}, {277, 91}}</string>
<reference key="NSSuperview" ref="309207255"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="584348218"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
@@ -708,6 +746,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
</array>
<string key="NSFrame">{{10, 33}, {505, 345}}</string>
+ <reference key="NSSuperview" ref="145760790"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="324328678"/>
</object>
<string key="NSLabel">Emulation</string>
@@ -719,7 +759,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<characters key="NS.bytes">2</characters>
</object>
<object class="NSView" key="NSView" id="494923943">
- <reference key="NSNextResponder" ref="145760790"/>
+ <nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="NSBox" id="30192545">
@@ -743,7 +783,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<int key="NSvFlags">259</int>
<string key="NSFrame">{{98, 7}, {111, 28}}</string>
<reference key="NSSuperview" ref="674673083"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="23337545"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="1054541347">
@@ -769,7 +808,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<int key="NSvFlags">262</int>
<string key="NSFrame">{{9, 7}, {90, 28}}</string>
<reference key="NSSuperview" ref="674673083"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="659624019"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="299254513">
@@ -795,7 +833,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<int key="NSvFlags">258</int>
<string key="NSFrame">{{11, 35}, {196, 26}}</string>
<reference key="NSSuperview" ref="674673083"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="857424577"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="170522740">
@@ -846,13 +883,11 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</array>
<string key="NSFrame">{{2, 2}, {218, 73}}</string>
<reference key="NSSuperview" ref="711664786"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="983879338"/>
</object>
</array>
<string key="NSFrame">{{13, 200}, {222, 90}}</string>
<reference key="NSSuperview" ref="613304714"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="674673083"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
@@ -885,7 +920,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<int key="NSvFlags">259</int>
<string key="NSFrame">{{98, 7}, {111, 28}}</string>
<reference key="NSSuperview" ref="451090636"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="490231628"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="175241227">
@@ -915,7 +949,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<int key="NSvFlags">262</int>
<string key="NSFrame">{{9, 7}, {90, 28}}</string>
<reference key="NSSuperview" ref="451090636"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="1060851478"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="449658334">
@@ -941,7 +974,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<int key="NSvFlags">258</int>
<string key="NSFrame">{{11, 35}, {196, 26}}</string>
<reference key="NSSuperview" ref="451090636"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="921855531"/>
<int key="NSTag">1</int>
<bool key="NSEnabled">YES</bool>
@@ -993,13 +1025,11 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</array>
<string key="NSFrame">{{2, 2}, {218, 73}}</string>
<reference key="NSSuperview" ref="23337545"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="184922838"/>
</object>
</array>
<string key="NSFrame">{{256, 200}, {222, 90}}</string>
<reference key="NSSuperview" ref="613304714"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="451090636"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
@@ -1032,7 +1062,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<int key="NSvFlags">259</int>
<string key="NSFrame">{{98, 7}, {111, 28}}</string>
<reference key="NSSuperview" ref="408048101"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="695086223"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="554603770">
@@ -1058,7 +1087,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<int key="NSvFlags">262</int>
<string key="NSFrame">{{9, 7}, {90, 28}}</string>
<reference key="NSSuperview" ref="408048101"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="255294672"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="154903563">
@@ -1084,7 +1112,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<int key="NSvFlags">258</int>
<string key="NSFrame">{{11, 35}, {196, 26}}</string>
<reference key="NSSuperview" ref="408048101"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="132376695"/>
<int key="NSTag">2</int>
<bool key="NSEnabled">YES</bool>
@@ -1136,13 +1163,11 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</array>
<string key="NSFrame">{{2, 2}, {218, 73}}</string>
<reference key="NSSuperview" ref="490231628"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="1001529761"/>
</object>
</array>
<string key="NSFrame">{{13, 106}, {222, 90}}</string>
<reference key="NSSuperview" ref="613304714"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="408048101"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
@@ -1175,7 +1200,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<int key="NSvFlags">259</int>
<string key="NSFrame">{{98, 7}, {111, 28}}</string>
<reference key="NSSuperview" ref="143420558"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="721006038"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="933521081">
@@ -1201,7 +1225,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<int key="NSvFlags">262</int>
<string key="NSFrame">{{9, 7}, {90, 28}}</string>
<reference key="NSSuperview" ref="143420558"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="986737125"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="773749244">
@@ -1227,7 +1250,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<int key="NSvFlags">258</int>
<string key="NSFrame">{{11, 35}, {196, 26}}</string>
<reference key="NSSuperview" ref="143420558"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="181214375"/>
<int key="NSTag">2</int>
<bool key="NSEnabled">YES</bool>
@@ -1278,13 +1300,11 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</array>
<string key="NSFrame">{{2, 2}, {218, 73}}</string>
<reference key="NSSuperview" ref="950422833"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="99318986"/>
</object>
</array>
<string key="NSFrame">{{13, 12}, {222, 90}}</string>
<reference key="NSSuperview" ref="613304714"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="143420558"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
@@ -1317,7 +1337,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<int key="NSvFlags">259</int>
<string key="NSFrame">{{98, 7}, {111, 28}}</string>
<reference key="NSSuperview" ref="221272233"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="950422833"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="350454119">
@@ -1343,7 +1362,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<int key="NSvFlags">262</int>
<string key="NSFrame">{{9, 7}, {90, 28}}</string>
<reference key="NSSuperview" ref="221272233"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="701329658"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="268195893">
@@ -1369,7 +1387,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<int key="NSvFlags">258</int>
<string key="NSFrame">{{11, 35}, {196, 26}}</string>
<reference key="NSSuperview" ref="221272233"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="495555989"/>
<int key="NSTag">3</int>
<bool key="NSEnabled">YES</bool>
@@ -1421,13 +1438,11 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</array>
<string key="NSFrame">{{2, 2}, {218, 73}}</string>
<reference key="NSSuperview" ref="695086223"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="169562785"/>
</object>
</array>
<string key="NSFrame">{{256, 106}, {222, 90}}</string>
<reference key="NSSuperview" ref="613304714"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="221272233"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
@@ -1460,7 +1475,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<int key="NSvFlags">259</int>
<string key="NSFrame">{{98, 7}, {111, 28}}</string>
<reference key="NSSuperview" ref="693248790"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="905819877">
@@ -1486,7 +1500,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<int key="NSvFlags">262</int>
<string key="NSFrame">{{9, 7}, {90, 28}}</string>
<reference key="NSSuperview" ref="693248790"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="155594978"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="774833876">
@@ -1512,7 +1525,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<int key="NSvFlags">258</int>
<string key="NSFrame">{{11, 35}, {196, 26}}</string>
<reference key="NSSuperview" ref="693248790"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="524369892"/>
<int key="NSTag">2</int>
<bool key="NSEnabled">YES</bool>
@@ -1564,13 +1576,11 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</array>
<string key="NSFrame">{{2, 2}, {218, 73}}</string>
<reference key="NSSuperview" ref="721006038"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="341120868"/>
</object>
</array>
<string key="NSFrame">{{256, 12}, {222, 90}}</string>
<reference key="NSSuperview" ref="613304714"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="693248790"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
@@ -1593,13 +1603,11 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</array>
<string key="NSFrameSize">{491, 293}</string>
<reference key="NSSuperview" ref="30192545"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="711664786"/>
</object>
</array>
<string key="NSFrame">{{7, 49}, {491, 293}}</string>
<reference key="NSSuperview" ref="494923943"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="613304714"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
@@ -1621,8 +1629,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
</array>
<string key="NSFrame">{{10, 33}, {505, 345}}</string>
- <reference key="NSSuperview" ref="145760790"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="30192545"/>
</object>
<string key="NSLabel">Plugins</string>
@@ -1918,6 +1924,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<int key="NSvFlags">289</int>
<string key="NSFrame">{{380, 6}, {93, 32}}</string>
<reference key="NSSuperview" ref="782866499"/>
+ <reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:687</string>
<int key="NSTag">2</int>
<bool key="NSEnabled">YES</bool>
@@ -2102,7 +2109,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSButton" id="195305356">
<reference key="NSNextResponder" ref="958294119"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{-3, 314}, {121, 32}}</string>
+ <string key="NSFrame">{{11, 314}, {121, 32}}</string>
<reference key="NSSuperview" ref="958294119"/>
<reference key="NSNextKeyView" ref="911328747"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
@@ -2129,7 +2136,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSTextField" id="911328747">
<reference key="NSNextResponder" ref="958294119"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{120, 320}, {310, 22}}</string>
+ <string key="NSFrame">{{134, 320}, {310, 22}}</string>
<reference key="NSSuperview" ref="958294119"/>
<reference key="NSNextKeyView" ref="168188758"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
@@ -2160,7 +2167,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSButton" id="168188758">
<reference key="NSNextResponder" ref="958294119"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{-3, 284}, {121, 32}}</string>
+ <string key="NSFrame">{{11, 284}, {121, 32}}</string>
<reference key="NSSuperview" ref="958294119"/>
<reference key="NSNextKeyView" ref="823878691"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
@@ -2187,7 +2194,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSTextField" id="823878691">
<reference key="NSNextResponder" ref="958294119"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{120, 290}, {310, 22}}</string>
+ <string key="NSFrame">{{134, 290}, {310, 22}}</string>
<reference key="NSSuperview" ref="958294119"/>
<reference key="NSNextKeyView" ref="795957481"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
@@ -2213,7 +2220,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSButton" id="795957481">
<reference key="NSNextResponder" ref="958294119"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{-3, 252}, {121, 32}}</string>
+ <string key="NSFrame">{{11, 252}, {121, 32}}</string>
<reference key="NSSuperview" ref="958294119"/>
<reference key="NSNextKeyView" ref="341191480"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
@@ -2240,7 +2247,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSTextField" id="341191480">
<reference key="NSNextResponder" ref="958294119"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{120, 259}, {310, 22}}</string>
+ <string key="NSFrame">{{134, 259}, {310, 22}}</string>
<reference key="NSSuperview" ref="958294119"/>
<reference key="NSNextKeyView" ref="659547625"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
@@ -2266,7 +2273,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSButton" id="659547625">
<reference key="NSNextResponder" ref="958294119"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{-3, 220}, {121, 32}}</string>
+ <string key="NSFrame">{{11, 220}, {121, 32}}</string>
<reference key="NSSuperview" ref="958294119"/>
<reference key="NSNextKeyView" ref="364881091"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
@@ -2293,7 +2300,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSTextField" id="364881091">
<reference key="NSNextResponder" ref="958294119"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{120, 227}, {310, 22}}</string>
+ <string key="NSFrame">{{134, 227}, {310, 22}}</string>
<reference key="NSSuperview" ref="958294119"/>
<reference key="NSNextKeyView" ref="246038820"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
@@ -2319,7 +2326,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSButton" id="246038820">
<reference key="NSNextResponder" ref="958294119"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{-3, 188}, {121, 32}}</string>
+ <string key="NSFrame">{{11, 188}, {121, 32}}</string>
<reference key="NSSuperview" ref="958294119"/>
<reference key="NSNextKeyView" ref="1072290452"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
@@ -2346,7 +2353,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSTextField" id="1072290452">
<reference key="NSNextResponder" ref="958294119"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{120, 195}, {310, 22}}</string>
+ <string key="NSFrame">{{134, 195}, {310, 22}}</string>
<reference key="NSSuperview" ref="958294119"/>
<reference key="NSNextKeyView" ref="860331374"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
@@ -2372,7 +2379,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSButton" id="860331374">
<reference key="NSNextResponder" ref="958294119"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{-3, 156}, {121, 32}}</string>
+ <string key="NSFrame">{{11, 156}, {121, 32}}</string>
<reference key="NSSuperview" ref="958294119"/>
<reference key="NSNextKeyView" ref="205239960"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
@@ -2399,7 +2406,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSTextField" id="205239960">
<reference key="NSNextResponder" ref="958294119"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{120, 164}, {310, 22}}</string>
+ <string key="NSFrame">{{134, 164}, {310, 22}}</string>
<reference key="NSSuperview" ref="958294119"/>
<reference key="NSNextKeyView" ref="32956648"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
@@ -2449,7 +2456,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSTextField" id="267389414">
<reference key="NSNextResponder" ref="958294119"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{0, 125}, {113, 17}}</string>
+ <string key="NSFrame">{{14, 125}, {113, 17}}</string>
<reference key="NSSuperview" ref="958294119"/>
<reference key="NSNextKeyView" ref="465452774"/>
<string key="NSReuseIdentifierKey">_NS:1535</string>
@@ -2469,9 +2476,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSPopUpButton" id="465452774">
<reference key="NSNextResponder" ref="958294119"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{117, 119}, {153, 26}}</string>
+ <string key="NSFrame">{{131, 119}, {153, 26}}</string>
<reference key="NSSuperview" ref="958294119"/>
- <reference key="NSNextKeyView" ref="145760790"/>
+ <reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="465026198">
@@ -2555,13 +2562,13 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<reference key="NSTabView" ref="145760790"/>
</object>
</array>
- <reference key="NSSelectedTabViewItem" ref="869045919"/>
+ <reference key="NSSelectedTabViewItem" ref="150404821"/>
<reference key="NSFont" ref="113129670"/>
<int key="NSTvFlags">0</int>
<bool key="NSAllowTruncatedLabels">YES</bool>
<bool key="NSDrawsBackground">YES</bool>
<array class="NSMutableArray" key="NSSubviews">
- <reference ref="494923943"/>
+ <reference ref="309207255"/>
</array>
</object>
</array>
@@ -2576,7 +2583,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<bool key="NSWindowIsRestorable">YES</bool>
</object>
<object class="NSView" id="128798333">
- <reference key="NSNextResponder"/>
+ <nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="NSBox" id="369120847">
@@ -2600,7 +2607,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</set>
<string key="NSFrame">{{65, 79}, {48, 48}}</string>
<reference key="NSSuperview" ref="873539094"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="534715842"/>
<string key="NSReuseIdentifierKey">_NS:2141</string>
<bool key="NSEnabled">YES</bool>
@@ -2625,7 +2631,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<int key="NSvFlags">266</int>
<string key="NSFrame">{{0, 54}, {178, 17}}</string>
<reference key="NSSuperview" ref="873539094"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="938529027"/>
<string key="NSReuseIdentifierKey">_NS:3944</string>
<bool key="NSEnabled">YES</bool>
@@ -2646,7 +2651,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<int key="NSvFlags">266</int>
<string key="NSFrame">{{0, 29}, {178, 17}}</string>
<reference key="NSSuperview" ref="873539094"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="462204898"/>
<string key="NSReuseIdentifierKey">_NS:3944</string>
<bool key="NSEnabled">YES</bool>
@@ -2667,8 +2671,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<int key="NSvFlags">266</int>
<string key="NSFrame">{{0, 7}, {178, 14}}</string>
<reference key="NSSuperview" ref="873539094"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:3944</string>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="809754268">
@@ -2697,7 +2699,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<int key="NSvFlags">274</int>
<string key="NSFrame">{{2, 5}, {20, 14}}</string>
<reference key="NSSuperview" ref="534715842"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="979844614"/>
<string key="NSReuseIdentifierKey">_NS:1535</string>
<bool key="NSEnabled">YES</bool>
@@ -2716,7 +2717,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</array>
<string key="NSFrame">{{89, 103}, {24, 24}}</string>
<reference key="NSSuperview" ref="873539094"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="370252462"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<string key="NSClassName">MemBadgeView</string>
@@ -2724,14 +2724,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</array>
<string key="NSFrameSize">{179, 130}</string>
<reference key="NSSuperview" ref="369120847"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="547270477"/>
<string key="NSReuseIdentifierKey">_NS:11</string>
</object>
</array>
<string key="NSFrameSize">{179, 130}</string>
<reference key="NSSuperview" ref="128798333"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="873539094"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<string key="NSOffsets">{0, 0}</string>
@@ -2760,8 +2758,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
</array>
<string key="NSFrameSize">{180, 130}</string>
- <reference key="NSSuperview"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="369120847"/>
</object>
<object class="NSCollectionViewItem" id="1047165271"/>
@@ -3059,6 +3055,38 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
+ <string key="label">noFastBootCell</string>
+ <reference key="source" ref="974938689"/>
+ <reference key="destination" ref="85343827"/>
+ </object>
+ <int key="connectionID">1280</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">consoleOutputCell</string>
+ <reference key="source" ref="974938689"/>
+ <reference key="destination" ref="772916223"/>
+ </object>
+ <int key="connectionID">1281</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">setCheckbox:</string>
+ <reference key="source" ref="974938689"/>
+ <reference key="destination" ref="772916223"/>
+ </object>
+ <int key="connectionID">1282</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">setCheckboxInverse:</string>
+ <reference key="source" ref="974938689"/>
+ <reference key="destination" ref="85343827"/>
+ </object>
+ <int key="connectionID">1283</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
<string key="label">delegate</string>
<reference key="source" ref="379363543"/>
<reference key="destination" ref="974938689"/>
@@ -3996,6 +4024,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<reference ref="1001969866"/>
<reference ref="322742106"/>
<reference ref="874223654"/>
+ <reference ref="772916223"/>
+ <reference ref="85343827"/>
</array>
<reference key="parent" ref="324328678"/>
</object>
@@ -4167,21 +4197,21 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<int key="objectID">656</int>
<reference key="object" ref="958294119"/>
<array class="NSMutableArray" key="children">
+ <reference ref="32956648"/>
<reference ref="195305356"/>
<reference ref="911328747"/>
+ <reference ref="168188758"/>
+ <reference ref="823878691"/>
<reference ref="795957481"/>
+ <reference ref="341191480"/>
<reference ref="659547625"/>
- <reference ref="246038820"/>
- <reference ref="860331374"/>
<reference ref="364881091"/>
+ <reference ref="246038820"/>
<reference ref="1072290452"/>
- <reference ref="341191480"/>
+ <reference ref="860331374"/>
<reference ref="205239960"/>
- <reference ref="32956648"/>
<reference ref="267389414"/>
<reference ref="465452774"/>
- <reference ref="823878691"/>
- <reference ref="168188758"/>
</array>
<reference key="parent" ref="185355004"/>
<string key="objectName">Hotkey View</string>
@@ -5127,6 +5157,16 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<reference key="object" ref="1054541347"/>
<reference key="parent" ref="659624019"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">1278</int>
+ <reference key="object" ref="772916223"/>
+ <reference key="parent" ref="260387224"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">1279</int>
+ <reference key="object" ref="85343827"/>
+ <reference key="parent" ref="260387224"/>
+ </object>
</array>
</object>
<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -5136,6 +5176,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string key="1021.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="1047.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="1048.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="1278.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="1279.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="21.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSMutableDictionary" key="238.IBAttributePlaceholdersKey">
@@ -5397,7 +5439,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
- <int key="maxID">1277</int>
+ <int key="maxID">1283</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -5614,27 +5656,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
</object>
<object class="IBPartialClassDescription">
- <string key="className">NSCollectionViewItem</string>
- <dictionary class="NSMutableDictionary" key="outlets">
- <string key="imageView">NSImageView</string>
- <string key="textField">NSTextField</string>
- </dictionary>
- <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
- <object class="IBToOneOutletInfo" key="imageView">
- <string key="name">imageView</string>
- <string key="candidateClassName">NSImageView</string>
- </object>
- <object class="IBToOneOutletInfo" key="textField">
- <string key="name">textField</string>
- <string key="candidateClassName">NSTextField</string>
- </object>
- </dictionary>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">./Classes/NSCollectionViewItem.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
<string key="className">PcsxrMemCardController</string>
<string key="superclassName">NSViewController</string>
<dictionary class="NSMutableDictionary" key="actions">
diff --git a/macosx/PcsxrController.h b/macosx/PcsxrController.h
index 8688cde6..8bf7b3c3 100755
--- a/macosx/PcsxrController.h
+++ b/macosx/PcsxrController.h
@@ -9,6 +9,7 @@
@class CheatController;
void ShowHelpAndExit(FILE* output, int exitCode) __dead2;
+void CloseEmuLog();
@interface PcsxrController : NSObject <NSApplicationDelegate>
{
@@ -16,8 +17,8 @@ void ShowHelpAndExit(FILE* output, int exitCode) __dead2;
CheatController *cheatController;
PluginList *pluginList;
- IBOutlet NSWindow *preferenceWindow;
- IBOutlet NSWindow *cheatWindow;
+ NSWindow *preferenceWindow;
+ NSWindow *cheatWindow;
IBOutlet RecentItemsMenu *recentItems;
struct _PSXflags {
diff --git a/macosx/PcsxrController.m b/macosx/PcsxrController.m
index 76b8589d..dfcf9b1e 100755
--- a/macosx/PcsxrController.m
+++ b/macosx/PcsxrController.m
@@ -339,6 +339,11 @@ void ShowHelpAndExit(FILE* output, int exitCode)
self.skipFiles = nil;
}
+- (void)applicationWillTerminate:(NSNotification *)notification
+{
+ CloseEmuLog();
+}
+
static void ParseErrorStr(NSString *errStr) __dead2;
static void ParseErrorStr(NSString *errStr)
{
diff --git a/macosx/main.m b/macosx/main.m
index 10724075..76a08abf 100755
--- a/macosx/main.m
+++ b/macosx/main.m
@@ -22,6 +22,36 @@ static BOOL sysInited = NO;
//#define EMU_LOG
static IOPMAssertionID powerAssertion = kIOPMNullAssertionID;
+static void LoadEmuLog()
+{
+ if (emuLog == NULL) {
+#ifdef EMU_LOG
+#ifndef LOG_STDOUT
+ NSFileManager *manager = [NSFileManager defaultManager];
+ NSURL *supportURL = [manager URLForDirectory:NSLibraryDirectory inDomain:NSUserDomainMask appropriateForURL:nil create:YES error:NULL];
+ NSURL *logFolderURL = [supportURL URLByAppendingPathComponent:@"Logs/PCSXR"];
+ if (![logFolderURL checkResourceIsReachableAndReturnError:NULL])
+ [manager createDirectoryAtPath:[logFolderURL path] withIntermediateDirectories:YES attributes:nil error:NULL];
+ //We use the log extension so that OS X's console app can open it by default.
+ NSURL *logFileURL = [logFolderURL URLByAppendingPathComponent:@"emuLog.log"];
+
+ emuLog = fopen([[logFileURL path] fileSystemRepresentation],"wb");
+#else
+ emuLog = stdout;
+#endif
+ setvbuf(emuLog, NULL, _IONBF, 0);
+#endif
+ }
+}
+
+void CloseEmuLog()
+{
+ if (emuLog != NULL) {
+ fclose(emuLog);
+ emuLog = NULL;
+ }
+}
+
int main(int argc, const char *argv[]) {
if ( argc >= 2 && strncmp (argv[1], "-psn", 4) == 0 ) {
char parentdir[MAXPATHLEN];
@@ -57,47 +87,34 @@ int main(int argc, const char *argv[]) {
if (getenv("DISPLAY") == NULL)
setenv("DISPLAY", ":0.0", 0); // Default to first local display
+ LoadEmuLog();
+
return NSApplicationMain(argc, argv);
}
int SysInit() {
if (!sysInited) {
-#ifdef EMU_LOG
-#ifndef LOG_STDOUT
- NSFileManager *manager = [NSFileManager defaultManager];
- NSURL *supportURL = [manager URLForDirectory:NSLibraryDirectory inDomain:NSUserDomainMask appropriateForURL:nil create:YES error:NULL];
- NSURL *logFolderURL = [supportURL URLByAppendingPathComponent:@"Logs/PCSXR"];
- if (![logFolderURL checkResourceIsReachableAndReturnError:NULL])
- [manager createDirectoryAtPath:[logFolderURL path] withIntermediateDirectories:YES attributes:nil error:NULL];
- //We use the log extension so that OS X's console app can open it by default.
- NSURL *logFileURL = [logFolderURL URLByAppendingPathComponent:@"emuLog.log"];
-
- emuLog = fopen([[logFileURL path] fileSystemRepresentation],"wb");
-#else
- emuLog = stdout;
-#endif
- setvbuf(emuLog, NULL, _IONBF, 0);
-#endif
-
+ LoadEmuLog();
+
if (EmuInit() != 0)
return -1;
-
+
sysInited = YES;
}
-
+
if (LoadPlugins() == -1) {
return -1;
}
-
+
LoadMcds(Config.Mcd1, Config.Mcd2);
-
+
IOReturn success = IOPMAssertionCreateWithName(kIOPMAssertionTypeNoDisplaySleep, kIOPMAssertionLevelOn, CFSTR("PSX Emu Running"), &powerAssertion);
if (success != kIOReturnSuccess) {
SysPrintf("Unable to stop sleep, error code %d", success);
}
-
- attachHotkeys();
-
+
+ attachHotkeys();
+
return 0;
}
@@ -106,6 +123,20 @@ void SysReset() {
//EmuReset();
}
+#ifdef EMU_LOG
+#ifndef LOG_STDOUT
+static NSDateFormatter* debugDateFormatter()
+{
+ static NSDateFormatter* theFormatter = nil;
+ if (theFormatter == nil) {
+ theFormatter = [[NSDateFormatter alloc] init];
+ [theFormatter setDateFormat:@"yyyy-MM-dd HH:mm:ss:SSS"];
+ }
+ return theFormatter;
+}
+#endif
+#endif
+
void SysPrintf(const char *fmt, ...) {
va_list list;
char msg[512];
@@ -117,7 +148,8 @@ void SysPrintf(const char *fmt, ...) {
if (Config.PsxOut) printf ("%s", msg);
#ifdef EMU_LOG
#ifndef LOG_STDOUT
- fprintf(emuLog, "%s", msg);
+ fprintf(emuLog, "%s %s: %s",[[debugDateFormatter() stringFromDate:[NSDate date]] UTF8String],
+ [[[NSBundle mainBundle]objectForInfoDictionaryKey:@"CFBundleName"] UTF8String], msg);
#endif
#endif
}
@@ -134,6 +166,12 @@ void SysMessage(const char *fmt, ...) {
NSDictionary *userInfo = [NSDictionary dictionaryWithObject:msg forKey:NSLocalizedFailureReasonErrorKey];
RELEASEOBJ(msg);
dispatch_sync(dispatch_get_main_queue(), ^{
+#ifdef EMU_LOG
+#ifndef LOG_STDOUT
+ fprintf(emuLog, "%s %s: %s",[[debugDateFormatter() stringFromDate:[NSDate date]] UTF8String],
+ [[[NSBundle mainBundle]objectForInfoDictionaryKey:@"CFBundleName"] UTF8String], [msg UTF8String]);
+#endif
+#endif
[NSApp presentError:[NSError errorWithDomain:@"Unknown Domain" code:-1 userInfo:userInfo]];
});
}
@@ -192,8 +230,8 @@ void SysClose() {
powerAssertion = kIOPMNullAssertionID;
}
- if (emuLog != NULL) fclose(emuLog);
-
+ //CloseEmuLog();
+
sysInited = NO;
detachHotkeys();
@@ -207,7 +245,8 @@ void SysClose() {
void OnFile_Exit() {
SysClose();
- exit(0);
+ CloseEmuLog();
+ [NSApp stop:nil];
}
char* Pcsxr_locale_text(char* toloc){
generated by cgit v1.2.3 (git 2.39.1) at 2026-06-14 21:35:41 +0000