Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Mountain lion tweaks

  • Loading branch information...
commit fbdb8ebb8dde344f288e599692317b3d49b7b50b 1 parent 3c5e324
@DisplayCast authored
Showing with 2,509 additions and 7,310 deletions.
  1. +88 −49 DisplayCast.xcworkspace/xcuserdata/chandra.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist
  2. +6 −4 Faunus/Faunus.xcodeproj/project.pbxproj
  3. +7 −4 OSX/Archiver/ArchiverAppDelegate.m
  4. +7 −7 OSX/Archiver/en.lproj/ArchiverMenu.xib
  5. +10 −7 OSX/Faunus/Faunus.m
  6. +9 −1 OSX/FaunusTest/main.m
  7. +3 −3 OSX/Faunusd/NameServer.m
  8. +5 −2 OSX/Faunusd/main.m
  9. +4 −2 OSX/OSX.xcodeproj/project.pbxproj
  10. +3 −0  OSX/Player/PlayerAppDelegate.h
  11. +34 −28 OSX/Player/PlayerAppDelegate.m
  12. +12 −2 OSX/Streamer/Streamer.m
  13. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/DDASLLogger.o
  14. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/DDAbstractDatabaseLogger.o
  15. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/DDFileLogger.o
  16. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/DDList.o
  17. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/DDLog.o
  18. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/DDTTYLogger.dia
  19. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/DDTTYLogger.o
  20. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/GCDAsyncSocket.dia
  21. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/GCDAsyncSocket.o
  22. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/GCDMulticastDelegate.o
  23. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/GetUniqueID.o
  24. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/HTTPServer.o
  25. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/LibIDN.o
  26. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/MenuEntry.o
  27. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/NSData+XMPP.o
  28. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/NSDate+XMPPDateTimeProfiles.o
  29. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/NSNumber+XMPP.o
  30. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/NSXMLElement+XMPP.o
  31. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/RFImageToDataTransformer.o
  32. +3 −0  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/Streamer.d
  33. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/Streamer.o
  34. +3 −0  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/StreamerAppDelegate.d
  35. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/StreamerAppDelegate.o
  36. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/TCPServer.o
  37. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/TURNSocket.dia
  38. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/TURNSocket.o
  39. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPAutoPing.o
  40. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPAutoTime.o
  41. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPCapabilities-CF61672052E53E51.o
  42. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPCapabilitiesCoreDataStorage.o
  43. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPCapsCoreDataStorageObject.o
  44. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPCapsResourceCoreDataStorageObject.o
  45. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPCoreDataStorage.o
  46. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPDateTimeProfiles.o
  47. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPDigestAuthentication.o
  48. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPElement+Delay.o
  49. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPElement.o
  50. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPGroupCoreDataStorageObject.o
  51. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPIDTracker.o
  52. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPIQ+JabberRPC.dia
  53. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPIQ+JabberRPC.o
  54. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPIQ+JabberRPCResonse.o
  55. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPIQ.o
  56. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPJID.o
  57. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPJabberRPCModule.o
  58. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPMessage+XEP0045.o
  59. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPMessage.o
  60. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPModule.o
  61. +3 −3 OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPParser.d
  62. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPParser.o
  63. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPPing.o
  64. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPPresence.o
  65. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPPubSub.o
  66. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPReconnect.o
  67. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPResourceCoreDataStorageObject.o
  68. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPResourceMemoryStorage.o
  69. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPRoom.o
  70. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPRoomOccupant.o
  71. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPRoster-41CECBB75B243A41.o
  72. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPRosterCoreDataStorage.o
  73. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPRosterMemoryStorage.o
  74. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPSRVResolver.o
  75. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPStream.dia
  76. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPStream.o
  77. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPTime.o
  78. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPTransports.o
  79. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPUserCoreDataStorageObject.o
  80. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPUserMemoryStorage.o
  81. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPXFacebookPlatformAuthentication.o
  82. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPvCardAvatarCoreDataStorageObject.o
  83. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPvCardAvatarModule.o
  84. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPvCardCoreDataStorage.o
  85. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPvCardCoreDataStorageObject.o
  86. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPvCardTemp.o
  87. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPvCardTempAdr.o
  88. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPvCardTempAdrTypes.o
  89. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPvCardTempBase.o
  90. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPvCardTempCoreDataStorageObject.o
  91. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPvCardTempEmail.o
  92. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPvCardTempLabel.o
  93. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPvCardTempModule.o
  94. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPvCardTempTel.o
  95. BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/main.o
  96. +12 −12 OSX/build/OSX.build/Release/Streamer.build/StaticAnalyzer/normal/x86_64/GCDMulticastDelegate.plist
  97. +444 −212 OSX/build/OSX.build/Release/Streamer.build/StaticAnalyzer/normal/x86_64/NSData+XMPP.plist
  98. +2 −2 OSX/build/OSX.build/Release/Streamer.build/StaticAnalyzer/normal/x86_64/NSXMLElement+XMPP.plist
  99. +3 −0  OSX/build/OSX.build/Release/Streamer.build/StaticAnalyzer/normal/x86_64/Streamer.d
  100. +3 −0  OSX/build/OSX.build/Release/Streamer.build/StaticAnalyzer/normal/x86_64/StreamerAppDelegate.d
  101. +0 −182 ...build/OSX.build/Release/Streamer.build/StaticAnalyzer/normal/x86_64/XMPPCapabilities-CF61672052E53E51.plist
  102. +3 −3 OSX/build/OSX.build/Release/Streamer.build/StaticAnalyzer/normal/x86_64/XMPPParser.d
  103. +36 −36 OSX/build/OSX.build/Release/Streamer.build/StaticAnalyzer/normal/x86_64/XMPPvCardTemp.plist
  104. BIN  OSX/build/OSX.build/Release/Streamer.build/Streamer-project-headers.hmap
  105. +169 −342 OSX/build/OSX.build/Release/Streamer.build/Streamer.dep
  106. BIN  OSX/build/OSX.build/Release/Streamer.build/Streamer.hmap
  107. +1,613 −6,390 OSX/build/OSX.build/Release/Streamer.build/build-state.dat
  108. +6 −6 OSX/build/Release/Streamer.app/Contents/Info.plist
  109. BIN  OSX/build/Release/Streamer.app/Contents/MacOS/Streamer
  110. BIN  OSX/build/Release/Streamer.app/Contents/Resources/XMPPCapabilities.mom
  111. BIN  OSX/build/Release/Streamer.app/Contents/Resources/XMPPRoster.mom
  112. BIN  OSX/build/Release/Streamer.app/Contents/Resources/XMPPvCard.momd/XMPPvCard.mom
  113. BIN  OSX/build/Release/Streamer.app/Contents/Resources/XMPPvCard.momd/XMPPvCard.omo
  114. BIN  OSX/build/Release/Streamer.app/Contents/Resources/en.lproj/StreamerMenu.nib
  115. +5 −5 OSX/build/Release/Streamer.app/Contents/_CodeSignature/CodeResources
  116. +15 −7 iOS/Player/phoneWindow.xib
  117. +1 −1  iOS/iOS.xcodeproj/project.pbxproj
View
137 DisplayCast.xcworkspace/xcuserdata/chandra.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist
@@ -884,8 +884,8 @@
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1109"
endingLineNumber = "1109"
- landmarkName = "-receiveFromService:"
- landmarkType = "5">
+ landmarkName = "@implementation PlayerAppDelegate"
+ landmarkType = "3">
</FileBreakpoint>
<FileBreakpoint
shouldBeEnabled = "No"
@@ -897,8 +897,8 @@
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1106"
endingLineNumber = "1106"
- landmarkName = "@implementation PlayerAppDelegate"
- landmarkType = "3">
+ landmarkName = "-updateKey:andNSNetService:"
+ landmarkType = "5">
</FileBreakpoint>
<FileBreakpoint
shouldBeEnabled = "No"
@@ -970,11 +970,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "OSX/Player/PlayerAppDelegate.m"
- timestampString = "363833322.203363"
+ timestampString = "366843854.532278"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "1317"
- endingLineNumber = "1317"
+ startingLineNumber = "1321"
+ endingLineNumber = "1321"
landmarkName = "-receiveFromService:"
landmarkType = "5">
</FileBreakpoint>
@@ -983,11 +983,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "OSX/Player/PlayerAppDelegate.m"
- timestampString = "363833322.203363"
+ timestampString = "366843854.532278"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "1393"
- endingLineNumber = "1393"
+ startingLineNumber = "1397"
+ endingLineNumber = "1397"
landmarkName = "-receiveFromService:"
landmarkType = "5">
</FileBreakpoint>
@@ -1035,11 +1035,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "OSX/Streamer/Streamer.m"
- timestampString = "363820327.52141"
+ timestampString = "366849577.333373"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "537"
- endingLineNumber = "537"
+ startingLineNumber = "547"
+ endingLineNumber = "547"
landmarkName = "streamListeningSocketCallback()"
landmarkType = "7">
</FileBreakpoint>
@@ -1527,11 +1527,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "OSX/Faunusd/main.m"
- timestampString = "362539069.756996"
+ timestampString = "366239258.019629"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "48"
- endingLineNumber = "48"
+ startingLineNumber = "51"
+ endingLineNumber = "51"
landmarkName = "main()"
landmarkType = "7">
</FileBreakpoint>
@@ -1553,11 +1553,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "OSX/Faunus/Faunus.m"
- timestampString = "362958922.090963"
+ timestampString = "366238900.502606"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "102"
- endingLineNumber = "102"
+ startingLineNumber = "105"
+ endingLineNumber = "105"
landmarkName = "-createName:publicP:"
landmarkType = "5">
</FileBreakpoint>
@@ -1579,11 +1579,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "OSX/Faunus/Faunus.m"
- timestampString = "362958922.090963"
+ timestampString = "366238900.502606"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "90"
- endingLineNumber = "90"
+ startingLineNumber = "93"
+ endingLineNumber = "93"
landmarkName = "-whiteboardRequest:"
landmarkType = "5">
</FileBreakpoint>
@@ -1592,11 +1592,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "OSX/FaunusTest/main.m"
- timestampString = "363048557.555257"
+ timestampString = "366237142.636369"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "103"
- endingLineNumber = "103"
+ startingLineNumber = "111"
+ endingLineNumber = "111"
landmarkName = "main()"
landmarkType = "7">
</FileBreakpoint>
@@ -1631,11 +1631,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "OSX/Faunus/Faunus.m"
- timestampString = "363820327.52141"
+ timestampString = "366238900.502606"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "263"
- endingLineNumber = "263"
+ startingLineNumber = "266"
+ endingLineNumber = "266"
landmarkName = "-addAttr:andValue:forName:"
landmarkType = "5">
</FileBreakpoint>
@@ -1644,11 +1644,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "OSX/Faunus/Faunus.m"
- timestampString = "363820327.52141"
+ timestampString = "366238900.502606"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "284"
- endingLineNumber = "284"
+ startingLineNumber = "287"
+ endingLineNumber = "287"
landmarkName = "-addAttr:andValue:forName:"
landmarkType = "5">
</FileBreakpoint>
@@ -1657,11 +1657,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "OSX/FaunusTest/main.m"
- timestampString = "363048557.555257"
+ timestampString = "366237142.636369"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "31"
- endingLineNumber = "31"
+ startingLineNumber = "39"
+ endingLineNumber = "39"
landmarkName = "main()"
landmarkType = "7">
</FileBreakpoint>
@@ -1670,11 +1670,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "OSX/Faunus/Faunus.m"
- timestampString = "363820327.52141"
+ timestampString = "366238900.502606"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "436"
- endingLineNumber = "436"
+ startingLineNumber = "439"
+ endingLineNumber = "439"
landmarkName = "-listAttrs:"
landmarkType = "5">
</FileBreakpoint>
@@ -1748,11 +1748,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "OSX/Faunus/Faunus.m"
- timestampString = "363820327.52141"
+ timestampString = "366238900.502606"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "461"
- endingLineNumber = "461"
+ startingLineNumber = "464"
+ endingLineNumber = "464"
landmarkName = "-mergeToWallet:"
landmarkType = "5">
</FileBreakpoint>
@@ -1813,11 +1813,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "OSX/Faunus/Faunus.m"
- timestampString = "363820327.52141"
+ timestampString = "366238900.502606"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "527"
- endingLineNumber = "527"
+ startingLineNumber = "530"
+ endingLineNumber = "530"
landmarkName = "-cloneCapability:"
landmarkType = "5">
</FileBreakpoint>
@@ -1852,11 +1852,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "OSX/Streamer/Streamer.m"
- timestampString = "363818305.185646"
+ timestampString = "366849577.333373"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "347"
- endingLineNumber = "347"
+ startingLineNumber = "357"
+ endingLineNumber = "357"
landmarkName = "-init"
landmarkType = "5">
</FileBreakpoint>
@@ -1865,11 +1865,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "OSX/Streamer/Streamer.m"
- timestampString = "363818393.079129"
+ timestampString = "366849577.333373"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "386"
- endingLineNumber = "386"
+ startingLineNumber = "396"
+ endingLineNumber = "396"
landmarkName = "-init"
landmarkType = "5">
</FileBreakpoint>
@@ -1886,5 +1886,44 @@
landmarkName = "-menuNeedsUpdate:"
landmarkType = "5">
</FileBreakpoint>
+ <FileBreakpoint
+ shouldBeEnabled = "No"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ filePath = "OSX/Faunus/Faunus.m"
+ timestampString = "366247509.351077"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "12"
+ endingLineNumber = "12"
+ landmarkName = "@implementation Faunus"
+ landmarkType = "3">
+ </FileBreakpoint>
+ <FileBreakpoint
+ shouldBeEnabled = "No"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ filePath = "OSX/Streamer/Streamer.m"
+ timestampString = "366849577.333373"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "360"
+ endingLineNumber = "360"
+ landmarkName = "-init"
+ landmarkType = "5">
+ </FileBreakpoint>
+ <FileBreakpoint
+ shouldBeEnabled = "No"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ filePath = "OSX/Streamer/Streamer.m"
+ timestampString = "366849577.333373"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "350"
+ endingLineNumber = "350"
+ landmarkName = "-init"
+ landmarkType = "5">
+ </FileBreakpoint>
</FileBreakpoints>
</Bucket>
View
10 Faunus/Faunus.xcodeproj/project.pbxproj
@@ -13,7 +13,6 @@
761768FD15A3B13100AE8553 /* Wallet.h in Resources */ = {isa = PBXBuildFile; fileRef = 761768F115A3B13100AE8553 /* Wallet.h */; };
7617690015A3B13100AE8553 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 761768F515A3B13100AE8553 /* InfoPlist.strings */; };
7617690115A3B13100AE8553 /* Faunus-Prefix.pch in Resources */ = {isa = PBXBuildFile; fileRef = 761768F615A3B13100AE8553 /* Faunus-Prefix.pch */; };
- 7663C11C15A435A60026704F /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7663C11B15A435A60026704F /* libsqlite3.dylib */; };
767EAD9615A3B88D00B956C0 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7617690815A3B16A00AE8553 /* Foundation.framework */; };
767EADA515A3B90F00B956C0 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 767EADA415A3B90F00B956C0 /* main.m */; };
767EADAE15A3BA6E00B956C0 /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 767EADAD15A3BA6E00B956C0 /* CoreData.framework */; };
@@ -167,7 +166,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- 7663C11C15A435A60026704F /* libsqlite3.dylib in Frameworks */,
76BDE78E15A3B32100BDB261 /* Foundation.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -638,7 +636,9 @@
"$(inherited)",
"\"$(SRCROOT)/../../hiredis\"",
);
+ MACOSX_DEPLOYMENT_TARGET = 10.7;
PRODUCT_NAME = "$(TARGET_NAME)";
+ SDKROOT = macosx;
VERSIONING_SYSTEM = "apple-generic";
};
name = Debug;
@@ -656,7 +656,9 @@
"$(inherited)",
"\"$(SRCROOT)/../../hiredis\"",
);
+ MACOSX_DEPLOYMENT_TARGET = 10.7;
PRODUCT_NAME = "$(TARGET_NAME)";
+ SDKROOT = macosx;
VERSIONING_SYSTEM = "apple-generic";
};
name = Release;
@@ -668,7 +670,7 @@
DSTROOT = /tmp/Faunus_iOS.dst;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "../OSX/Faunus/Faunus-iOS-Prefix.pch";
- IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 5.1;
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
@@ -684,7 +686,7 @@
DSTROOT = /tmp/Faunus_iOS.dst;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "../OSX/Faunus/Faunus-iOS-Prefix.pch";
- IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 5.1;
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
View
11 OSX/Archiver/ArchiverAppDelegate.m
@@ -690,10 +690,13 @@ - (void)receiveFromService:(NSNetService *)ns {
NSLog(@"Setting window of size %dx%d", width, height);
pWidth = width;
pHeight = height;
- // winData = calloc(width * height, sizeof(UInt32));
- updateData = malloc(width * height * sizeof(UInt32)); // Allocate once and reuse
- tmpUpdateData = malloc(width * height * sizeof(UInt32)); // Needed for bitmap encoding
-
+
+ // Xcode was giving a warning for this
+ // updateData = malloc(width * height * sizeof(UInt32)); // Allocate once and reuse
+ // tmpUpdateData = (UInt8 *)malloc(width * height * sizeof(UInt32)); // Needed for bitmap encoding
+ updateData = [[NSMutableData dataWithLength:(width * height * sizeof(UInt32))] mutableBytes];
+ tmpUpdateData = [[NSMutableData dataWithLength:(width * height * sizeof(UInt32))] mutableBytes];
+
NSDictionary *keys = [NSNetService dictionaryFromTXTRecordData:[ns TXTRecordData]];
NSData *data = [keys objectForKey:@"name"];
NSString *name = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
View
14 OSX/Archiver/en.lproj/ArchiverMenu.xib
@@ -2,13 +2,13 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1070</int>
- <string key="IBDocument.SystemVersion">12A206j</string>
- <string key="IBDocument.InterfaceBuilderVersion">2507</string>
- <string key="IBDocument.AppKitVersion">1172.1</string>
- <string key="IBDocument.HIToolboxVersion">613.00</string>
+ <string key="IBDocument.SystemVersion">12B13</string>
+ <string key="IBDocument.InterfaceBuilderVersion">2549</string>
+ <string key="IBDocument.AppKitVersion">1187</string>
+ <string key="IBDocument.HIToolboxVersion">624.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">2507</string>
+ <string key="NS.object.0">2549</string>
</object>
<array key="IBDocument.IntegratedClassDependencies">
<string>NSArrayController</string>
@@ -837,14 +837,14 @@
<object class="NSShadow" key="NSViewShadow">
<reference key="NSShadowColor" ref="789625297"/>
</object>
- <int key="NSsFlags">723505</int>
+ <int key="NSsFlags">199217</int>
<reference key="NSVScroller" ref="1033161357"/>
<reference key="NSHScroller" ref="895246025"/>
<reference key="NSContentView" ref="480856763"/>
<bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
<double key="NSMinMagnification">0.25</double>
<double key="NSMaxMagnification">4</double>
- <double key="NMagnification">1</double>
+ <double key="NSMagnification">1</double>
</object>
<object class="NSTextField" id="711059427">
<reference key="NSNextResponder" ref="275471549"/>
View
17 OSX/Faunus/Faunus.m
@@ -9,8 +9,11 @@
#include "faunusGlobals.h"
@implementation Faunus
-NSString *const kFaunusdServerandPort = @"127.0.0.1:9999";
-NSString *const kWhiteBoardServerandPort = @"127.0.0.1:8888";
+ // NSString *const kFaunusdServerandPort = @"127.0.0.1:9999";
+NSString *const kFaunusdServerandPort = @"192.168.22.69:9999";
+
+ // NSString *const kWhiteBoardServerandPort = @"127.0.0.1:8888";
+NSString *const kWhiteBoardServerandPort = @"192.168.22.69:8888";
Wallet *personalWallet;
@@ -32,7 +35,7 @@ - (id) init {
*/
- (NSString *)urlEncode:(NSString *)yourString {
- return ((NSString *)CFBridgingRelease(CFURLCreateStringByAddingPercentEscapes(NULL, (CFStringRef)yourString, NULL, NULL, kCFStringEncodingUTF8)));
+ return ((NSString *)CFBridgingRelease(CFURLCreateStringByAddingPercentEscapes(NULL, (__bridge CFStringRef)yourString, NULL, NULL, kCFStringEncodingUTF8)));
}
/*!
@@ -182,7 +185,7 @@ - (NSMutableArray *)listChildren:(NSString *)nm {
if (dict == nil) {
NSLog(@"FAUNUSD server down?");
- return NO;
+ return nil;
}
NSNumber *status = [dict objectForKey:@"status"];
@@ -331,7 +334,7 @@ - (NSString *) getAttr:(NSString *)key forName:(NSString *)nm {
if (dict == nil) {
NSLog(@"FAUNUSD server down?");
- return NO;
+ return nil;
}
NSNumber *status = [dict objectForKey:@"status"];
@@ -430,7 +433,7 @@ - (NSMutableArray *)listAttrs:(NSString *)nm {
if (dict == nil) {
NSLog(@"FAUNUSD server down?");
- return NO;
+ return nil;
}
NSNumber *status = [dict objectForKey:@"status"];
@@ -611,7 +614,7 @@ - (BOOL) registerName:(NSString *)nm withType:(NSString *)type {
switch ([status intValue]) {
case faunusSUCCESS: {
- NSLog(@"DEBUG: Published in white board");
+ // NSLog(@"DEBUG: Published in white board");
return YES;
}
View
10 OSX/FaunusTest/main.m
@@ -15,8 +15,16 @@ int main(int argc, const char * argv[]) {
@autoreleasepool {
Faunus *fn = [[Faunus alloc] init];
+ NSString *nm;
- NSString *nm = [fn createName:@"streamer" publicP:YES];
+ NSDate *methodStart = [NSDate date];
+ for (int i = 0; i < 1000; i++)
+ nm = [fn createName:@"streamer" publicP:NO];
+ NSDate *methodFinish = [NSDate date];
+ NSTimeInterval executionTime = [methodFinish timeIntervalSinceDate:methodStart];
+ NSLog(@"Created in: %fs %@", executionTime/1000, nm);
+
+ return 0;
NSMutableArray *names = [fn browseLocal:@"streamer"];
NSLog(@"Found: %ld streamers", [names count]);
View
6 OSX/Faunusd/NameServer.m
@@ -918,7 +918,7 @@ - (void) dumpDB {
#ifdef USE_REDIS
- (redisReply *)issueCommand: (NSString *)command {
- NSLog(@"Issuing: %@", command);
+ // NSLog(@"Issuing: %@", command);
redisReply *reply = redisCommand(rContext, [command UTF8String]);
if (reply == NULL) {
@@ -1103,7 +1103,7 @@ - (redisReply *) storeRedisName: (redisName *)rn {
NSData *json = [NSJSONSerialization dataWithJSONObject:jsonDict options:0 error:&error];
NSString *jsonStr = [[NSString alloc] initWithData:json encoding:NSUTF8StringEncoding];
- NSLog(@"DEBUG: Storing JSON object %@", jsonStr);
+ // NSLog(@"DEBUG: Storing JSON object %@", jsonStr);
redisReply *reply = redisCommand(rContext, "SET %s %s", [[rn id] UTF8String], [jsonStr UTF8String]);
if (reply == NULL)
@@ -1144,7 +1144,7 @@ - (void) HTTPConnection:connection didReceiveRequest:(HTTPServerRequest *)mess {
id responseObj = nil;
- NSLog(@"Command is: %@", command);
+ // NSLog(@"Command is: %@", command);
if ([command localizedCaseInsensitiveCompare:@"/CREATENAME"] == NSOrderedSame) {
responseObj = [self createName];
View
7 OSX/Faunusd/main.m
@@ -7,9 +7,12 @@
#include <unistd.h>
-#define REDIS_SERVER "127.0.0.1"
+ // #define REDIS_SERVER "127.0.0.1"
+ // #define REDIS_SERVER "192.168.25.158" // "redis.xcloud.fxpal.net"
+#define REDIS_SERVER "192.168.22.69" // mac mini i7
+
#define REDIS_PORT 6379
-#define REDIS_DB 0
+#define REDIS_DB 6
int main(int argc, char * const argv[]) {
int ch;
View
6 OSX/OSX.xcodeproj/project.pbxproj
@@ -1994,12 +1994,13 @@
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/Utilities/xmppframework/Vendor/libidn\"",
+ "\"$(SYSTEM_APPS_DIR)/Xcode45-DP4.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS5.1.sdk/usr/lib\"",
);
MACOSX_DEPLOYMENT_TARGET = 10.6;
ONLY_ACTIVE_ARCH = NO;
OTHER_LDFLAGS = "-lxml2";
PRODUCT_NAME = "$(TARGET_NAME)";
- SDKROOT = macosx;
+ SDKROOT = macosx10.7;
WRAPPER_EXTENSION = app;
};
name = Debug;
@@ -2026,12 +2027,13 @@
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/Utilities/xmppframework/Vendor/libidn\"",
+ "\"$(SYSTEM_APPS_DIR)/Xcode45-DP4.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS5.1.sdk/usr/lib\"",
);
MACOSX_DEPLOYMENT_TARGET = 10.6;
ONLY_ACTIVE_ARCH = NO;
OTHER_LDFLAGS = "-lxml2";
PRODUCT_NAME = "$(TARGET_NAME)";
- SDKROOT = macosx;
+ SDKROOT = macosx10.7;
WRAPPER_EXTENSION = app;
};
name = Release;
View
3  OSX/Player/PlayerAppDelegate.h
@@ -29,6 +29,7 @@
NSOperationQueue * _queue;
NSString *myUniqueID;
+ NSString *_playerID;
NSStatusItem *trayItem;
@@ -68,6 +69,8 @@
@property (nonatomic, retain, readonly ) NSArray * sortDescriptors;
@property (nonatomic, copy, readonly ) NSString * serviceName;
+@property (retain) NSString *playerID;
+
@property (nonatomic, retain) Faunus *faunus;
@end
View
62 OSX/Player/PlayerAppDelegate.m
@@ -25,6 +25,8 @@
#include <sys/time.h>
#include <zlib.h>
+#include <stdlib.h>
+
@interface PlayerAppDelegate () <NSNetServiceBrowserDelegate, NSNetServiceDelegate, NSWindowDelegate>
@property (nonatomic, retain, readwrite) NSNetServiceBrowser * browser;
@@ -33,8 +35,6 @@ @interface PlayerAppDelegate () <NSNetServiceBrowserDelegate, NSNetServiceDelega
@property (nonatomic, copy, readwrite) NSString * serviceName;
@property (nonatomic, copy, readonly ) NSString * defaultServiceName;
-@property (nonatomic, retain) NSString * playerID;
-
// forward declarations
- (void)receiveFromService:(NSNetService *)service;
@@ -53,7 +53,7 @@ @implementation PlayerAppDelegate
@synthesize servicesArray = _servicesArray;
@synthesize browser = _browser;
-@synthesize playerID;
+@synthesize playerID = _playerID;
// Generating the Windows from the XIB file.
@synthesize rw0;
@@ -502,22 +502,23 @@ - (void)applicationDidFinishLaunching:(NSNotification *)notification {
// Register our service with Bonjour.
in_port_t chosenPort = [self createServerSocketWithAcceptCallBack:ListeningSocketCallback];
- playerID = [[NSUserDefaults standardUserDefaults] stringForKey:myUniqueID];
- if (playerID == nil) { // First time
- playerID = [faunus createName:PLAYER publicP:YES]; // Try Faunus
+ _playerID = [[NSUserDefaults standardUserDefaults] stringForKey:myUniqueID];
+ if (_playerID == nil) { // First time
+ _playerID = (NSString *)[faunus createName:PLAYER publicP:YES]; // Try Faunus
// Faunus was successful
- if (playerID != nil) {
- [[NSUserDefaults standardUserDefaults] setObject:playerID forKey:myUniqueID];
- [[NSUserDefaults standardUserDefaults] synchronize];
- } else { // Create a temporary ID - will be replaced the next time we contact Faunus service
+ if (_playerID == nil) {
+ // Create a temporary ID - will be replaced the next time we contact Faunus service
CFUUIDRef uuidObj = CFUUIDCreate(nil);
CFStringRef uidStr = CFUUIDCreateString(nil, uuidObj);
[[NSUserDefaults standardUserDefaults] setObject:(id)uidStr forKey:myUniqueID];
CFRelease(uidStr);
CFRelease(uuidObj);
- playerID = [[NSUserDefaults standardUserDefaults] objectForKey:myUniqueID];
+ _playerID = [[NSUserDefaults standardUserDefaults] stringForKey:myUniqueID];
+ } else {
+ [[NSUserDefaults standardUserDefaults] setObject:_playerID forKey:myUniqueID];
+ [[NSUserDefaults standardUserDefaults] synchronize];
}
NSString *nm = NSFullUserName();
@@ -533,7 +534,7 @@ - (void)applicationDidFinishLaunching:(NSNotification *)notification {
NSMutableArray *names = [faunus browseLocal:PLAYER];
for (NSString *name in names) {
- if ([name isEqualToString:playerID]) {
+ if ([name isEqualToString:_playerID]) {
known = YES;
break;
@@ -541,17 +542,17 @@ - (void)applicationDidFinishLaunching:(NSNotification *)notification {
}
if (known == NO) {
- playerID = [faunus createName:PLAYER publicP:YES];
+ _playerID = [faunus createName:PLAYER publicP:YES];
// Faunus was successful
- if (playerID != nil) {
- [[NSUserDefaults standardUserDefaults] setObject:playerID forKey:myUniqueID];
+ if (_playerID != nil) {
+ [[NSUserDefaults standardUserDefaults] setObject:_playerID forKey:myUniqueID];
[[NSUserDefaults standardUserDefaults] synchronize];
}
// The -Name component is reused
}
}
- assert(playerID != nil);
+ assert(_playerID != nil);
#ifdef OLD
if (playerID == nil) { // Generate a new player ID
@@ -573,7 +574,7 @@ - (void)applicationDidFinishLaunching:(NSNotification *)notification {
#endif /* OLD */
// Register ourselves in Bonjour
- netService = [[NSNetService alloc] initWithDomain:BONJOUR_DOMAIN type:PLAYER name:playerID port:chosenPort];
+ netService = [[NSNetService alloc] initWithDomain:BONJOUR_DOMAIN type:PLAYER name:_playerID port:chosenPort];
if (netService != nil) {
// Deprecated in 10.8
// SInt32 major, minor, bugfix;
@@ -598,7 +599,7 @@ - (void)applicationDidFinishLaunching:(NSNotification *)notification {
[netService setDelegate:self];
[netService publishWithOptions:NSNetServiceNoAutoRename];
- [faunus addAttrs:myKeys forName:playerID];
+ [faunus addAttrs:myKeys forName:_playerID];
#ifdef USE_BLUETOOTH
// This code used to work synchronously and then it was deprecated in 10.6 and now it just hangs when I compile in Lion+. Apple developer forum has no answer on why this fails!!
@@ -626,7 +627,7 @@ - (void) getBluetoothDeviceAddress {
[netService setTXTRecordData:[NSNetService dataFromTXTRecordDictionary:myKeys]];
- [faunus addAttrs:myKeys forName:playerID];
+ [faunus addAttrs:myKeys forName:_playerID];
}
#endif /* USE_BLUETOOTH */
@@ -1092,8 +1093,8 @@ - (void)updateKey:(NSWindow *)window andNSNetService: (NSNetService *)ns{
// NSRect geom = [window frame];
// NSLog(@"Window state changed");
- playerID = [[NSUserDefaults standardUserDefaults] stringForKey:myUniqueID];
- NSString *session = [[[NSString alloc] initWithFormat:@"%@ %@ %.0f %.0f %.0f %.0f %d %d", [ns name], playerID, geom.origin.x, geom.origin.y, geom.size.width, geom.size.height, ([window isMiniaturized] ? 1:0), ([window isZoomed] ? 1:0)] autorelease];
+ _playerID = [[NSUserDefaults standardUserDefaults] stringForKey:myUniqueID];
+ NSString *session = [[[NSString alloc] initWithFormat:@"%@ %@ %.0f %.0f %.0f %.0f %d %d", [ns name], _playerID, geom.origin.x, geom.origin.y, geom.size.width, geom.size.height, ([window isMiniaturized] ? 1:0), ([window isZoomed] ? 1:0)] autorelease];
NSString *myObjID = [[[NSString alloc] initWithFormat:@"%lu", [window hash]] autorelease];
[myKeys removeObjectForKey:myObjID];
@@ -1101,7 +1102,7 @@ - (void)updateKey:(NSWindow *)window andNSNetService: (NSNetService *)ns{
[netService setTXTRecordData:[NSNetService dataFromTXTRecordDictionary:myKeys]];
- [faunus addAttrs:myKeys forName:playerID];
+ [faunus addAttrs:myKeys forName:_playerID];
}
#pragma mark -
@@ -1112,7 +1113,7 @@ - (void)receiveFromService:(NSNetService *)ns {
@autoreleasepool {
UInt8 *receiveBuf = NULL; // Buffer for receiving network datagrams
UInt32 *winData = NULL; // Backing store for the window.
- int pWidth = -1, pHeight = -1; // Previous width and height to detect and perhaps
+ int pWidth = -1, pHeight = -1; // Previous width and height to detect and perhaps
unsigned int pmaskX = -1, pmaskY = -1, pmaskWidth = -1, pmaskHeight = -1;
UInt8 *updateData = NULL, *tmpUpdateData = NULL; // Buffer for receiving updates
@@ -1245,9 +1246,14 @@ - (void)receiveFromService:(NSNetService *)ns {
NSLog(@"Setting window of size %dx%d", width, height);
pWidth = width;
pHeight = height;
- // winData = calloc(width * height, sizeof(UInt32));
- updateData = malloc(width * height * sizeof(UInt32)); // Allocate once and reuse
- tmpUpdateData = malloc(width * height * sizeof(UInt32)); // Needed for bitmap encoding
+
+ // Xcode was warning that malloc is converted to a pointer of type UInt8 whih is incompatible with sizeof operarand type 'UInt32'. WTF
+ // updateData = malloc(width * height * sizeof(UInt32)); // Allocate once and reuse
+ // tmpUpdateData = malloc(width * height * sizeof(UInt32)); // Needed for bitmap encoding
+
+ updateData = [[NSMutableData dataWithLength:(width * height * sizeof(UInt32))] mutableBytes];
+ tmpUpdateData = [[NSMutableData dataWithLength:(width * height * sizeof(UInt32))] mutableBytes];
+
assert(updateData != NULL);
assert(tmpUpdateData != NULL);
@@ -1305,7 +1311,7 @@ - (void)receiveFromService:(NSNetService *)ns {
[netService setTXTRecordData:[NSNetService dataFromTXTRecordDictionary:myKeys]];
- [faunus addAttrs:myKeys forName:playerID];
+ [faunus addAttrs:myKeys forName:_playerID];
[self updateKey:window andNSNetService:ns];
@@ -1490,7 +1496,7 @@ - (void)windowWillClose:(NSNotification *)notification {
[myKeys removeObjectForKey:myID];
[netService setTXTRecordData:[NSNetService dataFromTXTRecordDictionary:myKeys]];
- [faunus addAttrs:myKeys forName:playerID];
+ [faunus addAttrs:myKeys forName:_playerID];
}
break;
}
View
14 OSX/Streamer/Streamer.m
@@ -213,7 +213,16 @@ void MyScreenRefreshCallback (CGRectCount count, const CGRect *rectArray, void *
w = rectArray[ind].size.width;
h = rectArray[ind].size.height;
}
-
+
+ if ((y+h) > height) {
+ continue;
+
+ // WTF. Noticed this in 10.8 (Mountain Lion). I guess these screen capture functions are deprecated. Even CGDisplayCreateImageForRect returns null
+ // CGImageRef *img = CGDisplayCreateImageForRect(CGMainDisplayID, rectArray[ind]);
+ // assert(img != nil);
+ }
+
+
UInt32 *transformStr = (UInt32 *)malloc((w * h + 5) * sizeof(UInt32));
UInt8 *bmPtr = (UInt8 *)transformStr + (5 * sizeof(UInt32)), *dataPtr = bmPtr + (w * h);
int bufSz = w * h + (5 * sizeof(UInt32));
@@ -227,6 +236,7 @@ void MyScreenRefreshCallback (CGRectCount count, const CGRect *rectArray, void *
for (unsigned int iy = 0; iy < h; iy++) {
for (unsigned int ix = 0; ix < w; ix++) {
int indx = ((int) width * (y + iy)) + (x + ix);
+
UInt32 prev = *(prevFramebufferData + indx);
UInt32 cur = *(curFramebufferData + indx);
@@ -394,7 +404,7 @@ - (id)init {
// The -Name component is reused
}
}
- assert(self.streamerID != nil);
+ assert(self.streamerID != nil); // Will fail when Faunus is completely unavailable
// NSString *myAddr = [[[NSString alloc] initWithCString:ma encoding:NSASCIIStringEncoding] autorelease];
// NSLog(@"Address: %@:%d. MaxPacketSize: %d Name: %@\n", myAddr, myPort, maxPacketSize, self.serviceName);
View
BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/DDASLLogger.o
Binary file not shown
View
BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/DDAbstractDatabaseLogger.o
Binary file not shown
View
BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/DDFileLogger.o
Binary file not shown
View
BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/DDList.o
Binary file not shown
View
BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/DDLog.o
Binary file not shown
View
BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/DDTTYLogger.dia
Binary file not shown
View
BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/DDTTYLogger.o
Binary file not shown
View
BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/GCDAsyncSocket.dia
Binary file not shown
View
BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/GCDAsyncSocket.o
Binary file not shown
View
BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/GCDMulticastDelegate.o
Binary file not shown
View
BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/GetUniqueID.o
Binary file not shown
View
BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/HTTPServer.o
Binary file not shown
View
BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/LibIDN.o
Binary file not shown
View
BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/MenuEntry.o
Binary file not shown
View
BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/NSData+XMPP.o
Binary file not shown
View
BIN  ...uild/OSX.build/Release/Streamer.build/Objects-normal/x86_64/NSDate+XMPPDateTimeProfiles.o
Binary file not shown
View
BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/NSNumber+XMPP.o
Binary file not shown
View
BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/NSXMLElement+XMPP.o
Binary file not shown
View
BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/RFImageToDataTransformer.o
Binary file not shown
View
3  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/Streamer.d
@@ -1,5 +1,8 @@
dependencies: /Users/chandra/Src/DisplayCast/OSX/Streamer/Streamer.m \
/Users/chandra/Src/DisplayCast/OSX/Streamer/Streamer.h \
+ /Users/chandra/Src/DisplayCast/OSX/../../../Library/Developer/Xcode/DerivedData/DisplayCast-dtyncjxorofroigmdowujhzfjtfw/Build/Products/Debug/Faunus.framework/Headers/Faunus.h \
+ /Users/chandra/Src/DisplayCast/OSX/../../../Library/Developer/Xcode/DerivedData/DisplayCast-dtyncjxorofroigmdowujhzfjtfw/Build/Products/Debug/Faunus.framework/Headers/Capabilities.h \
+ /Users/chandra/Src/DisplayCast/OSX/../../../Library/Developer/Xcode/DerivedData/DisplayCast-dtyncjxorofroigmdowujhzfjtfw/Build/Products/Debug/Faunus.framework/Headers/Wallet.h \
/Users/chandra/Src/DisplayCast/OSX/Shared/Globals.h \
/Users/chandra/Src/DisplayCast/OSX/Streamer/HTTPServer.h \
/Users/chandra/Src/DisplayCast/OSX/Streamer/TCPServer.h \
View
BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/Streamer.o
Binary file not shown
View
3  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/StreamerAppDelegate.d
@@ -3,6 +3,9 @@ dependencies: \
/Users/chandra/Src/DisplayCast/OSX/Streamer/MenuEntry.h \
/Users/chandra/Src/DisplayCast/OSX/Streamer/StreamerAppDelegate.h \
/Users/chandra/Src/DisplayCast/OSX/Streamer/Streamer.h \
+ /Users/chandra/Src/DisplayCast/OSX/../../../Library/Developer/Xcode/DerivedData/DisplayCast-dtyncjxorofroigmdowujhzfjtfw/Build/Products/Debug/Faunus.framework/Headers/Faunus.h \
+ /Users/chandra/Src/DisplayCast/OSX/../../../Library/Developer/Xcode/DerivedData/DisplayCast-dtyncjxorofroigmdowujhzfjtfw/Build/Products/Debug/Faunus.framework/Headers/Capabilities.h \
+ /Users/chandra/Src/DisplayCast/OSX/../../../Library/Developer/Xcode/DerivedData/DisplayCast-dtyncjxorofroigmdowujhzfjtfw/Build/Products/Debug/Faunus.framework/Headers/Wallet.h \
/Users/chandra/Src/DisplayCast/OSX/Shared/Globals.h \
/Users/chandra/Src/DisplayCast/OSX/Streamer/HTTPServer.h \
/Users/chandra/Src/DisplayCast/OSX/Streamer/TCPServer.h \
View
BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/StreamerAppDelegate.o
Binary file not shown
View
BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/TCPServer.o
Binary file not shown
View
BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/TURNSocket.dia
Binary file not shown
View
BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/TURNSocket.o
Binary file not shown
View
BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPAutoPing.o
Binary file not shown
View
BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPAutoTime.o
Binary file not shown
View
BIN  ...SX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPCapabilities-CF61672052E53E51.o
Binary file not shown
View
BIN  .../OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPCapabilitiesCoreDataStorage.o
Binary file not shown
View
BIN  ...ld/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPCapsCoreDataStorageObject.o
Binary file not shown
View
BIN  ...uild/Release/Streamer.build/Objects-normal/x86_64/XMPPCapsResourceCoreDataStorageObject.o
Binary file not shown
View
BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPCoreDataStorage.o
Binary file not shown
View
BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPDateTimeProfiles.o
Binary file not shown
View
BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPDigestAuthentication.o
Binary file not shown
View
BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPElement+Delay.o
Binary file not shown
View
BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPElement.o
Binary file not shown
View
BIN  ...d/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPGroupCoreDataStorageObject.o
Binary file not shown
View
BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPIDTracker.o
Binary file not shown
View
BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPIQ+JabberRPC.dia
Binary file not shown
View
BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPIQ+JabberRPC.o
Binary file not shown
View
BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPIQ+JabberRPCResonse.o
Binary file not shown
View
BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPIQ.o
Binary file not shown
View
BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPJID.o
Binary file not shown
View
BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPJabberRPCModule.o
Binary file not shown
View
BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPMessage+XEP0045.o
Binary file not shown
View
BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPMessage.o
Binary file not shown
View
BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPModule.o
Binary file not shown
View
6 OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPParser.d
@@ -3,6 +3,6 @@ dependencies: \
/Users/chandra/Src/DisplayCast/OSX/Utilities/xmppframework/Core/XMPPParser.h \
/Users/chandra/Src/DisplayCast/OSX/Utilities/xmppframework/Core/XMPPLogging.h \
/Users/chandra/Src/DisplayCast/OSX/Utilities/xmppframework/Vendor/CocoaLumberjack/DDLog.h \
- /Applications/Xcode44-DP5.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/usr/include/libxml2/libxml/parserInternals.h \
- /Applications/Xcode44-DP5.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/usr/include/libxml2/libxml/HTMLparser.h \
- /Applications/Xcode44-DP5.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/usr/include/libxml2/libxml/chvalid.h
+ /Applications/Xcode45-DP4.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/usr/include/libxml2/libxml/parserInternals.h \
+ /Applications/Xcode45-DP4.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/usr/include/libxml2/libxml/HTMLparser.h \
+ /Applications/Xcode45-DP4.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/usr/include/libxml2/libxml/chvalid.h
View
BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPParser.o
Binary file not shown
View
BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPPing.o
Binary file not shown
View
BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPPresence.o
Binary file not shown
View
BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPPubSub.o
Binary file not shown
View
BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPReconnect.o
Binary file not shown
View
BIN  ...SX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPResourceCoreDataStorageObject.o
Binary file not shown
View
BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPResourceMemoryStorage.o
Binary file not shown
View
BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPRoom.o
Binary file not shown
View
BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPRoomOccupant.o
Binary file not shown
View
BIN  ...uild/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPRoster-41CECBB75B243A41.o
Binary file not shown
View
BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPRosterCoreDataStorage.o
Binary file not shown
View
BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPRosterMemoryStorage.o
Binary file not shown
View
BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPSRVResolver.o
Binary file not shown
View
BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPStream.dia
Binary file not shown
View
BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPStream.o
Binary file not shown
View
BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPTime.o
Binary file not shown
View
BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPTransports.o
Binary file not shown
View
BIN  ...ld/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPUserCoreDataStorageObject.o
Binary file not shown
View
BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPUserMemoryStorage.o
Binary file not shown
View
BIN  ....build/Release/Streamer.build/Objects-normal/x86_64/XMPPXFacebookPlatformAuthentication.o
Binary file not shown
View
BIN  ...build/Release/Streamer.build/Objects-normal/x86_64/XMPPvCardAvatarCoreDataStorageObject.o
Binary file not shown
View
BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPvCardAvatarModule.o
Binary file not shown
View
BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPvCardCoreDataStorage.o
Binary file not shown
View
BIN  ...d/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPvCardCoreDataStorageObject.o
Binary file not shown
View
BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPvCardTemp.o
Binary file not shown
View
BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPvCardTempAdr.o
Binary file not shown
View
BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPvCardTempAdrTypes.o
Binary file not shown
View
BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPvCardTempBase.o
Binary file not shown
View
BIN  ...X.build/Release/Streamer.build/Objects-normal/x86_64/XMPPvCardTempCoreDataStorageObject.o
Binary file not shown
View
BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPvCardTempEmail.o
Binary file not shown
View
BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPvCardTempLabel.o
Binary file not shown
View
BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPvCardTempModule.o
Binary file not shown
View
BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/XMPPvCardTempTel.o
Binary file not shown
View
BIN  OSX/build/OSX.build/Release/Streamer.build/Objects-normal/x86_64/main.o
Binary file not shown
View
24 .../OSX.build/Release/Streamer.build/StaticAnalyzer/normal/x86_64/GCDMulticastDelegate.plist
@@ -25,7 +25,7 @@
</dict>
<dict>
<key>line</key><integer>398</integer>
- <key>col</key><integer>2</integer>
+ <key>col</key><integer>3</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
@@ -72,7 +72,7 @@
</dict>
<dict>
<key>line</key><integer>400</integer>
- <key>col</key><integer>3</integer>
+ <key>col</key><integer>14</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
@@ -93,7 +93,7 @@
</dict>
<dict>
<key>line</key><integer>400</integer>
- <key>col</key><integer>3</integer>
+ <key>col</key><integer>14</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
@@ -106,7 +106,7 @@
</dict>
<dict>
<key>line</key><integer>418</integer>
- <key>col</key><integer>3</integer>
+ <key>col</key><integer>4</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
@@ -127,7 +127,7 @@
</dict>
<dict>
<key>line</key><integer>418</integer>
- <key>col</key><integer>3</integer>
+ <key>col</key><integer>4</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
@@ -140,7 +140,7 @@
</dict>
<dict>
<key>line</key><integer>418</integer>
- <key>col</key><integer>7</integer>
+ <key>col</key><integer>10</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
@@ -161,7 +161,7 @@
</dict>
<dict>
<key>line</key><integer>418</integer>
- <key>col</key><integer>7</integer>
+ <key>col</key><integer>10</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
@@ -174,7 +174,7 @@
</dict>
<dict>
<key>line</key><integer>437</integer>
- <key>col</key><integer>3</integer>
+ <key>col</key><integer>8</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
@@ -195,7 +195,7 @@
</dict>
<dict>
<key>line</key><integer>437</integer>
- <key>col</key><integer>3</integer>
+ <key>col</key><integer>8</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
@@ -208,7 +208,7 @@
</dict>
<dict>
<key>line</key><integer>439</integer>
- <key>col</key><integer>3</integer>
+ <key>col</key><integer>11</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
@@ -229,7 +229,7 @@
</dict>
<dict>
<key>line</key><integer>439</integer>
- <key>col</key><integer>3</integer>
+ <key>col</key><integer>11</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
@@ -242,7 +242,7 @@
</dict>
<dict>
<key>line</key><integer>439</integer>
- <key>col</key><integer>44</integer>
+ <key>col</key><integer>20</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
View
656 OSX/build/OSX.build/Release/Streamer.build/StaticAnalyzer/normal/x86_64/NSData+XMPP.plist
@@ -25,7 +25,7 @@
</dict>
<dict>
<key>line</key><integer>99</integer>
- <key>col</key><integer>2</integer>
+ <key>col</key><integer>6</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
@@ -38,7 +38,7 @@
</dict>
<dict>
<key>line</key><integer>110</integer>
- <key>col</key><integer>2</integer>
+ <key>col</key><integer>6</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
@@ -59,7 +59,7 @@
</dict>
<dict>
<key>line</key><integer>110</integer>
- <key>col</key><integer>2</integer>
+ <key>col</key><integer>6</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
@@ -72,7 +72,7 @@
</dict>
<dict>
<key>line</key><integer>112</integer>
- <key>col</key><integer>3</integer>
+ <key>col</key><integer>4</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
@@ -93,7 +93,7 @@
</dict>
<dict>
<key>line</key><integer>112</integer>
- <key>col</key><integer>3</integer>
+ <key>col</key><integer>4</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
@@ -106,7 +106,7 @@
</dict>
<dict>
<key>line</key><integer>112</integer>
- <key>col</key><integer>7</integer>
+ <key>col</key><integer>12</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
@@ -114,6 +114,35 @@
</array>
</dict>
<dict>
+ <key>kind</key><string>event</string>
+ <key>location</key>
+ <dict>
+ <key>line</key><integer>112</integer>
+ <key>col</key><integer>7</integer>
+ <key>file</key><integer>0</integer>
+ </dict>
+ <key>ranges</key>
+ <array>
+ <array>
+ <dict>
+ <key>line</key><integer>112</integer>
+ <key>col</key><integer>7</integer>
+ <key>file</key><integer>0</integer>
+ </dict>
+ <dict>
+ <key>line</key><integer>112</integer>
+ <key>col</key><integer>23</integer>
+ <key>file</key><integer>0</integer>
+ </dict>
+ </array>
+ </array>
+ <key>depth</key><integer>0</integer>
+ <key>extended_message</key>
+ <string>Assuming &apos;ixtext&apos; is &lt; &apos;lentext&apos;</string>
+ <key>message</key>
+<string>Assuming &apos;ixtext&apos; is &lt; &apos;lentext&apos;</string>
+ </dict>
+ <dict>
<key>kind</key><string>control</string>
<key>edges</key>
<array>
@@ -127,7 +156,7 @@
</dict>
<dict>
<key>line</key><integer>112</integer>
- <key>col</key><integer>7</integer>
+ <key>col</key><integer>12</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
@@ -140,7 +169,7 @@
</dict>
<dict>
<key>line</key><integer>113</integer>
- <key>col</key><integer>3</integer>
+ <key>col</key><integer>4</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
@@ -161,7 +190,7 @@
</dict>
<dict>
<key>line</key><integer>113</integer>
- <key>col</key><integer>3</integer>
+ <key>col</key><integer>4</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
@@ -174,7 +203,7 @@
</dict>
<dict>
<key>line</key><integer>116</integer>
- <key>col</key><integer>3</integer>
+ <key>col</key><integer>4</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
@@ -195,7 +224,7 @@
</dict>
<dict>
<key>line</key><integer>116</integer>
- <key>col</key><integer>3</integer>
+ <key>col</key><integer>4</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
@@ -208,7 +237,7 @@
</dict>
<dict>
<key>line</key><integer>116</integer>
- <key>col</key><integer>9</integer>
+ <key>col</key><integer>10</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
@@ -229,7 +258,7 @@
</dict>
<dict>
<key>line</key><integer>116</integer>
- <key>col</key><integer>9</integer>
+ <key>col</key><integer>10</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
@@ -242,7 +271,7 @@
</dict>
<dict>
<key>line</key><integer>117</integer>
- <key>col</key><integer>8</integer>
+ <key>col</key><integer>9</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
@@ -263,7 +292,7 @@
</dict>
<dict>
<key>line</key><integer>117</integer>
- <key>col</key><integer>8</integer>
+ <key>col</key><integer>9</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
@@ -276,7 +305,7 @@
</dict>
<dict>
<key>line</key><integer>117</integer>
- <key>col</key><integer>14</integer>
+ <key>col</key><integer>15</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
@@ -297,7 +326,7 @@
</dict>
<dict>
<key>line</key><integer>117</integer>
- <key>col</key><integer>14</integer>
+ <key>col</key><integer>15</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
@@ -310,7 +339,7 @@
</dict>
<dict>
<key>line</key><integer>118</integer>
- <key>col</key><integer>8</integer>
+ <key>col</key><integer>9</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
@@ -331,7 +360,7 @@
</dict>
<dict>
<key>line</key><integer>118</integer>
- <key>col</key><integer>8</integer>
+ <key>col</key><integer>9</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
@@ -344,7 +373,7 @@
</dict>
<dict>
<key>line</key><integer>118</integer>
- <key>col</key><integer>14</integer>
+ <key>col</key><integer>15</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
@@ -365,7 +394,7 @@
</dict>
<dict>
<key>line</key><integer>118</integer>
- <key>col</key><integer>14</integer>
+ <key>col</key><integer>15</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
@@ -378,7 +407,7 @@
</dict>
<dict>
<key>line</key><integer>119</integer>
- <key>col</key><integer>8</integer>
+ <key>col</key><integer>9</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
@@ -399,7 +428,7 @@
</dict>
<dict>
<key>line</key><integer>119</integer>
- <key>col</key><integer>8</integer>
+ <key>col</key><integer>9</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
@@ -412,7 +441,7 @@
</dict>
<dict>
<key>line</key><integer>120</integer>
- <key>col</key><integer>8</integer>
+ <key>col</key><integer>9</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
@@ -433,7 +462,7 @@
</dict>
<dict>
<key>line</key><integer>120</integer>
- <key>col</key><integer>8</integer>
+ <key>col</key><integer>9</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
@@ -446,7 +475,7 @@
</dict>
<dict>
<key>line</key><integer>121</integer>
- <key>col</key><integer>8</integer>
+ <key>col</key><integer>9</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
@@ -467,7 +496,7 @@
</dict>
<dict>
<key>line</key><integer>121</integer>
- <key>col</key><integer>8</integer>
+ <key>col</key><integer>9</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
@@ -480,7 +509,7 @@
</dict>
<dict>
<key>line</key><integer>121</integer>
- <key>col</key><integer>24</integer>
+ <key>col</key><integer>25</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
@@ -501,7 +530,7 @@
</dict>
<dict>
<key>line</key><integer>121</integer>
- <key>col</key><integer>24</integer>
+ <key>col</key><integer>25</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
@@ -514,7 +543,7 @@
</dict>
<dict>
<key>line</key><integer>124</integer>
- <key>col</key><integer>3</integer>
+ <key>col</key><integer>4</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
@@ -535,7 +564,7 @@
</dict>
<dict>
<key>line</key><integer>124</integer>
- <key>col</key><integer>3</integer>
+ <key>col</key><integer>4</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
@@ -548,7 +577,7 @@
</dict>
<dict>
<key>line</key><integer>126</integer>
- <key>col</key><integer>4</integer>
+ <key>col</key><integer>8</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
@@ -569,7 +598,7 @@
</dict>
<dict>
<key>line</key><integer>126</integer>
- <key>col</key><integer>4</integer>
+ <key>col</key><integer>8</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
@@ -582,7 +611,7 @@
</dict>
<dict>
<key>line</key><integer>129</integer>
- <key>col</key><integer>4</integer>
+ <key>col</key><integer>5</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
@@ -603,7 +632,7 @@
</dict>
<dict>
<key>line</key><integer>129</integer>
- <key>col</key><integer>4</integer>
+ <key>col</key><integer>5</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
@@ -616,7 +645,7 @@
</dict>
<dict>
<key>line</key><integer>138</integer>
- <key>col</key><integer>4</integer>
+ <key>col</key><integer>8</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
@@ -637,7 +666,7 @@
</dict>
<dict>
<key>line</key><integer>138</integer>
- <key>col</key><integer>4</integer>
+ <key>col</key><integer>8</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
@@ -650,7 +679,7 @@
</dict>
<dict>
<key>line</key><integer>140</integer>
- <key>col</key><integer>4</integer>
+ <key>col</key><integer>5</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
@@ -671,7 +700,7 @@
</dict>
<dict>
<key>line</key><integer>140</integer>
- <key>col</key><integer>4</integer>
+ <key>col</key><integer>5</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
@@ -684,7 +713,7 @@
</dict>
<dict>
<key>line</key><integer>151</integer>
- <key>col</key><integer>4</integer>
+ <key>col</key><integer>5</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
@@ -705,7 +734,7 @@
</dict>
<dict>
<key>line</key><integer>151</integer>
- <key>col</key><integer>4</integer>
+ <key>col</key><integer>5</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
@@ -726,6 +755,35 @@
</array>
</dict>
<dict>
+ <key>kind</key><string>event</string>
+ <key>location</key>
+ <dict>
+ <key>line</key><integer>110</integer>
+ <key>col</key><integer>2</integer>
+ <key>file</key><integer>0</integer>
+ </dict>
+ <key>ranges</key>
+ <array>
+ <array>
+ <dict>
+ <key>line</key><integer>110</integer>
+ <key>col</key><integer>2</integer>
+ <key>file</key><integer>0</integer>
+ </dict>
+ <dict>
+ <key>line</key><integer>110</integer>
+ <key>col</key><integer>6</integer>
+ <key>file</key><integer>0</integer>
+ </dict>
+ </array>
+ </array>
+ <key>depth</key><integer>0</integer>
+ <key>extended_message</key>
+ <string>Looping back to the head of the loop</string>
+ <key>message</key>
+<string>Looping back to the head of the loop</string>
+ </dict>
+ <dict>
<key>kind</key><string>control</string>
<key>edges</key>
<array>
@@ -752,7 +810,7 @@
</dict>
<dict>
<key>line</key><integer>112</integer>
- <key>col</key><integer>3</integer>
+ <key>col</key><integer>4</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
@@ -773,7 +831,7 @@
</dict>
<dict>
<key>line</key><integer>112</integer>
- <key>col</key><integer>3</integer>
+ <key>col</key><integer>4</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
@@ -786,7 +844,7 @@
</dict>
<dict>
<key>line</key><integer>112</integer>
- <key>col</key><integer>7</integer>
+ <key>col</key><integer>12</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
@@ -794,6 +852,35 @@
</array>
</dict>
<dict>
+ <key>kind</key><string>event</string>
+ <key>location</key>
+ <dict>
+ <key>line</key><integer>112</integer>
+ <key>col</key><integer>7</integer>
+ <key>file</key><integer>0</integer>
+ </dict>
+ <key>ranges</key>
+ <array>
+ <array>
+ <dict>
+ <key>line</key><integer>112</integer>
+ <key>col</key><integer>7</integer>
+ <key>file</key><integer>0</integer>
+ </dict>
+ <dict>
+ <key>line</key><integer>112</integer>
+ <key>col</key><integer>23</integer>
+ <key>file</key><integer>0</integer>
+ </dict>
+ </array>
+ </array>
+ <key>depth</key><integer>0</integer>
+ <key>extended_message</key>
+ <string>Assuming &apos;ixtext&apos; is &lt; &apos;lentext&apos;</string>
+ <key>message</key>
+<string>Assuming &apos;ixtext&apos; is &lt; &apos;lentext&apos;</string>
+ </dict>
+ <dict>
<key>kind</key><string>control</string>
<key>edges</key>
<array>
@@ -807,7 +894,7 @@
</dict>
<dict>
<key>line</key><integer>112</integer>
- <key>col</key><integer>7</integer>
+ <key>col</key><integer>12</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
@@ -820,7 +907,7 @@
</dict>
<dict>
<key>line</key><integer>113</integer>
- <key>col</key><integer>3</integer>
+ <key>col</key><integer>4</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
@@ -841,7 +928,7 @@
</dict>
<dict>
<key>line</key><integer>113</integer>
- <key>col</key><integer>3</integer>
+ <key>col</key><integer>4</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
@@ -854,7 +941,7 @@
</dict>
<dict>
<key>line</key><integer>116</integer>
- <key>col</key><integer>3</integer>
+ <key>col</key><integer>4</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
@@ -875,7 +962,7 @@
</dict>
<dict>
<key>line</key><integer>116</integer>
- <key>col</key><integer>3</integer>
+ <key>col</key><integer>4</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
@@ -888,7 +975,7 @@
</dict>
<dict>
<key>line</key><integer>116</integer>
- <key>col</key><integer>9</integer>
+ <key>col</key><integer>10</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
@@ -909,7 +996,7 @@
</dict>
<dict>
<key>line</key><integer>116</integer>
- <key>col</key><integer>9</integer>
+ <key>col</key><integer>10</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
@@ -922,7 +1009,7 @@
</dict>
<dict>
<key>line</key><integer>117</integer>
- <key>col</key><integer>8</integer>
+ <key>col</key><integer>9</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
@@ -943,7 +1030,7 @@
</dict>
<dict>
<key>line</key><integer>117</integer>
- <key>col</key><integer>8</integer>
+ <key>col</key><integer>9</integer>
<key>file</key><integer>0</integer>
</dict>
</array>
@@ -956,7 +1043,7 @@
</dict>
<dict>