Cosmetic changes.

Set svn properties on files.

--HG--
extra : convert_revision : svn%3Affd33b8c-2492-42e0-bdc5-587b920b7d6d/trunk%4044493

Library/AssemblyCommentAttribute.cs

@@ -1,15 +1,15 @@
-using System;
+using System;
-
+
-namespace Jellyfish.Library
+namespace Jellyfish.Library
-{
+{
-    [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true, Inherited = false)]
+    [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true, Inherited = false)]
-    public sealed class AssemblyCommentAttribute : Attribute
+    public sealed class AssemblyCommentAttribute : Attribute
-    {
+    {
-        public AssemblyCommentAttribute(string comment)
+        public AssemblyCommentAttribute(string comment)
-        {
+        {
-            Comment = comment;
+            Comment = comment;
-        }
+        }
-
+
-        public string Comment { get; private set; }
+        public string Comment { get; private set; }
-    }
+    }
-}
+}

Library/CustomDictionary.xml

@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
-<Dictionary>
+<Dictionary>
-    <Words>
+    <Words>
-        <Recognized>
+        <Recognized>
-            <Word>Alloc</Word>
+            <Word>Alloc</Word>
-        </Recognized>
+        </Recognized>
-    </Words>
+    </Words>
 </Dictionary>

Library/DirectSound.cs

@@ -67,12 +67,12 @@ private void Initialize()
 
             GCHandleHelpers.Pin(new WaveFormat(_sampleRate, _sampleChannels, _sampleBits), waveFormat => 
             {
-                BufferDescription description = new BufferDescription(BufferCapabilities.CtrlPositionNotify | BufferCapabilities.CtrlVolume, BlockCount * _sampleSize, waveFormat);
+                var description = new BufferDescription(BufferCapabilities.CtrlPositionNotify | BufferCapabilities.CtrlVolume, BlockCount * _sampleSize, waveFormat);
                 _device.CreateSoundBuffer(description, out _buffer, IntPtr.Zero);
             });
             ClearBuffer();
 
-            BufferPositionNotify[] positionEvents = new BufferPositionNotify[BlockCount]
+            var positionEvents = new BufferPositionNotify[BlockCount]
             {
                 new BufferPositionNotify(0 * _sampleSize, _position1Event), new BufferPositionNotify(1 * _sampleSize, _position2Event)
             };
@@ -85,10 +85,7 @@ private void Initialize()
 
         private void ClearBuffer()
         {
-            UpdateBuffer(0, 0, BufferLock.EntireBuffer, (buffer, bufferSize) => 
+            UpdateBuffer(0, 0, BufferLock.EntireBuffer, (buffer, bufferSize) => MarshalHelpers.ZeroMemory(buffer, bufferSize));
-            {
-                MarshalHelpers.ZeroMemory(buffer, bufferSize);
-            });
         }
 
         private void RestoreBuffer()
@@ -106,10 +103,7 @@ private void UpdateBuffer(int block)
             EventHandler<DirectSoundUpdateEventArgs> handler = Update;
             if (handler != null)
             {
-                UpdateBuffer(block * _sampleSize, _sampleSize, BufferLock.None, (buffer, bufferSize) => 
+                UpdateBuffer(block * _sampleSize, _sampleSize, BufferLock.None, (buffer, bufferSize) => handler(this, DirectSoundUpdateEventArgs.Create(buffer, bufferSize)));
-                {
-                    handler(this, DirectSoundUpdateEventArgs.Create(buffer, bufferSize));
-                });
             }
         }
 
@@ -154,7 +148,7 @@ private void Run() // com mta thread
         {
             Initialize();
 
-            EventWaitHandle[] eventHandles = new EventWaitHandle[] { _position1Event, _position2Event, _stopEvent };
+            var eventHandles = new EventWaitHandle[] { _position1Event, _position2Event, _stopEvent };
             int index = WaitHandle.WaitAny(eventHandles);
 
             while (index < BlockCount)

Library/GCHandleHelpers.cs

@@ -14,7 +14,7 @@ public static void Pin(object value, Action<IntPtr> action)
                 throw new ArgumentNullException("action");
             }
 
-            GCHandle gcHandle = new GCHandle();
+            var gcHandle = new GCHandle();
             try
             {
                 gcHandle = GCHandle.Alloc(value, GCHandleType.Pinned);

Library/GeneralSecurity.cs

@@ -1,277 +1,277 @@
-using System;
+using System;
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
-using System.Runtime.InteropServices;
+using System.Runtime.InteropServices;
-using System.Security.AccessControl;
+using System.Security.AccessControl;
-using System.Security.Permissions;
+using System.Security.Permissions;
-using System.Security.Principal;
+using System.Security.Principal;
-
+
-namespace Jellyfish.Library
+namespace Jellyfish.Library
-{
+{
-    [StructLayout(LayoutKind.Sequential)]
+    [StructLayout(LayoutKind.Sequential)]
-    public sealed class SecurityAttributes
+    public sealed class SecurityAttributes
-    {
+    {
-        [SecurityPermission(SecurityAction.LinkDemand, UnmanagedCode = true)]
+        [SecurityPermission(SecurityAction.LinkDemand, UnmanagedCode = true)]
-        public SecurityAttributes()
+        public SecurityAttributes()
-        {
+        {
-            _length = Marshal.SizeOf(typeof(SecurityAttributes));
+            _length = Marshal.SizeOf(typeof(SecurityAttributes));
-        }
+        }
-
+
-        public int Length { get { return _length; } }
+        public int Length { get { return _length; } }
-        public IntPtr SecurityDescriptor { get { return _securityDescriptor; } set { _securityDescriptor = value; } }
+        public IntPtr SecurityDescriptor { get { return _securityDescriptor; } set { _securityDescriptor = value; } }
-        public bool InheritHandle { get { return _inheritHandle; } set { _inheritHandle = value; } }
+        public bool InheritHandle { get { return _inheritHandle; } set { _inheritHandle = value; } }
-
+
-        private int _length;
+        private int _length;
-        private IntPtr _securityDescriptor;
+        private IntPtr _securityDescriptor;
-        private bool _inheritHandle;
+        private bool _inheritHandle;
-    }
+    }
-
+
-    public sealed class GeneralAccessRule : AccessRule
+    public sealed class GeneralAccessRule : AccessRule
-    {
+    {
-        public GeneralAccessRule(IdentityReference identity, int rights, AccessControlType type) : 
+        public GeneralAccessRule(IdentityReference identity, int rights, AccessControlType type) : 
-            base(identity, rights, false, InheritanceFlags.None, PropagationFlags.None, type)
+            base(identity, rights, false, InheritanceFlags.None, PropagationFlags.None, type)
-        {
+        {
-        }
+        }
-
+
-        public GeneralAccessRule(IdentityReference identity, int rights, InheritanceFlags inheritance, PropagationFlags propagation, AccessControlType type) : 
+        public GeneralAccessRule(IdentityReference identity, int rights, InheritanceFlags inheritance, PropagationFlags propagation, AccessControlType type) : 
-            base(identity, rights, false, inheritance, propagation, type)
+            base(identity, rights, false, inheritance, propagation, type)
-        {
+        {
-        }
+        }
-
+
-        public GeneralAccessRule(IdentityReference identity, int rights, bool isInherited, InheritanceFlags inheritance, PropagationFlags propagation, 
+        public GeneralAccessRule(IdentityReference identity, int rights, bool isInherited, InheritanceFlags inheritance, PropagationFlags propagation, 
-            AccessControlType type) : 
+            AccessControlType type) : 
-            base(identity, rights, isInherited, inheritance, propagation, type)
+            base(identity, rights, isInherited, inheritance, propagation, type)
-        {
+        {
-        }
+        }
-
+
-        public int AccessRights { get { return AccessMask; } }
+        public int AccessRights { get { return AccessMask; } }
-    }
+    }
-
+
-    public sealed class GeneralAuditRule : AuditRule
+    public sealed class GeneralAuditRule : AuditRule
-    {
+    {
-        public GeneralAuditRule(IdentityReference identity, int rights, AuditFlags audit) : 
+        public GeneralAuditRule(IdentityReference identity, int rights, AuditFlags audit) : 
-            base(identity, rights, false, InheritanceFlags.None, PropagationFlags.None, audit)
+            base(identity, rights, false, InheritanceFlags.None, PropagationFlags.None, audit)
-        {
+        {
-        }
+        }
-
+
-        public GeneralAuditRule(IdentityReference identity, int rights, InheritanceFlags inheritance, PropagationFlags propagation, AuditFlags audit) : 
+        public GeneralAuditRule(IdentityReference identity, int rights, InheritanceFlags inheritance, PropagationFlags propagation, AuditFlags audit) : 
-            base(identity, rights, false, inheritance, propagation, audit)
+            base(identity, rights, false, inheritance, propagation, audit)
-        {
+        {
-        }
+        }
-
+
-        public GeneralAuditRule(IdentityReference identity, int rights, bool isInherited, InheritanceFlags inheritance, PropagationFlags propagation, 
+        public GeneralAuditRule(IdentityReference identity, int rights, bool isInherited, InheritanceFlags inheritance, PropagationFlags propagation, 
-            AuditFlags audit) : 
+            AuditFlags audit) : 
-            base(identity, rights, isInherited, inheritance, propagation, audit)
+            base(identity, rights, isInherited, inheritance, propagation, audit)
-        {
+        {
-        }
+        }
-
+
-        public int AccessRights { get { return AccessMask; } }
+        public int AccessRights { get { return AccessMask; } }
-    }
+    }
-
+
-    public sealed class GeneralSecurity : NativeObjectSecurity
+    public sealed class GeneralSecurity : NativeObjectSecurity
-    {
+    {
-        public GeneralSecurity(bool isContainer, ResourceType resourceType) : 
+        public GeneralSecurity(bool isContainer, ResourceType resourceType) : 
-            base(isContainer, resourceType)
+            base(isContainer, resourceType)
-        {
+        {
-        }
+        }
-
+
-        public GeneralSecurity(bool isContainer, ResourceType resourceType, SafeHandle handle) : 
+        public GeneralSecurity(bool isContainer, ResourceType resourceType, SafeHandle handle) : 
-            base(isContainer, resourceType, handle, AccessControlSections.Access | AccessControlSections.Group | AccessControlSections.Owner)
+            base(isContainer, resourceType, handle, AccessControlSections.Access | AccessControlSections.Group | AccessControlSections.Owner)
-        {
+        {
-        }
+        }
-
+
-        public GeneralSecurity(bool isContainer, ResourceType resourceType, SafeHandle handle, AccessControlSections includeSections) : 
+        public GeneralSecurity(bool isContainer, ResourceType resourceType, SafeHandle handle, AccessControlSections includeSections) : 
-            base(isContainer, resourceType, handle, includeSections)
+            base(isContainer, resourceType, handle, includeSections)
-        {
+        {
-        }
+        }
-
+
-        public GeneralSecurity(bool isContainer, ResourceType resourceType, string name) : 
+        public GeneralSecurity(bool isContainer, ResourceType resourceType, string name) : 
-            base(isContainer, resourceType, name, AccessControlSections.Access | AccessControlSections.Group | AccessControlSections.Owner)
+            base(isContainer, resourceType, name, AccessControlSections.Access | AccessControlSections.Group | AccessControlSections.Owner)
-        {
+        {
-        }
+        }
-
+
-        public GeneralSecurity(bool isContainer, ResourceType resourceType, string name, AccessControlSections includeSections) : 
+        public GeneralSecurity(bool isContainer, ResourceType resourceType, string name, AccessControlSections includeSections) : 
-            base(isContainer, resourceType, name, includeSections)
+            base(isContainer, resourceType, name, includeSections)
-        {
+        {
-        }
+        }
-
+
-        public override AccessRule AccessRuleFactory(IdentityReference identityReference, int accessMask, bool isInherited, InheritanceFlags inheritanceFlags, 
+        public override AccessRule AccessRuleFactory(IdentityReference identityReference, int accessMask, bool isInherited, InheritanceFlags inheritanceFlags, 
-            PropagationFlags propagationFlags, AccessControlType type)
+            PropagationFlags propagationFlags, AccessControlType type)
-        {
+        {
-            return new GeneralAccessRule(identityReference, accessMask, isInherited, inheritanceFlags, propagationFlags, type);
+            return new GeneralAccessRule(identityReference, accessMask, isInherited, inheritanceFlags, propagationFlags, type);
-        }
+        }
-
+
-        public override AuditRule AuditRuleFactory(IdentityReference identityReference, int accessMask, bool isInherited, InheritanceFlags inheritanceFlags, 
+        public override AuditRule AuditRuleFactory(IdentityReference identityReference, int accessMask, bool isInherited, InheritanceFlags inheritanceFlags, 
-            PropagationFlags propagationFlags, AuditFlags flags)
+            PropagationFlags propagationFlags, AuditFlags flags)
-        {
+        {
-            return new GeneralAuditRule(identityReference, accessMask, isInherited, inheritanceFlags, propagationFlags, flags);
+            return new GeneralAuditRule(identityReference, accessMask, isInherited, inheritanceFlags, propagationFlags, flags);
-        }
+        }
-
+
-        [SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters")]
+        [SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters")]
-        public void AddAccessRule(GeneralAccessRule rule)
+        public void AddAccessRule(GeneralAccessRule rule)
-        {
+        {
-            base.AddAccessRule(rule);
+            base.AddAccessRule(rule);
-        }
+        }
-
+
-        [SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters")]
+        [SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters")]
-        public void AddAuditRule(GeneralAuditRule rule)
+        public void AddAuditRule(GeneralAuditRule rule)
-        {
+        {
-            base.AddAuditRule(rule);
+            base.AddAuditRule(rule);
-        }
+        }
-
+
-        [SecurityPermission(SecurityAction.LinkDemand, UnmanagedCode = true)]
+        [SecurityPermission(SecurityAction.LinkDemand, UnmanagedCode = true)]
-        public void GetSecurityAttributes(bool inheritable, Action<SecurityAttributes> action)
+        public void GetSecurityAttributes(bool inheritable, Action<SecurityAttributes> action)
-        {
+        {
-            GetSecurityAttributes(this, inheritable, action);
+            GetSecurityAttributes(this, inheritable, action);
-        }
+        }
-
+
-        [SecurityPermission(SecurityAction.LinkDemand, UnmanagedCode = true)]
+        [SecurityPermission(SecurityAction.LinkDemand, UnmanagedCode = true)]
-        public static void GetSecurityAttributes(ObjectSecurity security, bool inheritable, Action<SecurityAttributes> action)
+        public static void GetSecurityAttributes(ObjectSecurity security, bool inheritable, Action<SecurityAttributes> action)
-        {
+        {
-            if (action == null)
+            if (action == null)
-            {
+            {
-                throw new ArgumentNullException("action");
+                throw new ArgumentNullException("action");
-            }
+            }
-
+
-            if (security != null)
+            if (security != null)
-            {
+            {
-                GCHandleHelpers.Pin(security.GetSecurityDescriptorBinaryForm(), securityDescriptor => 
+                GCHandleHelpers.Pin(security.GetSecurityDescriptorBinaryForm(), securityDescriptor => 
-                {
+                {
-                    action(new SecurityAttributes() { SecurityDescriptor = securityDescriptor, InheritHandle = inheritable });
+                    action(new SecurityAttributes() { SecurityDescriptor = securityDescriptor, InheritHandle = inheritable });
-                });
+                });
-            }
+            }
-            else if (inheritable)
+            else if (inheritable)
-            {
+            {
-                action(new SecurityAttributes() { InheritHandle = inheritable });
+                action(new SecurityAttributes() { InheritHandle = inheritable });
-            }
+            }
-            else
+            else
-            {
+            {
-                action(null);
+                action(null);
-            }
+            }
-        }
+        }
-
+
-        [SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters")]
+        [SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters")]
-        public bool RemoveAccessRule(GeneralAccessRule rule)
+        public bool RemoveAccessRule(GeneralAccessRule rule)
-        {
+        {
-            return base.RemoveAccessRule(rule);
+            return base.RemoveAccessRule(rule);
-        }
+        }
-
+
-        [SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters")]
+        [SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters")]
-        public void RemoveAccessRuleAll(GeneralAccessRule rule)
+        public void RemoveAccessRuleAll(GeneralAccessRule rule)
-        {
+        {
-            base.RemoveAccessRuleAll(rule);
+            base.RemoveAccessRuleAll(rule);
-        }
+        }
-
+
-        [SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters")]
+        [SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters")]
-        public void RemoveAccessRuleSpecific(GeneralAccessRule rule)
+        public void RemoveAccessRuleSpecific(GeneralAccessRule rule)
-        {
+        {
-            base.RemoveAccessRuleSpecific(rule);
+            base.RemoveAccessRuleSpecific(rule);
-        }
+        }
-
+
-        [SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters")]
+        [SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters")]
-        public bool RemoveAuditRule(GeneralAuditRule rule)
+        public bool RemoveAuditRule(GeneralAuditRule rule)
-        {
+        {
-            return base.RemoveAuditRule(rule);
+            return base.RemoveAuditRule(rule);
-        }
+        }
-
+
-        [SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters")]
+        [SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters")]
-        public void RemoveAuditRuleAll(GeneralAuditRule rule)
+        public void RemoveAuditRuleAll(GeneralAuditRule rule)
-        {
+        {
-            base.RemoveAuditRuleAll(rule);
+            base.RemoveAuditRuleAll(rule);
-        }
+        }
-
+
-        [SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters")]
+        [SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters")]
-        public void RemoveAuditRuleSpecific(GeneralAuditRule rule)
+        public void RemoveAuditRuleSpecific(GeneralAuditRule rule)
-        {
+        {
-            base.RemoveAuditRuleSpecific(rule);
+            base.RemoveAuditRuleSpecific(rule);
-        }
+        }
-
+
-        [SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters")]
+        [SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters")]
-        public void ResetAccessRule(GeneralAccessRule rule)
+        public void ResetAccessRule(GeneralAccessRule rule)
-        {
+        {
-            base.ResetAccessRule(rule);
+            base.ResetAccessRule(rule);
-        }
+        }
-
+
-        [SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters")]
+        [SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters")]
-        public void SetAccessRule(GeneralAccessRule rule)
+        public void SetAccessRule(GeneralAccessRule rule)
-        {
+        {
-            base.SetAccessRule(rule);
+            base.SetAccessRule(rule);
-        }
+        }
-
+
-        [SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters")]
+        [SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters")]
-        public void SetAuditRule(GeneralAuditRule rule)
+        public void SetAuditRule(GeneralAuditRule rule)
-        {
+        {
-            base.SetAuditRule(rule);
+            base.SetAuditRule(rule);
-        }
+        }
-
+
-        public void Persist(SafeHandle handle)
+        public void Persist(SafeHandle handle)
-        {
+        {
-            WriteLock();
+            WriteLock();
-            try
+            try
-            {
+            {
-                AccessControlSections sectionsModified = GetAccessControlSectionsModified();
+                var sectionsModified = GetAccessControlSectionsModified();
-                if (sectionsModified != AccessControlSections.None)
+                if (sectionsModified != AccessControlSections.None)
-                {
+                {
-                    Persist(handle, sectionsModified);
+                    Persist(handle, sectionsModified);
-                    ResetAccessControlSectionsModified();
+                    ResetAccessControlSectionsModified();
-                }
+                }
-            }
+            }
-            finally
+            finally
-            {
+            {
-                WriteUnlock();
+                WriteUnlock();
-            }
+            }
-        }
+        }
-
+
-        public void Persist(string name)
+        public void Persist(string name)
-        {
+        {
-            WriteLock();
+            WriteLock();
-            try
+            try
-            {
+            {
-                AccessControlSections sectionsModified = GetAccessControlSectionsModified();
+                var sectionsModified = GetAccessControlSectionsModified();
-                if (sectionsModified != AccessControlSections.None)
+                if (sectionsModified != AccessControlSections.None)
-                {
+                {
-                    Persist(name, sectionsModified);
+                    Persist(name, sectionsModified);
-                    ResetAccessControlSectionsModified();
+                    ResetAccessControlSectionsModified();
-                }
+                }
-            }
+            }
-            finally
+            finally
-            {
+            {
-                WriteUnlock();
+                WriteUnlock();
-            }
+            }
-        }
+        }
-
+
-        private AccessControlSections GetAccessControlSectionsModified()
+        private AccessControlSections GetAccessControlSectionsModified()
-        {
+        {
-            AccessControlSections sectionsModified = AccessControlSections.None;
+            var sectionsModified = AccessControlSections.None;
-            if (AccessRulesModified)
+            if (AccessRulesModified)
-            {
+            {
-                sectionsModified = AccessControlSections.Access;
+                sectionsModified = AccessControlSections.Access;
-            }
+            }
-            if (AuditRulesModified)
+            if (AuditRulesModified)
-            {
+            {
-                sectionsModified |= AccessControlSections.Audit;
+                sectionsModified |= AccessControlSections.Audit;
-            }
+            }
-            if (OwnerModified)
+            if (OwnerModified)
-            {
+            {
-                sectionsModified |= AccessControlSections.Owner;
+                sectionsModified |= AccessControlSections.Owner;
-            }
+            }
-            if (GroupModified)
+            if (GroupModified)
-            {
+            {
-                sectionsModified |= AccessControlSections.Group;
+                sectionsModified |= AccessControlSections.Group;
-            }
+            }
-
+
-            return sectionsModified;
+            return sectionsModified;
-        }
+        }
-
+
-        private void ResetAccessControlSectionsModified()
+        private void ResetAccessControlSectionsModified()
-        {
+        {
-            AccessRulesModified = false;
+            AccessRulesModified = false;
-            AuditRulesModified = false;
+            AuditRulesModified = false;
-            OwnerModified = false;
+            OwnerModified = false;
-            GroupModified = false;
+            GroupModified = false;
-        }
+        }
-
+
-        public override Type AccessRightType { get { return typeof(int); } }
+        public override Type AccessRightType { get { return typeof(int); } }
-        public override Type AccessRuleType { get { return typeof(GeneralAccessRule); } }
+        public override Type AccessRuleType { get { return typeof(GeneralAccessRule); } }
-        public override Type AuditRuleType { get { return typeof(GeneralAuditRule); } }
+        public override Type AuditRuleType { get { return typeof(GeneralAuditRule); } }
-    }
+    }
-}
+}

Library/GlobalSuppressions.cs

@@ -1,4 +1,4 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
-
+
-[assembly: SuppressMessage("Microsoft.Design", "CA2210:AssembliesShouldHaveValidStrongNames")]
+[assembly: SuppressMessage("Microsoft.Design", "CA2210:AssembliesShouldHaveValidStrongNames")]
-[assembly: SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields", Scope = "member", Target = "Jellyfish.Library.FrameRateCounter.#frameRateControl")]
+[assembly: SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields", Scope = "member", Target = "Jellyfish.Library.FrameRateCounter.#frameRateControl")]

Library/IEnumerableExtensions.cs

@@ -1,25 +1,25 @@
-using System;
+using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
-
+
-namespace Jellyfish.Library
+namespace Jellyfish.Library
-{
+{
-    public static class IEnumerableExtensions
+    public static class IEnumerableExtensions
-    {
+    {
-        public static void ForEach<T>(this IEnumerable<T> source, Action<T> action)
+        public static void ForEach<T>(this IEnumerable<T> source, Action<T> action)
-        {
+        {
-            if (source == null)
+            if (source == null)
-            {
+            {
-                throw new ArgumentNullException("source");
+                throw new ArgumentNullException("source");
-            }
+            }
-            if (action == null)
+            if (action == null)
-            {
+            {
-                throw new ArgumentNullException("action");
+                throw new ArgumentNullException("action");
-            }
+            }
-
+
-            foreach (T item in source)
+            foreach (T item in source)
-            {
+            {
-                action(item);
+                action(item);
-            }
+            }
-        }
+        }
-    }
+    }
-}
+}

Library/Lazy.cs

@@ -1,37 +1,37 @@
-using System;
+using System;
-using System.Threading;
+using System.Threading;
-
+
-namespace Jellyfish.Library
+namespace Jellyfish.Library
-{
+{
-    public sealed class Lazy<T> where T : class
+    public sealed class Lazy<T> where T : class
-    {
+    {
-        public Lazy(Func<T> initializer)
+        public Lazy(Func<T> initializer)
-        {
+        {
-            _initializer = initializer;
+            _initializer = initializer;
-        }
+        }
-
+
-        public T Value
+        public T Value
-        {
+        {
-            get
+            get
-            {
+            {
-                if (_value == null)
+                if (_value == null)
-                {
+                {
-                    T value = _initializer();
+                    T value = _initializer();
-                    if (Interlocked.CompareExchange(ref _value, value, null) != null)
+                    if (Interlocked.CompareExchange(ref _value, value, null) != null)
-                    {
+                    {
-                        IDisposable disposable = value as IDisposable; // dispose preempted instance
+                        var disposable = value as IDisposable; // dispose preempted instance
-                        if (disposable != null)
+                        if (disposable != null)
-                        {
+                        {
-                            disposable.Dispose();
+                            disposable.Dispose();
-                        }
+                        }
-                    }
+                    }
-                }
+                }
-
+
-                return _value;
+                return _value;
-            }
+            }
-        }
+        }
-
+
-        private Func<T> _initializer;
+        private Func<T> _initializer;
-        private T _value;
+        private T _value;
-    }
+    }
-}
+}

Library/MathHelpers.cs

@@ -1,15 +1,15 @@
-namespace Jellyfish.Library
+namespace Jellyfish.Library
-{
+{
-    public static class MathHelpers
+    public static class MathHelpers
-    {
+    {
-        public static int Clamp(int value, int min, int max)
+        public static int Clamp(int value, int min, int max)
-        {
+        {
-            return (value < min) ? min : (value > max) ? max : value;
+            return (value < min) ? min : (value > max) ? max : value;
-        }
+        }
-
+
-        public static int ClampByte(int value)
+        public static int ClampByte(int value)
-        {
+        {
-            return Clamp(value, byte.MinValue, byte.MaxValue);
+            return Clamp(value, byte.MinValue, byte.MaxValue);
-        }
+        }
-    }
+    }
-}
+}

Library/SafeAllocHandle.cs

@@ -1,147 +1,147 @@
-using System;
+using System;
-using System.ComponentModel;
+using System.ComponentModel;
-using System.Runtime.ConstrainedExecution;
+using System.Runtime.ConstrainedExecution;
-using System.Runtime.InteropServices;
+using System.Runtime.InteropServices;
-using System.Security;
+using System.Security;
-using System.Security.Permissions;
+using System.Security.Permissions;
-using Microsoft.Win32.SafeHandles;
+using Microsoft.Win32.SafeHandles;
-
+
-namespace Jellyfish.Library
+namespace Jellyfish.Library
-{
+{
-    [SecurityPermission(SecurityAction.InheritanceDemand, UnmanagedCode = true)]
+    [SecurityPermission(SecurityAction.InheritanceDemand, UnmanagedCode = true)]
-    [SecurityPermission(SecurityAction.LinkDemand, UnmanagedCode = true)]
+    [SecurityPermission(SecurityAction.LinkDemand, UnmanagedCode = true)]
-    public abstract class SafeAllocHandle : SafeHandleZeroOrMinusOneIsInvalid
+    public abstract class SafeAllocHandle : SafeHandleZeroOrMinusOneIsInvalid
-    {
+    {
-        [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
+        [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
-        protected SafeAllocHandle(bool ownsHandle) : 
+        protected SafeAllocHandle(bool ownsHandle) : 
-            base(ownsHandle)
+            base(ownsHandle)
-        {
+        {
-        }
+        }
-    }
+    }
-
+
-    [SecurityPermission(SecurityAction.LinkDemand, UnmanagedCode = true)]
+    [SecurityPermission(SecurityAction.LinkDemand, UnmanagedCode = true)]
-    public sealed class SafeGlobalAllocHandle : SafeAllocHandle
+    public sealed class SafeGlobalAllocHandle : SafeAllocHandle
-    {
+    {
-        [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
+        [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
-        public SafeGlobalAllocHandle() : 
+        public SafeGlobalAllocHandle() : 
-            base(true)
+            base(true)
-        {
+        {
-        }
+        }
-
+
-        [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
+        [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
-        public SafeGlobalAllocHandle(IntPtr existingHandle, bool ownsHandle) : 
+        public SafeGlobalAllocHandle(IntPtr existingHandle, bool ownsHandle) : 
-            base(ownsHandle)
+            base(ownsHandle)
-        {
+        {
-            SetHandle(existingHandle);
+            SetHandle(existingHandle);
-        }
+        }
-
+
-        public static SafeGlobalAllocHandle Allocate(int size)
+        public static SafeGlobalAllocHandle Allocate(int size)
-        {
+        {
-            return Allocate(0x0, size);
+            return Allocate(0x0, size);
-        }
+        }
-
+
-        public static SafeGlobalAllocHandle Allocate(byte[] value)
+        public static SafeGlobalAllocHandle Allocate(byte[] value)
-        {
+        {
-            if (value == null)
+            if (value == null)
-            {
+            {
-                throw new ArgumentNullException("value");
+                throw new ArgumentNullException("value");
-            }
+            }
-
+
-            SafeGlobalAllocHandle alloc = Allocate(value.Length);
+            var alloc = Allocate(value.Length);
-            Marshal.Copy(value, 0, alloc.DangerousGetHandle(), value.Length);
+            Marshal.Copy(value, 0, alloc.DangerousGetHandle(), value.Length);
-
+
-            return alloc;
+            return alloc;
-        }
+        }
-
+
-        [ReliabilityContract(Consistency.WillNotCorruptState, Cer.Success)]
+        [ReliabilityContract(Consistency.WillNotCorruptState, Cer.Success)]
-        protected override bool ReleaseHandle()
+        protected override bool ReleaseHandle()
-        {
+        {
-            return (NativeMethods.GlobalFree(handle) == IntPtr.Zero);
+            return (NativeMethods.GlobalFree(handle) == IntPtr.Zero);
-        }
+        }
-
+
-        private static SafeGlobalAllocHandle Allocate(uint flags, int size)
+        private static SafeGlobalAllocHandle Allocate(uint flags, int size)
-        {
+        {
-            SafeGlobalAllocHandle alloc = NativeMethods.GlobalAlloc(flags, (IntPtr)size);
+            var alloc = NativeMethods.GlobalAlloc(flags, (IntPtr)size);
-            if (alloc.IsInvalid)
+            if (alloc.IsInvalid)
-            {
+            {
-                throw new Win32Exception();
+                throw new Win32Exception();
-            }
+            }
-
+
-            return alloc;
+            return alloc;
-        }
+        }
-
+
-        [SuppressUnmanagedCodeSecurity]
+        [SuppressUnmanagedCodeSecurity]
-        private static class NativeMethods
+        private static class NativeMethods
-        {
+        {
-            [DllImport("kernel32.dll", SetLastError = true)]
+            [DllImport("kernel32.dll", SetLastError = true)]
-            public static extern SafeGlobalAllocHandle GlobalAlloc(uint dwFlags, IntPtr sizetBytes);
+            public static extern SafeGlobalAllocHandle GlobalAlloc(uint dwFlags, IntPtr sizetBytes);
-
+
-            [DllImport("kernel32.dll", SetLastError = true)]
+            [DllImport("kernel32.dll", SetLastError = true)]
-            [ReliabilityContract(Consistency.WillNotCorruptState, Cer.Success)]
+            [ReliabilityContract(Consistency.WillNotCorruptState, Cer.Success)]
-            public static extern IntPtr GlobalFree(IntPtr hMem);
+            public static extern IntPtr GlobalFree(IntPtr hMem);
-        }
+        }
-    }
+    }
-
+
-    [SecurityPermission(SecurityAction.LinkDemand, UnmanagedCode = true)]
+    [SecurityPermission(SecurityAction.LinkDemand, UnmanagedCode = true)]
-    public sealed class SafeLocalAllocHandle : SafeAllocHandle
+    public sealed class SafeLocalAllocHandle : SafeAllocHandle
-    {
+    {
-        [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
+        [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
-        public SafeLocalAllocHandle() : 
+        public SafeLocalAllocHandle() : 
-            base(true)
+            base(true)
-        {
+        {
-        }
+        }
-
+
-        [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
+        [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
-        public SafeLocalAllocHandle(IntPtr existingHandle, bool ownsHandle) : 
+        public SafeLocalAllocHandle(IntPtr existingHandle, bool ownsHandle) : 
-            base(ownsHandle)
+            base(ownsHandle)
-        {
+        {
-            SetHandle(existingHandle);
+            SetHandle(existingHandle);
-        }
+        }
-
+
-        public static SafeLocalAllocHandle Allocate(int size)
+        public static SafeLocalAllocHandle Allocate(int size)
-        {
+        {
-            return Allocate(0x0, size);
+            return Allocate(0x0, size);
-        }
+        }
-
+
-        public static SafeLocalAllocHandle Allocate(byte[] value)
+        public static SafeLocalAllocHandle Allocate(byte[] value)
-        {
+        {
-            if (value == null)
+            if (value == null)
-            {
+            {
-                throw new ArgumentNullException("value");
+                throw new ArgumentNullException("value");
-            }
+            }
-
+
-            SafeLocalAllocHandle alloc = Allocate(value.Length);
+            var alloc = Allocate(value.Length);
-            Marshal.Copy(value, 0, alloc.DangerousGetHandle(), value.Length);
+            Marshal.Copy(value, 0, alloc.DangerousGetHandle(), value.Length);
-
+
-            return alloc;
+            return alloc;
-        }
+        }
-
+
-        [ReliabilityContract(Consistency.WillNotCorruptState, Cer.Success)]
+        [ReliabilityContract(Consistency.WillNotCorruptState, Cer.Success)]
-        protected override bool ReleaseHandle()
+        protected override bool ReleaseHandle()
-        {
+        {
-            return (NativeMethods.LocalFree(handle) == IntPtr.Zero);
+            return (NativeMethods.LocalFree(handle) == IntPtr.Zero);
-        }
+        }
-
+
-        private static SafeLocalAllocHandle Allocate(uint flags, int size)
+        private static SafeLocalAllocHandle Allocate(uint flags, int size)
-        {
+        {
-            SafeLocalAllocHandle alloc = NativeMethods.LocalAlloc(flags, (IntPtr)size);
+            var alloc = NativeMethods.LocalAlloc(flags, (IntPtr)size);
-            if (alloc.IsInvalid)
+            if (alloc.IsInvalid)
-            {
+            {
-                throw new Win32Exception();
+                throw new Win32Exception();
-            }
+            }
-
+
-            return alloc;
+            return alloc;
-        }
+        }
-
+
-        [SuppressUnmanagedCodeSecurity]
+        [SuppressUnmanagedCodeSecurity]
-        private static class NativeMethods
+        private static class NativeMethods
-        {
+        {
-            [DllImport("kernel32.dll", SetLastError = true)]
+            [DllImport("kernel32.dll", SetLastError = true)]
-            public static extern SafeLocalAllocHandle LocalAlloc(uint dwFlags, IntPtr sizetBytes);
+            public static extern SafeLocalAllocHandle LocalAlloc(uint dwFlags, IntPtr sizetBytes);
-
+
-            [DllImport("kernel32.dll", SetLastError = true)]
+            [DllImport("kernel32.dll", SetLastError = true)]
-            [ReliabilityContract(Consistency.WillNotCorruptState, Cer.Success)]
+            [ReliabilityContract(Consistency.WillNotCorruptState, Cer.Success)]
-            public static extern IntPtr LocalFree(IntPtr hMem);
+            public static extern IntPtr LocalFree(IntPtr hMem);
-        }
+        }
-    }
+    }
-}
+}

Library/SafeFileHandle.cs

@@ -1,95 +1,95 @@
-using System;
+using System;
-using System.ComponentModel;
+using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
-using System.IO;
+using System.IO;
-using System.Runtime.ConstrainedExecution;
+using System.Runtime.ConstrainedExecution;
-using System.Runtime.InteropServices;
+using System.Runtime.InteropServices;
-using System.Security;
+using System.Security;
-using System.Security.AccessControl;
+using System.Security.AccessControl;
-using System.Security.Permissions;
+using System.Security.Permissions;
-using Microsoft.Win32.SafeHandles;
+using Microsoft.Win32.SafeHandles;
-
+
-namespace Jellyfish.Library
+namespace Jellyfish.Library
-{
+{
-    [SecurityPermission(SecurityAction.LinkDemand, UnmanagedCode = true)]
+    [SecurityPermission(SecurityAction.LinkDemand, UnmanagedCode = true)]
-    public sealed class SafeFileHandle : SafeHandleZeroOrMinusOneIsInvalid
+    public sealed class SafeFileHandle : SafeHandleZeroOrMinusOneIsInvalid
-    {
+    {
-        [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
+        [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
-        public SafeFileHandle() : 
+        public SafeFileHandle() : 
-            base(true)
+            base(true)
-        {
+        {
-        }
+        }
-
+
-        [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
+        [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
-        public SafeFileHandle(IntPtr existingHandle, bool ownsHandle) : 
+        public SafeFileHandle(IntPtr existingHandle, bool ownsHandle) : 
-            base(ownsHandle)
+            base(ownsHandle)
-        {
+        {
-            SetHandle(existingHandle);
+            SetHandle(existingHandle);
-        }
+        }
-
+
-        public static SafeFileHandle CreateFile(string fileName, FileAccess fileAccess, FileShare fileShare, FileMode fileMode, GeneralSecurity fileSecurity)
+        public static SafeFileHandle CreateFile(string fileName, FileAccess fileAccess, FileShare fileShare, FileMode fileMode, GeneralSecurity fileSecurity)
-        {
+        {
-            if (fileMode == FileMode.Append)
+            if (fileMode == FileMode.Append)
-            {
+            {
-                throw new NotImplementedException();
+                throw new NotImplementedException();
-            }
+            }
-
+
-            bool inheritable = ((fileShare & FileShare.Inheritable) != 0);
+            bool inheritable = ((fileShare & FileShare.Inheritable) != 0);
-            fileShare &= ~FileShare.Inheritable;
+            fileShare &= ~FileShare.Inheritable;
-
+
-            return CreateFile(fileName, (uint)fileAccess, (uint)fileShare, (uint)fileMode, 0x0, fileSecurity, inheritable);
+            return CreateFile(fileName, (uint)fileAccess, (uint)fileShare, (uint)fileMode, 0x0, fileSecurity, inheritable);
-        }
+        }
-
+
-        [ReliabilityContract(Consistency.WillNotCorruptState, Cer.Success)]
+        [ReliabilityContract(Consistency.WillNotCorruptState, Cer.Success)]
-        protected override bool ReleaseHandle()
+        protected override bool ReleaseHandle()
-        {
+        {
-            return NativeMethods.CloseHandle(handle);
+            return NativeMethods.CloseHandle(handle);
-        }
+        }
-
+
-        [SuppressMessage("Microsoft.Design", "CA1024:UsePropertiesWhereAppropriate")]
+        [SuppressMessage("Microsoft.Design", "CA1024:UsePropertiesWhereAppropriate")]
-        public GeneralSecurity GetAccessControl()
+        public GeneralSecurity GetAccessControl()
-        {
+        {
-            return new GeneralSecurity(false, ResourceType.FileObject, this);
+            return new GeneralSecurity(false, ResourceType.FileObject, this);
-        }
+        }
-
+
-        public void SetAccessControl(GeneralSecurity fileSecurity)
+        public void SetAccessControl(GeneralSecurity fileSecurity)
-        {
+        {
-            if (fileSecurity == null)
+            if (fileSecurity == null)
-            {
+            {
-                throw new ArgumentNullException("fileSecurity");
+                throw new ArgumentNullException("fileSecurity");
-            }
+            }
-
+
-            fileSecurity.Persist(this);
+            fileSecurity.Persist(this);
-        }
+        }
-
+
-        private static SafeFileHandle CreateFile(string fileName, uint fileAccess, uint fileShare, uint fileMode, uint fileOptions, GeneralSecurity fileSecurity, 
+        private static SafeFileHandle CreateFile(string fileName, uint fileAccess, uint fileShare, uint fileMode, uint fileOptions, GeneralSecurity fileSecurity, 
-            bool inheritable)
+            bool inheritable)
-        {
+        {
-            SafeFileHandle file = new SafeFileHandle();
+            var file = new SafeFileHandle();
-
+
-            GeneralSecurity.GetSecurityAttributes(fileSecurity, inheritable, securityAttributes => 
+            GeneralSecurity.GetSecurityAttributes(fileSecurity, inheritable, securityAttributes => 
-            {
+            {
-                file = NativeMethods.CreateFile(fileName, fileAccess, fileShare, securityAttributes, fileMode, fileOptions, IntPtr.Zero);
+                file = NativeMethods.CreateFile(fileName, fileAccess, fileShare, securityAttributes, fileMode, fileOptions, IntPtr.Zero);
-                if (file.IsInvalid)
+                if (file.IsInvalid)
-                {
+                {
-                    throw new Win32Exception();
+                    throw new Win32Exception();
-                }
+                }
-            });
+            });
-
+
-            return file;
+            return file;
-        }
+        }
-
+
-        [SuppressUnmanagedCodeSecurity]
+        [SuppressUnmanagedCodeSecurity]
-        private static class NativeMethods
+        private static class NativeMethods
-        {
+        {
-            [DllImport("kernel32.dll", SetLastError = true)]
+            [DllImport("kernel32.dll", SetLastError = true)]
-            [ReliabilityContract(Consistency.WillNotCorruptState, Cer.Success)]
+            [ReliabilityContract(Consistency.WillNotCorruptState, Cer.Success)]
-            [return: MarshalAs(UnmanagedType.Bool)]
+            [return: MarshalAs(UnmanagedType.Bool)]
-            public static extern bool CloseHandle(IntPtr handle);
+            public static extern bool CloseHandle(IntPtr handle);
-
+
-            [DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
+            [DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
-            public static extern SafeFileHandle CreateFile(string lpFileName, uint dwDesiredAccess, uint dwShareMode, SecurityAttributes lpSecurityAttributes, 
+            public static extern SafeFileHandle CreateFile(string lpFileName, uint dwDesiredAccess, uint dwShareMode, SecurityAttributes lpSecurityAttributes, 
-                uint dwCreationDisposition, uint dwFlagsAndAttributes, IntPtr hTemplateFile);
+                uint dwCreationDisposition, uint dwFlagsAndAttributes, IntPtr hTemplateFile);
-        }
+        }
-    }
+    }
-}
+}

Library/Silverlight/ApplicationBase.cs

@@ -1,65 +1,65 @@
-using System;
+using System;
-using System.Text;
+using System.Text;
-using System.Windows;
+using System.Windows;
-
+
-namespace Jellyfish.Library
+namespace Jellyfish.Library
-{
+{
-    public class ApplicationBase : Application
+    public class ApplicationBase : Application
-    {
+    {
-        public ApplicationBase() : 
+        public ApplicationBase() : 
-            this(null)
+            this(null)
-        {
+        {
-        }
+        }
-
+
-        public ApplicationBase(string name)
+        public ApplicationBase(string name)
-        {
+        {
-            Name = name;
+            Name = name;
-
+
-            UnhandledException += OnApplicationUnhandledException;
+            UnhandledException += OnApplicationUnhandledException;
-            //AppDomain.CurrentDomain.UnhandledException += OnAppDomainUnhandledException;
+            //AppDomain.CurrentDomain.UnhandledException += OnAppDomainUnhandledException;
-        }
+        }
-
+
-        private void OnApplicationUnhandledException(object sender, ApplicationUnhandledExceptionEventArgs e)
+        private void OnApplicationUnhandledException(object sender, ApplicationUnhandledExceptionEventArgs e)
-        {
+        {
-            MessageBox.Show(GetExceptionMessage(e.ExceptionObject), GetExceptionCaption("Application Exception", false), MessageBoxButton.OK);
+            MessageBox.Show(GetExceptionMessage(e.ExceptionObject), GetExceptionCaption("Application Exception", false), MessageBoxButton.OK);
-            e.Handled = true;
+            e.Handled = true;
-        }
+        }
-
+
-        //private void OnAppDomainUnhandledException(object sender, UnhandledExceptionEventArgs e)
+        //private void OnAppDomainUnhandledException(object sender, UnhandledExceptionEventArgs e)
-        //{
+        //{
-        //    MessageBox.Show(GetExceptionMessage(e.ExceptionObject as Exception), GetExceptionCaption("AppDomain Exception", e.IsTerminating), MessageBoxButton.OK);
+        //    MessageBox.Show(GetExceptionMessage(e.ExceptionObject as Exception), GetExceptionCaption("AppDomain Exception", e.IsTerminating), MessageBoxButton.OK);
-        //}
+        //}
-
+
-        private string GetExceptionCaption(string title, bool isTerminating)
+        private string GetExceptionCaption(string title, bool isTerminating)
-        {
+        {
-            StringBuilder caption = new StringBuilder();
+            var caption = new StringBuilder();
-            if (!string.IsNullOrEmpty(Name))
+            if (!string.IsNullOrEmpty(Name))
-            {
+            {
-                caption.Append(Name);
+                caption.Append(Name);
-                caption.Append(" ");
+                caption.Append(" ");
-            }
+            }
-            caption.Append(title);
+            caption.Append(title);
-            if (isTerminating)
+            if (isTerminating)
-            {
+            {
-                caption.Append(" (Terminating)");
+                caption.Append(" (Terminating)");
-            }
+            }
-
+
-            return caption.ToString();
+            return caption.ToString();
-        }
+        }
-
+
-        private static string GetExceptionMessage(Exception exception)
+        private static string GetExceptionMessage(Exception exception)
-        {
+        {
-            StringBuilder message = new StringBuilder();
+            var message = new StringBuilder();
-            if (exception != null)
+            if (exception != null)
-            {
+            {
-                message.Append(exception.Message.ToString());
+                message.Append(exception.Message.ToString());
-                message.Append(Environment.NewLine);
+                message.Append(Environment.NewLine);
-                message.Append(exception.StackTrace.ToString());
+                message.Append(exception.StackTrace.ToString());
-            }
+            }
-
+
-            return message.ToString();
+            return message.ToString();
-        }
+        }
-
+
-        public string Name { get; private set; }
+        public string Name { get; private set; }
-    }
+    }
-}
+}

Library/Silverlight/FrameRateCounter.xaml

@@ -1,13 +1,13 @@
-<UserControl x:Class="Jellyfish.Library.FrameRateCounter" x:Name="frameRateControl"
+<UserControl x:Class="Jellyfish.Library.FrameRateCounter" x:Name="frameRateControl"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:jl="clr-namespace:Jellyfish.Library;assembly=Jellyfish.Library">
+    xmlns:jl="clr-namespace:Jellyfish.Library;assembly=Jellyfish.Library">
-    <UserControl.Resources>
+    <UserControl.Resources>
-        <jl:StringFormatConverter x:Key="StringFormatConverter"/>
+        <jl:StringFormatConverter x:Key="StringFormatConverter"/>
-    </UserControl.Resources>
+    </UserControl.Resources>
-    <TextBlock FontFamily="Consolas" FontSize="12" Foreground="White">
+    <TextBlock FontFamily="Consolas" FontSize="12" Foreground="White">
-        <TextBlock.Text>
+        <TextBlock.Text>
-            <Binding Path="FrameRate" ElementName="frameRateControl" Converter="{StaticResource StringFormatConverter}" ConverterParameter="{}{0:D} fps"/>
+            <Binding Path="FrameRate" ElementName="frameRateControl" Converter="{StaticResource StringFormatConverter}" ConverterParameter="{}{0:D} fps"/>
-        </TextBlock.Text>
+        </TextBlock.Text>
-    </TextBlock>
+    </TextBlock>
-</UserControl>
+</UserControl>

Library/Silverlight/FrameRateCounter.xaml.cs

@@ -1,42 +1,42 @@
-using System;
+using System;
-using System.Windows;
+using System.Windows;
-using System.Windows.Controls;
+using System.Windows.Controls;
-using System.Windows.Media;
+using System.Windows.Media;
-
+
-namespace Jellyfish.Library
+namespace Jellyfish.Library
-{
+{
-    public sealed partial class FrameRateCounter : UserControl
+    public sealed partial class FrameRateCounter : UserControl
-    {
+    {
-        public FrameRateCounter()
+        public FrameRateCounter()
-        {
+        {
-            InitializeComponent();
+            InitializeComponent();
-
+
-            CompositionTarget.Rendering += OnCompositionTargetRendering;
+            CompositionTarget.Rendering += OnCompositionTargetRendering;
-        }
+        }
-
+
-        private void OnCompositionTargetRendering(object sender, EventArgs e)
+        private void OnCompositionTargetRendering(object sender, EventArgs e)
-        {
+        {
-            _frameCount++;
+            _frameCount++;
-
+
-            long time = DateTime.UtcNow.Ticks;
+            long time = DateTime.UtcNow.Ticks;
-            if (time - _lastTime >= TimeSpan.TicksPerSecond)
+            if (time - _lastTime >= TimeSpan.TicksPerSecond)
-            {
+            {
-                _lastTime = time;
+                _lastTime = time;
-                FrameRate = _frameCount;
+                FrameRate = _frameCount;
-                _frameCount = 0;
+                _frameCount = 0;
-            }
+            }
-        }
+        }
-
+
-        public static readonly DependencyProperty FrameRateProperty = DependencyProperty.Register("FrameRate", typeof(int), typeof(FrameRateCounter), 
+        public static readonly DependencyProperty FrameRateProperty = DependencyProperty.Register("FrameRate", typeof(int), typeof(FrameRateCounter), 
-            new PropertyMetadata(0));
+            new PropertyMetadata(0));
-
+
-        public int FrameRate
+        public int FrameRate
-        {
+        {
-            get { return (int)GetValue(FrameRateProperty); }
+            get { return (int)GetValue(FrameRateProperty); }
-            set { SetValue(FrameRateProperty, value); }
+            set { SetValue(FrameRateProperty, value); }
-        }
+        }
-
+
-        private int _frameCount;
+        private int _frameCount;
-        private long _lastTime;
+        private long _lastTime;
-    }
+    }
-}
+}

Library/Silverlight/Properties/AssemblyInfo.cs

@@ -1,22 +1,22 @@
-using System;
+using System;
-using System.Reflection;
+using System.Reflection;
-using System.Resources;
+using System.Resources;
-using System.Runtime.InteropServices;
+using System.Runtime.InteropServices;
-using Jellyfish.Library;
+using Jellyfish.Library;
-
+
-[assembly: AssemblyTitle("Library")]
+[assembly: AssemblyTitle("Library")]
-[assembly: AssemblyDescription("Common Library")]
+[assembly: AssemblyDescription("Common Library")]
-[assembly: AssemblyProduct("Jellyfish.Library.Silverlight")]
+[assembly: AssemblyProduct("Jellyfish.Library.Silverlight")]
-[assembly: AssemblyCompany("Digital Jellyfish Design Ltd")]
+[assembly: AssemblyCompany("Digital Jellyfish Design Ltd")]
-[assembly: AssemblyCopyright("Copyright © 2009-2010 Digital Jellyfish Design Ltd")]
+[assembly: AssemblyCopyright("Copyright © 2009-2010 Digital Jellyfish Design Ltd")]
-[assembly: AssemblyComment("Developed by Sean Fausett")]
+[assembly: AssemblyComment("Developed by Sean Fausett")]
-
+
-[assembly: AssemblyVersion("0.1.0.0")]
+[assembly: AssemblyVersion("0.1.0.0")]
-[assembly: AssemblyFileVersion("0.1.0.0")]
+[assembly: AssemblyFileVersion("0.1.0.0")]
-[assembly: AssemblyInformationalVersion("0.1.0.0")]
+[assembly: AssemblyInformationalVersion("0.1.0.0")]
-
+
-[assembly: CLSCompliant(false)]
+[assembly: CLSCompliant(false)]
-[assembly: ComVisible(false)]
+[assembly: ComVisible(false)]
-[assembly: Guid("66034b9e-9f0b-47b0-aac4-cade9a748891")]
+[assembly: Guid("66034b9e-9f0b-47b0-aac4-cade9a748891")]
-
+
-[assembly: NeutralResourcesLanguage("en")]
+[assembly: NeutralResourcesLanguage("en")]

Library/Silverlight/StringFormatConverter.cs

@@ -1,41 +1,41 @@
-using System;
+using System;
-using System.Globalization;
+using System.Globalization;
-using System.Windows;
+using System.Windows;
-using System.Windows.Data;
+using System.Windows.Data;
-
+
-namespace Jellyfish.Library
+namespace Jellyfish.Library
-{
+{
-    public sealed class StringFormatConverter : IValueConverter // SL is missing Binding.StringFormat
+    public sealed class StringFormatConverter : IValueConverter // SL is missing Binding.StringFormat
-    {
+    {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
+        {
-            if (targetType != typeof(string))
+            if (targetType != typeof(string))
-            {
+            {
-                return DependencyProperty.UnsetValue;
+                return DependencyProperty.UnsetValue;
-            }
+            }
-
+
-            if (value == null)
+            if (value == null)
-            {
+            {
-                return string.Empty;
+                return string.Empty;
-            }
+            }
-
+
-            string format = parameter as string;
+            string format = parameter as string;
-            if (!string.IsNullOrEmpty(format))
+            if (!string.IsNullOrEmpty(format))
-            {
+            {
-                if (format.IndexOf('{') < 0)
+                if (format.IndexOf('{') < 0)
-                {
+                {
-                    format = "{0:" + format + "}";
+                    format = "{0:" + format + "}";
-                }
+                }
-
+
-                return string.Format(culture, format, value);
+                return string.Format(culture, format, value);
-            }
+            }
-
+
-            return value.ToString();
+            return value.ToString();
-        }
+        }
-
+
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
+        {
-            return DependencyProperty.UnsetValue; // one way only
+            return DependencyProperty.UnsetValue; // one way only
-        }
+        }
-    }
+    }
-}
+}

Library/SingletonFactory.cs

@@ -1,18 +1,18 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
-
+
-namespace Jellyfish.Library
+namespace Jellyfish.Library
-{
+{
-    public static class SingletonFactory<T> where T : class, new()
+    public static class SingletonFactory<T> where T : class, new()
-    {
+    {
-        [SuppressMessage("Microsoft.Design", "CA1000:DoNotDeclareStaticMembersOnGenericTypes")]
+        [SuppressMessage("Microsoft.Design", "CA1000:DoNotDeclareStaticMembersOnGenericTypes")]
-        public static T Create()
+        public static T Create()
-        {
+        {
-            return _instance;
+            return _instance;
-        }
+        }
-
+
-        [SuppressMessage("Microsoft.Design", "CA1000:DoNotDeclareStaticMembersOnGenericTypes")]
+        [SuppressMessage("Microsoft.Design", "CA1000:DoNotDeclareStaticMembersOnGenericTypes")]
-        public static T Instance { get { return _instance; } }
+        public static T Instance { get { return _instance; } }
-
+
-        private static readonly T _instance = new T();
+        private static readonly T _instance = new T();
-    }
+    }
-}
+}

Library/StreamExtensions.cs

@@ -1,40 +1,40 @@
-using System;
+using System;
-using System.IO;
+using System.IO;
-
+
-namespace Jellyfish.Library
+namespace Jellyfish.Library
-{
+{
-    public static class StreamExtensions
+    public static class StreamExtensions
-    {
+    {
-        public static byte[] ReadAllBytes(this Stream stream)
+        public static byte[] ReadAllBytes(this Stream stream)
-        {
+        {
-            if (stream == null)
+            if (stream == null)
-            {
+            {
-                throw new ArgumentNullException("stream");
+                throw new ArgumentNullException("stream");
-            }
+            }
-
+
-            int count = (int)stream.Length;
+            int count = (int)stream.Length;
-            byte[] buffer = new byte[count];
+            byte[] buffer = new byte[count];
-            ReadBlock(stream, buffer, 0, count);
+            ReadBlock(stream, buffer, 0, count);
-
+
-            return buffer;
+            return buffer;
-        }
+        }
-
+
-        public static int ReadBlock(this Stream stream, byte[] buffer, int offset, int count)
+        public static int ReadBlock(this Stream stream, byte[] buffer, int offset, int count)
-        {
+        {
-            if (stream == null)
+            if (stream == null)
-            {
+            {
-                throw new ArgumentNullException("stream");
+                throw new ArgumentNullException("stream");
-            }
+            }
-
+
-            int total = 0;
+            int total = 0;
-            int read;
+            int read;
-            do
+            do
-            {
+            {
-                total += read = stream.Read(buffer, offset + total, count - total);
+                total += read = stream.Read(buffer, offset + total, count - total);
-            }
+            }
-            while ((read > 0) && (total < count));
+            while ((read > 0) && (total < count));
-
+
-            return total;
+            return total;
-        }
+        }
-    }
+    }
-}
+}

Library/StringBuilderExtensions.cs

@@ -1,38 +1,38 @@
-using System.Globalization;
+using System.Globalization;
-using System.Text;
+using System.Text;
-
+
-namespace Jellyfish.Library
+namespace Jellyfish.Library
-{
+{
-    public static class StringBuilderExtensions
+    public static class StringBuilderExtensions
-    {
+    {
-        public static StringBuilder AppendHex(this StringBuilder builder, short value) // little endian
+        public static StringBuilder AppendHex(this StringBuilder builder, short value) // little endian
-        {
+        {
-            return builder.AppendFormat(CultureInfo.InvariantCulture, "{0:X2}{1:X2}", value & 0xFF, value >> 8);
+            return builder.AppendFormat(CultureInfo.InvariantCulture, "{0:X2}{1:X2}", value & 0xFF, value >> 8);
-        }
+        }
-
+
-        public static StringBuilder AppendHex(this StringBuilder builder, int value) // little endian
+        public static StringBuilder AppendHex(this StringBuilder builder, int value) // little endian
-        {
+        {
-            return builder.AppendFormat(CultureInfo.InvariantCulture, "{0:X2}{1:X2}{2:X2}{3:X2}", value & 0xFF, (value >> 8) & 0xFF, (value >> 16) & 0xFF, value >> 24);
+            return builder.AppendFormat(CultureInfo.InvariantCulture, "{0:X2}{1:X2}{2:X2}{3:X2}", value & 0xFF, (value >> 8) & 0xFF, (value >> 16) & 0xFF, value >> 24);
-        }
+        }
-
+
-        public static StringBuilder AppendWithoutGarbage(this StringBuilder builder, int value)
+        public static StringBuilder AppendWithoutGarbage(this StringBuilder builder, int value)
-        {
+        {
-            if (value < 0)
+            if (value < 0)
-            {
+            {
-                builder.Append('-');
+                builder.Append('-');
-            }
+            }
-
+
-            int index = builder.Length;
+            int index = builder.Length;
-            do
+            do
-            {
+            {
-                builder.Insert(index, Digits, (value % 10) + 9, 1);
+                builder.Insert(index, Digits, (value % 10) + 9, 1);
-                value /= 10;
+                value /= 10;
-            }
+            }
-            while (value != 0);
+            while (value != 0);
-
+
-            return builder;
+            return builder;
-        }
+        }
-
+
-        private static readonly char[] Digits = new char[] { '9', '8', '7', '6', '5', '4', '3', '2', '1', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9' };
+        private static readonly char[] Digits = new char[] { '9', '8', '7', '6', '5', '4', '3', '2', '1', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9' };
-    }
+    }
-}
+}

Library/WaveFormat.cs

@@ -18,7 +18,7 @@ public WaveFormat(int sampleRate, int sampleChannels, int sampleBits)
 
         public string ToHexString() // little endian
         {
-            StringBuilder builder = new StringBuilder();
+            var builder = new StringBuilder();
 
             builder.AppendHex(_formatTag);
             builder.AppendHex(_channels);

Library/Wpf/ApplicationBase.cs

@@ -1,72 +1,72 @@
-using System;
+using System;
-using System.Diagnostics;
+using System.Diagnostics;
-using System.Security.Permissions;
+using System.Security.Permissions;
-using System.Text;
+using System.Text;
-using System.Windows;
+using System.Windows;
-using System.Windows.Threading;
+using System.Windows.Threading;
-
+
-namespace Jellyfish.Library
+namespace Jellyfish.Library
-{
+{
-    public class ApplicationBase : Application
+    public class ApplicationBase : Application
-    {
+    {
-        [SecurityPermission(SecurityAction.LinkDemand, UnmanagedCode = true)]
+        [SecurityPermission(SecurityAction.LinkDemand, UnmanagedCode = true)]
-        public ApplicationBase() : 
+        public ApplicationBase() : 
-            this(null)
+            this(null)
-        {
+        {
-        }
+        }
-
+
-        [SecurityPermission(SecurityAction.LinkDemand, UnmanagedCode = true)]
+        [SecurityPermission(SecurityAction.LinkDemand, UnmanagedCode = true)]
-        public ApplicationBase(string name)
+        public ApplicationBase(string name)
-        {
+        {
-            Name = name;
+            Name = name;
-
+
-            DispatcherUnhandledException += OnApplicationDispatcherUnhandledException;
+            DispatcherUnhandledException += OnApplicationDispatcherUnhandledException;
-            AppDomain.CurrentDomain.UnhandledException += OnAppDomainUnhandledException;
+            AppDomain.CurrentDomain.UnhandledException += OnAppDomainUnhandledException;
-        }
+        }
-
+
-        private void OnApplicationDispatcherUnhandledException(object sender, DispatcherUnhandledExceptionEventArgs e)
+        private void OnApplicationDispatcherUnhandledException(object sender, DispatcherUnhandledExceptionEventArgs e)
-        {
+        {
-            MessageBox.Show(GetExceptionMessage(e.Exception), GetExceptionCaption("Application Dispatcher Exception", true));
+            MessageBox.Show(GetExceptionMessage(e.Exception), GetExceptionCaption("Application Dispatcher Exception", true));
-            e.Handled = true;
+            e.Handled = true;
-            Shutdown();
+            Shutdown();
-        }
+        }
-
+
-        private void OnAppDomainUnhandledException(object sender, UnhandledExceptionEventArgs e)
+        private void OnAppDomainUnhandledException(object sender, UnhandledExceptionEventArgs e)
-        {
+        {
-            MessageBox.Show(GetExceptionMessage(e.ExceptionObject as Exception), GetExceptionCaption("AppDomain Exception", e.IsTerminating));
+            MessageBox.Show(GetExceptionMessage(e.ExceptionObject as Exception), GetExceptionCaption("AppDomain Exception", e.IsTerminating));
-        }
+        }
-
+
-        private string GetExceptionCaption(string title, bool isTerminating)
+        private string GetExceptionCaption(string title, bool isTerminating)
-        {
+        {
-            StringBuilder caption = new StringBuilder();
+            var caption = new StringBuilder();
-            caption.AppendFormat("[{0}] ", Process.GetCurrentProcess().Id);
+            caption.AppendFormat("[{0}] ", Process.GetCurrentProcess().Id);
-            if (!string.IsNullOrEmpty(Name))
+            if (!string.IsNullOrEmpty(Name))
-            {
+            {
-                caption.Append(Name);
+                caption.Append(Name);
-                caption.Append(" ");
+                caption.Append(" ");
-            }
+            }
-            caption.Append(title);
+            caption.Append(title);
-            if (isTerminating)
+            if (isTerminating)
-            {
+            {
-                caption.Append(" (Terminating)");
+                caption.Append(" (Terminating)");
-            }
+            }
-
+
-            return caption.ToString();
+            return caption.ToString();
-        }
+        }
-
+
-        private static string GetExceptionMessage(Exception exception)
+        private static string GetExceptionMessage(Exception exception)
-        {
+        {
-            StringBuilder message = new StringBuilder();
+            var message = new StringBuilder();
-            if (exception != null)
+            if (exception != null)
-            {
+            {
-                message.Append(exception.Message.ToString());
+                message.Append(exception.Message.ToString());
-                message.Append(Environment.NewLine);
+                message.Append(Environment.NewLine);
-                message.Append(exception.StackTrace.ToString());
+                message.Append(exception.StackTrace.ToString());
-            }
+            }
-
+
-            return message.ToString();
+            return message.ToString();
-        }
+        }
-
+
-        public string Name { get; private set; }
+        public string Name { get; private set; }
-    }
+    }
-}
+}

Library/Wpf/FrameRateCounter.xaml

@@ -1,9 +1,9 @@
-<UserControl x:Class="Jellyfish.Library.FrameRateCounter" x:Name="frameRateControl"
+<UserControl x:Class="Jellyfish.Library.FrameRateCounter" x:Name="frameRateControl"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <TextBlock FontFamily="Consolas" FontSize="12" Foreground="White">
+    <TextBlock FontFamily="Consolas" FontSize="12" Foreground="White">
-        <TextBlock.Text>
+        <TextBlock.Text>
-            <Binding Path="FrameRate" ElementName="frameRateControl" StringFormat="{}{0:D} fps"/>
+            <Binding Path="FrameRate" ElementName="frameRateControl" StringFormat="{}{0:D} fps"/>
-        </TextBlock.Text>
+        </TextBlock.Text>
-    </TextBlock>
+    </TextBlock>
-</UserControl>
+</UserControl>

Library/Wpf/FrameRateCounter.xaml.cs

@@ -1,42 +1,42 @@
-using System;
+using System;
-using System.Windows;
+using System.Windows;
-using System.Windows.Controls;
+using System.Windows.Controls;
-using System.Windows.Media;
+using System.Windows.Media;
-
+
-namespace Jellyfish.Library
+namespace Jellyfish.Library
-{
+{
-    public sealed partial class FrameRateCounter : UserControl
+    public sealed partial class FrameRateCounter : UserControl
-    {
+    {
-        public FrameRateCounter()
+        public FrameRateCounter()
-        {
+        {
-            InitializeComponent();
+            InitializeComponent();
-
+
-            CompositionTarget.Rendering += OnCompositionTargetRendering;
+            CompositionTarget.Rendering += OnCompositionTargetRendering;
-        }
+        }
-
+
-        private void OnCompositionTargetRendering(object sender, EventArgs e)
+        private void OnCompositionTargetRendering(object sender, EventArgs e)
-        {
+        {
-            _frameCount++;
+            _frameCount++;
-
+
-            long time = DateTime.UtcNow.Ticks;
+            long time = DateTime.UtcNow.Ticks;
-            if (time - _lastTime >= TimeSpan.TicksPerSecond)
+            if (time - _lastTime >= TimeSpan.TicksPerSecond)
-            {
+            {
-                _lastTime = time;
+                _lastTime = time;
-                FrameRate = _frameCount;
+                FrameRate = _frameCount;
-                _frameCount = 0;
+                _frameCount = 0;
-            }
+            }
-        }
+        }
-
+
-        public static readonly DependencyProperty FrameRateProperty = DependencyProperty.Register("FrameRate", typeof(int), typeof(FrameRateCounter), 
+        public static readonly DependencyProperty FrameRateProperty = DependencyProperty.Register("FrameRate", typeof(int), typeof(FrameRateCounter), 
-            new PropertyMetadata(0));
+            new PropertyMetadata(0));
-
+
-        public int FrameRate
+        public int FrameRate
-        {
+        {
-            get { return (int)GetValue(FrameRateProperty); }
+            get { return (int)GetValue(FrameRateProperty); }
-            set { SetValue(FrameRateProperty, value); }
+            set { SetValue(FrameRateProperty, value); }
-        }
+        }
-
+
-        private int _frameCount;
+        private int _frameCount;
-        private long _lastTime;
+        private long _lastTime;
-    }
+    }
-}
+}

Library/Wpf/Properties/AssemblyInfo.cs

@@ -1,22 +1,22 @@
-using System;
+using System;
-using System.Reflection;
+using System.Reflection;
-using System.Resources;
+using System.Resources;
-using System.Runtime.InteropServices;
+using System.Runtime.InteropServices;
-using Jellyfish.Library;
+using Jellyfish.Library;
-
+
-[assembly: AssemblyTitle("Library")]
+[assembly: AssemblyTitle("Library")]
-[assembly: AssemblyDescription("Common Library")]
+[assembly: AssemblyDescription("Common Library")]
-[assembly: AssemblyProduct("Jellyfish.Library.Wpf")]
+[assembly: AssemblyProduct("Jellyfish.Library.Wpf")]
-[assembly: AssemblyCompany("Digital Jellyfish Design Ltd")]
+[assembly: AssemblyCompany("Digital Jellyfish Design Ltd")]
-[assembly: AssemblyCopyright("Copyright © 2009-2010 Digital Jellyfish Design Ltd")]
+[assembly: AssemblyCopyright("Copyright © 2009-2010 Digital Jellyfish Design Ltd")]
-[assembly: AssemblyComment("Developed by Sean Fausett")]
+[assembly: AssemblyComment("Developed by Sean Fausett")]
-
+
-[assembly: AssemblyVersion("0.1.0.0")]
+[assembly: AssemblyVersion("0.1.0.0")]
-[assembly: AssemblyFileVersion("0.1.0.0")]
+[assembly: AssemblyFileVersion("0.1.0.0")]
-[assembly: AssemblyInformationalVersion("0.1.0.0")]
+[assembly: AssemblyInformationalVersion("0.1.0.0")]
-
+
-[assembly: CLSCompliant(false)]
+[assembly: CLSCompliant(false)]
-[assembly: ComVisible(false)]
+[assembly: ComVisible(false)]
-[assembly: Guid("66034b9e-9f0b-47b0-aac4-cade9a748891")]
+[assembly: Guid("66034b9e-9f0b-47b0-aac4-cade9a748891")]
-
+
-[assembly: NeutralResourcesLanguage("en")]
+[assembly: NeutralResourcesLanguage("en")]

Library/XmlSerializerHelpers.cs

@@ -1,40 +1,40 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
-using System.IO;
+using System.IO;
-using System.Xml;
+using System.Xml;
-using System.Xml.Serialization;
+using System.Xml.Serialization;
-
+
-namespace Jellyfish.Library
+namespace Jellyfish.Library
-{
+{
-    public static class XmlSerializerHelpers
+    public static class XmlSerializerHelpers
-    {
+    {
-        [SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter")]
+        [SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter")]
-        public static T Deserialize<T>(Stream stream)
+        public static T Deserialize<T>(Stream stream)
-        {
+        {
-            return Deserialize<T>(stream, null);
+            return Deserialize<T>(stream, null);
-        }
+        }
-
+
-        [SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter")]
+        [SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter")]
-        public static T Deserialize<T>(Stream stream, string defaultNamespace)
+        public static T Deserialize<T>(Stream stream, string defaultNamespace)
-        {
+        {
-            using (XmlReader reader = XmlReader.Create(stream))
+            using (var reader = XmlReader.Create(stream))
-            {
+            {
-                XmlSerializer serializer = new XmlSerializer(typeof(T), defaultNamespace);
+                var serializer = new XmlSerializer(typeof(T), defaultNamespace);
-                return (T)serializer.Deserialize(reader);
+                return (T)serializer.Deserialize(reader);
-            }
+            }
-        }
+        }
-
+
-        public static void Serialize<T>(Stream stream, T instance)
+        public static void Serialize<T>(Stream stream, T instance)
-        {
+        {
-            Serialize<T>(stream, instance, null);
+            Serialize<T>(stream, instance, null);
-        }
+        }
-
+
-        public static void Serialize<T>(Stream stream, T instance, string defaultNamespace)
+        public static void Serialize<T>(Stream stream, T instance, string defaultNamespace)
-        {
+        {
-            using (XmlWriter writer = XmlWriter.Create(stream))
+            using (var writer = XmlWriter.Create(stream))
-            {
+            {
-                XmlSerializer serializer = new XmlSerializer(typeof(T), defaultNamespace);
+                var serializer = new XmlSerializer(typeof(T), defaultNamespace);
-                serializer.Serialize(writer, instance);
+                serializer.Serialize(writer, instance);
-            }
+            }
-        }
+        }
-    }
+    }
-}
+}

Library/Xna/FrameRateCounter.cs

@@ -1,71 +1,71 @@
-using System;
+using System;
-using System.Text;
+using System.Text;
-using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
+using Microsoft.Xna.Framework.Graphics;
-
+
-namespace Jellyfish.Library
+namespace Jellyfish.Library
-{
+{
-    public sealed class FrameRateCounter : DrawableGameComponent
+    public sealed class FrameRateCounter : DrawableGameComponent
-    {
+    {
-        public FrameRateCounter(GameBase game) : 
+        public FrameRateCounter(GameBase game) : 
-            base(game)
+            base(game)
-        {
+        {
-            FontColor = Color.White;
+            FontColor = Color.White;
-            FontName = "Default";
+            FontName = "Default";
-
+
-            //game.IsFixedTimeStep = true; // fixed (default)
+            //game.IsFixedTimeStep = true; // fixed (default)
-            //game.TargetElapsedTime = TimeSpan.FromSeconds(1 / 60f);
+            //game.TargetElapsedTime = TimeSpan.FromSeconds(1 / 60f);
-
+
-            //game.IsFixedTimeStep = false; // flatout
+            //game.IsFixedTimeStep = false; // flatout
-            //game.GraphicsDeviceManager.SynchronizeWithVerticalRetrace = false;
+            //game.GraphicsDeviceManager.SynchronizeWithVerticalRetrace = false;
-        }
+        }
-
+
-        protected override void LoadContent()
+        protected override void LoadContent()
-        {
+        {
-            _spriteBatch = new SpriteBatch(GraphicsDevice);
+            _spriteBatch = new SpriteBatch(GraphicsDevice);
-            _spriteFont = Game.Content.Load<SpriteFont>(FontName);
+            _spriteFont = Game.Content.Load<SpriteFont>(FontName);
-
+
-            Rectangle titleSafeArea = Game.GraphicsDevice.DisplayMode.TitleSafeArea;
+            var titleSafeArea = Game.GraphicsDevice.DisplayMode.TitleSafeArea;
-            Position = new Vector2(titleSafeArea.X, titleSafeArea.Y);
+            Position = new Vector2(titleSafeArea.X, titleSafeArea.Y);
-        }
+        }
-
+
-        public override void Draw(GameTime gameTime)
+        public override void Draw(GameTime gameTime)
-        {
+        {
-            _frameCount++;
+            _frameCount++;
-
+
-            _frameRateBuilder.Length = 0;
+            _frameRateBuilder.Length = 0;
-            _frameRateBuilder.AppendWithoutGarbage(_frameRate).Append(" fps");
+            _frameRateBuilder.AppendWithoutGarbage(_frameRate).Append(" fps");
-
+
-            _spriteBatch.Begin(SpriteBlendMode.AlphaBlend, SpriteSortMode.Immediate, SaveStateMode.None);
+            _spriteBatch.Begin(SpriteBlendMode.AlphaBlend, SpriteSortMode.Immediate, SaveStateMode.None);
-            //_spriteBatch.DrawString(_spriteFont, fps, Position - Vector2.UnitX, Color.Black); // rough outline
+            //_spriteBatch.DrawString(_spriteFont, fps, Position - Vector2.UnitX, Color.Black); // rough outline
-            //_spriteBatch.DrawString(_spriteFont, fps, Position + Vector2.UnitX, Color.Black);
+            //_spriteBatch.DrawString(_spriteFont, fps, Position + Vector2.UnitX, Color.Black);
-            //_spriteBatch.DrawString(_spriteFont, fps, Position - Vector2.UnitY, Color.Black);
+            //_spriteBatch.DrawString(_spriteFont, fps, Position - Vector2.UnitY, Color.Black);
-            //_spriteBatch.DrawString(_spriteFont, fps, Position + Vector2.UnitY, Color.Black);
+            //_spriteBatch.DrawString(_spriteFont, fps, Position + Vector2.UnitY, Color.Black);
-            _spriteBatch.DrawString(_spriteFont, _frameRateBuilder, Position, FontColor);
+            _spriteBatch.DrawString(_spriteFont, _frameRateBuilder, Position, FontColor);
-            _spriteBatch.End();
+            _spriteBatch.End();
-        }
+        }
-
+
-        public override void Update(GameTime gameTime)
+        public override void Update(GameTime gameTime)
-        {
+        {
-            _elapsedTime += gameTime.ElapsedGameTime.Ticks;
+            _elapsedTime += gameTime.ElapsedGameTime.Ticks;
-
+
-            if (_elapsedTime >= TimeSpan.TicksPerSecond)
+            if (_elapsedTime >= TimeSpan.TicksPerSecond)
-            {
+            {
-                _elapsedTime -= TimeSpan.TicksPerSecond;
+                _elapsedTime -= TimeSpan.TicksPerSecond;
-                _frameRate = _frameCount;
+                _frameRate = _frameCount;
-                _frameCount = 0;
+                _frameCount = 0;
-            }
+            }
-        }
+        }
-
+
-        public Color FontColor { get; set; }
+        public Color FontColor { get; set; }
-        public string FontName { get; set; }
+        public string FontName { get; set; }
-        public Vector2 Position { get; set; }
+        public Vector2 Position { get; set; }
-
+
-        private SpriteBatch _spriteBatch;
+        private SpriteBatch _spriteBatch;
-        private SpriteFont _spriteFont;
+        private SpriteFont _spriteFont;
-        private long _elapsedTime;
+        private long _elapsedTime;
-        private int _frameCount;
+        private int _frameCount;
-        private int _frameRate;
+        private int _frameRate;
-        private StringBuilder _frameRateBuilder = new StringBuilder(); // cache builder; avoids garbage
+        private StringBuilder _frameRateBuilder = new StringBuilder(); // cache builder; avoids garbage
-    }
+    }
-}
+}

Library/Xna/GameBase.cs

@@ -1,45 +1,45 @@
-using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.GamerServices;
+using Microsoft.Xna.Framework.GamerServices;
-using Microsoft.Xna.Framework.Graphics;
+using Microsoft.Xna.Framework.Graphics;
-using Microsoft.Xna.Framework.Input;
+using Microsoft.Xna.Framework.Input;
-
+
-namespace Jellyfish.Library
+namespace Jellyfish.Library
-{
+{
-    public class GameBase : Game
+    public class GameBase : Game
-    {
+    {
-        public GameBase() : 
+        public GameBase() : 
-            this(null)
+            this(null)
-        {
+        {
-        }
+        }
-
+
-        public GameBase(string name)
+        public GameBase(string name)
-        {
+        {
-            Name = name;
+            Name = name;
-
+
-            GraphicsDeviceManager = new GraphicsDeviceManager(this);
+            GraphicsDeviceManager = new GraphicsDeviceManager(this);
-            GraphicsDeviceService = (IGraphicsDeviceService)Services.GetService(typeof(IGraphicsDeviceService));
+            GraphicsDeviceService = (IGraphicsDeviceService)Services.GetService(typeof(IGraphicsDeviceService));
-
+
-            Components.Add(new GamerServicesComponent(this));
+            Components.Add(new GamerServicesComponent(this));
-            Content.RootDirectory = "Content";
+            Content.RootDirectory = "Content";
-            if (!string.IsNullOrEmpty(Name))
+            if (!string.IsNullOrEmpty(Name))
-            {
+            {
-                Window.Title = Name;
+                Window.Title = Name;
-            }
+            }
-        }
+        }
-
+
-        protected override void Update(GameTime gameTime)
+        protected override void Update(GameTime gameTime)
-        {
+        {
-            GamePadState gamePadState = GamePad.GetState(PlayerIndex.One);
+            var gamePadState = GamePad.GetState(PlayerIndex.One);
-            if (gamePadState.Buttons.Back == ButtonState.Pressed)
+            if (gamePadState.Buttons.Back == ButtonState.Pressed)
-            {
+            {
-                Exit();
+                Exit();
-            }
+            }
-
+
-            base.Update(gameTime);
+            base.Update(gameTime);
-        }
+        }
-
+
-        public string Name { get; private set; }
+        public string Name { get; private set; }
-        public GraphicsDeviceManager GraphicsDeviceManager { get; private set; }
+        public GraphicsDeviceManager GraphicsDeviceManager { get; private set; }
-        public IGraphicsDeviceService GraphicsDeviceService { get; private set; }
+        public IGraphicsDeviceService GraphicsDeviceService { get; private set; }
-    }
+    }
-}
+}

Library/Xna/Properties/AssemblyInfo.cs

@@ -1,30 +1,30 @@
-using System;
+using System;
-using System.Reflection;
+using System.Reflection;
-using System.Resources;
+using System.Resources;
-using System.Runtime.InteropServices;
+using System.Runtime.InteropServices;
-using Jellyfish.Library;
+using Jellyfish.Library;
-
+
-[assembly: AssemblyTitle("Library")]
+[assembly: AssemblyTitle("Library")]
-[assembly: AssemblyDescription("Common Library")]
+[assembly: AssemblyDescription("Common Library")]
-#if XBOX
+#if XBOX
-[assembly: AssemblyProduct("Jellyfish.Library.Xna.Xbox")]
+[assembly: AssemblyProduct("Jellyfish.Library.Xna.Xbox")]
-#elif ZUNE
+#elif ZUNE
-[assembly: AssemblyProduct("Jellyfish.Library.Xna.Zune")]
+[assembly: AssemblyProduct("Jellyfish.Library.Xna.Zune")]
-#else
+#else
-[assembly: AssemblyProduct("Jellyfish.Library.Xna")]
+[assembly: AssemblyProduct("Jellyfish.Library.Xna")]
-#endif
+#endif
-[assembly: AssemblyCompany("Digital Jellyfish Design Ltd")]
+[assembly: AssemblyCompany("Digital Jellyfish Design Ltd")]
-[assembly: AssemblyCopyright("Copyright © 2009-2010 Digital Jellyfish Design Ltd")]
+[assembly: AssemblyCopyright("Copyright © 2009-2010 Digital Jellyfish Design Ltd")]
-[assembly: AssemblyComment("Developed by Sean Fausett")]
+[assembly: AssemblyComment("Developed by Sean Fausett")]
-
+
-[assembly: AssemblyVersion("0.1.0.0")]
+[assembly: AssemblyVersion("0.1.0.0")]
-#if WINDOWS
+#if WINDOWS
-[assembly: AssemblyFileVersion("0.1.0.0")]
+[assembly: AssemblyFileVersion("0.1.0.0")]
-#endif
+#endif
-[assembly: AssemblyInformationalVersion("0.1.0.0")]
+[assembly: AssemblyInformationalVersion("0.1.0.0")]
-
+
-[assembly: CLSCompliant(false)]
+[assembly: CLSCompliant(false)]
-[assembly: ComVisible(false)]
+[assembly: ComVisible(false)]
-[assembly: Guid("66034b9e-9f0b-47b0-aac4-cade9a748891")]
+[assembly: Guid("66034b9e-9f0b-47b0-aac4-cade9a748891")]
-
+
-[assembly: NeutralResourcesLanguage("en")]
+[assembly: NeutralResourcesLanguage("en")]

Virtu/Cassette.cs

@@ -1,23 +1,23 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
-
+
-namespace Jellyfish.Virtu
+namespace Jellyfish.Virtu
-{
+{
-    public sealed class Cassette : MachineComponent
+    public sealed class Cassette : MachineComponent
-    {
+    {
-        public Cassette(Machine machine) :
+        public Cassette(Machine machine) :
-            base(machine)
+            base(machine)
-        {
+        {
-        }
+        }
-
+
-        [SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic")]
+        [SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic")]
-        public bool ReadInput()
+        public bool ReadInput()
-        {
+        {
-            return false;
+            return false;
-        }
+        }
-
+
-        [SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic")]
+        [SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic")]
-        public void ToggleOutput()
+        public void ToggleOutput()
-        {
+        {
-        }
+        }
-    }
+    }
-}
+}

Virtu/CpuData.cs

@@ -1,83 +1,83 @@
-using System;
+using System;
-
+
-namespace Jellyfish.Virtu
+namespace Jellyfish.Virtu
-{
+{
-    public partial class Cpu
+    public partial class Cpu
-    {
+    {
-        private const int OpcodeCount = 256;
+        private const int OpcodeCount = 256;
-
+
-        private readonly Action[] ExecuteOpcode65N02;
+        private readonly Action[] ExecuteOpcode65N02;
-        private readonly Action[] ExecuteOpcode65C02;
+        private readonly Action[] ExecuteOpcode65C02;
-
+
-        private const int PC = 0x01;
+        private const int PC = 0x01;
-        private const int PZ = 0x02;
+        private const int PZ = 0x02;
-        private const int PI = 0x04;
+        private const int PI = 0x04;
-        private const int PD = 0x08;
+        private const int PD = 0x08;
-        private const int PB = 0x10;
+        private const int PB = 0x10;
-        private const int PR = 0x20;
+        private const int PR = 0x20;
-        private const int PV = 0x40;
+        private const int PV = 0x40;
-        private const int PN = 0x80;
+        private const int PN = 0x80;
-
+
-        private const int DataCount = 256;
+        private const int DataCount = 256;
-
+
-        private static readonly int[] DataPN = new int[DataCount]
+        private static readonly int[] DataPN = new int[DataCount]
-        {
+        {
-            0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 
+            0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 
-            0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 
+            0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 
-            0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 
+            0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 
-            0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 
+            0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 
-            0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 
+            0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 
-            0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 
+            0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 
-            0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 
+            0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 
-            0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 
+            0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 
-            PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN, 
+            PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN, 
-            PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN, 
+            PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN, 
-            PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN, 
+            PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN, 
-            PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN, 
+            PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN, 
-            PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN, 
+            PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN, 
-            PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN, 
+            PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN, 
-            PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN, 
+            PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN, 
-            PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN
+            PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN
-        };
+        };
-
+
-        private static readonly int[] DataPZ = new int[DataCount]
+        private static readonly int[] DataPZ = new int[DataCount]
-        {
+        {
-            PZ,  0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 
+            PZ,  0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 
-            0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 
+            0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 
-            0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 
+            0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 
-            0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 
+            0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 
-            0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 
+            0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 
-            0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 
+            0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 
-            0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 
+            0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 
-            0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 
+            0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 
-            0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 
+            0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 
-            0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 
+            0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 
-            0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 
+            0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 
-            0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 
+            0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 
-            0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 
+            0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 
-            0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 
+            0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 
-            0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 
+            0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 
-            0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0
+            0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0
-        };
+        };
-
+
-        private static readonly int[] DataPNZ = new int[DataCount]
+        private static readonly int[] DataPNZ = new int[DataCount]
-        {
+        {
-            PZ,  0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 
+            PZ,  0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 
-            0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 
+            0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 
-            0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 
+            0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 
-            0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 
+            0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 
-            0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 
+            0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 
-            0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 
+            0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 
-            0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 
+            0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 
-            0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 
+            0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 
-            PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN, 
+            PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN, 
-            PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN, 
+            PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN, 
-            PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN, 
+            PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN, 
-            PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN, 
+            PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN, 
-            PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN, 
+            PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN, 
-            PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN, 
+            PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN, 
-            PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN, 
+            PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN, 
-            PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN
+            PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN,  PN
-        };
+        };
-    }
+    }
-}
+}

Virtu/CustomDictionary.xml

@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
-<Dictionary>
+<Dictionary>
-    <Acronyms>
+    <Acronyms>
-        <CasingExceptions>
+        <CasingExceptions>
-            <Acronym>CXXX</Acronym>
+            <Acronym>CXXX</Acronym>
-            <Acronym>RPC</Acronym>
+            <Acronym>RPC</Acronym>
-        </CasingExceptions>
+        </CasingExceptions>
-    </Acronyms>
+    </Acronyms>
-    <Words>
+    <Words>
-        <Recognized>
+        <Recognized>
-            <Word>Annunciator</Word>
+            <Word>Annunciator</Word>
-            <Word>Dsk</Word>
+            <Word>Dsk</Word>
-            <Word>Opcode</Word>
+            <Word>Opcode</Word>
-            <Word>Unpause</Word>
+            <Word>Unpause</Word>
-            <Word>Virtu</Word>
+            <Word>Virtu</Word>
-            <Word>Xna</Word>
+            <Word>Xna</Word>
-            <Word>x</Word>
+            <Word>x</Word>
-            <Word>y</Word>
+            <Word>y</Word>
-        </Recognized>
+        </Recognized>
-        <Unrecognized>
+        <Unrecognized>
-            <Word>DownRight</Word>
+            <Word>DownRight</Word>
-            <Word>UpRight</Word>
+            <Word>UpRight</Word>
-        </Unrecognized>
+        </Unrecognized>
-    </Words>
+    </Words>
 </Dictionary>

Virtu/Disk525.cs

@@ -1,43 +1,43 @@
-using System;
+using System;
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
-
+
-namespace Jellyfish.Virtu
+namespace Jellyfish.Virtu
-{
+{
-    public abstract class Disk525
+    public abstract class Disk525
-    {
+    {
-        protected Disk525(string name, byte[] data, bool isWriteProtected)
+        protected Disk525(string name, byte[] data, bool isWriteProtected)
-        {
+        {
-            Name = name;
+            Name = name;
-            Data = data;
+            Data = data;
-            IsWriteProtected = isWriteProtected;
+            IsWriteProtected = isWriteProtected;
-        }
+        }
-
+
-        public static Disk525 CreateDisk(string name, byte[] data, bool isWriteProtected)
+        public static Disk525 CreateDisk(string name, byte[] data, bool isWriteProtected)
-        {
+        {
-            if (name.EndsWith(".nib", StringComparison.OrdinalIgnoreCase) && (data.Length == TrackCount * TrackSize))
+            if (name.EndsWith(".nib", StringComparison.OrdinalIgnoreCase) && (data.Length == TrackCount * TrackSize))
-            {
+            {
-                return new DiskNib(name, data, isWriteProtected);
+                return new DiskNib(name, data, isWriteProtected);
-            }
+            }
-            else if (name.EndsWith(".dsk", StringComparison.OrdinalIgnoreCase) && (data.Length == TrackCount * SectorCount * SectorSize))
+            else if (name.EndsWith(".dsk", StringComparison.OrdinalIgnoreCase) && (data.Length == TrackCount * SectorCount * SectorSize))
-            {
+            {
-                return new DiskDsk(name, data, isWriteProtected);
+                return new DiskDsk(name, data, isWriteProtected);
-            }
+            }
-
+
-            return null;
+            return null;
-        }
+        }
-
+
-        public abstract void ReadTrack(int number, int fraction, byte[] buffer);
+        public abstract void ReadTrack(int number, int fraction, byte[] buffer);
-        public abstract void WriteTrack(int number, int fraction, byte[] buffer);
+        public abstract void WriteTrack(int number, int fraction, byte[] buffer);
-
+
-        public string Name { get; private set; }
+        public string Name { get; private set; }
-        public bool IsWriteProtected { get; private set; }
+        public bool IsWriteProtected { get; private set; }
-
+
-        [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
+        [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
-        protected byte[] Data { get; private set; }
+        protected byte[] Data { get; private set; }
-
+
-        public const int SectorCount = 16;
+        public const int SectorCount = 16;
-        public const int SectorSize = 0x100;
+        public const int SectorSize = 0x100;
-        public const int TrackCount = 35;
+        public const int TrackCount = 35;
-        public const int TrackSize = 0x1A00;
+        public const int TrackSize = 0x1A00;
-    }
+    }
-}
+}

Virtu/DiskDsk.cs

@@ -1,289 +1,289 @@
-using System;
+using System;
-
+
-namespace Jellyfish.Virtu
+namespace Jellyfish.Virtu
-{
+{
-    public sealed class DiskDsk : Disk525
+    public sealed class DiskDsk : Disk525
-    {
+    {
-        public DiskDsk(string name, byte[] data, bool isWriteProtected) : 
+        public DiskDsk(string name, byte[] data, bool isWriteProtected) : 
-            base(name, data, isWriteProtected)
+            base(name, data, isWriteProtected)
-        {
+        {
-        }
+        }
-
+
-        public override void ReadTrack(int number, int fraction, byte[] buffer)
+        public override void ReadTrack(int number, int fraction, byte[] buffer)
-        {
+        {
-            int track = number / 2;
+            int track = number / 2;
-
+
-            _trackBuffer = buffer;
+            _trackBuffer = buffer;
-            _trackOffset = 0;
+            _trackOffset = 0;
-
+
-            WriteNibble(0xFF, 48); // gap 0
+            WriteNibble(0xFF, 48); // gap 0
-
+
-            for (int sector = 0; sector < SectorCount; sector++)
+            for (int sector = 0; sector < SectorCount; sector++)
-            {
+            {
-                WriteNibble(0xD5); // address prologue
+                WriteNibble(0xD5); // address prologue
-                WriteNibble(0xAA);
+                WriteNibble(0xAA);
-                WriteNibble(0x96);
+                WriteNibble(0x96);
-
+
-                WriteNibble44(Volume);
+                WriteNibble44(Volume);
-                WriteNibble44(track);
+                WriteNibble44(track);
-                WriteNibble44(sector);
+                WriteNibble44(sector);
-                WriteNibble44(Volume ^ track ^ sector);
+                WriteNibble44(Volume ^ track ^ sector);
-
+
-                WriteNibble(0xDE); // address epilogue
+                WriteNibble(0xDE); // address epilogue
-                WriteNibble(0xAA);
+                WriteNibble(0xAA);
-                WriteNibble(0xEB);
+                WriteNibble(0xEB);
-                WriteNibble(0xFF, 8);
+                WriteNibble(0xFF, 8);
-
+
-                WriteNibble(0xD5); // data prologue
+                WriteNibble(0xD5); // data prologue
-                WriteNibble(0xAA);
+                WriteNibble(0xAA);
-                WriteNibble(0xAD);
+                WriteNibble(0xAD);
-
+
-                WriteDataNibbles((track * SectorCount + DosOrderToLogicalSector[sector]) * SectorSize);
+                WriteDataNibbles((track * SectorCount + DosOrderToLogicalSector[sector]) * SectorSize);
-
+
-                WriteNibble(0xDE); // data epilogue
+                WriteNibble(0xDE); // data epilogue
-                WriteNibble(0xAA);
+                WriteNibble(0xAA);
-                WriteNibble(0xEB);
+                WriteNibble(0xEB);
-                WriteNibble(0xFF, 16);
+                WriteNibble(0xFF, 16);
-            }
+            }
-        }
+        }
-
+
-        public override void WriteTrack(int number, int fraction, byte[] buffer)
+        public override void WriteTrack(int number, int fraction, byte[] buffer)
-        {
+        {
-            if (IsWriteProtected)
+            if (IsWriteProtected)
-                return;
+                return;
-
+
-            int track = number / 2;
+            int track = number / 2;
-
+
-            _trackBuffer = buffer;
+            _trackBuffer = buffer;
-            _trackOffset = 0;
+            _trackOffset = 0;
-            int sectorsDone = 0;
+            int sectorsDone = 0;
-
+
-            for (int sector = 0; sector < SectorCount; sector++)
+            for (int sector = 0; sector < SectorCount; sector++)
-            {
+            {
-                if (!Read3Nibbles(0xD5, 0xAA, 0x96, 0x304))
+                if (!Read3Nibbles(0xD5, 0xAA, 0x96, 0x304))
-                    break; // no address prologue
+                    break; // no address prologue
-
+
-                /*int readVolume = */ReadNibble44();
+                /*int readVolume = */ReadNibble44();
-
+
-                int readTrack = ReadNibble44();
+                int readTrack = ReadNibble44();
-                if (readTrack != track)
+                if (readTrack != track)
-                    break; // bad track number
+                    break; // bad track number
-
+
-                int readSector = ReadNibble44();
+                int readSector = ReadNibble44();
-                if (readSector > SectorCount)
+                if (readSector > SectorCount)
-                    break; // bad sector number
+                    break; // bad sector number
-                if ((sectorsDone & (0x1 << readSector)) != 0)
+                if ((sectorsDone & (0x1 << readSector)) != 0)
-                    break; // already done this sector
+                    break; // already done this sector
-
+
-                if (ReadNibble44() != (Volume ^ readTrack ^ readSector))
+                if (ReadNibble44() != (Volume ^ readTrack ^ readSector))
-                    break; // bad address checksum
+                    break; // bad address checksum
-
+
-                if ((ReadNibble() != 0xDE) || (ReadNibble() != 0xAA))
+                if ((ReadNibble() != 0xDE) || (ReadNibble() != 0xAA))
-                    break; // bad address epilogue
+                    break; // bad address epilogue
-
+
-                if (!Read3Nibbles(0xD5, 0xAA, 0xAD, 0x20))
+                if (!Read3Nibbles(0xD5, 0xAA, 0xAD, 0x20))
-                    break; // no data prologue
+                    break; // no data prologue
-
+
-                if (!ReadDataNibbles((track * SectorCount + DosOrderToLogicalSector[sector]) * SectorSize))
+                if (!ReadDataNibbles((track * SectorCount + DosOrderToLogicalSector[sector]) * SectorSize))
-                    break; // bad data checksum
+                    break; // bad data checksum
-
+
-                if ((ReadNibble() != 0xDE) || (ReadNibble() != 0xAA))
+                if ((ReadNibble() != 0xDE) || (ReadNibble() != 0xAA))
-                    break; // bad data epilogue
+                    break; // bad data epilogue
-
+
-                sectorsDone |= 0x1 << sector;
+                sectorsDone |= 0x1 << sector;
-            }
+            }
-
+
-            if (sectorsDone != 0xFFFF)
+            if (sectorsDone != 0xFFFF)
-                throw new InvalidOperationException("disk error"); // TODO: we should alert the user and "dump" a NIB
+                throw new InvalidOperationException("disk error"); // TODO: we should alert the user and "dump" a NIB
-        }
+        }
-
+
-        private byte ReadNibble()
+        private byte ReadNibble()
-        {
+        {
-            byte data = _trackBuffer[_trackOffset];
+            byte data = _trackBuffer[_trackOffset];
-            if (_trackOffset++ == TrackSize)
+            if (_trackOffset++ == TrackSize)
-            {
+            {
-                _trackOffset = 0;
+                _trackOffset = 0;
-            }
+            }
-            return data;
+            return data;
-        }
+        }
-
+
-        private bool Read3Nibbles(byte data1, byte data2, byte data3, int maxReads)
+        private bool Read3Nibbles(byte data1, byte data2, byte data3, int maxReads)
-        {
+        {
-            bool result = false;
+            bool result = false;
-            while (--maxReads > 0)
+            while (--maxReads > 0)
-            {
+            {
-                if (ReadNibble() != data1)
+                if (ReadNibble() != data1)
-                    continue;
+                    continue;
-
+
-                if (ReadNibble() != data2)
+                if (ReadNibble() != data2)
-                    continue;
+                    continue;
-
+
-                if (ReadNibble() != data3)
+                if (ReadNibble() != data3)
-                    continue;
+                    continue;
-
+
-                result = true;
+                result = true;
-                break;
+                break;
-            }
+            }
-            return result;
+            return result;
-        }
+        }
-
+
-        private int ReadNibble44()
+        private int ReadNibble44()
-        {
+        {
-            return (((ReadNibble() << 1) | 0x1) & ReadNibble());
+            return (((ReadNibble() << 1) | 0x1) & ReadNibble());
-        }
+        }
-
+
-        private byte ReadTranslatedNibble()
+        private byte ReadTranslatedNibble()
-        {
+        {
-            byte data = NibbleToByte[ReadNibble()];
+            byte data = NibbleToByte[ReadNibble()];
-            // TODO: check that invalid nibbles aren't used
+            // TODO: check that invalid nibbles aren't used
-            // (put 0xFFs for invalid nibbles in the table)
+            // (put 0xFFs for invalid nibbles in the table)
-            //if (data == 0xFF)
+            //if (data == 0xFF)
-            //{
+            //{
-                //throw an exception
+                //throw an exception
-            //}
+            //}
-            return data;
+            return data;
-        }
+        }
-
+
-        private bool ReadDataNibbles(int sectorOffset)
+        private bool ReadDataNibbles(int sectorOffset)
-        {
+        {
-            byte a, x, y;
+            byte a, x, y;
-
+
-            y = SecondaryBufferLength;
+            y = SecondaryBufferLength;
-            a = 0;
+            a = 0;
-            do // fill and de-nibblize secondary buffer
+            do // fill and de-nibblize secondary buffer
-            {
+            {
-                a = _secondaryBuffer[--y] = (byte)(a ^ ReadTranslatedNibble());
+                a = _secondaryBuffer[--y] = (byte)(a ^ ReadTranslatedNibble());
-            }
+            }
-            while (y > 0);
+            while (y > 0);
-
+
-            do // fill and de-nibblize secondary buffer
+            do // fill and de-nibblize secondary buffer
-            {
+            {
-                a = _primaryBuffer[y++] = (byte)(a ^ ReadTranslatedNibble());
+                a = _primaryBuffer[y++] = (byte)(a ^ ReadTranslatedNibble());
-            }
+            }
-            while (y != 0);
+            while (y != 0);
-
+
-            int checksum = a ^ ReadTranslatedNibble(); // should be 0
+            int checksum = a ^ ReadTranslatedNibble(); // should be 0
-
+
-            x = y = 0;
+            x = y = 0;
-            do // decode data
+            do // decode data
-            {
+            {
-                if (x == 0)
+                if (x == 0)
-                {
+                {
-                    x = SecondaryBufferLength;
+                    x = SecondaryBufferLength;
-                }
+                }
-                a = (byte)((_primaryBuffer[y] << 2) | SwapBits[_secondaryBuffer[--x] & 0x03]);
+                a = (byte)((_primaryBuffer[y] << 2) | SwapBits[_secondaryBuffer[--x] & 0x03]);
-                _secondaryBuffer[x] >>= 2;
+                _secondaryBuffer[x] >>= 2;
-                Data[sectorOffset + y] = a;
+                Data[sectorOffset + y] = a;
-            }
+            }
-            while (++y != 0);
+            while (++y != 0);
-
+
-            return (checksum == 0);
+            return (checksum == 0);
-        }
+        }
-
+
-        private void WriteNibble(int data)
+        private void WriteNibble(int data)
-        {
+        {
-            _trackBuffer[_trackOffset++] = (byte)data;
+            _trackBuffer[_trackOffset++] = (byte)data;
-        }
+        }
-
+
-        private void WriteNibble(int data, int count)
+        private void WriteNibble(int data, int count)
-        {
+        {
-            while (count-- > 0)
+            while (count-- > 0)
-            {
+            {
-                WriteNibble(data);
+                WriteNibble(data);
-            }
+            }
-        }
+        }
-
+
-        private void WriteNibble44(int data)
+        private void WriteNibble44(int data)
-        {
+        {
-            WriteNibble((data >> 1) | 0xAA);
+            WriteNibble((data >> 1) | 0xAA);
-            WriteNibble(data | 0xAA);
+            WriteNibble(data | 0xAA);
-        }
+        }
-
+
-        private void WriteDataNibbles(int sectorOffset)
+        private void WriteDataNibbles(int sectorOffset)
-        {
+        {
-            byte a, x, y;
+            byte a, x, y;
-
+
-            for (x = 0; x < SecondaryBufferLength; x++)
+            for (x = 0; x < SecondaryBufferLength; x++)
-            {
+            {
-                _secondaryBuffer[x] = 0; // zero secondary buffer
+                _secondaryBuffer[x] = 0; // zero secondary buffer
-            }
+            }
-
+
-            y = 2;
+            y = 2;
-            do // fill buffers
+            do // fill buffers
-            {
+            {
-                x = 0;
+                x = 0;
-                do
+                do
-                {
+                {
-                    a = Data[sectorOffset + --y];
+                    a = Data[sectorOffset + --y];
-                    _secondaryBuffer[x] = (byte)((_secondaryBuffer[x] << 2) | SwapBits[a & 0x03]); // b1,b0 -> secondary buffer
+                    _secondaryBuffer[x] = (byte)((_secondaryBuffer[x] << 2) | SwapBits[a & 0x03]); // b1,b0 -> secondary buffer
-                    _primaryBuffer[y] = (byte)(a >> 2); // b7-b2 -> primary buffer
+                    _primaryBuffer[y] = (byte)(a >> 2); // b7-b2 -> primary buffer
-                }
+                }
-                while (++x < SecondaryBufferLength);
+                while (++x < SecondaryBufferLength);
-            }
+            }
-            while (y != 0);
+            while (y != 0);
-
+
-            y = SecondaryBufferLength;
+            y = SecondaryBufferLength;
-            do // write secondary buffer
+            do // write secondary buffer
-            {
+            {
-                WriteNibble(ByteToNibble[_secondaryBuffer[y] ^ _secondaryBuffer[y - 1]]);
+                WriteNibble(ByteToNibble[_secondaryBuffer[y] ^ _secondaryBuffer[y - 1]]);
-            }
+            }
-            while (--y != 0);
+            while (--y != 0);
-
+
-            a = _secondaryBuffer[0];
+            a = _secondaryBuffer[0];
-            do // write primary buffer
+            do // write primary buffer
-            {
+            {
-                WriteNibble(ByteToNibble[a ^ _primaryBuffer[y]]);
+                WriteNibble(ByteToNibble[a ^ _primaryBuffer[y]]);
-                a = _primaryBuffer[y];
+                a = _primaryBuffer[y];
-            }
+            }
-            while (++y != 0);
+            while (++y != 0);
-            
+            
-            WriteNibble(ByteToNibble[a]); // data checksum
+            WriteNibble(ByteToNibble[a]); // data checksum
-        }
+        }
-
+
-        private byte[] _trackBuffer;
+        private byte[] _trackBuffer;
-        private int _trackOffset;
+        private int _trackOffset;
-        private byte[] _primaryBuffer = new byte[0x100];
+        private byte[] _primaryBuffer = new byte[0x100];
-        private const int SecondaryBufferLength = 0x56;
+        private const int SecondaryBufferLength = 0x56;
-        private byte[] _secondaryBuffer = new byte[SecondaryBufferLength + 1];
+        private byte[] _secondaryBuffer = new byte[SecondaryBufferLength + 1];
-        private const int Volume = 0xFE;
+        private const int Volume = 0xFE;
-
+
-        private static readonly byte[] SwapBits = { 0, 2, 1, 3 };
+        private static readonly byte[] SwapBits = { 0, 2, 1, 3 };
-
+
-        private static readonly int[] DosOrderToLogicalSector = new int[]
+        private static readonly int[] DosOrderToLogicalSector = new int[]
-        {
+        {
-            0x0, 0x7, 0xE, 0x6, 0xD, 0x5, 0xC, 0x4, 0xB, 0x3, 0xA, 0x2, 0x9, 0x1, 0x8, 0xF
+            0x0, 0x7, 0xE, 0x6, 0xD, 0x5, 0xC, 0x4, 0xB, 0x3, 0xA, 0x2, 0x9, 0x1, 0x8, 0xF
-        };
+        };
-
+
-        private static readonly byte[] ByteToNibble = new byte[]
+        private static readonly byte[] ByteToNibble = new byte[]
-        {
+        {
-            0x96, 0x97, 0x9A, 0x9B, 0x9D, 0x9E, 0x9F, 0xA6, 0xA7, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF, 0xB2, 0xB3,
+            0x96, 0x97, 0x9A, 0x9B, 0x9D, 0x9E, 0x9F, 0xA6, 0xA7, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF, 0xB2, 0xB3,
-            0xB4, 0xB5, 0xB6, 0xB7, 0xB9, 0xBA, 0xBB, 0xBC, 0xBD, 0xBE, 0xBF, 0xCB, 0xCD, 0xCE, 0xCF, 0xD3,
+            0xB4, 0xB5, 0xB6, 0xB7, 0xB9, 0xBA, 0xBB, 0xBC, 0xBD, 0xBE, 0xBF, 0xCB, 0xCD, 0xCE, 0xCF, 0xD3,
-            0xD6, 0xD7, 0xD9, 0xDA, 0xDB, 0xDC, 0xDD, 0xDE, 0xDF, 0xE5, 0xE6, 0xE7, 0xE9, 0xEA, 0xEB, 0xEC,
+            0xD6, 0xD7, 0xD9, 0xDA, 0xDB, 0xDC, 0xDD, 0xDE, 0xDF, 0xE5, 0xE6, 0xE7, 0xE9, 0xEA, 0xEB, 0xEC,
-            0xED, 0xEE, 0xEF, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFF
+            0xED, 0xEE, 0xEF, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFF
-        };
+        };
-
+
-        private static readonly byte[] NibbleToByte = new byte[]
+        private static readonly byte[] NibbleToByte = new byte[]
-        {
+        {
-            // padding for offset (not used)
+            // padding for offset (not used)
-            0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
+            0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
-            0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F,
+            0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F,
-            0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F,
+            0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F,
-            0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x3B, 0x3C, 0x3D, 0x3E, 0x3F,
+            0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x3B, 0x3C, 0x3D, 0x3E, 0x3F,
-            0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F,
+            0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F,
-            0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5A, 0x5B, 0x5C, 0x5D, 0x5E, 0x5F,
+            0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5A, 0x5B, 0x5C, 0x5D, 0x5E, 0x5F,
-            0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F,
+            0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F,
-            0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A, 0x7B, 0x7C, 0x7D, 0x7E, 0x7F,
+            0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A, 0x7B, 0x7C, 0x7D, 0x7E, 0x7F,
-            0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F,
+            0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F,
-            0x90, 0x91, 0x92, 0x93, 0x94, 0x95,
+            0x90, 0x91, 0x92, 0x93, 0x94, 0x95,
-
+
-            // nibble translate table
+            // nibble translate table
-                                                0x00, 0x01, 0x98, 0x99, 0x02, 0x03, 0x9C, 0x04, 0x05, 0x06,
+                                                0x00, 0x01, 0x98, 0x99, 0x02, 0x03, 0x9C, 0x04, 0x05, 0x06,
-            0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0x07, 0x08, 0xA8, 0xA9, 0xAA, 0x09, 0x0A, 0x0B, 0x0C, 0x0D,
+            0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0x07, 0x08, 0xA8, 0xA9, 0xAA, 0x09, 0x0A, 0x0B, 0x0C, 0x0D,
-            0xB0, 0xB1, 0x0E, 0x0F, 0x10, 0x11, 0x12, 0x13, 0xB8, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A,
+            0xB0, 0xB1, 0x0E, 0x0F, 0x10, 0x11, 0x12, 0x13, 0xB8, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A,
-            0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0x1B, 0xCC, 0x1C, 0x1D, 0x1E,
+            0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0x1B, 0xCC, 0x1C, 0x1D, 0x1E,
-            0xD0, 0xD1, 0xD2, 0x1F, 0xD4, 0xD5, 0x20, 0x21, 0xD8, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28,
+            0xD0, 0xD1, 0xD2, 0x1F, 0xD4, 0xD5, 0x20, 0x21, 0xD8, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28,
-            0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0x29, 0x2A, 0x2B, 0xE8, 0x2C, 0x2D, 0x2E, 0x2F, 0x30, 0x31, 0x32,
+            0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0x29, 0x2A, 0x2B, 0xE8, 0x2C, 0x2D, 0x2E, 0x2F, 0x30, 0x31, 0x32,
-            0xF0, 0xF1, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0xF8, 0x39, 0x3A, 0x3B, 0x3C, 0x3D, 0x3E, 0x3F
+            0xF0, 0xF1, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0xF8, 0x39, 0x3A, 0x3B, 0x3C, 0x3D, 0x3E, 0x3F
-        };
+        };
-    }
+    }
-}
+}

Virtu/DiskII.cs

@@ -1,241 +1,241 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
-using Jellyfish.Virtu.Services;
+using Jellyfish.Virtu.Services;
-using Jellyfish.Virtu.Settings;
+using Jellyfish.Virtu.Settings;
-
+
-namespace Jellyfish.Virtu
+namespace Jellyfish.Virtu
-{
+{
-    public sealed class DiskII : MachineComponent
+    public sealed class DiskII : MachineComponent
-    {
+    {
-        public DiskII(Machine machine) : 
+        public DiskII(Machine machine) : 
-            base(machine)
+            base(machine)
-        {
+        {
-        }
+        }
-
+
-        public override void Initialize()
+        public override void Initialize()
-        {
+        {
-            _drives[0].InsertDisk("Default.dsk", StorageService.GetResourceStream("Default.dsk", 0x23000), false);
+            _drives[0].InsertDisk("Default.dsk", StorageService.GetResourceStream("Default.dsk", 0x23000), false);
-
+
-#if WINDOWS
+#if WINDOWS
-            DiskIISettings settings = Machine.Settings.DiskII;
+            var settings = Machine.Settings.DiskII;
-            if (settings.Disk1.Name.Length > 0)
+            if (settings.Disk1.Name.Length > 0)
-            {
+            {
-                _drives[0].InsertDisk(settings.Disk1.Name, settings.Disk1.IsWriteProtected);
+                _drives[0].InsertDisk(settings.Disk1.Name, settings.Disk1.IsWriteProtected);
-            }
+            }
-            if (settings.Disk2.Name.Length > 0)
+            if (settings.Disk2.Name.Length > 0)
-            {
+            {
-                _drives[1].InsertDisk(settings.Disk2.Name, settings.Disk2.IsWriteProtected);
+                _drives[1].InsertDisk(settings.Disk2.Name, settings.Disk2.IsWriteProtected);
-            }
+            }
-#endif
+#endif
-        }
+        }
-
+
-        public override void Reset()
+        public override void Reset()
-        {
+        {
-            _phaseStates = 0;
+            _phaseStates = 0;
-            SetMotorOn(false);
+            SetMotorOn(false);
-            SetDriveNumber(0);
+            SetDriveNumber(0);
-            _loadMode = false;
+            _loadMode = false;
-            _writeMode = false;
+            _writeMode = false;
-        }
+        }
-
+
-        public override void Uninitialize()
+        public override void Uninitialize()
-        {
+        {
-            Flush();
+            Flush();
-        }
+        }
-
+
-        [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
+        [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        public int Read(int address)
+        public int Read(int address)
-        {
+        {
-            switch (address & 0xF)
+            switch (address & 0xF)
-            {
+            {
-                case 0x0: case 0x1: case 0x2: case 0x3: case 0x4: case 0x5: case 0x6: case 0x7:
+                case 0x0: case 0x1: case 0x2: case 0x3: case 0x4: case 0x5: case 0x6: case 0x7:
-                    SetPhase(address);
+                    SetPhase(address);
-                    break;
+                    break;
-
+
-                case 0x8:
+                case 0x8:
-                    SetMotorOn(false);
+                    SetMotorOn(false);
-                    break;
+                    break;
-
+
-                case 0x9:
+                case 0x9:
-                    SetMotorOn(true);
+                    SetMotorOn(true);
-                    break;
+                    break;
-
+
-                case 0xA:
+                case 0xA:
-                    SetDriveNumber(0);
+                    SetDriveNumber(0);
-                    break;
+                    break;
-
+
-                case 0xB:
+                case 0xB:
-                    SetDriveNumber(1);
+                    SetDriveNumber(1);
-                    break;
+                    break;
-
+
-                case 0xC:
+                case 0xC:
-                    _loadMode = false;
+                    _loadMode = false;
-                    if (_motorOn)
+                    if (_motorOn)
-                    {
+                    {
-                        if (!_writeMode)
+                        if (!_writeMode)
-                        {
+                        {
-                            return _latch = _drives[_driveNumber].Read();
+                            return _latch = _drives[_driveNumber].Read();
-                        }
+                        }
-                        else
+                        else
-                        {
+                        {
-                            WriteLatch();
+                            WriteLatch();
-                        }
+                        }
-                    }
+                    }
-                    break;
+                    break;
-
+
-                case 0xD:
+                case 0xD:
-                    _loadMode = true;
+                    _loadMode = true;
-                    if (_motorOn && !_writeMode)
+                    if (_motorOn && !_writeMode)
-                    {
+                    {
-                        // write protect is forced if phase 1 is on [F9.7]
+                        // write protect is forced if phase 1 is on [F9.7]
-                        _latch &= 0x7F;
+                        _latch &= 0x7F;
-                        if (_drives[_driveNumber].IsWriteProtected || 
+                        if (_drives[_driveNumber].IsWriteProtected || 
-                            (_phaseStates & Phase1On) != 0)
+                            (_phaseStates & Phase1On) != 0)
-                        {
+                        {
-                            _latch |= 0x80;
+                            _latch |= 0x80;
-                        }
+                        }
-                    }
+                    }
-                    break;
+                    break;
-
+
-                case 0xE:
+                case 0xE:
-                    _writeMode = false;
+                    _writeMode = false;
-                    break;
+                    break;
-
+
-                case 0xF:
+                case 0xF:
-                    _writeMode = true;
+                    _writeMode = true;
-                    break;
+                    break;
-            }
+            }
-
+
-            if ((address & 1) == 0)
+            if ((address & 1) == 0)
-            {
+            {
-                // only even addresses return the latch
+                // only even addresses return the latch
-                if (_motorOn)
+                if (_motorOn)
-                {
+                {
-                    return _latch;
+                    return _latch;
-                }
+                }
-
+
-                // simple hack to fool DOS SAMESLOT drive spin check (usually at $BD34)
+                // simple hack to fool DOS SAMESLOT drive spin check (usually at $BD34)
-                _driveSpin = !_driveSpin;
+                _driveSpin = !_driveSpin;
-                return _driveSpin ? 0x7E : 0x7F;
+                return _driveSpin ? 0x7E : 0x7F;
-            }
+            }
-
+
-            return Machine.Video.ReadFloatingBus(); // [5-40]
+            return Machine.Video.ReadFloatingBus(); // [5-40]
-        }
+        }
-
+
-        public void Write(int address, int data)
+        public void Write(int address, int data)
-        {
+        {
-            switch (address & 0xF)
+            switch (address & 0xF)
-            {
+            {
-                case 0x0: case 0x1: case 0x2: case 0x3: case 0x4: case 0x5: case 0x6: case 0x7:
+                case 0x0: case 0x1: case 0x2: case 0x3: case 0x4: case 0x5: case 0x6: case 0x7:
-                    SetPhase(address);
+                    SetPhase(address);
-                    break;
+                    break;
-
+
-                case 0x8:
+                case 0x8:
-                    SetMotorOn(false);
+                    SetMotorOn(false);
-                    break;
+                    break;
-
+
-                case 0x9:
+                case 0x9:
-                    SetMotorOn(true);
+                    SetMotorOn(true);
-                    break;
+                    break;
-
+
-                case 0xA: 
+                case 0xA: 
-                    SetDriveNumber(0);
+                    SetDriveNumber(0);
-                    break;
+                    break;
-
+
-                case 0xB:
+                case 0xB:
-                    SetDriveNumber(1);
+                    SetDriveNumber(1);
-                    break;
+                    break;
-
+
-                case 0xC:
+                case 0xC:
-                    _loadMode = false;
+                    _loadMode = false;
-                    if (_writeMode)
+                    if (_writeMode)
-                    {
+                    {
-                        WriteLatch();
+                        WriteLatch();
-                    }
+                    }
-                    break;
+                    break;
-
+
-                case 0xD:
+                case 0xD:
-                    _loadMode = true;
+                    _loadMode = true;
-                    break;
+                    break;
-
+
-                case 0xE:
+                case 0xE:
-                    _writeMode = false;
+                    _writeMode = false;
-                    break;
+                    break;
-
+
-                case 0xF:
+                case 0xF:
-                    _writeMode = true;
+                    _writeMode = true;
-                    break;
+                    break;
-            }
+            }
-
+
-            if (_motorOn && _writeMode)
+            if (_motorOn && _writeMode)
-            {
+            {
-                if (_loadMode)
+                if (_loadMode)
-                {
+                {
-                    // any address writes latch for sequencer LD; OE1/2 irrelevant ['323 datasheet]
+                    // any address writes latch for sequencer LD; OE1/2 irrelevant ['323 datasheet]
-                    _latch = data;
+                    _latch = data;
-                }
+                }
-            }
+            }
-        }
+        }
-
+
-        private void WriteLatch()
+        private void WriteLatch()
-        {
+        {
-            // write protect is forced if phase 1 is on [F9.7]
+            // write protect is forced if phase 1 is on [F9.7]
-            if ((_phaseStates & Phase1On) == 0)
+            if ((_phaseStates & Phase1On) == 0)
-            {
+            {
-                _drives[_driveNumber].Write(_latch);
+                _drives[_driveNumber].Write(_latch);
-            }
+            }
-        }
+        }
-
+
-        private void Flush()
+        private void Flush()
-        {
+        {
-            _drives[_driveNumber].FlushTrack();
+            _drives[_driveNumber].FlushTrack();
-        }
+        }
-
+
-        private void SetDriveNumber(int driveNumber)
+        private void SetDriveNumber(int driveNumber)
-        {
+        {
-            if (_driveNumber != driveNumber)
+            if (_driveNumber != driveNumber)
-            {
+            {
-                Flush();
+                Flush();
-                _driveNumber = driveNumber;
+                _driveNumber = driveNumber;
-            }
+            }
-        }
+        }
-
+
-        private void SetMotorOn(bool state)
+        private void SetMotorOn(bool state)
-        {
+        {
-            if (_motorOn && !state)
+            if (_motorOn && !state)
-            {
+            {
-                Flush();
+                Flush();
-            }
+            }
-            _motorOn = state;
+            _motorOn = state;
-        }
+        }
-
+
-        private void SetPhase(int address)
+        private void SetPhase(int address)
-        {
+        {
-            int phase = (address >> 1) & 0x3;
+            int phase = (address >> 1) & 0x3;
-            int state = address & 1;
+            int state = address & 1;
-            _phaseStates &= ~(1 << phase);
+            _phaseStates &= ~(1 << phase);
-            _phaseStates |= (state << phase);
+            _phaseStates |= (state << phase);
-
+
-            if (_motorOn)
+            if (_motorOn)
-            {
+            {
-                _drives[_driveNumber].ApplyPhaseChange(_phaseStates);
+                _drives[_driveNumber].ApplyPhaseChange(_phaseStates);
-            }
+            }
-        }
+        }
-
+
-        [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
+        [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
-        public Drive525[] Drives { get { return _drives; } }
+        public Drive525[] Drives { get { return _drives; } }
-
+
-        private const int Phase0On = 1 << 0;
+        private const int Phase0On = 1 << 0;
-        private const int Phase1On = 1 << 1;
+        private const int Phase1On = 1 << 1;
-        private const int Phase2On = 1 << 2;
+        private const int Phase2On = 1 << 2;
-        private const int Phase3On = 1 << 3;
+        private const int Phase3On = 1 << 3;
-
+
-        private Drive525[] _drives = new Drive525[] { new Drive525(), new Drive525() };
+        private Drive525[] _drives = new Drive525[] { new Drive525(), new Drive525() };
-        private int _latch;
+        private int _latch;
-        private int _phaseStates;
+        private int _phaseStates;
-        private bool _motorOn;
+        private bool _motorOn;
-        private int _driveNumber;
+        private int _driveNumber;
-        private bool _loadMode;
+        private bool _loadMode;
-        private bool _writeMode;
+        private bool _writeMode;
-        private bool _driveSpin;
+        private bool _driveSpin;
-    }
+    }
-}
+}

Virtu/DiskNib.cs

@@ -1,22 +1,22 @@
-using System;
+using System;
-
+
-namespace Jellyfish.Virtu
+namespace Jellyfish.Virtu
-{
+{
-    public sealed class DiskNib : Disk525
+    public sealed class DiskNib : Disk525
-    {
+    {
-        public DiskNib(string name, byte[] data, bool isWriteProtected) : 
+        public DiskNib(string name, byte[] data, bool isWriteProtected) : 
-            base(name, data, isWriteProtected)
+            base(name, data, isWriteProtected)
-        {
+        {
-        }
+        }
-
+
-        public override void ReadTrack(int number, int fraction, byte[] buffer)
+        public override void ReadTrack(int number, int fraction, byte[] buffer)
-        {
+        {
-            Buffer.BlockCopy(Data, (number / 2) * TrackSize, buffer, 0, TrackSize);
+            Buffer.BlockCopy(Data, (number / 2) * TrackSize, buffer, 0, TrackSize);
-        }
+        }
-
+
-        public override void WriteTrack(int number, int fraction, byte[] buffer)
+        public override void WriteTrack(int number, int fraction, byte[] buffer)
-        {
+        {
-            Buffer.BlockCopy(buffer, 0, Data, (number / 2) * TrackSize, TrackSize);
+            Buffer.BlockCopy(buffer, 0, Data, (number / 2) * TrackSize, TrackSize);
-        }
+        }
-    }
+    }
-}
+}

Virtu/Drive525.cs

@@ -1,118 +1,118 @@
-using System;
+using System;
-using System.IO;
+using System.IO;
-using Jellyfish.Library;
+using Jellyfish.Library;
-
+
-namespace Jellyfish.Virtu
+namespace Jellyfish.Virtu
-{
+{
-    public sealed class Drive525
+    public sealed class Drive525
-    {
+    {
-        public Drive525()
+        public Drive525()
-        {
+        {
-            DriveArmStepDelta[0] = new int[] { 0,  0,  1,  1,  0,  0,  1,  1, -1, -1,  0,  0, -1, -1,  0,  0 }; // phase 0
+            DriveArmStepDelta[0] = new int[] { 0,  0,  1,  1,  0,  0,  1,  1, -1, -1,  0,  0, -1, -1,  0,  0 }; // phase 0
-            DriveArmStepDelta[1] = new int[] { 0, -1,  0, -1,  1,  0,  1,  0,  0, -1,  0, -1,  1,  0,  1,  0 }; // phase 1
+            DriveArmStepDelta[1] = new int[] { 0, -1,  0, -1,  1,  0,  1,  0,  0, -1,  0, -1,  1,  0,  1,  0 }; // phase 1
-            DriveArmStepDelta[2] = new int[] { 0,  0, -1, -1,  0,  0, -1, -1,  1,  1,  0,  0,  1,  1,  0,  0 }; // phase 2
+            DriveArmStepDelta[2] = new int[] { 0,  0, -1, -1,  0,  0, -1, -1,  1,  1,  0,  0,  1,  1,  0,  0 }; // phase 2
-            DriveArmStepDelta[3] = new int[] { 0,  1,  0,  1, -1,  0, -1,  0,  0,  1,  0,  1, -1,  0, -1,  0 }; // phase 3
+            DriveArmStepDelta[3] = new int[] { 0,  1,  0,  1, -1,  0, -1,  0,  0,  1,  0,  1, -1,  0, -1,  0 }; // phase 3
-        }
+        }
-
+
-        public void InsertDisk(string fileName, bool isWriteProtected)
+        public void InsertDisk(string fileName, bool isWriteProtected)
-        {
+        {
-            using (FileStream stream = File.OpenRead(fileName))
+            using (var stream = File.OpenRead(fileName))
-            {
+            {
-                InsertDisk(fileName, stream, isWriteProtected);
+                InsertDisk(fileName, stream, isWriteProtected);
-            }
+            }
-        }
+        }
-
+
-        public void InsertDisk(string name, Stream stream, bool isWriteProtected)
+        public void InsertDisk(string name, Stream stream, bool isWriteProtected)
-        {
+        {
-            FlushTrack();
+            FlushTrack();
-
+
-            // TODO handle null param/empty string for eject, or add Eject()
+            // TODO handle null param/empty string for eject, or add Eject()
-
+
-            _disk = Disk525.CreateDisk(name, stream.ReadAllBytes(), isWriteProtected);
+            _disk = Disk525.CreateDisk(name, stream.ReadAllBytes(), isWriteProtected);
-            _trackLoaded = false;
+            _trackLoaded = false;
-        }
+        }
-
+
-        public void ApplyPhaseChange(int phaseState)
+        public void ApplyPhaseChange(int phaseState)
-        {
+        {
-            // step the drive head according to stepper magnet changes
+            // step the drive head according to stepper magnet changes
-            int delta = DriveArmStepDelta[_trackNumber & 0x3][phaseState];
+            int delta = DriveArmStepDelta[_trackNumber & 0x3][phaseState];
-            if (delta != 0)
+            if (delta != 0)
-            {
+            {
-                int newTrackNumber = MathHelpers.Clamp(_trackNumber + delta, 0, TrackNumberMax);
+                int newTrackNumber = MathHelpers.Clamp(_trackNumber + delta, 0, TrackNumberMax);
-                if (newTrackNumber != _trackNumber)
+                if (newTrackNumber != _trackNumber)
-                {
+                {
-                    FlushTrack();
+                    FlushTrack();
-                    _trackNumber = newTrackNumber;
+                    _trackNumber = newTrackNumber;
-                    _trackOffset = 0;
+                    _trackOffset = 0;
-                    _trackLoaded = false;
+                    _trackLoaded = false;
-                }
+                }
-            }
+            }
-        }
+        }
-
+
-        public int Read()
+        public int Read()
-        {
+        {
-            if (LoadTrack())
+            if (LoadTrack())
-            {
+            {
-                int data = _trackData[_trackOffset++];
+                int data = _trackData[_trackOffset++];
-                if (_trackOffset >= Disk525.TrackSize)
+                if (_trackOffset >= Disk525.TrackSize)
-                {
+                {
-                    _trackOffset = 0;
+                    _trackOffset = 0;
-                }
+                }
-
+
-                return data;
+                return data;
-            }
+            }
-
+
-            return _random.Next(0x01, 0xFF);
+            return _random.Next(0x01, 0xFF);
-        }
+        }
-
+
-        public void Write(int data)
+        public void Write(int data)
-        {
+        {
-            if (LoadTrack())
+            if (LoadTrack())
-            {
+            {
-                _trackChanged = true;
+                _trackChanged = true;
-                _trackData[_trackOffset++] = (byte)data;
+                _trackData[_trackOffset++] = (byte)data;
-                if (_trackOffset >= Disk525.TrackSize)
+                if (_trackOffset >= Disk525.TrackSize)
-                {
+                {
-                    _trackOffset = 0;
+                    _trackOffset = 0;
-                }
+                }
-            }
+            }
-        }
+        }
-
+
-        private bool LoadTrack()
+        private bool LoadTrack()
-        {
+        {
-            if (!_trackLoaded && (_disk != null))
+            if (!_trackLoaded && (_disk != null))
-            {
+            {
-                _disk.ReadTrack(_trackNumber, 0, _trackData);
+                _disk.ReadTrack(_trackNumber, 0, _trackData);
-                _trackLoaded = true;
+                _trackLoaded = true;
-            }
+            }
-
+
-            return _trackLoaded;
+            return _trackLoaded;
-        }
+        }
-
+
-        public void FlushTrack()
+        public void FlushTrack()
-        {
+        {
-            if (_trackChanged)
+            if (_trackChanged)
-            {
+            {
-                _disk.WriteTrack(_trackNumber, 0, _trackData);
+                _disk.WriteTrack(_trackNumber, 0, _trackData);
-                _trackChanged = false;
+                _trackChanged = false;
-            }
+            }
-        }
+        }
-
+
-        public bool IsWriteProtected { get { return _disk.IsWriteProtected; } }
+        public bool IsWriteProtected { get { return _disk.IsWriteProtected; } }
-
+
-        private const int TrackNumberMax = 0x44;
+        private const int TrackNumberMax = 0x44;
-
+
-        private const int PhaseCount = 4;
+        private const int PhaseCount = 4;
-
+
-        private readonly int[][] DriveArmStepDelta = new int[PhaseCount][];
+        private readonly int[][] DriveArmStepDelta = new int[PhaseCount][];
-
+
-        private Disk525 _disk;
+        private Disk525 _disk;
-        private bool _trackLoaded;
+        private bool _trackLoaded;
-        private bool _trackChanged;
+        private bool _trackChanged;
-        private int _trackNumber;
+        private int _trackNumber;
-        private int _trackOffset;
+        private int _trackOffset;
-        private byte[] _trackData = new byte[Disk525.TrackSize];
+        private byte[] _trackData = new byte[Disk525.TrackSize];
-
+
-        private Random _random = new Random();
+        private Random _random = new Random();
-    }
+    }
-}
+}

Virtu/GamePort.cs

@@ -1,158 +1,158 @@
-using System;
+using System;
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
-using Jellyfish.Library;
+using Jellyfish.Library;
-using Jellyfish.Virtu.Services;
+using Jellyfish.Virtu.Services;
-using Jellyfish.Virtu.Settings;
+using Jellyfish.Virtu.Settings;
-
+
-namespace Jellyfish.Virtu
+namespace Jellyfish.Virtu
-{
+{
-    public sealed class GamePort : MachineComponent
+    public sealed class GamePort : MachineComponent
-    {
+    {
-        public GamePort(Machine machine) :
+        public GamePort(Machine machine) :
-            base(machine)
+            base(machine)
-        {
+        {
-            _resetPaddle0StrobeEvent = ResetPaddle0StrobeEvent; // cache delegates; avoids garbage
+            _resetPaddle0StrobeEvent = ResetPaddle0StrobeEvent; // cache delegates; avoids garbage
-            _resetPaddle1StrobeEvent = ResetPaddle1StrobeEvent;
+            _resetPaddle1StrobeEvent = ResetPaddle1StrobeEvent;
-            _resetPaddle2StrobeEvent = ResetPaddle2StrobeEvent;
+            _resetPaddle2StrobeEvent = ResetPaddle2StrobeEvent;
-            _resetPaddle3StrobeEvent = ResetPaddle3StrobeEvent;
+            _resetPaddle3StrobeEvent = ResetPaddle3StrobeEvent;
-        }
+        }
-
+
-        public override void Initialize()
+        public override void Initialize()
-        {
+        {
-            _keyboardService = Machine.Services.GetService<KeyboardService>();
+            _keyboardService = Machine.Services.GetService<KeyboardService>();
-            _gamePortService = Machine.Services.GetService<GamePortService>();
+            _gamePortService = Machine.Services.GetService<GamePortService>();
-        }
+        }
-
+
-        public bool ReadButton0()
+        public bool ReadButton0()
-        {
+        {
-            GamePortSettings settings = Machine.Settings.GamePort;
+            var settings = Machine.Settings.GamePort;
-
+
-            return (_gamePortService.IsButton0Down || _keyboardService.IsOpenAppleKeyDown || 
+            return (_gamePortService.IsButton0Down || _keyboardService.IsOpenAppleKeyDown || 
-                (settings.UseKeyboard && (settings.Key.Button0 > 0) && _keyboardService.IsKeyDown(settings.Key.Button0)));
+                (settings.UseKeyboard && (settings.Key.Button0 > 0) && _keyboardService.IsKeyDown(settings.Key.Button0)));
-        }
+        }
-
+
-        public bool ReadButton1()
+        public bool ReadButton1()
-        {
+        {
-            GamePortSettings settings = Machine.Settings.GamePort;
+            var settings = Machine.Settings.GamePort;
-
+
-            return (_gamePortService.IsButton1Down || _keyboardService.IsCloseAppleKeyDown || 
+            return (_gamePortService.IsButton1Down || _keyboardService.IsCloseAppleKeyDown || 
-                (settings.UseKeyboard && (settings.Key.Button1 > 0) && _keyboardService.IsKeyDown(settings.Key.Button1)));
+                (settings.UseKeyboard && (settings.Key.Button1 > 0) && _keyboardService.IsKeyDown(settings.Key.Button1)));
-        }
+        }
-
+
-        public bool ReadButton2()
+        public bool ReadButton2()
-        {
+        {
-            GamePortSettings settings = Machine.Settings.GamePort;
+            var settings = Machine.Settings.GamePort;
-
+
-            return (_gamePortService.IsButton2Down || 
+            return (_gamePortService.IsButton2Down || 
-                (settings.UseKeyboard && (settings.Key.Button2 > 0) && _keyboardService.IsKeyDown(settings.Key.Button2)));
+                (settings.UseKeyboard && (settings.Key.Button2 > 0) && _keyboardService.IsKeyDown(settings.Key.Button2)));
-        }
+        }
-
+
-        [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
+        [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        public void TriggerTimers()
+        public void TriggerTimers()
-        {
+        {
-            int paddle0 = _gamePortService.Paddle0;
+            int paddle0 = _gamePortService.Paddle0;
-            int paddle1 = _gamePortService.Paddle1;
+            int paddle1 = _gamePortService.Paddle1;
-            int paddle2 = _gamePortService.Paddle2;
+            int paddle2 = _gamePortService.Paddle2;
-            int paddle3 = _gamePortService.Paddle3;
+            int paddle3 = _gamePortService.Paddle3;
-
+
-            GamePortSettings settings = Machine.Settings.GamePort;
+            var settings = Machine.Settings.GamePort;
-
+
-            if (settings.UseKeyboard) // override
+            if (settings.UseKeyboard) // override
-            {
+            {
-                if (((settings.Key.Joystick0.UpLeft > 0) && _keyboardService.IsKeyDown(settings.Key.Joystick0.UpLeft)) || 
+                if (((settings.Key.Joystick0.UpLeft > 0) && _keyboardService.IsKeyDown(settings.Key.Joystick0.UpLeft)) || 
-                    ((settings.Key.Joystick0.Left > 0) && _keyboardService.IsKeyDown(settings.Key.Joystick0.Left)) || 
+                    ((settings.Key.Joystick0.Left > 0) && _keyboardService.IsKeyDown(settings.Key.Joystick0.Left)) || 
-                    ((settings.Key.Joystick0.DownLeft > 0) && _keyboardService.IsKeyDown(settings.Key.Joystick0.DownLeft)))
+                    ((settings.Key.Joystick0.DownLeft > 0) && _keyboardService.IsKeyDown(settings.Key.Joystick0.DownLeft)))
-                {
+                {
-                    paddle0 -= 128;
+                    paddle0 -= 128;
-                }
+                }
-                if (((settings.Key.Joystick0.UpRight > 0) && _keyboardService.IsKeyDown(settings.Key.Joystick0.UpRight)) || 
+                if (((settings.Key.Joystick0.UpRight > 0) && _keyboardService.IsKeyDown(settings.Key.Joystick0.UpRight)) || 
-                    ((settings.Key.Joystick0.Right > 0) && _keyboardService.IsKeyDown(settings.Key.Joystick0.Right)) || 
+                    ((settings.Key.Joystick0.Right > 0) && _keyboardService.IsKeyDown(settings.Key.Joystick0.Right)) || 
-                    ((settings.Key.Joystick0.DownRight > 0) && _keyboardService.IsKeyDown(settings.Key.Joystick0.DownRight)))
+                    ((settings.Key.Joystick0.DownRight > 0) && _keyboardService.IsKeyDown(settings.Key.Joystick0.DownRight)))
-                {
+                {
-                    paddle0 += 128;
+                    paddle0 += 128;
-                }
+                }
-                if (((settings.Key.Joystick0.UpLeft > 0) && _keyboardService.IsKeyDown(settings.Key.Joystick0.UpLeft)) || 
+                if (((settings.Key.Joystick0.UpLeft > 0) && _keyboardService.IsKeyDown(settings.Key.Joystick0.UpLeft)) || 
-                    ((settings.Key.Joystick0.Up > 0) && _keyboardService.IsKeyDown(settings.Key.Joystick0.Up)) || 
+                    ((settings.Key.Joystick0.Up > 0) && _keyboardService.IsKeyDown(settings.Key.Joystick0.Up)) || 
-                    ((settings.Key.Joystick0.UpRight > 0) && _keyboardService.IsKeyDown(settings.Key.Joystick0.UpRight)))
+                    ((settings.Key.Joystick0.UpRight > 0) && _keyboardService.IsKeyDown(settings.Key.Joystick0.UpRight)))
-                {
+                {
-                    paddle1 -= 128;
+                    paddle1 -= 128;
-                }
+                }
-                if (((settings.Key.Joystick0.DownLeft > 0) && _keyboardService.IsKeyDown(settings.Key.Joystick0.DownLeft)) || 
+                if (((settings.Key.Joystick0.DownLeft > 0) && _keyboardService.IsKeyDown(settings.Key.Joystick0.DownLeft)) || 
-                    ((settings.Key.Joystick0.Down > 0) && _keyboardService.IsKeyDown(settings.Key.Joystick0.Down)) || 
+                    ((settings.Key.Joystick0.Down > 0) && _keyboardService.IsKeyDown(settings.Key.Joystick0.Down)) || 
-                    ((settings.Key.Joystick0.DownRight > 0) && _keyboardService.IsKeyDown(settings.Key.Joystick0.DownRight)))
+                    ((settings.Key.Joystick0.DownRight > 0) && _keyboardService.IsKeyDown(settings.Key.Joystick0.DownRight)))
-                {
+                {
-                    paddle1 += 128;
+                    paddle1 += 128;
-                }
+                }
-                if (((settings.Key.Joystick1.UpLeft > 0) && _keyboardService.IsKeyDown(settings.Key.Joystick1.UpLeft)) || 
+                if (((settings.Key.Joystick1.UpLeft > 0) && _keyboardService.IsKeyDown(settings.Key.Joystick1.UpLeft)) || 
-                    ((settings.Key.Joystick1.Left > 0) && _keyboardService.IsKeyDown(settings.Key.Joystick1.Left)) || 
+                    ((settings.Key.Joystick1.Left > 0) && _keyboardService.IsKeyDown(settings.Key.Joystick1.Left)) || 
-                    ((settings.Key.Joystick1.DownLeft > 0) && _keyboardService.IsKeyDown(settings.Key.Joystick1.DownLeft)))
+                    ((settings.Key.Joystick1.DownLeft > 0) && _keyboardService.IsKeyDown(settings.Key.Joystick1.DownLeft)))
-                {
+                {
-                    paddle2 -= 128;
+                    paddle2 -= 128;
-                }
+                }
-                if (((settings.Key.Joystick1.UpRight > 0) && _keyboardService.IsKeyDown(settings.Key.Joystick1.UpRight)) || 
+                if (((settings.Key.Joystick1.UpRight > 0) && _keyboardService.IsKeyDown(settings.Key.Joystick1.UpRight)) || 
-                    ((settings.Key.Joystick1.Right > 0) && _keyboardService.IsKeyDown(settings.Key.Joystick1.Right)) || 
+                    ((settings.Key.Joystick1.Right > 0) && _keyboardService.IsKeyDown(settings.Key.Joystick1.Right)) || 
-                    ((settings.Key.Joystick1.DownRight > 0) && _keyboardService.IsKeyDown(settings.Key.Joystick1.DownRight)))
+                    ((settings.Key.Joystick1.DownRight > 0) && _keyboardService.IsKeyDown(settings.Key.Joystick1.DownRight)))
-                {
+                {
-                    paddle2 += 128;
+                    paddle2 += 128;
-                }
+                }
-                if (((settings.Key.Joystick1.UpLeft > 0) && _keyboardService.IsKeyDown(settings.Key.Joystick1.UpLeft)) || 
+                if (((settings.Key.Joystick1.UpLeft > 0) && _keyboardService.IsKeyDown(settings.Key.Joystick1.UpLeft)) || 
-                    ((settings.Key.Joystick1.Up > 0) && _keyboardService.IsKeyDown(settings.Key.Joystick1.Up)) || 
+                    ((settings.Key.Joystick1.Up > 0) && _keyboardService.IsKeyDown(settings.Key.Joystick1.Up)) || 
-                    ((settings.Key.Joystick1.UpRight > 0) && _keyboardService.IsKeyDown(settings.Key.Joystick1.UpRight)))
+                    ((settings.Key.Joystick1.UpRight > 0) && _keyboardService.IsKeyDown(settings.Key.Joystick1.UpRight)))
-                {
+                {
-                    paddle3 -= 128;
+                    paddle3 -= 128;
-                }
+                }
-                if (((settings.Key.Joystick1.DownLeft > 0) && _keyboardService.IsKeyDown(settings.Key.Joystick1.DownLeft)) || 
+                if (((settings.Key.Joystick1.DownLeft > 0) && _keyboardService.IsKeyDown(settings.Key.Joystick1.DownLeft)) || 
-                    ((settings.Key.Joystick1.Down > 0) && _keyboardService.IsKeyDown(settings.Key.Joystick1.Down)) || 
+                    ((settings.Key.Joystick1.Down > 0) && _keyboardService.IsKeyDown(settings.Key.Joystick1.Down)) || 
-                    ((settings.Key.Joystick1.DownRight > 0) && _keyboardService.IsKeyDown(settings.Key.Joystick1.DownRight)))
+                    ((settings.Key.Joystick1.DownRight > 0) && _keyboardService.IsKeyDown(settings.Key.Joystick1.DownRight)))
-                {
+                {
-                    paddle3 += 128;
+                    paddle3 += 128;
-                }
+                }
-            }
+            }
-
+
-            Paddle0Strobe = true;
+            Paddle0Strobe = true;
-            Paddle1Strobe = true;
+            Paddle1Strobe = true;
-            Paddle2Strobe = true;
+            Paddle2Strobe = true;
-            Paddle3Strobe = true;
+            Paddle3Strobe = true;
-
+
-            Machine.Events.AddEvent(MathHelpers.ClampByte(paddle0) * CyclesPerValue, _resetPaddle0StrobeEvent); // [7-29]
+            Machine.Events.AddEvent(MathHelpers.ClampByte(paddle0) * CyclesPerValue, _resetPaddle0StrobeEvent); // [7-29]
-            Machine.Events.AddEvent(MathHelpers.ClampByte(paddle1) * CyclesPerValue, _resetPaddle1StrobeEvent);
+            Machine.Events.AddEvent(MathHelpers.ClampByte(paddle1) * CyclesPerValue, _resetPaddle1StrobeEvent);
-            Machine.Events.AddEvent(MathHelpers.ClampByte(paddle2) * CyclesPerValue, _resetPaddle2StrobeEvent);
+            Machine.Events.AddEvent(MathHelpers.ClampByte(paddle2) * CyclesPerValue, _resetPaddle2StrobeEvent);
-            Machine.Events.AddEvent(MathHelpers.ClampByte(paddle3) * CyclesPerValue, _resetPaddle3StrobeEvent);
+            Machine.Events.AddEvent(MathHelpers.ClampByte(paddle3) * CyclesPerValue, _resetPaddle3StrobeEvent);
-        }
+        }
-
+
-        private void ResetPaddle0StrobeEvent()
+        private void ResetPaddle0StrobeEvent()
-        {
+        {
-            Paddle0Strobe = false;
+            Paddle0Strobe = false;
-        }
+        }
-
+
-        private void ResetPaddle1StrobeEvent()
+        private void ResetPaddle1StrobeEvent()
-        {
+        {
-            Paddle1Strobe = false;
+            Paddle1Strobe = false;
-        }
+        }
-
+
-        private void ResetPaddle2StrobeEvent()
+        private void ResetPaddle2StrobeEvent()
-        {
+        {
-            Paddle2Strobe = false;
+            Paddle2Strobe = false;
-        }
+        }
-
+
-        private void ResetPaddle3StrobeEvent()
+        private void ResetPaddle3StrobeEvent()
-        {
+        {
-            Paddle3Strobe = false;
+            Paddle3Strobe = false;
-        }
+        }
-
+
-        public bool Paddle0Strobe { get; private set; }
+        public bool Paddle0Strobe { get; private set; }
-        public bool Paddle1Strobe { get; private set; }
+        public bool Paddle1Strobe { get; private set; }
-        public bool Paddle2Strobe { get; private set; }
+        public bool Paddle2Strobe { get; private set; }
-        public bool Paddle3Strobe { get; private set; }
+        public bool Paddle3Strobe { get; private set; }
-
+
-        private const int CyclesPerValue = 11;
+        private const int CyclesPerValue = 11;
-
+
-        private Action _resetPaddle0StrobeEvent;
+        private Action _resetPaddle0StrobeEvent;
-        private Action _resetPaddle1StrobeEvent;
+        private Action _resetPaddle1StrobeEvent;
-        private Action _resetPaddle2StrobeEvent;
+        private Action _resetPaddle2StrobeEvent;
-        private Action _resetPaddle3StrobeEvent;
+        private Action _resetPaddle3StrobeEvent;
-
+
-        private KeyboardService _keyboardService;
+        private KeyboardService _keyboardService;
-        private GamePortService _gamePortService;
+        private GamePortService _gamePortService;
-    }
+    }
-}
+}

Virtu/Keyboard.cs

@@ -1,133 +1,133 @@
-using System;
+using System;
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
-using Jellyfish.Virtu.Services;
+using Jellyfish.Virtu.Services;
-using Jellyfish.Virtu.Settings;
+using Jellyfish.Virtu.Settings;
-
+
-namespace Jellyfish.Virtu
+namespace Jellyfish.Virtu
-{
+{
-    public sealed class Keyboard : MachineComponent
+    public sealed class Keyboard : MachineComponent
-    {
+    {
-        public Keyboard(Machine machine) :
+        public Keyboard(Machine machine) :
-            base(machine)
+            base(machine)
-        {
+        {
-        }
+        }
-
+
-        public override void Initialize()
+        public override void Initialize()
-        {
+        {
-            _keyboardService = Machine.Services.GetService<KeyboardService>();
+            _keyboardService = Machine.Services.GetService<KeyboardService>();
-            _gamePortService = Machine.Services.GetService<GamePortService>();
+            _gamePortService = Machine.Services.GetService<GamePortService>();
-
+
-            _keyboardService.AsciiKeyDown += (sender, e) => Latch = e.AsciiKey;
+            _keyboardService.AsciiKeyDown += (sender, e) => Latch = e.AsciiKey;
-        }
+        }
-
+
-        [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
+        [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        public int ReadLatch()
+        public int ReadLatch()
-        {
+        {
-            if (Strobe)
+            if (Strobe)
-            {
+            {
-                return Latch;
+                return Latch;
-            }
+            }
-
+
-            KeyboardSettings settings = Machine.Settings.Keyboard;
+            var settings = Machine.Settings.Keyboard;
-
+
-            if (settings.UseGamePort)
+            if (settings.UseGamePort)
-            {
+            {
-                if ((settings.Key.Joystick0.UpLeft > 0) && _gamePortService.Joystick0.IsUp && _gamePortService.Joystick0.IsLeft)
+                if ((settings.Key.Joystick0.UpLeft > 0) && _gamePortService.Joystick0.IsUp && _gamePortService.Joystick0.IsLeft)
-                {
+                {
-                    Latch = settings.Key.Joystick0.UpLeft;
+                    Latch = settings.Key.Joystick0.UpLeft;
-                }
+                }
-                else if ((settings.Key.Joystick0.UpRight > 0) && _gamePortService.Joystick0.IsUp && _gamePortService.Joystick0.IsRight)
+                else if ((settings.Key.Joystick0.UpRight > 0) && _gamePortService.Joystick0.IsUp && _gamePortService.Joystick0.IsRight)
-                {
+                {
-                    Latch = settings.Key.Joystick0.UpRight;
+                    Latch = settings.Key.Joystick0.UpRight;
-                }
+                }
-                else if ((settings.Key.Joystick0.DownLeft > 0) && _gamePortService.Joystick0.IsDown && _gamePortService.Joystick0.IsLeft)
+                else if ((settings.Key.Joystick0.DownLeft > 0) && _gamePortService.Joystick0.IsDown && _gamePortService.Joystick0.IsLeft)
-                {
+                {
-                    Latch = settings.Key.Joystick0.DownLeft;
+                    Latch = settings.Key.Joystick0.DownLeft;
-                }
+                }
-                else if ((settings.Key.Joystick0.DownRight > 0) && _gamePortService.Joystick0.IsDown && _gamePortService.Joystick0.IsRight)
+                else if ((settings.Key.Joystick0.DownRight > 0) && _gamePortService.Joystick0.IsDown && _gamePortService.Joystick0.IsRight)
-                {
+                {
-                    Latch = settings.Key.Joystick0.DownRight;
+                    Latch = settings.Key.Joystick0.DownRight;
-                }
+                }
-                else if ((settings.Key.Joystick0.Up > 0) && _gamePortService.Joystick0.IsUp)
+                else if ((settings.Key.Joystick0.Up > 0) && _gamePortService.Joystick0.IsUp)
-                {
+                {
-                    Latch = settings.Key.Joystick0.Up;
+                    Latch = settings.Key.Joystick0.Up;
-                }
+                }
-                else if ((settings.Key.Joystick0.Left > 0) && _gamePortService.Joystick0.IsLeft)
+                else if ((settings.Key.Joystick0.Left > 0) && _gamePortService.Joystick0.IsLeft)
-                {
+                {
-                    Latch = settings.Key.Joystick0.Left;
+                    Latch = settings.Key.Joystick0.Left;
-                }
+                }
-                else if ((settings.Key.Joystick0.Right > 0) && _gamePortService.Joystick0.IsRight)
+                else if ((settings.Key.Joystick0.Right > 0) && _gamePortService.Joystick0.IsRight)
-                {
+                {
-                    Latch = settings.Key.Joystick0.Right;
+                    Latch = settings.Key.Joystick0.Right;
-                }
+                }
-                else if ((settings.Key.Joystick0.Down > 0) && _gamePortService.Joystick0.IsDown)
+                else if ((settings.Key.Joystick0.Down > 0) && _gamePortService.Joystick0.IsDown)
-                {
+                {
-                    Latch = settings.Key.Joystick0.Down;
+                    Latch = settings.Key.Joystick0.Down;
-                }
+                }
-
+
-                if ((settings.Key.Joystick1.UpLeft > 0) && _gamePortService.Joystick1.IsUp && _gamePortService.Joystick1.IsLeft) // override
+                if ((settings.Key.Joystick1.UpLeft > 0) && _gamePortService.Joystick1.IsUp && _gamePortService.Joystick1.IsLeft) // override
-                {
+                {
-                    Latch = settings.Key.Joystick1.UpLeft;
+                    Latch = settings.Key.Joystick1.UpLeft;
-                }
+                }
-                else if ((settings.Key.Joystick1.UpRight > 0) && _gamePortService.Joystick1.IsUp && _gamePortService.Joystick1.IsRight)
+                else if ((settings.Key.Joystick1.UpRight > 0) && _gamePortService.Joystick1.IsUp && _gamePortService.Joystick1.IsRight)
-                {
+                {
-                    Latch = settings.Key.Joystick1.UpRight;
+                    Latch = settings.Key.Joystick1.UpRight;
-                }
+                }
-                else if ((settings.Key.Joystick1.DownLeft > 0) && _gamePortService.Joystick1.IsDown && _gamePortService.Joystick1.IsLeft)
+                else if ((settings.Key.Joystick1.DownLeft > 0) && _gamePortService.Joystick1.IsDown && _gamePortService.Joystick1.IsLeft)
-                {
+                {
-                    Latch = settings.Key.Joystick1.DownLeft;
+                    Latch = settings.Key.Joystick1.DownLeft;
-                }
+                }
-                else if ((settings.Key.Joystick1.DownRight > 0) && _gamePortService.Joystick1.IsDown && _gamePortService.Joystick1.IsRight)
+                else if ((settings.Key.Joystick1.DownRight > 0) && _gamePortService.Joystick1.IsDown && _gamePortService.Joystick1.IsRight)
-                {
+                {
-                    Latch = settings.Key.Joystick1.DownRight;
+                    Latch = settings.Key.Joystick1.DownRight;
-                }
+                }
-                else if ((settings.Key.Joystick1.Up > 0) && _gamePortService.Joystick1.IsUp)
+                else if ((settings.Key.Joystick1.Up > 0) && _gamePortService.Joystick1.IsUp)
-                {
+                {
-                    Latch = settings.Key.Joystick1.Up;
+                    Latch = settings.Key.Joystick1.Up;
-                }
+                }
-                else if ((settings.Key.Joystick1.Left > 0) && _gamePortService.Joystick1.IsLeft)
+                else if ((settings.Key.Joystick1.Left > 0) && _gamePortService.Joystick1.IsLeft)
-                {
+                {
-                    Latch = settings.Key.Joystick1.Left;
+                    Latch = settings.Key.Joystick1.Left;
-                }
+                }
-                else if ((settings.Key.Joystick1.Right > 0) && _gamePortService.Joystick1.IsRight)
+                else if ((settings.Key.Joystick1.Right > 0) && _gamePortService.Joystick1.IsRight)
-                {
+                {
-                    Latch = settings.Key.Joystick1.Right;
+                    Latch = settings.Key.Joystick1.Right;
-                }
+                }
-                else if ((settings.Key.Joystick1.Down > 0) && _gamePortService.Joystick1.IsDown)
+                else if ((settings.Key.Joystick1.Down > 0) && _gamePortService.Joystick1.IsDown)
-                {
+                {
-                    Latch = settings.Key.Joystick1.Down;
+                    Latch = settings.Key.Joystick1.Down;
-                }
+                }
-
+
-                if ((settings.Key.Button0 > 0) && _gamePortService.IsButton0Down) // override
+                if ((settings.Key.Button0 > 0) && _gamePortService.IsButton0Down) // override
-                {
+                {
-                    Latch = settings.Key.Button0;
+                    Latch = settings.Key.Button0;
-                }
+                }
-                else if ((settings.Key.Button1 > 0) && _gamePortService.IsButton1Down)
+                else if ((settings.Key.Button1 > 0) && _gamePortService.IsButton1Down)
-                {
+                {
-                    Latch = settings.Key.Button1;
+                    Latch = settings.Key.Button1;
-                }
+                }
-                else if ((settings.Key.Button2 > 0) && _gamePortService.IsButton2Down)
+                else if ((settings.Key.Button2 > 0) && _gamePortService.IsButton2Down)
-                {
+                {
-                    Latch = settings.Key.Button2;
+                    Latch = settings.Key.Button2;
-                }
+                }
-            }
+            }
-
+
-            return Latch;
+            return Latch;
-        }
+        }
-
+
-        public void ResetStrobe()
+        public void ResetStrobe()
-        {
+        {
-            Strobe = false;
+            Strobe = false;
-        }
+        }
-
+
-        public bool IsAnyKeyDown { get { return _keyboardService.IsAnyKeyDown; } }
+        public bool IsAnyKeyDown { get { return _keyboardService.IsAnyKeyDown; } }
-        public bool Strobe { get; private set; }
+        public bool Strobe { get; private set; }
-
+
-        private int Latch { get { return _latch; } set { _latch = value; Strobe = true; } }
+        private int Latch { get { return _latch; } set { _latch = value; Strobe = true; } }
-
+
-        private KeyboardService _keyboardService;
+        private KeyboardService _keyboardService;
-        private GamePortService _gamePortService;
+        private GamePortService _gamePortService;
-
+
-        private int _latch;
+        private int _latch;
-    }
+    }
-}
+}

Virtu/Machine.cs

@@ -1,128 +1,128 @@
-using System;
+using System;
-using System.Collections.ObjectModel;
+using System.Collections.ObjectModel;
-using System.Threading;
+using System.Threading;
-using Jellyfish.Library;
+using Jellyfish.Library;
-using Jellyfish.Virtu.Services;
+using Jellyfish.Virtu.Services;
-using Jellyfish.Virtu.Settings;
+using Jellyfish.Virtu.Settings;
-
+
-namespace Jellyfish.Virtu
+namespace Jellyfish.Virtu
-{
+{
-    public enum MachineState { Stopped = 0, Starting, Running, Pausing, Paused, Stopping }
+    public enum MachineState { Stopped = 0, Starting, Running, Pausing, Paused, Stopping }
-
+
-    public sealed class Machine : IDisposable
+    public sealed class Machine : IDisposable
-    {
+    {
-        public Machine()
+        public Machine()
-        {
+        {
-            Events = new MachineEvents();
+            Events = new MachineEvents();
-            Services = new MachineServices();
+            Services = new MachineServices();
-            Settings = new MachineSettings();
+            Settings = new MachineSettings();
-
+
-            Cpu = new Cpu(this);
+            Cpu = new Cpu(this);
-            Memory = new Memory(this);
+            Memory = new Memory(this);
-            DiskII = new DiskII(this);
+            DiskII = new DiskII(this);
-            Keyboard = new Keyboard(this);
+            Keyboard = new Keyboard(this);
-            GamePort = new GamePort(this);
+            GamePort = new GamePort(this);
-            Cassette = new Cassette(this);
+            Cassette = new Cassette(this);
-            Speaker = new Speaker(this);
+            Speaker = new Speaker(this);
-            Video = new Video(this);
+            Video = new Video(this);
-            Components = new Collection<MachineComponent> { Cpu, Memory, DiskII, Keyboard, GamePort, Cassette, Speaker, Video };
+            Components = new Collection<MachineComponent> { Cpu, Memory, DiskII, Keyboard, GamePort, Cassette, Speaker, Video };
-
+
-            Thread = new Thread(Run) { Name = "Machine" };
+            Thread = new Thread(Run) { Name = "Machine" };
-        }
+        }
-
+
-        public void Dispose()
+        public void Dispose()
-        {
+        {
-            _pauseEvent.Close();
+            _pauseEvent.Close();
-            _unpauseEvent.Close();
+            _unpauseEvent.Close();
-        }
+        }
-
+
-        public void Reset()
+        public void Reset()
-        {
+        {
-            Components.ForEach(component => component.Reset()); // while machine starting or paused
+            Components.ForEach(component => component.Reset()); // while machine starting or paused
-        }
+        }
-
+
-        public void Start()
+        public void Start()
-        {
+        {
-            _storageService = Services.GetService<StorageService>();
+            _storageService = Services.GetService<StorageService>();
-            _storageService.Load(MachineSettings.FileName, stream => Settings.Deserialize(stream));
+            _storageService.Load(MachineSettings.FileName, stream => Settings.Deserialize(stream));
-
+
-            State = MachineState.Starting;
+            State = MachineState.Starting;
-            Services.ForEach(service => service.Start());
+            Services.ForEach(service => service.Start());
-
+
-            Thread.Start();
+            Thread.Start();
-        }
+        }
-
+
-        public void Pause()
+        public void Pause()
-        {
+        {
-            State = MachineState.Pausing;
+            State = MachineState.Pausing;
-            _pauseEvent.WaitOne();
+            _pauseEvent.WaitOne();
-            State = MachineState.Paused;
+            State = MachineState.Paused;
-        }
+        }
-
+
-        public void Unpause()
+        public void Unpause()
-        {
+        {
-            State = MachineState.Running;
+            State = MachineState.Running;
-            _unpauseEvent.Set();
+            _unpauseEvent.Set();
-        }
+        }
-
+
-        public void Stop()
+        public void Stop()
-        {
+        {
-            State = MachineState.Stopping;
+            State = MachineState.Stopping;
-            Services.ForEach(service => service.Stop());
+            Services.ForEach(service => service.Stop());
-
+
-            _pauseEvent.Set();
+            _pauseEvent.Set();
-            _unpauseEvent.Set();
+            _unpauseEvent.Set();
-            Thread.Join();
+            Thread.Join();
-            State = MachineState.Stopped;
+            State = MachineState.Stopped;
-
+
-            _storageService.Save(MachineSettings.FileName, stream => Settings.Serialize(stream));
+            _storageService.Save(MachineSettings.FileName, stream => Settings.Serialize(stream));
-        }
+        }
-
+
-        private void Run() // machine thread
+        private void Run() // machine thread
-        {
+        {
-            Components.ForEach(component => component.Initialize());
+            Components.ForEach(component => component.Initialize());
-            Reset();
+            Reset();
-
+
-            State = MachineState.Running;
+            State = MachineState.Running;
-            do
+            do
-            {
+            {
-                do
+                do
-                {
+                {
-                    Events.HandleEvents(Cpu.Execute());
+                    Events.HandleEvents(Cpu.Execute());
-                }
+                }
-                while (State == MachineState.Running);
+                while (State == MachineState.Running);
-
+
-                if (State == MachineState.Pausing)
+                if (State == MachineState.Pausing)
-                {
+                {
-                    _pauseEvent.Set();
+                    _pauseEvent.Set();
-                    _unpauseEvent.WaitOne();
+                    _unpauseEvent.WaitOne();
-                }
+                }
-            }
+            }
-            while (State != MachineState.Stopping);
+            while (State != MachineState.Stopping);
-
+
-            Components.ForEach(component => component.Uninitialize());
+            Components.ForEach(component => component.Uninitialize());
-        }
+        }
-
+
-        public MachineEvents Events { get; private set; }
+        public MachineEvents Events { get; private set; }
-        public MachineServices Services { get; private set; }
+        public MachineServices Services { get; private set; }
-        public MachineSettings Settings { get; private set; }
+        public MachineSettings Settings { get; private set; }
-        public MachineState State { get; private set; }
+        public MachineState State { get; private set; }
-
+
-        public Cpu Cpu { get; private set; }
+        public Cpu Cpu { get; private set; }
-        public Memory Memory { get; private set; }
+        public Memory Memory { get; private set; }
-        public DiskII DiskII { get; private set; }
+        public DiskII DiskII { get; private set; }
-        public Keyboard Keyboard { get; private set; }
+        public Keyboard Keyboard { get; private set; }
-        public GamePort GamePort { get; private set; }
+        public GamePort GamePort { get; private set; }
-        public Cassette Cassette { get; private set; }
+        public Cassette Cassette { get; private set; }
-        public Speaker Speaker { get; private set; }
+        public Speaker Speaker { get; private set; }
-        public Video Video { get; private set; }
+        public Video Video { get; private set; }
-        public Collection<MachineComponent> Components { get; private set; }
+        public Collection<MachineComponent> Components { get; private set; }
-
+
-        public Thread Thread { get; private set; }
+        public Thread Thread { get; private set; }
-
+
-        private AutoResetEvent _pauseEvent = new AutoResetEvent(false);
+        private AutoResetEvent _pauseEvent = new AutoResetEvent(false);
-        private AutoResetEvent _unpauseEvent = new AutoResetEvent(false);
+        private AutoResetEvent _unpauseEvent = new AutoResetEvent(false);
-
+
-        private StorageService _storageService;
+        private StorageService _storageService;
-    }
+    }
-}
+}

Virtu/MachineComponent.cs

@@ -1,24 +1,24 @@
-namespace Jellyfish.Virtu
+namespace Jellyfish.Virtu
-{
+{
-    public abstract class MachineComponent
+    public abstract class MachineComponent
-    {
+    {
-        protected MachineComponent(Machine machine)
+        protected MachineComponent(Machine machine)
-        {
+        {
-            Machine = machine;
+            Machine = machine;
-        }
+        }
-
+
-        public virtual void Initialize()
+        public virtual void Initialize()
-        {
+        {
-        }
+        }
-
+
-        public virtual void Reset()
+        public virtual void Reset()
-        {
+        {
-        }
+        }
-
+
-        public virtual void Uninitialize()
+        public virtual void Uninitialize()
-        {
+        {
-        }
+        }
-
+
-        protected Machine Machine { get; private set; }
+        protected Machine Machine { get; private set; }
-    }
+    }
-}
+}

Virtu/MachineEvents.cs

@@ -1,107 +1,107 @@
-using System;
+using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.Globalization;
+using System.Globalization;
-
+
-namespace Jellyfish.Virtu
+namespace Jellyfish.Virtu
-{
+{
-    public sealed class MachineEvent
+    public sealed class MachineEvent
-    {
+    {
-        public MachineEvent(int delta, Action action)
+        public MachineEvent(int delta, Action action)
-        {
+        {
-            Delta = delta;
+            Delta = delta;
-            Action = action;
+            Action = action;
-        }
+        }
-
+
-        public override string ToString()
+        public override string ToString()
-        {
+        {
-            return string.Format(CultureInfo.CurrentCulture, "Delta = {0} Action = {{{1}.{2}}}", Delta, Action.Method.DeclaringType.Name, Action.Method.Name);
+            return string.Format(CultureInfo.CurrentCulture, "Delta = {0} Action = {{{1}.{2}}}", Delta, Action.Method.DeclaringType.Name, Action.Method.Name);
-        }
+        }
-
+
-        public int Delta { get; set; }
+        public int Delta { get; set; }
-        public Action Action { get; set; }
+        public Action Action { get; set; }
-    }
+    }
-
+
-    public sealed class MachineEvents
+    public sealed class MachineEvents
-    {
+    {
-        public void AddEvent(int delta, Action action)
+        public void AddEvent(int delta, Action action)
-        {
+        {
-            LinkedListNode<MachineEvent> node = _used.First;
+            LinkedListNode<MachineEvent> node = _used.First;
-            for (; node != null; node = node.Next)
+            for (; node != null; node = node.Next)
-            {
+            {
-                if (delta < node.Value.Delta)
+                if (delta < node.Value.Delta)
-                {
+                {
-                    node.Value.Delta -= delta;
+                    node.Value.Delta -= delta;
-                    break;
+                    break;
-                }
+                }
-                if (node.Value.Delta > 0)
+                if (node.Value.Delta > 0)
-                {
+                {
-                    delta -= node.Value.Delta;
+                    delta -= node.Value.Delta;
-                }
+                }
-            }
+            }
-
+
-            LinkedListNode<MachineEvent> newNode = _free.First;
+            LinkedListNode<MachineEvent> newNode = _free.First;
-            if (newNode != null)
+            if (newNode != null)
-            {
+            {
-                _free.RemoveFirst();
+                _free.RemoveFirst();
-                newNode.Value.Delta = delta;
+                newNode.Value.Delta = delta;
-                newNode.Value.Action = action;
+                newNode.Value.Action = action;
-            }
+            }
-            else
+            else
-            {
+            {
-                newNode = new LinkedListNode<MachineEvent>(new MachineEvent(delta, action));
+                newNode = new LinkedListNode<MachineEvent>(new MachineEvent(delta, action));
-            }
+            }
-
+
-            if (node != null)
+            if (node != null)
-            {
+            {
-                _used.AddBefore(node, newNode);
+                _used.AddBefore(node, newNode);
-            }
+            }
-            else
+            else
-            {
+            {
-                _used.AddLast(newNode);
+                _used.AddLast(newNode);
-            }
+            }
-        }
+        }
-
+
-        public int FindEvent(Action action)
+        public int FindEvent(Action action)
-        {
+        {
-            int delta = 0;
+            int delta = 0;
-
+
-            for (LinkedListNode<MachineEvent> node = _used.First; node != null; node = node.Next)
+            for (LinkedListNode<MachineEvent> node = _used.First; node != null; node = node.Next)
-            {
+            {
-                delta += node.Value.Delta;
+                delta += node.Value.Delta;
-                if (object.ReferenceEquals(node.Value.Action, action)) // assumes delegate cached
+                if (object.ReferenceEquals(node.Value.Action, action)) // assumes delegate cached
-                {
+                {
-                    return delta;
+                    return delta;
-                }
+                }
-            }
+            }
-
+
-            return 0;
+            return 0;
-        }
+        }
-
+
-        public void HandleEvents(int delta)
+        public void HandleEvents(int delta)
-        {
+        {
-            LinkedListNode<MachineEvent> node = _used.First;
+            LinkedListNode<MachineEvent> node = _used.First;
-            node.Value.Delta -= delta;
+            node.Value.Delta -= delta;
-
+
-            while (node.Value.Delta <= 0)
+            while (node.Value.Delta <= 0)
-            {
+            {
-                node.Value.Action();
+                node.Value.Action();
-                RemoveEvent(node);
+                RemoveEvent(node);
-                node = _used.First;
+                node = _used.First;
-            }
+            }
-        }
+        }
-
+
-        private void RemoveEvent(LinkedListNode<MachineEvent> node)
+        private void RemoveEvent(LinkedListNode<MachineEvent> node)
-        {
+        {
-            if (node.Next != null)
+            if (node.Next != null)
-            {
+            {
-                node.Next.Value.Delta += node.Value.Delta;
+                node.Next.Value.Delta += node.Value.Delta;
-            }
+            }
-
+
-            _used.Remove(node);
+            _used.Remove(node);
-            _free.AddFirst(node); // cache node; avoids garbage
+            _free.AddFirst(node); // cache node; avoids garbage
-        }
+        }
-
+
-        private LinkedList<MachineEvent> _used = new LinkedList<MachineEvent>();
+        private LinkedList<MachineEvent> _used = new LinkedList<MachineEvent>();
-        private LinkedList<MachineEvent> _free = new LinkedList<MachineEvent>();
+        private LinkedList<MachineEvent> _free = new LinkedList<MachineEvent>();
-    }
+    }
-}
+}

Virtu/MachineSettings.cs

@@ -1,393 +1,393 @@
-using System;
+using System;
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
-using System.IO;
+using System.IO;
-using System.Xml;
+using System.Xml;
-using System.Xml.Linq;
+using System.Xml.Linq;
-
+
-namespace Jellyfish.Virtu.Settings
+namespace Jellyfish.Virtu.Settings
-{
+{
-    public sealed class MachineSettings
+    public sealed class MachineSettings
-    {
+    {
-        public MachineSettings()
+        public MachineSettings()
-        {
+        {
-            Cpu = new CpuSettings { Is65C02 = true, IsThrottled = true, Multiplier = 1 };
+            Cpu = new CpuSettings { Is65C02 = true, IsThrottled = true, Multiplier = 1 };
-            DiskII = new DiskIISettings
+            DiskII = new DiskIISettings
-            {
+            {
-                Disk1 = new DiskSettings { Name = string.Empty, IsWriteProtected = false }, 
+                Disk1 = new DiskSettings { Name = string.Empty, IsWriteProtected = false }, 
-                Disk2 = new DiskSettings { Name = string.Empty, IsWriteProtected = false }
+                Disk2 = new DiskSettings { Name = string.Empty, IsWriteProtected = false }
-            };
+            };
-            Keyboard = new KeyboardSettings
+            Keyboard = new KeyboardSettings
-            {
+            {
-                UseGamePort = false, 
+                UseGamePort = false, 
-                Key = new KeySettings
+                Key = new KeySettings
-                {
+                {
-                    Joystick0 = new JoystickSettings { UpLeft = 0, Up = 'I', UpRight = 0, Left = 'J', Right = 'L', DownLeft = 0, Down = 'K', DownRight = 0 }, 
+                    Joystick0 = new JoystickSettings { UpLeft = 0, Up = 'I', UpRight = 0, Left = 'J', Right = 'L', DownLeft = 0, Down = 'K', DownRight = 0 }, 
-                    Joystick1 = new JoystickSettings { UpLeft = 0, Up = 'E', UpRight = 0, Left = 'S', Right = 'F', DownLeft = 0, Down = 'D', DownRight = 0 }, 
+                    Joystick1 = new JoystickSettings { UpLeft = 0, Up = 'E', UpRight = 0, Left = 'S', Right = 'F', DownLeft = 0, Down = 'D', DownRight = 0 }, 
-                    Button0 = 0, Button1 = 0, Button2 = 0
+                    Button0 = 0, Button1 = 0, Button2 = 0
-                }
+                }
-            };
+            };
-            GamePort = new GamePortSettings
+            GamePort = new GamePortSettings
-            {
+            {
-                UseKeyboard = false, 
+                UseKeyboard = false, 
-                Key = new KeySettings
+                Key = new KeySettings
-                {
+                {
-                    Joystick0 = new JoystickSettings { UpLeft = 0, Up = 0, UpRight = 0, Left = 0, Right = 0, DownLeft = 0, Down = 0, DownRight = 0 }, 
+                    Joystick0 = new JoystickSettings { UpLeft = 0, Up = 0, UpRight = 0, Left = 0, Right = 0, DownLeft = 0, Down = 0, DownRight = 0 }, 
-                    Joystick1 = new JoystickSettings { UpLeft = 0, Up = 0, UpRight = 0, Left = 0, Right = 0, DownLeft = 0, Down = 0, DownRight = 0 }, 
+                    Joystick1 = new JoystickSettings { UpLeft = 0, Up = 0, UpRight = 0, Left = 0, Right = 0, DownLeft = 0, Down = 0, DownRight = 0 }, 
-                    Button0 = 0, Button1 = 0, Button2 = 0
+                    Button0 = 0, Button1 = 0, Button2 = 0
-                }
+                }
-            };
+            };
-            Video = new VideoSettings
+            Video = new VideoSettings
-            {
+            {
-                IsFullScreen = false, IsMonochrome = false, ScannerOptions = ScannerOptions.None, 
+                IsFullScreen = false, IsMonochrome = false, ScannerOptions = ScannerOptions.None, 
-                Color = new ColorSettings
+                Color = new ColorSettings
-                {
+                {
-                    Black = 0x000000, 
+                    Black = 0x000000, 
-                    DarkBlue = 0x000099, 
+                    DarkBlue = 0x000099, 
-                    DarkGreen = 0x117722, 
+                    DarkGreen = 0x117722, 
-                    MediumBlue = 0x0000FF, 
+                    MediumBlue = 0x0000FF, 
-                    Brown = 0x885500, 
+                    Brown = 0x885500, 
-                    LightGrey = 0x99AAAA, 
+                    LightGrey = 0x99AAAA, 
-                    Green = 0x00EE11, 
+                    Green = 0x00EE11, 
-                    Aquamarine = 0x55FFAA, 
+                    Aquamarine = 0x55FFAA, 
-                    DeepRed = 0xFF1111, 
+                    DeepRed = 0xFF1111, 
-                    Purple = 0xDD00DD, 
+                    Purple = 0xDD00DD, 
-                    DarkGrey = 0x445555, 
+                    DarkGrey = 0x445555, 
-                    LightBlue = 0x33AAFF, 
+                    LightBlue = 0x33AAFF, 
-                    Orange = 0xFF4411, 
+                    Orange = 0xFF4411, 
-                    Pink = 0xFF9988, 
+                    Pink = 0xFF9988, 
-                    Yellow = 0xFFFF11, 
+                    Yellow = 0xFFFF11, 
-                    White = 0xFFFFFF, 
+                    White = 0xFFFFFF, 
-                    Monochrome = 0x00AA00
+                    Monochrome = 0x00AA00
-                }
+                }
-            };
+            };
-        }
+        }
-
+
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes")]
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes")]
-        public void Deserialize(Stream stream)
+        public void Deserialize(Stream stream)
-        {
+        {
-            try
+            try
-            {
+            {
-                using (XmlReader reader = XmlReader.Create(stream))
+                using (var reader = XmlReader.Create(stream))
-                {
+                {
-                    XNamespace ns = Namespace;
+                    var ns = Namespace;
-                    XElement root = XElement.Load(reader);
+                    var root = XElement.Load(reader);
-                    XElement cpu = root.Element(ns + "Cpu");
+                    var cpu = root.Element(ns + "Cpu");
-                    Cpu = new CpuSettings
+                    Cpu = new CpuSettings
-                    {
+                    {
-                        Is65C02 = (bool)cpu.Attribute("Is65C02"), 
+                        Is65C02 = (bool)cpu.Attribute("Is65C02"), 
-                        IsThrottled = (bool)cpu.Attribute("IsThrottled"), 
+                        IsThrottled = (bool)cpu.Attribute("IsThrottled"), 
-                        Multiplier = (int)cpu.Attribute("Multiplier")
+                        Multiplier = (int)cpu.Attribute("Multiplier")
-                    };
+                    };
-                    XElement diskII = root.Element(ns + "DiskII");
+                    var diskII = root.Element(ns + "DiskII");
-                    XElement disk1 = diskII.Element(ns + "Disk1");
+                    var disk1 = diskII.Element(ns + "Disk1");
-                    XElement disk2 = diskII.Element(ns + "Disk2");
+                    var disk2 = diskII.Element(ns + "Disk2");
-                    DiskII = new DiskIISettings
+                    DiskII = new DiskIISettings
-                    {
+                    {
-                        Disk1 = new DiskSettings
+                        Disk1 = new DiskSettings
-                        {
+                        {
-                            Name = (string)disk1.Attribute("Name") ?? string.Empty, 
+                            Name = (string)disk1.Attribute("Name") ?? string.Empty, 
-                            IsWriteProtected = (bool)disk1.Attribute("IsWriteProtected")
+                            IsWriteProtected = (bool)disk1.Attribute("IsWriteProtected")
-                        },
+                        },
-                        Disk2 = new DiskSettings
+                        Disk2 = new DiskSettings
-                        {
+                        {
-                            Name = (string)disk2.Attribute("Name") ?? string.Empty, 
+                            Name = (string)disk2.Attribute("Name") ?? string.Empty, 
-                            IsWriteProtected = (bool)disk2.Attribute("IsWriteProtected")
+                            IsWriteProtected = (bool)disk2.Attribute("IsWriteProtected")
-                        },
+                        },
-                    };
+                    };
-                    XElement keyboard = root.Element(ns + "Keyboard");
+                    var keyboard = root.Element(ns + "Keyboard");
-                    XElement key = keyboard.Element(ns + "Key");
+                    var key = keyboard.Element(ns + "Key");
-                    XElement joystick0 = key.Element(ns + "Joystick0");
+                    var joystick0 = key.Element(ns + "Joystick0");
-                    XElement joystick1 = key.Element(ns + "Joystick1");
+                    var joystick1 = key.Element(ns + "Joystick1");
-                    XElement buttons = key.Element(ns + "Buttons");
+                    var buttons = key.Element(ns + "Buttons");
-                    Keyboard = new KeyboardSettings
+                    Keyboard = new KeyboardSettings
-                    {
+                    {
-                        UseGamePort = (bool)keyboard.Attribute("UseGamePort"), 
+                        UseGamePort = (bool)keyboard.Attribute("UseGamePort"), 
-                        Key = new KeySettings
+                        Key = new KeySettings
-                        {
+                        {
-                            Joystick0 = new JoystickSettings
+                            Joystick0 = new JoystickSettings
-                            {
+                            {
-                                UpLeft = (int)joystick0.Attribute("UpLeft"), 
+                                UpLeft = (int)joystick0.Attribute("UpLeft"), 
-                                Up = (int)joystick0.Attribute("Up"), 
+                                Up = (int)joystick0.Attribute("Up"), 
-                                UpRight = (int)joystick0.Attribute("UpRight"), 
+                                UpRight = (int)joystick0.Attribute("UpRight"), 
-                                Left = (int)joystick0.Attribute("Left"), 
+                                Left = (int)joystick0.Attribute("Left"), 
-                                Right = (int)joystick0.Attribute("Right"), 
+                                Right = (int)joystick0.Attribute("Right"), 
-                                DownLeft = (int)joystick0.Attribute("DownLeft"), 
+                                DownLeft = (int)joystick0.Attribute("DownLeft"), 
-                                Down = (int)joystick0.Attribute("Down"), 
+                                Down = (int)joystick0.Attribute("Down"), 
-                                DownRight = (int)joystick0.Attribute("DownRight")
+                                DownRight = (int)joystick0.Attribute("DownRight")
-                            }, 
+                            }, 
-                            Joystick1 = new JoystickSettings
+                            Joystick1 = new JoystickSettings
-                            {
+                            {
-                                UpLeft = (int)joystick1.Attribute("UpLeft"), 
+                                UpLeft = (int)joystick1.Attribute("UpLeft"), 
-                                Up = (int)joystick1.Attribute("Up"), 
+                                Up = (int)joystick1.Attribute("Up"), 
-                                UpRight = (int)joystick1.Attribute("UpRight"), 
+                                UpRight = (int)joystick1.Attribute("UpRight"), 
-                                Left = (int)joystick1.Attribute("Left"), 
+                                Left = (int)joystick1.Attribute("Left"), 
-                                Right = (int)joystick1.Attribute("Right"), 
+                                Right = (int)joystick1.Attribute("Right"), 
-                                DownLeft = (int)joystick1.Attribute("DownLeft"), 
+                                DownLeft = (int)joystick1.Attribute("DownLeft"), 
-                                Down = (int)joystick1.Attribute("Down"), 
+                                Down = (int)joystick1.Attribute("Down"), 
-                                DownRight = (int)joystick1.Attribute("DownRight")
+                                DownRight = (int)joystick1.Attribute("DownRight")
-                            }, 
+                            }, 
-                            Button0 = (int)buttons.Attribute("Button0"), 
+                            Button0 = (int)buttons.Attribute("Button0"), 
-                            Button1 = (int)buttons.Attribute("Button1"), 
+                            Button1 = (int)buttons.Attribute("Button1"), 
-                            Button2 = (int)buttons.Attribute("Button2")
+                            Button2 = (int)buttons.Attribute("Button2")
-                        }
+                        }
-                    };
+                    };
-                    XElement gamePort = root.Element(ns + "GamePort");
+                    var gamePort = root.Element(ns + "GamePort");
-                    key = gamePort.Element(ns + "Key");
+                    key = gamePort.Element(ns + "Key");
-                    joystick0 = key.Element(ns + "Joystick0");
+                    joystick0 = key.Element(ns + "Joystick0");
-                    joystick1 = key.Element(ns + "Joystick1");
+                    joystick1 = key.Element(ns + "Joystick1");
-                    buttons = key.Element(ns + "Buttons");
+                    buttons = key.Element(ns + "Buttons");
-                    GamePort = new GamePortSettings
+                    GamePort = new GamePortSettings
-                    {
+                    {
-                        UseKeyboard = (bool)gamePort.Attribute("UseKeyboard"), 
+                        UseKeyboard = (bool)gamePort.Attribute("UseKeyboard"), 
-                        Key = new KeySettings
+                        Key = new KeySettings
-                        {
+                        {
-                            Joystick0 = new JoystickSettings
+                            Joystick0 = new JoystickSettings
-                            {
+                            {
-                                UpLeft = (int)joystick0.Attribute("UpLeft"), 
+                                UpLeft = (int)joystick0.Attribute("UpLeft"), 
-                                Up = (int)joystick0.Attribute("Up"), 
+                                Up = (int)joystick0.Attribute("Up"), 
-                                UpRight = (int)joystick0.Attribute("UpRight"), 
+                                UpRight = (int)joystick0.Attribute("UpRight"), 
-                                Left = (int)joystick0.Attribute("Left"), 
+                                Left = (int)joystick0.Attribute("Left"), 
-                                Right = (int)joystick0.Attribute("Right"), 
+                                Right = (int)joystick0.Attribute("Right"), 
-                                DownLeft = (int)joystick0.Attribute("DownLeft"), 
+                                DownLeft = (int)joystick0.Attribute("DownLeft"), 
-                                Down = (int)joystick0.Attribute("Down"), 
+                                Down = (int)joystick0.Attribute("Down"), 
-                                DownRight = (int)joystick0.Attribute("DownRight")
+                                DownRight = (int)joystick0.Attribute("DownRight")
-                            }, 
+                            }, 
-                            Joystick1 = new JoystickSettings
+                            Joystick1 = new JoystickSettings
-                            {
+                            {
-                                UpLeft = (int)joystick1.Attribute("UpLeft"), 
+                                UpLeft = (int)joystick1.Attribute("UpLeft"), 
-                                Up = (int)joystick1.Attribute("Up"), 
+                                Up = (int)joystick1.Attribute("Up"), 
-                                UpRight = (int)joystick1.Attribute("UpRight"), 
+                                UpRight = (int)joystick1.Attribute("UpRight"), 
-                                Left = (int)joystick1.Attribute("Left"), 
+                                Left = (int)joystick1.Attribute("Left"), 
-                                Right = (int)joystick1.Attribute("Right"), 
+                                Right = (int)joystick1.Attribute("Right"), 
-                                DownLeft = (int)joystick1.Attribute("DownLeft"), 
+                                DownLeft = (int)joystick1.Attribute("DownLeft"), 
-                                Down = (int)joystick1.Attribute("Down"), 
+                                Down = (int)joystick1.Attribute("Down"), 
-                                DownRight = (int)joystick1.Attribute("DownRight")
+                                DownRight = (int)joystick1.Attribute("DownRight")
-                            }, 
+                            }, 
-                            Button0 = (int)buttons.Attribute("Button0"), 
+                            Button0 = (int)buttons.Attribute("Button0"), 
-                            Button1 = (int)buttons.Attribute("Button1"), 
+                            Button1 = (int)buttons.Attribute("Button1"), 
-                            Button2 = (int)buttons.Attribute("Button2")
+                            Button2 = (int)buttons.Attribute("Button2")
-                        }
+                        }
-                    };
+                    };
-                    XElement video = root.Element(ns + "Video");
+                    var video = root.Element(ns + "Video");
-                    XElement color = video.Element(ns + "Color");
+                    var color = video.Element(ns + "Color");
-                    Video = new VideoSettings
+                    Video = new VideoSettings
-                    {
+                    {
-                        IsFullScreen = (bool)video.Attribute("IsFullScreen"), 
+                        IsFullScreen = (bool)video.Attribute("IsFullScreen"), 
-                        IsMonochrome = (bool)video.Attribute("IsMonochrome"), 
+                        IsMonochrome = (bool)video.Attribute("IsMonochrome"), 
-                        ScannerOptions = (ScannerOptions)Enum.Parse(typeof(ScannerOptions), (string)video.Attribute("ScannerOptions"), true), 
+                        ScannerOptions = (ScannerOptions)Enum.Parse(typeof(ScannerOptions), (string)video.Attribute("ScannerOptions"), true), 
-                        Color = new ColorSettings
+                        Color = new ColorSettings
-                        {
+                        {
-                            Black = (uint)color.Attribute("Black"), 
+                            Black = (uint)color.Attribute("Black"), 
-                            DarkBlue = (uint)color.Attribute("DarkBlue"), 
+                            DarkBlue = (uint)color.Attribute("DarkBlue"), 
-                            DarkGreen = (uint)color.Attribute("DarkGreen"), 
+                            DarkGreen = (uint)color.Attribute("DarkGreen"), 
-                            MediumBlue = (uint)color.Attribute("MediumBlue"), 
+                            MediumBlue = (uint)color.Attribute("MediumBlue"), 
-                            Brown = (uint)color.Attribute("Brown"), 
+                            Brown = (uint)color.Attribute("Brown"), 
-                            LightGrey = (uint)color.Attribute("LightGrey"), 
+                            LightGrey = (uint)color.Attribute("LightGrey"), 
-                            Green = (uint)color.Attribute("Green"), 
+                            Green = (uint)color.Attribute("Green"), 
-                            Aquamarine = (uint)color.Attribute("Aquamarine"), 
+                            Aquamarine = (uint)color.Attribute("Aquamarine"), 
-                            DeepRed = (uint)color.Attribute("DeepRed"), 
+                            DeepRed = (uint)color.Attribute("DeepRed"), 
-                            Purple = (uint)color.Attribute("Purple"), 
+                            Purple = (uint)color.Attribute("Purple"), 
-                            DarkGrey = (uint)color.Attribute("DarkGrey"), 
+                            DarkGrey = (uint)color.Attribute("DarkGrey"), 
-                            LightBlue = (uint)color.Attribute("LightBlue"), 
+                            LightBlue = (uint)color.Attribute("LightBlue"), 
-                            Orange = (uint)color.Attribute("Orange"), 
+                            Orange = (uint)color.Attribute("Orange"), 
-                            Pink = (uint)color.Attribute("Pink"), 
+                            Pink = (uint)color.Attribute("Pink"), 
-                            Yellow = (uint)color.Attribute("Yellow"), 
+                            Yellow = (uint)color.Attribute("Yellow"), 
-                            White = (uint)color.Attribute("White"), 
+                            White = (uint)color.Attribute("White"), 
-                            Monochrome = (uint)color.Attribute("Monochrome")
+                            Monochrome = (uint)color.Attribute("Monochrome")
-                        }
+                        }
-                    };
+                    };
-                }
+                }
-            }
+            }
-            catch (Exception)
+            catch (Exception)
-            {
+            {
-            }
+            }
-        }
+        }
-
+
-        public void Serialize(Stream stream)
+        public void Serialize(Stream stream)
-        {
+        {
-            XNamespace ns = Namespace;
+            var ns = Namespace;
-            XElement xml = new XElement(ns + "MachineSettings",
+            var xml = new XElement(ns + "MachineSettings",
-                new XElement(ns + "Cpu",
+                new XElement(ns + "Cpu",
-                    new XAttribute("Is65C02", Cpu.Is65C02),
+                    new XAttribute("Is65C02", Cpu.Is65C02),
-                    new XAttribute("IsThrottled", Cpu.IsThrottled),
+                    new XAttribute("IsThrottled", Cpu.IsThrottled),
-                    new XAttribute("Multiplier", Cpu.Multiplier)),
+                    new XAttribute("Multiplier", Cpu.Multiplier)),
-                new XElement(ns + "DiskII",
+                new XElement(ns + "DiskII",
-                    new XElement(ns + "Disk1",
+                    new XElement(ns + "Disk1",
-                        new XAttribute("Name", DiskII.Disk1.Name),
+                        new XAttribute("Name", DiskII.Disk1.Name),
-                        new XAttribute("IsWriteProtected", DiskII.Disk1.IsWriteProtected)),
+                        new XAttribute("IsWriteProtected", DiskII.Disk1.IsWriteProtected)),
-                    new XElement(ns + "Disk2",
+                    new XElement(ns + "Disk2",
-                        new XAttribute("Name", DiskII.Disk2.Name),
+                        new XAttribute("Name", DiskII.Disk2.Name),
-                        new XAttribute("IsWriteProtected", DiskII.Disk2.IsWriteProtected))),
+                        new XAttribute("IsWriteProtected", DiskII.Disk2.IsWriteProtected))),
-                new XElement(ns + "Keyboard",
+                new XElement(ns + "Keyboard",
-                    new XAttribute("UseGamePort", Keyboard.UseGamePort),
+                    new XAttribute("UseGamePort", Keyboard.UseGamePort),
-                    new XElement(ns + "Key",
+                    new XElement(ns + "Key",
-                        new XElement(ns + "Joystick0",
+                        new XElement(ns + "Joystick0",
-                            new XAttribute("UpLeft", Keyboard.Key.Joystick0.UpLeft),
+                            new XAttribute("UpLeft", Keyboard.Key.Joystick0.UpLeft),
-                            new XAttribute("Up", Keyboard.Key.Joystick0.Up),
+                            new XAttribute("Up", Keyboard.Key.Joystick0.Up),
-                            new XAttribute("UpRight", Keyboard.Key.Joystick0.UpRight),
+                            new XAttribute("UpRight", Keyboard.Key.Joystick0.UpRight),
-                            new XAttribute("Left", Keyboard.Key.Joystick0.Left),
+                            new XAttribute("Left", Keyboard.Key.Joystick0.Left),
-                            new XAttribute("Right", Keyboard.Key.Joystick0.Right),
+                            new XAttribute("Right", Keyboard.Key.Joystick0.Right),
-                            new XAttribute("DownLeft", Keyboard.Key.Joystick0.DownLeft),
+                            new XAttribute("DownLeft", Keyboard.Key.Joystick0.DownLeft),
-                            new XAttribute("Down", Keyboard.Key.Joystick0.Down),
+                            new XAttribute("Down", Keyboard.Key.Joystick0.Down),
-                            new XAttribute("DownRight", Keyboard.Key.Joystick0.DownRight)),
+                            new XAttribute("DownRight", Keyboard.Key.Joystick0.DownRight)),
-                        new XElement(ns + "Joystick1",
+                        new XElement(ns + "Joystick1",
-                            new XAttribute("UpLeft", Keyboard.Key.Joystick1.UpLeft),
+                            new XAttribute("UpLeft", Keyboard.Key.Joystick1.UpLeft),
-                            new XAttribute("Up", Keyboard.Key.Joystick1.Up),
+                            new XAttribute("Up", Keyboard.Key.Joystick1.Up),
-                            new XAttribute("UpRight", Keyboard.Key.Joystick1.UpRight),
+                            new XAttribute("UpRight", Keyboard.Key.Joystick1.UpRight),
-                            new XAttribute("Left", Keyboard.Key.Joystick1.Left),
+                            new XAttribute("Left", Keyboard.Key.Joystick1.Left),
-                            new XAttribute("Right", Keyboard.Key.Joystick1.Right),
+                            new XAttribute("Right", Keyboard.Key.Joystick1.Right),
-                            new XAttribute("DownLeft", Keyboard.Key.Joystick1.DownLeft),
+                            new XAttribute("DownLeft", Keyboard.Key.Joystick1.DownLeft),
-                            new XAttribute("Down", Keyboard.Key.Joystick1.Down),
+                            new XAttribute("Down", Keyboard.Key.Joystick1.Down),
-                            new XAttribute("DownRight", Keyboard.Key.Joystick1.DownRight)),
+                            new XAttribute("DownRight", Keyboard.Key.Joystick1.DownRight)),
-                        new XElement(ns + "Buttons",
+                        new XElement(ns + "Buttons",
-                            new XAttribute("Button0", Keyboard.Key.Button0),
+                            new XAttribute("Button0", Keyboard.Key.Button0),
-                            new XAttribute("Button1", Keyboard.Key.Button1),
+                            new XAttribute("Button1", Keyboard.Key.Button1),
-                            new XAttribute("Button2", Keyboard.Key.Button2)))),
+                            new XAttribute("Button2", Keyboard.Key.Button2)))),
-                new XElement(ns + "GamePort",
+                new XElement(ns + "GamePort",
-                    new XAttribute("UseKeyboard", GamePort.UseKeyboard),
+                    new XAttribute("UseKeyboard", GamePort.UseKeyboard),
-                    new XElement(ns + "Key",
+                    new XElement(ns + "Key",
-                        new XElement(ns + "Joystick0",
+                        new XElement(ns + "Joystick0",
-                            new XAttribute("UpLeft", GamePort.Key.Joystick0.UpLeft),
+                            new XAttribute("UpLeft", GamePort.Key.Joystick0.UpLeft),
-                            new XAttribute("Up", GamePort.Key.Joystick0.Up),
+                            new XAttribute("Up", GamePort.Key.Joystick0.Up),
-                            new XAttribute("UpRight", GamePort.Key.Joystick0.UpRight),
+                            new XAttribute("UpRight", GamePort.Key.Joystick0.UpRight),
-                            new XAttribute("Left", GamePort.Key.Joystick0.Left),
+                            new XAttribute("Left", GamePort.Key.Joystick0.Left),
-                            new XAttribute("Right", GamePort.Key.Joystick0.Right),
+                            new XAttribute("Right", GamePort.Key.Joystick0.Right),
-                            new XAttribute("DownLeft", GamePort.Key.Joystick0.DownLeft),
+                            new XAttribute("DownLeft", GamePort.Key.Joystick0.DownLeft),
-                            new XAttribute("Down", GamePort.Key.Joystick0.Down),
+                            new XAttribute("Down", GamePort.Key.Joystick0.Down),
-                            new XAttribute("DownRight", GamePort.Key.Joystick0.DownRight)),
+                            new XAttribute("DownRight", GamePort.Key.Joystick0.DownRight)),
-                        new XElement(ns + "Joystick1",
+                        new XElement(ns + "Joystick1",
-                            new XAttribute("UpLeft", GamePort.Key.Joystick1.UpLeft),
+                            new XAttribute("UpLeft", GamePort.Key.Joystick1.UpLeft),
-                            new XAttribute("Up", GamePort.Key.Joystick1.Up),
+                            new XAttribute("Up", GamePort.Key.Joystick1.Up),
-                            new XAttribute("UpRight", GamePort.Key.Joystick1.UpRight),
+                            new XAttribute("UpRight", GamePort.Key.Joystick1.UpRight),
-                            new XAttribute("Left", GamePort.Key.Joystick1.Left),
+                            new XAttribute("Left", GamePort.Key.Joystick1.Left),
-                            new XAttribute("Right", GamePort.Key.Joystick1.Right),
+                            new XAttribute("Right", GamePort.Key.Joystick1.Right),
-                            new XAttribute("DownLeft", GamePort.Key.Joystick1.DownLeft),
+                            new XAttribute("DownLeft", GamePort.Key.Joystick1.DownLeft),
-                            new XAttribute("Down", GamePort.Key.Joystick1.Down),
+                            new XAttribute("Down", GamePort.Key.Joystick1.Down),
-                            new XAttribute("DownRight", GamePort.Key.Joystick1.DownRight)),
+                            new XAttribute("DownRight", GamePort.Key.Joystick1.DownRight)),
-                        new XElement(ns + "Buttons",
+                        new XElement(ns + "Buttons",
-                            new XAttribute("Button0", Keyboard.Key.Button0),
+                            new XAttribute("Button0", Keyboard.Key.Button0),
-                            new XAttribute("Button1", Keyboard.Key.Button1),
+                            new XAttribute("Button1", Keyboard.Key.Button1),
-                            new XAttribute("Button2", Keyboard.Key.Button2)))),
+                            new XAttribute("Button2", Keyboard.Key.Button2)))),
-                new XElement(ns + "Video",
+                new XElement(ns + "Video",
-                    new XAttribute("IsFullScreen", Video.IsFullScreen),
+                    new XAttribute("IsFullScreen", Video.IsFullScreen),
-                    new XAttribute("IsMonochrome", Video.IsMonochrome),
+                    new XAttribute("IsMonochrome", Video.IsMonochrome),
-                    new XAttribute("ScannerOptions", Video.ScannerOptions),
+                    new XAttribute("ScannerOptions", Video.ScannerOptions),
-                    new XElement(ns + "Color",
+                    new XElement(ns + "Color",
-                        new XAttribute("Black", Video.Color.Black),
+                        new XAttribute("Black", Video.Color.Black),
-                        new XAttribute("DarkBlue", Video.Color.DarkBlue),
+                        new XAttribute("DarkBlue", Video.Color.DarkBlue),
-                        new XAttribute("DarkGreen", Video.Color.DarkGreen),
+                        new XAttribute("DarkGreen", Video.Color.DarkGreen),
-                        new XAttribute("MediumBlue", Video.Color.MediumBlue),
+                        new XAttribute("MediumBlue", Video.Color.MediumBlue),
-                        new XAttribute("Brown", Video.Color.Brown),
+                        new XAttribute("Brown", Video.Color.Brown),
-                        new XAttribute("LightGrey", Video.Color.LightGrey),
+                        new XAttribute("LightGrey", Video.Color.LightGrey),
-                        new XAttribute("Green", Video.Color.Green),
+                        new XAttribute("Green", Video.Color.Green),
-                        new XAttribute("Aquamarine", Video.Color.Aquamarine),
+                        new XAttribute("Aquamarine", Video.Color.Aquamarine),
-                        new XAttribute("DeepRed", Video.Color.DeepRed),
+                        new XAttribute("DeepRed", Video.Color.DeepRed),
-                        new XAttribute("Purple", Video.Color.Purple),
+                        new XAttribute("Purple", Video.Color.Purple),
-                        new XAttribute("DarkGrey", Video.Color.DarkGrey),
+                        new XAttribute("DarkGrey", Video.Color.DarkGrey),
-                        new XAttribute("LightBlue", Video.Color.LightBlue),
+                        new XAttribute("LightBlue", Video.Color.LightBlue),
-                        new XAttribute("Orange", Video.Color.Orange),
+                        new XAttribute("Orange", Video.Color.Orange),
-                        new XAttribute("Pink", Video.Color.Pink),
+                        new XAttribute("Pink", Video.Color.Pink),
-                        new XAttribute("Yellow", Video.Color.Yellow),
+                        new XAttribute("Yellow", Video.Color.Yellow),
-                        new XAttribute("White", Video.Color.White),
+                        new XAttribute("White", Video.Color.White),
-                        new XAttribute("Monochrome", Video.Color.Monochrome))));
+                        new XAttribute("Monochrome", Video.Color.Monochrome))));
-
+
-            using (XmlWriter writer = XmlWriter.Create(stream))
+            using (var writer = XmlWriter.Create(stream))
-            {
+            {
-                xml.WriteTo(writer);
+                xml.WriteTo(writer);
-            }
+            }
-        }
+        }
-
+
-        public CpuSettings Cpu { get; set; }
+        public CpuSettings Cpu { get; set; }
-        public DiskIISettings DiskII { get; set; }
+        public DiskIISettings DiskII { get; set; }
-        public KeyboardSettings Keyboard { get; set; }
+        public KeyboardSettings Keyboard { get; set; }
-        public GamePortSettings GamePort { get; set; }
+        public GamePortSettings GamePort { get; set; }
-        public VideoSettings Video { get; set; }
+        public VideoSettings Video { get; set; }
-
+
-        public const string FileName = "Settings.xml";
+        public const string FileName = "Settings.xml";
-        public const string Namespace = "http://schemas.jellyfish.co.nz/virtu/settings";
+        public static readonly XNamespace Namespace = "http://schemas.jellyfish.co.nz/virtu/settings";
-    }
+    }
-
+
-    public sealed class CpuSettings
+    public sealed class CpuSettings
-    {
+    {
-        public bool Is65C02 { get; set; }
+        public bool Is65C02 { get; set; }
-        public bool IsThrottled { get; set; }
+        public bool IsThrottled { get; set; }
-        public int Multiplier { get; set; }
+        public int Multiplier { get; set; }
-    }
+    }
-
+
-    public sealed class DiskSettings
+    public sealed class DiskSettings
-    {
+    {
-        public string Name { get; set; }
+        public string Name { get; set; }
-        public bool IsWriteProtected { get; set; }
+        public bool IsWriteProtected { get; set; }
-    };
+    };
-
+
-    public sealed class DiskIISettings
+    public sealed class DiskIISettings
-    {
+    {
-        public DiskSettings Disk1 { get; set; }
+        public DiskSettings Disk1 { get; set; }
-        public DiskSettings Disk2 { get; set; }
+        public DiskSettings Disk2 { get; set; }
-    };
+    };
-
+
-    public sealed class JoystickSettings
+    public sealed class JoystickSettings
-    {
+    {
-        public int UpLeft { get; set; }
+        public int UpLeft { get; set; }
-        public int Up { get; set; }
+        public int Up { get; set; }
-        public int UpRight { get; set; }
+        public int UpRight { get; set; }
-        public int Left { get; set; }
+        public int Left { get; set; }
-        public int Right { get; set; }
+        public int Right { get; set; }
-        public int DownLeft { get; set; }
+        public int DownLeft { get; set; }
-        public int Down { get; set; }
+        public int Down { get; set; }
-        public int DownRight { get; set; }
+        public int DownRight { get; set; }
-    };
+    };
-
+
-    public sealed class KeySettings
+    public sealed class KeySettings
-    {
+    {
-        public JoystickSettings Joystick0 { get; set; }
+        public JoystickSettings Joystick0 { get; set; }
-        public JoystickSettings Joystick1 { get; set; }
+        public JoystickSettings Joystick1 { get; set; }
-        public int Button0 { get; set; }
+        public int Button0 { get; set; }
-        public int Button1 { get; set; }
+        public int Button1 { get; set; }
-        public int Button2 { get; set; }
+        public int Button2 { get; set; }
-    };
+    };
-
+
-    public sealed class KeyboardSettings
+    public sealed class KeyboardSettings
-    {
+    {
-        public bool UseGamePort { get; set; }
+        public bool UseGamePort { get; set; }
-        public KeySettings Key { get; set; }
+        public KeySettings Key { get; set; }
-    }
+    }
-
+
-    public sealed class GamePortSettings
+    public sealed class GamePortSettings
-    {
+    {
-        public bool UseKeyboard { get; set; }
+        public bool UseKeyboard { get; set; }
-        public KeySettings Key { get; set; }
+        public KeySettings Key { get; set; }
-    }
+    }
-
+
-    public sealed class ColorSettings
+    public sealed class ColorSettings
-    {
+    {
-        public uint Black { get; set; }
+        public uint Black { get; set; }
-        public uint DarkBlue { get; set; }
+        public uint DarkBlue { get; set; }
-        public uint DarkGreen { get; set; }
+        public uint DarkGreen { get; set; }
-        public uint MediumBlue { get; set; }
+        public uint MediumBlue { get; set; }
-        public uint Brown { get; set; }
+        public uint Brown { get; set; }
-        public uint LightGrey { get; set; }
+        public uint LightGrey { get; set; }
-        public uint Green { get; set; }
+        public uint Green { get; set; }
-        public uint Aquamarine { get; set; }
+        public uint Aquamarine { get; set; }
-        public uint DeepRed { get; set; }
+        public uint DeepRed { get; set; }
-        public uint Purple { get; set; }
+        public uint Purple { get; set; }
-        public uint DarkGrey { get; set; }
+        public uint DarkGrey { get; set; }
-        public uint LightBlue { get; set; }
+        public uint LightBlue { get; set; }
-        public uint Orange { get; set; }
+        public uint Orange { get; set; }
-        public uint Pink { get; set; }
+        public uint Pink { get; set; }
-        public uint Yellow { get; set; }
+        public uint Yellow { get; set; }
-        public uint White { get; set; }
+        public uint White { get; set; }
-        public uint Monochrome { get; set; }
+        public uint Monochrome { get; set; }
-    }
+    }
-
+
-    [Flags]
+    [Flags]
-    public enum ScannerOptions { None = 0x0, AppleII = 0x1, Pal = 0x2 } // defaults to AppleIIe, Ntsc
+    public enum ScannerOptions { None = 0x0, AppleII = 0x1, Pal = 0x2 } // defaults to AppleIIe, Ntsc
-
+
-    public sealed class VideoSettings
+    public sealed class VideoSettings
-    {
+    {
-        public bool IsFullScreen { get; set; }
+        public bool IsFullScreen { get; set; }
-        public bool IsMonochrome { get; set; }
+        public bool IsMonochrome { get; set; }
-        public ScannerOptions ScannerOptions { get; set; }
+        public ScannerOptions ScannerOptions { get; set; }
-        public ColorSettings Color { get; set; }
+        public ColorSettings Color { get; set; }
-    };
+    };
-}
+}

Virtu/MemoryData.cs

@@ -1,105 +1,105 @@
-using System;
+using System;
-
+
-namespace Jellyfish.Virtu
+namespace Jellyfish.Virtu
-{
+{
-    public partial class Memory
+    public partial class Memory
-    {
+    {
-        private const int BankCount = 2;
+        private const int BankCount = 2;
-
+
-        private const int BankMain = 0;
+        private const int BankMain = 0;
-        private const int BankAux = 1;
+        private const int BankAux = 1;
-
+
-        private const int RegionCount = 12;
+        private const int RegionCount = 12;
-
+
-        private const int Region0001 = 0;
+        private const int Region0001 = 0;
-        private const int Region02BF = 1;
+        private const int Region02BF = 1;
-        private const int Region0407 = 2;
+        private const int Region0407 = 2;
-        private const int Region080B = 3;
+        private const int Region080B = 3;
-        private const int Region203F = 4;
+        private const int Region203F = 4;
-        private const int Region405F = 5;
+        private const int Region405F = 5;
-        private const int RegionC0C0 = 6;
+        private const int RegionC0C0 = 6;
-        private const int RegionC1C7 = 7;
+        private const int RegionC1C7 = 7;
-        private const int RegionC3C3 = 8;
+        private const int RegionC3C3 = 8;
-        private const int RegionC8CF = 9;
+        private const int RegionC8CF = 9;
-        private const int RegionD0DF = 10;
+        private const int RegionD0DF = 10;
-        private const int RegionE0FF = 11;
+        private const int RegionE0FF = 11;
-
+
-        private static readonly int[] RegionBaseAddress = new int[RegionCount]
+        private static readonly int[] RegionBaseAddress = new int[RegionCount]
-        {
+        {
-            0x0000, 0x0200, 0x0200, 0x0200, 0x0200, 0x0200, 0xC000, 0xC100, 0xC100, 0xC100, 0xD000, 0xE000
+            0x0000, 0x0200, 0x0200, 0x0200, 0x0200, 0x0200, 0xC000, 0xC100, 0xC100, 0xC100, 0xD000, 0xE000
-        };
+        };
-
+
-        private const int PageCount = 256;
+        private const int PageCount = 256;
-
+
-        private static readonly int[] PageRegion = new int[PageCount]
+        private static readonly int[] PageRegion = new int[PageCount]
-        {
+        {
-            Region0001, Region0001, Region02BF, Region02BF, Region0407, Region0407, Region0407, Region0407, 
+            Region0001, Region0001, Region02BF, Region02BF, Region0407, Region0407, Region0407, Region0407, 
-            Region080B, Region080B, Region080B, Region080B, Region02BF, Region02BF, Region02BF, Region02BF, 
+            Region080B, Region080B, Region080B, Region080B, Region02BF, Region02BF, Region02BF, Region02BF, 
-            Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, 
+            Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, 
-            Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, 
+            Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, 
-            Region203F, Region203F, Region203F, Region203F, Region203F, Region203F, Region203F, Region203F, 
+            Region203F, Region203F, Region203F, Region203F, Region203F, Region203F, Region203F, Region203F, 
-            Region203F, Region203F, Region203F, Region203F, Region203F, Region203F, Region203F, Region203F, 
+            Region203F, Region203F, Region203F, Region203F, Region203F, Region203F, Region203F, Region203F, 
-            Region203F, Region203F, Region203F, Region203F, Region203F, Region203F, Region203F, Region203F, 
+            Region203F, Region203F, Region203F, Region203F, Region203F, Region203F, Region203F, Region203F, 
-            Region203F, Region203F, Region203F, Region203F, Region203F, Region203F, Region203F, Region203F, 
+            Region203F, Region203F, Region203F, Region203F, Region203F, Region203F, Region203F, Region203F, 
-            Region405F, Region405F, Region405F, Region405F, Region405F, Region405F, Region405F, Region405F, 
+            Region405F, Region405F, Region405F, Region405F, Region405F, Region405F, Region405F, Region405F, 
-            Region405F, Region405F, Region405F, Region405F, Region405F, Region405F, Region405F, Region405F, 
+            Region405F, Region405F, Region405F, Region405F, Region405F, Region405F, Region405F, Region405F, 
-            Region405F, Region405F, Region405F, Region405F, Region405F, Region405F, Region405F, Region405F, 
+            Region405F, Region405F, Region405F, Region405F, Region405F, Region405F, Region405F, Region405F, 
-            Region405F, Region405F, Region405F, Region405F, Region405F, Region405F, Region405F, Region405F, 
+            Region405F, Region405F, Region405F, Region405F, Region405F, Region405F, Region405F, Region405F, 
-            Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, 
+            Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, 
-            Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, 
+            Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, 
-            Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, 
+            Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, 
-            Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, 
+            Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, 
-            Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, 
+            Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, 
-            Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, 
+            Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, 
-            Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, 
+            Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, 
-            Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, 
+            Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, 
-            Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, 
+            Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, 
-            Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, 
+            Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, 
-            Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, 
+            Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, 
-            Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, 
+            Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, Region02BF, 
-            RegionC0C0, RegionC1C7, RegionC1C7, RegionC3C3, RegionC1C7, RegionC1C7, RegionC1C7, RegionC1C7, 
+            RegionC0C0, RegionC1C7, RegionC1C7, RegionC3C3, RegionC1C7, RegionC1C7, RegionC1C7, RegionC1C7, 
-            RegionC8CF, RegionC8CF, RegionC8CF, RegionC8CF, RegionC8CF, RegionC8CF, RegionC8CF, RegionC8CF, 
+            RegionC8CF, RegionC8CF, RegionC8CF, RegionC8CF, RegionC8CF, RegionC8CF, RegionC8CF, RegionC8CF, 
-            RegionD0DF, RegionD0DF, RegionD0DF, RegionD0DF, RegionD0DF, RegionD0DF, RegionD0DF, RegionD0DF, 
+            RegionD0DF, RegionD0DF, RegionD0DF, RegionD0DF, RegionD0DF, RegionD0DF, RegionD0DF, RegionD0DF, 
-            RegionD0DF, RegionD0DF, RegionD0DF, RegionD0DF, RegionD0DF, RegionD0DF, RegionD0DF, RegionD0DF, 
+            RegionD0DF, RegionD0DF, RegionD0DF, RegionD0DF, RegionD0DF, RegionD0DF, RegionD0DF, RegionD0DF, 
-            RegionE0FF, RegionE0FF, RegionE0FF, RegionE0FF, RegionE0FF, RegionE0FF, RegionE0FF, RegionE0FF, 
+            RegionE0FF, RegionE0FF, RegionE0FF, RegionE0FF, RegionE0FF, RegionE0FF, RegionE0FF, RegionE0FF, 
-            RegionE0FF, RegionE0FF, RegionE0FF, RegionE0FF, RegionE0FF, RegionE0FF, RegionE0FF, RegionE0FF, 
+            RegionE0FF, RegionE0FF, RegionE0FF, RegionE0FF, RegionE0FF, RegionE0FF, RegionE0FF, RegionE0FF, 
-            RegionE0FF, RegionE0FF, RegionE0FF, RegionE0FF, RegionE0FF, RegionE0FF, RegionE0FF, RegionE0FF, 
+            RegionE0FF, RegionE0FF, RegionE0FF, RegionE0FF, RegionE0FF, RegionE0FF, RegionE0FF, RegionE0FF, 
-            RegionE0FF, RegionE0FF, RegionE0FF, RegionE0FF, RegionE0FF, RegionE0FF, RegionE0FF, RegionE0FF
+            RegionE0FF, RegionE0FF, RegionE0FF, RegionE0FF, RegionE0FF, RegionE0FF, RegionE0FF, RegionE0FF
-        };
+        };
-
+
-        private const int State80Col = 0x000001;
+        private const int State80Col = 0x000001;
-        private const int StateText = 0x000002;
+        private const int StateText = 0x000002;
-        private const int StateMixed = 0x000004;
+        private const int StateMixed = 0x000004;
-        private const int StateHires = 0x000008;
+        private const int StateHires = 0x000008;
-        private const int StateDRes = 0x000010;
+        private const int StateDRes = 0x000010;
-        private const int State80Store = 0x000020;
+        private const int State80Store = 0x000020;
-        private const int StateAltChrSet = 0x000040;
+        private const int StateAltChrSet = 0x000040;
-        private const int StateAltZP = 0x000080;
+        private const int StateAltZP = 0x000080;
-        private const int StateBank1 = 0x000100;
+        private const int StateBank1 = 0x000100;
-        private const int StateHRamRd = 0x000200;
+        private const int StateHRamRd = 0x000200;
-        private const int StateHRamPreWrt = 0x000400;
+        private const int StateHRamPreWrt = 0x000400;
-        private const int StateHRamWrt = 0x000800;
+        private const int StateHRamWrt = 0x000800;
-        private const int StatePage2 = 0x001000;
+        private const int StatePage2 = 0x001000;
-        private const int StateRamRd = 0x002000;
+        private const int StateRamRd = 0x002000;
-        private const int StateRamWrt = 0x004000;
+        private const int StateRamWrt = 0x004000;
-        private const int StateSlotC3Rom = 0x008000;
+        private const int StateSlotC3Rom = 0x008000;
-        private const int StateIntCXRom = 0x010000;
+        private const int StateIntCXRom = 0x010000;
-        private const int StateAn0 = 0x020000;
+        private const int StateAn0 = 0x020000;
-        private const int StateAn1 = 0x040000;
+        private const int StateAn1 = 0x040000;
-        private const int StateAn2 = 0x080000;
+        private const int StateAn2 = 0x080000;
-        private const int StateAn3 = 0x100000;
+        private const int StateAn3 = 0x100000;
-        private const int StateVideo = State80Col | StateText | StateMixed | StateHires | StateDRes;
+        private const int StateVideo = State80Col | StateText | StateMixed | StateHires | StateDRes;
-
+
-        private const int StateVideoModeCount = 32;
+        private const int StateVideoModeCount = 32;
-
+
-        private static readonly int[] StateVideoMode = new int[StateVideoModeCount]
+        private static readonly int[] StateVideoMode = new int[StateVideoModeCount]
-        {
+        {
-            Video.Mode0, Video.Mode0, Video.Mode1, Video.Mode2, Video.Mode3, Video.Mode4, Video.Mode1, Video.Mode2, 
+            Video.Mode0, Video.Mode0, Video.Mode1, Video.Mode2, Video.Mode3, Video.Mode4, Video.Mode1, Video.Mode2, 
-            Video.Mode5, Video.Mode5, Video.Mode1, Video.Mode2, Video.Mode6, Video.Mode7, Video.Mode1, Video.Mode2, 
+            Video.Mode5, Video.Mode5, Video.Mode1, Video.Mode2, Video.Mode6, Video.Mode7, Video.Mode1, Video.Mode2, 
-            Video.Mode8, Video.Mode9, Video.Mode1, Video.Mode2, Video.ModeA, Video.ModeB, Video.Mode1, Video.Mode2, 
+            Video.Mode8, Video.Mode9, Video.Mode1, Video.Mode2, Video.ModeA, Video.ModeB, Video.Mode1, Video.Mode2, 
-            Video.ModeC, Video.ModeD, Video.Mode1, Video.Mode2, Video.ModeE, Video.ModeF, Video.Mode1, Video.Mode2
+            Video.ModeC, Video.ModeD, Video.Mode1, Video.Mode2, Video.ModeE, Video.ModeF, Video.Mode1, Video.Mode2
-        };
+        };
-
+
-        private readonly Action<int, byte>[][][] WriteRamModeBankRegion;
+        private readonly Action<int, byte>[][][] WriteRamModeBankRegion;
-    }
+    }
-}
+}

Virtu/Properties/SR.Designer.cs

@@ -1,99 +1,99 @@
-//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
-// <auto-generated>
+// <auto-generated>
-//     This code was generated by a tool.
+//     This code was generated by a tool.
-//     Runtime Version:2.0.50727.4927
+//     Runtime Version:2.0.50727.4927
-//
+//
-//     Changes to this file may cause incorrect behavior and will be lost if
+//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     the code is regenerated.
-// </auto-generated>
+// </auto-generated>
-//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
-
+
-namespace Jellyfish.Virtu.Properties {
+namespace Jellyfish.Virtu.Properties {
-    using System;
+    using System;
-    
+    
-    
+    
-    /// <summary>
+    /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
-    /// </summary>
+    /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // class via a tool like ResGen or Visual Studio.
+    // class via a tool like ResGen or Visual Studio.
-    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // To add or remove a member, edit your .ResX file then rerun ResGen
-    // with the /str option, or rebuild your VS project.
+    // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class SR {
+    internal class SR {
-        
+        
-        private static global::System.Resources.ResourceManager resourceMan;
+        private static global::System.Resources.ResourceManager resourceMan;
-        
+        
-        private static global::System.Globalization.CultureInfo resourceCulture;
+        private static global::System.Globalization.CultureInfo resourceCulture;
-        
+        
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal SR() {
+        internal SR() {
-        }
+        }
-        
+        
-        /// <summary>
+        /// <summary>
-        ///   Returns the cached ResourceManager instance used by this class.
+        ///   Returns the cached ResourceManager instance used by this class.
-        /// </summary>
+        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
+        internal static global::System.Resources.ResourceManager ResourceManager {
-            get {
+            get {
-                if (object.ReferenceEquals(resourceMan, null)) {
+                if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Jellyfish.Virtu.Properties.SR", typeof(SR).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Jellyfish.Virtu.Properties.SR", typeof(SR).Assembly);
-                    resourceMan = temp;
+                    resourceMan = temp;
-                }
+                }
-                return resourceMan;
+                return resourceMan;
-            }
+            }
-        }
+        }
-        
+        
-        /// <summary>
+        /// <summary>
-        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   Overrides the current thread's CurrentUICulture property for all
-        ///   resource lookups using this strongly typed resource class.
+        ///   resource lookups using this strongly typed resource class.
-        /// </summary>
+        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
+        internal static global::System.Globalization.CultureInfo Culture {
-            get {
+            get {
-                return resourceCulture;
+                return resourceCulture;
-            }
+            }
-            set {
+            set {
-                resourceCulture = value;
+                resourceCulture = value;
-            }
+            }
-        }
+        }
-        
+        
-        /// <summary>
+        /// <summary>
-        ///   Looks up a localized string similar to Resource &apos;{0}&apos; invalid..
+        ///   Looks up a localized string similar to Resource &apos;{0}&apos; invalid..
-        /// </summary>
+        /// </summary>
-        internal static string ResourceInvalid {
+        internal static string ResourceInvalid {
-            get {
+            get {
-                return ResourceManager.GetString("ResourceInvalid", resourceCulture);
+                return ResourceManager.GetString("ResourceInvalid", resourceCulture);
-            }
+            }
-        }
+        }
-        
+        
-        /// <summary>
+        /// <summary>
-        ///   Looks up a localized string similar to Resource &apos;{0}&apos; not found..
+        ///   Looks up a localized string similar to Resource &apos;{0}&apos; not found..
-        /// </summary>
+        /// </summary>
-        internal static string ResourceNotFound {
+        internal static string ResourceNotFound {
-            get {
+            get {
-                return ResourceManager.GetString("ResourceNotFound", resourceCulture);
+                return ResourceManager.GetString("ResourceNotFound", resourceCulture);
-            }
+            }
-        }
+        }
-        
+        
-        /// <summary>
+        /// <summary>
-        ///   Looks up a localized string similar to Service type &apos;{0}&apos; already present..
+        ///   Looks up a localized string similar to Service type &apos;{0}&apos; already present..
-        /// </summary>
+        /// </summary>
-        internal static string ServiceAlreadyPresent {
+        internal static string ServiceAlreadyPresent {
-            get {
+            get {
-                return ResourceManager.GetString("ServiceAlreadyPresent", resourceCulture);
+                return ResourceManager.GetString("ServiceAlreadyPresent", resourceCulture);
-            }
+            }
-        }
+        }
-        
+        
-        /// <summary>
+        /// <summary>
-        ///   Looks up a localized string similar to Service type &apos;{0}&apos; must be assignable from service provider &apos;{1}&apos;..
+        ///   Looks up a localized string similar to Service type &apos;{0}&apos; must be assignable from service provider &apos;{1}&apos;..
-        /// </summary>
+        /// </summary>
-        internal static string ServiceMustBeAssignable {
+        internal static string ServiceMustBeAssignable {
-            get {
+            get {
-                return ResourceManager.GetString("ServiceMustBeAssignable", resourceCulture);
+                return ResourceManager.GetString("ServiceMustBeAssignable", resourceCulture);
-            }
+            }
-        }
+        }
-    }
+    }
-}
+}

Virtu/Properties/SR.resx

@@ -1,132 +1,132 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
-<root>
+<root>
-  <!-- 
+  <!-- 
-    Microsoft ResX Schema 
+    Microsoft ResX Schema 
-    
+    
-    Version 2.0
+    Version 2.0
-    
+    
-    The primary goals of this format is to allow a simple XML format 
+    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
+    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
+    various data types are done through the TypeConverter classes 
-    associated with the data types.
+    associated with the data types.
-    
+    
-    Example:
+    Example:
-    
+    
-    ... ado.net/XML headers & schema ...
+    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
+    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
+    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
+        <comment>This is a comment</comment>
-    </data>
+    </data>
-                
+                
-    There are any number of "resheader" rows that contain simple 
+    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
+    name/value pairs.
-    
+    
-    Each data row contains a name, and value. The row also contains a 
+    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
+    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
+    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
+    Classes that don't support this are serialized and stored with the 
-    mimetype set.
+    mimetype set.
-    
+    
-    The mimetype is used for serialized objects, and tells the 
+    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
+    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
+    extensible. For a given mimetype the value must be set accordingly:
-    
+    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
+    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
+    read any of the formats listed below.
-    
+    
-    mimetype: application/x-microsoft.net.object.binary.base64
+    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
+            : and then encoded with base64 encoding.
-    
+    
-    mimetype: application/x-microsoft.net.object.soap.base64
+    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
+            : and then encoded with base64 encoding.
-
+
-    mimetype: application/x-microsoft.net.object.bytearray.base64
+    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
+    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
+            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
+            : and then encoded with base64 encoding.
-    -->
+    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
+    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
+      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
+        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
+          <xsd:element name="metadata">
-            <xsd:complexType>
+            <xsd:complexType>
-              <xsd:sequence>
+              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
+              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
+              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
+            </xsd:complexType>
-          </xsd:element>
+          </xsd:element>
-          <xsd:element name="assembly">
+          <xsd:element name="assembly">
-            <xsd:complexType>
+            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
+            </xsd:complexType>
-          </xsd:element>
+          </xsd:element>
-          <xsd:element name="data">
+          <xsd:element name="data">
-            <xsd:complexType>
+            <xsd:complexType>
-              <xsd:sequence>
+              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
+              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
+              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
+            </xsd:complexType>
-          </xsd:element>
+          </xsd:element>
-          <xsd:element name="resheader">
+          <xsd:element name="resheader">
-            <xsd:complexType>
+            <xsd:complexType>
-              <xsd:sequence>
+              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
+              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
+              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
+            </xsd:complexType>
-          </xsd:element>
+          </xsd:element>
-        </xsd:choice>
+        </xsd:choice>
-      </xsd:complexType>
+      </xsd:complexType>
-    </xsd:element>
+    </xsd:element>
-  </xsd:schema>
+  </xsd:schema>
-  <resheader name="resmimetype">
+  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
+    <value>text/microsoft-resx</value>
-  </resheader>
+  </resheader>
-  <resheader name="version">
+  <resheader name="version">
-    <value>2.0</value>
+    <value>2.0</value>
-  </resheader>
+  </resheader>
-  <resheader name="reader">
+  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
+  </resheader>
-  <resheader name="writer">
+  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
+  </resheader>
-  <data name="ResourceNotFound" xml:space="preserve">
+  <data name="ResourceNotFound" xml:space="preserve">
-    <value>Resource '{0}' not found.</value>
+    <value>Resource '{0}' not found.</value>
-  </data>
+  </data>
-  <data name="ResourceInvalid" xml:space="preserve">
+  <data name="ResourceInvalid" xml:space="preserve">
-    <value>Resource '{0}' invalid.</value>
+    <value>Resource '{0}' invalid.</value>
-  </data>
+  </data>
-  <data name="ServiceAlreadyPresent" xml:space="preserve">
+  <data name="ServiceAlreadyPresent" xml:space="preserve">
-    <value>Service type '{0}' already present.</value>
+    <value>Service type '{0}' already present.</value>
-  </data>
+  </data>
-  <data name="ServiceMustBeAssignable" xml:space="preserve">
+  <data name="ServiceMustBeAssignable" xml:space="preserve">
-    <value>Service type '{0}' must be assignable from service provider '{1}'.</value>
+    <value>Service type '{0}' must be assignable from service provider '{1}'.</value>
-  </data>
+  </data>
 </root>

Virtu/Services/AudioService.cs

@@ -1,67 +1,67 @@
-using System;
+using System;
-using System.Threading;
+using System.Threading;
-
+
-namespace Jellyfish.Virtu.Services
+namespace Jellyfish.Virtu.Services
-{
+{
-    public class AudioService : MachineService
+    public class AudioService : MachineService
-    {
+    {
-        public AudioService(Machine machine) : 
+        public AudioService(Machine machine) : 
-            base(machine)
+            base(machine)
-        {
+        {
-        }
+        }
-
+
-        public void Output(int data) // machine thread
+        public void Output(int data) // machine thread
-        {
+        {
-            _buffer[_index] = (byte)data;
+            _buffer[_index] = (byte)data;
-            _index = (_index + 1) % SampleSize;
+            _index = (_index + 1) % SampleSize;
-            if (_index == 0)
+            if (_index == 0)
-            {
+            {
-                _readEvent.Set();
+                _readEvent.Set();
-                if (Machine.Settings.Cpu.IsThrottled)
+                if (Machine.Settings.Cpu.IsThrottled)
-                {
+                {
-                    _writeEvent.WaitOne();
+                    _writeEvent.WaitOne();
-                }
+                }
-            }
+            }
-        }
+        }
-
+
-        public void Reset()
+        public void Reset()
-        {
+        {
-            Buffer.BlockCopy(SampleZero, 0, _buffer, 0, SampleSize);
+            Buffer.BlockCopy(SampleZero, 0, _buffer, 0, SampleSize);
-        }
+        }
-
+
-        public override void Stop() // main thread
+        public override void Stop() // main thread
-        {
+        {
-            _readEvent.Set(); // signal events; avoids deadlock
+            _readEvent.Set(); // signal events; avoids deadlock
-            _writeEvent.Set();
+            _writeEvent.Set();
-        }
+        }
-
+
-        protected void Update(int bufferSize, Action<byte[], int> updateBuffer) // audio thread
+        protected void Update(int bufferSize, Action<byte[], int> updateBuffer) // audio thread
-        {
+        {
-            if (updateBuffer == null)
+            if (updateBuffer == null)
-            {
+            {
-                throw new ArgumentNullException("updateBuffer");
+                throw new ArgumentNullException("updateBuffer");
-            }
+            }
-
+
-            if (Machine.State == MachineState.Running)
+            if (Machine.State == MachineState.Running)
-            {
+            {
-                _readEvent.WaitOne();
+                _readEvent.WaitOne();
-            }
+            }
-            updateBuffer(_buffer, bufferSize);
+            updateBuffer(_buffer, bufferSize);
-            _writeEvent.Set();
+            _writeEvent.Set();
-        }
+        }
-
+
-        public const int SampleRate = 44100; // hz
+        public const int SampleRate = 44100; // hz
-        public const int SampleChannels = 1;
+        public const int SampleChannels = 1;
-        public const int SampleBits = 8;
+        public const int SampleBits = 8;
-        public const int SampleLatency = 40; // ms
+        public const int SampleLatency = 40; // ms
-        public const int SampleSize = (SampleRate * SampleLatency / 1000) * SampleChannels * (SampleBits / 8);
+        public const int SampleSize = (SampleRate * SampleLatency / 1000) * SampleChannels * (SampleBits / 8);
-
+
-        private static readonly byte[] SampleZero = new byte[SampleSize];
+        private static readonly byte[] SampleZero = new byte[SampleSize];
-
+
-        private byte[] _buffer = new byte[SampleSize];
+        private byte[] _buffer = new byte[SampleSize];
-        private int _index;
+        private int _index;
-
+
-        private AutoResetEvent _readEvent = new AutoResetEvent(false);
+        private AutoResetEvent _readEvent = new AutoResetEvent(false);
-        private AutoResetEvent _writeEvent = new AutoResetEvent(false);
+        private AutoResetEvent _writeEvent = new AutoResetEvent(false);
-    }
+    }
-}
+}

Virtu/Services/GamePortService.cs

@@ -1,73 +1,73 @@
-namespace Jellyfish.Virtu.Services
+namespace Jellyfish.Virtu.Services
-{
+{
-    public struct Joystick
+    public struct Joystick
-    {
+    {
-        public Joystick(bool isUp, bool isLeft, bool isRight, bool isDown)
+        public Joystick(bool isUp, bool isLeft, bool isRight, bool isDown)
-        {
+        {
-            _isUp = isUp;
+            _isUp = isUp;
-            _isLeft = isLeft;
+            _isLeft = isLeft;
-            _isRight = isRight;
+            _isRight = isRight;
-            _isDown = isDown;
+            _isDown = isDown;
-        }
+        }
-
+
-        public override bool Equals(object obj)
+        public override bool Equals(object obj)
-        {
+        {
-            return ((obj is Joystick) && (this == (Joystick)obj));
+            return ((obj is Joystick) && (this == (Joystick)obj));
-        }
+        }
-
+
-        public override int GetHashCode()
+        public override int GetHashCode()
-        {
+        {
-            return (_isUp.GetHashCode() ^ _isLeft.GetHashCode() ^ _isRight.GetHashCode() ^ _isDown.GetHashCode());
+            return (_isUp.GetHashCode() ^ _isLeft.GetHashCode() ^ _isRight.GetHashCode() ^ _isDown.GetHashCode());
-        }
+        }
-
+
-        public override string ToString()
+        public override string ToString()
-        {
+        {
-            return !(_isUp || _isDown || _isLeft || _isRight) ? "Position = Center" : 
+            return !(_isUp || _isDown || _isLeft || _isRight) ? "Position = Center" : 
-                string.Concat("Position = ", _isUp ? "Up" : _isDown ? "Down" : string.Empty, _isLeft ? "Left" : _isRight ? "Right" : string.Empty);
+                string.Concat("Position = ", _isUp ? "Up" : _isDown ? "Down" : string.Empty, _isLeft ? "Left" : _isRight ? "Right" : string.Empty);
-        }
+        }
-
+
-        public static bool operator ==(Joystick joystick1, Joystick joystick2)
+        public static bool operator ==(Joystick joystick1, Joystick joystick2)
-        {
+        {
-            return ((joystick1._isUp == joystick2._isUp) && (joystick1._isLeft == joystick2._isLeft) && 
+            return ((joystick1._isUp == joystick2._isUp) && (joystick1._isLeft == joystick2._isLeft) && 
-                (joystick1._isRight == joystick2._isRight) && (joystick1._isDown == joystick2._isDown));
+                (joystick1._isRight == joystick2._isRight) && (joystick1._isDown == joystick2._isDown));
-        }
+        }
-
+
-        public static bool operator !=(Joystick joystick1, Joystick joystick2)
+        public static bool operator !=(Joystick joystick1, Joystick joystick2)
-        {
+        {
-            return !(joystick1 == joystick2);
+            return !(joystick1 == joystick2);
-        }
+        }
-
+
-        public bool IsUp { get { return _isUp; } } // no auto props
+        public bool IsUp { get { return _isUp; } } // no auto props
-        public bool IsLeft { get { return _isLeft; } }
+        public bool IsLeft { get { return _isLeft; } }
-        public bool IsRight { get { return _isRight; } }
+        public bool IsRight { get { return _isRight; } }
-        public bool IsDown { get { return _isDown; } }
+        public bool IsDown { get { return _isDown; } }
-
+
-        private bool _isUp;
+        private bool _isUp;
-        private bool _isLeft;
+        private bool _isLeft;
-        private bool _isRight;
+        private bool _isRight;
-        private bool _isDown;
+        private bool _isDown;
-    }
+    }
-
+
-    public class GamePortService : MachineService
+    public class GamePortService : MachineService
-    {
+    {
-        public GamePortService(Machine machine) : 
+        public GamePortService(Machine machine) : 
-            base(machine)
+            base(machine)
-        {
+        {
-            Paddle0 = Paddle1 = Paddle2 = Paddle3 = 255; // not connected
+            Paddle0 = Paddle1 = Paddle2 = Paddle3 = 255; // not connected
-        }
+        }
-
+
-        public virtual void Update() { } // main thread
+        public virtual void Update() { } // main thread
-
+
-        public int Paddle0 { get; protected set; }
+        public int Paddle0 { get; protected set; }
-        public int Paddle1 { get; protected set; }
+        public int Paddle1 { get; protected set; }
-        public int Paddle2 { get; protected set; }
+        public int Paddle2 { get; protected set; }
-        public int Paddle3 { get; protected set; }
+        public int Paddle3 { get; protected set; }
-
+
-        public Joystick Joystick0 { get; protected set; }
+        public Joystick Joystick0 { get; protected set; }
-        public Joystick Joystick1 { get; protected set; }
+        public Joystick Joystick1 { get; protected set; }
-
+
-        public bool IsButton0Down { get; protected set; }
+        public bool IsButton0Down { get; protected set; }
-        public bool IsButton1Down { get; protected set; }
+        public bool IsButton1Down { get; protected set; }
-        public bool IsButton2Down { get; protected set; }
+        public bool IsButton2Down { get; protected set; }
-    }
+    }
-}
+}

Virtu/Services/KeyboardService.cs

@@ -1,70 +1,70 @@
-using System;
+using System;
-using System.Threading;
+using System.Threading;
-
+
-namespace Jellyfish.Virtu.Services
+namespace Jellyfish.Virtu.Services
-{
+{
-    public sealed class AsciiKeyEventArgs : EventArgs
+    public sealed class AsciiKeyEventArgs : EventArgs
-    {
+    {
-        private AsciiKeyEventArgs()
+        private AsciiKeyEventArgs()
-        {
+        {
-        }
+        }
-
+
-        public static AsciiKeyEventArgs Create(int asciiKey)
+        public static AsciiKeyEventArgs Create(int asciiKey)
-        {
+        {
-            _instance.AsciiKey = asciiKey;
+            _instance.AsciiKey = asciiKey;
-
+
-            return _instance;  // use singleton; avoids garbage
+            return _instance;  // use singleton; avoids garbage
-        }
+        }
-
+
-        public int AsciiKey { get; private set; }
+        public int AsciiKey { get; private set; }
-
+
-        private static readonly AsciiKeyEventArgs _instance = new AsciiKeyEventArgs();
+        private static readonly AsciiKeyEventArgs _instance = new AsciiKeyEventArgs();
-    }
+    }
-
+
-    public abstract class KeyboardService : MachineService
+    public abstract class KeyboardService : MachineService
-    {
+    {
-        protected KeyboardService(Machine machine) : 
+        protected KeyboardService(Machine machine) : 
-            base(machine)
+            base(machine)
-        {
+        {
-        }
+        }
-
+
-        public abstract bool IsKeyDown(int key);
+        public abstract bool IsKeyDown(int key);
-
+
-        public virtual void Update() // main thread
+        public virtual void Update() // main thread
-        {
+        {
-            if (IsResetKeyDown)
+            if (IsResetKeyDown)
-            {
+            {
-                if (!_resetKeyDown)
+                if (!_resetKeyDown)
-                {
+                {
-                    _resetKeyDown = true; // entering reset; pause until key released
+                    _resetKeyDown = true; // entering reset; pause until key released
-                    Machine.Pause();
+                    Machine.Pause();
-                    Machine.Reset();
+                    Machine.Reset();
-                }
+                }
-            }
+            }
-            else if (_resetKeyDown)
+            else if (_resetKeyDown)
-            {
+            {
-                _resetKeyDown = false; // leaving reset
+                _resetKeyDown = false; // leaving reset
-                Machine.Unpause();
+                Machine.Unpause();
-            }
+            }
-        }
+        }
-
+
-        protected void OnAsciiKeyDown(int asciiKey)
+        protected void OnAsciiKeyDown(int asciiKey)
-        {
+        {
-            EventHandler<AsciiKeyEventArgs> handler = AsciiKeyDown;
+            EventHandler<AsciiKeyEventArgs> handler = AsciiKeyDown;
-            if (handler != null)
+            if (handler != null)
-            {
+            {
-                handler(this, AsciiKeyEventArgs.Create(asciiKey));
+                handler(this, AsciiKeyEventArgs.Create(asciiKey));
-            }
+            }
-        }
+        }
-
+
-        public event EventHandler<AsciiKeyEventArgs> AsciiKeyDown;
+        public event EventHandler<AsciiKeyEventArgs> AsciiKeyDown;
-
+
-        public bool IsAnyKeyDown { get; protected set; }
+        public bool IsAnyKeyDown { get; protected set; }
-        public bool IsOpenAppleKeyDown { get; protected set; }
+        public bool IsOpenAppleKeyDown { get; protected set; }
-        public bool IsCloseAppleKeyDown { get; protected set; }
+        public bool IsCloseAppleKeyDown { get; protected set; }
-
+
-        protected bool IsResetKeyDown { get; set; }
+        protected bool IsResetKeyDown { get; set; }
-
+
-        private bool _resetKeyDown;
+        private bool _resetKeyDown;
-    }
+    }
-}
+}

Virtu/Services/MachineServices.cs

@@ -1,57 +1,57 @@
-using System;
+using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
+using System.Globalization;
-using Jellyfish.Library;
+using Jellyfish.Library;
-using Jellyfish.Virtu.Properties;
+using Jellyfish.Virtu.Properties;
-
+
-namespace Jellyfish.Virtu.Services
+namespace Jellyfish.Virtu.Services
-{
+{
-    public sealed class MachineServices : IServiceProvider
+    public sealed class MachineServices : IServiceProvider
-    {
+    {
-        public void AddService(Type serviceType, MachineService serviceProvider)
+        public void AddService(Type serviceType, MachineService serviceProvider)
-        {
+        {
-            if (serviceType == null)
+            if (serviceType == null)
-            {
+            {
-                throw new ArgumentNullException("serviceType");
+                throw new ArgumentNullException("serviceType");
-            }
+            }
-            if (_serviceProviders.ContainsKey(serviceType))
+            if (_serviceProviders.ContainsKey(serviceType))
-            {
+            {
-                throw new ArgumentException(string.Format(CultureInfo.CurrentCulture, SR.ServiceAlreadyPresent, serviceType.FullName), "serviceType");
+                throw new ArgumentException(string.Format(CultureInfo.CurrentCulture, SR.ServiceAlreadyPresent, serviceType.FullName), "serviceType");
-            }
+            }
-            if (serviceProvider == null)
+            if (serviceProvider == null)
-            {
+            {
-                throw new ArgumentNullException("serviceProvider");
+                throw new ArgumentNullException("serviceProvider");
-            }
+            }
-            if (!serviceType.IsAssignableFrom(serviceProvider.GetType()))
+            if (!serviceType.IsAssignableFrom(serviceProvider.GetType()))
-            {
+            {
-                throw new ArgumentException(string.Format(CultureInfo.CurrentCulture, SR.ServiceMustBeAssignable, serviceType.FullName, serviceProvider.GetType().FullName));
+                throw new ArgumentException(string.Format(CultureInfo.CurrentCulture, SR.ServiceMustBeAssignable, serviceType.FullName, serviceProvider.GetType().FullName));
-            }
+            }
-
+
-            _serviceProviders.Add(serviceType, serviceProvider);
+            _serviceProviders.Add(serviceType, serviceProvider);
-        }
+        }
-
+
-        public void ForEach(Action<MachineService> action)
+        public void ForEach(Action<MachineService> action)
-        {
+        {
-            _serviceProviders.Values.ForEach(action);
+            _serviceProviders.Values.ForEach(action);
-        }
+        }
-
+
-        [SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter")]
+        [SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter")]
-        public T GetService<T>()
+        public T GetService<T>()
-        {
+        {
-            return (T)GetService(typeof(T));
+            return (T)GetService(typeof(T));
-        }
+        }
-
+
-        public object GetService(Type serviceType)
+        public object GetService(Type serviceType)
-        {
+        {
-            return _serviceProviders.ContainsKey(serviceType) ? _serviceProviders[serviceType] : null;
+            return _serviceProviders.ContainsKey(serviceType) ? _serviceProviders[serviceType] : null;
-        }
+        }
-
+
-        public void RemoveService(Type serviceType)
+        public void RemoveService(Type serviceType)
-        {
+        {
-            _serviceProviders.Remove(serviceType);
+            _serviceProviders.Remove(serviceType);
-        }
+        }
-
+
-        private Dictionary<Type, MachineService> _serviceProviders = new Dictionary<Type, MachineService>();
+        private Dictionary<Type, MachineService> _serviceProviders = new Dictionary<Type, MachineService>();
-    }
+    }
-}
+}

Virtu/Services/StorageService.cs

@@ -1,41 +1,41 @@
-using System;
+using System;
-using System.Globalization;
+using System.Globalization;
-using System.IO;
+using System.IO;
-using System.Reflection;
+using System.Reflection;
-using System.Resources;
+using System.Resources;
-using Jellyfish.Virtu.Properties;
+using Jellyfish.Virtu.Properties;
-
+
-namespace Jellyfish.Virtu.Services
+namespace Jellyfish.Virtu.Services
-{
+{
-    public abstract class StorageService : MachineService
+    public abstract class StorageService : MachineService
-    {
+    {
-        protected StorageService(Machine machine) : 
+        protected StorageService(Machine machine) : 
-            base(machine)
+            base(machine)
-        {
+        {
-        }
+        }
-
+
-        public static Stream GetResourceStream(string resourceName)
+        public static Stream GetResourceStream(string resourceName)
-        {
+        {
-            return GetResourceStream(resourceName, 0);
+            return GetResourceStream(resourceName, 0);
-        }
+        }
-
+
-        public static Stream GetResourceStream(string resourceName, int resourceSize)
+        public static Stream GetResourceStream(string resourceName, int resourceSize)
-        {
+        {
-            ResourceManager resourceManager = new ResourceManager("Jellyfish.Virtu.g", Assembly.GetExecutingAssembly()) { IgnoreCase = true };
+            var resourceManager = new ResourceManager("Jellyfish.Virtu.g", Assembly.GetExecutingAssembly()) { IgnoreCase = true };
-            Stream resourceStream = (Stream)resourceManager.GetObject(resourceName);
+            var resourceStream = (Stream)resourceManager.GetObject(resourceName);
-            if (resourceStream == null)
+            if (resourceStream == null)
-            {
+            {
-                throw new InvalidOperationException(string.Format(CultureInfo.CurrentCulture, SR.ResourceNotFound, resourceName));
+                throw new InvalidOperationException(string.Format(CultureInfo.CurrentCulture, SR.ResourceNotFound, resourceName));
-            }
+            }
-            if ((resourceSize > 0) && (resourceStream.Length != resourceSize))
+            if ((resourceSize > 0) && (resourceStream.Length != resourceSize))
-            {
+            {
-                throw new InvalidOperationException(string.Format(CultureInfo.CurrentCulture, SR.ResourceInvalid, resourceName));
+                throw new InvalidOperationException(string.Format(CultureInfo.CurrentCulture, SR.ResourceInvalid, resourceName));
-            }
+            }
-
+
-            return resourceStream;
+            return resourceStream;
-        }
+        }
-
+
-        public abstract void Load(string path, Action<Stream> reader);
+        public abstract void Load(string path, Action<Stream> reader);
-        public abstract void Save(string path, Action<Stream> writer);
+        public abstract void Save(string path, Action<Stream> writer);
-    }
+    }
-}
+}

Virtu/Services/VideoService.cs

@@ -1,20 +1,20 @@
-namespace Jellyfish.Virtu.Services
+namespace Jellyfish.Virtu.Services
-{
+{
-    public abstract class VideoService : MachineService
+    public abstract class VideoService : MachineService
-    {
+    {
-        protected VideoService(Machine machine) : 
+        protected VideoService(Machine machine) : 
-            base(machine)
+            base(machine)
-        {
+        {
-        }
+        }
-
+
-        public abstract void SetPixel(int x, int y, uint color);
+        public abstract void SetPixel(int x, int y, uint color);
-        public abstract void Update(); // main thread
+        public abstract void Update(); // main thread
-
+
-        public void ToggleFullScreen()
+        public void ToggleFullScreen()
-        {
+        {
-            IsFullScreen ^= true;
+            IsFullScreen ^= true;
-        }
+        }
-
+
-        public bool IsFullScreen { get; private set; }
+        public bool IsFullScreen { get; private set; }
-    }
+    }
-}
+}

Virtu/Silverlight/MainApp.xaml

@@ -1,11 +1,11 @@
-<jl:ApplicationBase x:Class="Jellyfish.Virtu.MainApp"
+<jl:ApplicationBase x:Class="Jellyfish.Virtu.MainApp"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:jl="clr-namespace:Jellyfish.Library;assembly=Jellyfish.Library"
+    xmlns:jl="clr-namespace:Jellyfish.Library;assembly=Jellyfish.Library"
-    xmlns:jv="clr-namespace:Jellyfish.Virtu;assembly=Jellyfish.Virtu">
+    xmlns:jv="clr-namespace:Jellyfish.Virtu;assembly=Jellyfish.Virtu">
-    <Application.RootVisual>
+    <Application.RootVisual>
-        <jv:MainPage/>
+        <jv:MainPage/>
-    </Application.RootVisual>
+    </Application.RootVisual>
-    <Application.Resources>
+    <Application.Resources>
-    </Application.Resources>
+    </Application.Resources>
-</jl:ApplicationBase>
+</jl:ApplicationBase>

Virtu/Silverlight/MainApp.xaml.cs

@@ -1,13 +1,13 @@
-using Jellyfish.Library;
+using Jellyfish.Library;
-
+
-namespace Jellyfish.Virtu
+namespace Jellyfish.Virtu
-{
+{
-    public sealed partial class MainApp : ApplicationBase
+    public sealed partial class MainApp : ApplicationBase
-    {
+    {
-        public MainApp() :
+        public MainApp() :
-            base("Virtu")
+            base("Virtu")
-        {
+        {
-            InitializeComponent();
+            InitializeComponent();
-        }
+        }
-    }
+    }
-}
+}

Virtu/Silverlight/MainPage.xaml

@@ -1,21 +1,21 @@
-<UserControl x:Class="Jellyfish.Virtu.MainPage"
+<UserControl x:Class="Jellyfish.Virtu.MainPage"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:tk="clr-namespace:System.Windows.Controls;assembly=System.Windows.Controls.Toolkit"
+    xmlns:tk="clr-namespace:System.Windows.Controls;assembly=System.Windows.Controls.Toolkit"
-    xmlns:jl="clr-namespace:Jellyfish.Library;assembly=Jellyfish.Library"
+    xmlns:jl="clr-namespace:Jellyfish.Library;assembly=Jellyfish.Library"
-    xmlns:jv="clr-namespace:Jellyfish.Virtu;assembly=Jellyfish.Virtu">
+    xmlns:jv="clr-namespace:Jellyfish.Virtu;assembly=Jellyfish.Virtu">
-    <tk:DockPanel Background="Black">
+    <tk:DockPanel Background="Black">
-        <StackPanel Orientation="Horizontal" tk:DockPanel.Dock="Top">
+        <StackPanel Orientation="Horizontal" tk:DockPanel.Dock="Top">
-            <Button x:Name="_disk1Button" Content="Disk 1" IsTabStop="False" Margin="4 4 0 4"/>
+            <Button x:Name="_disk1Button" Content="Disk 1" IsTabStop="False" Margin="4 4 0 4"/>
-            <Button x:Name="_disk2Button" Content="Disk 2" IsTabStop="False" Margin="4 4 0 4"/>
+            <Button x:Name="_disk2Button" Content="Disk 2" IsTabStop="False" Margin="4 4 0 4"/>
-            <jl:FrameRateCounter Margin="4 4 0 4" VerticalAlignment="Center"/>
+            <jl:FrameRateCounter Margin="4 4 0 4" VerticalAlignment="Center"/>
-        </StackPanel>
+        </StackPanel>
-        <Grid>
+        <Grid>
-            <Image x:Name="_image" MinWidth="560" MinHeight="384"/>
+            <Image x:Name="_image" MinWidth="560" MinHeight="384"/>
-            <MediaElement x:Name="_media"/>
+            <MediaElement x:Name="_media"/>
-            <!--<ScrollViewer BorderThickness="0" IsTabStop="False" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" VerticalScrollBarVisibility="Auto">
+            <!--<ScrollViewer BorderThickness="0" IsTabStop="False" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" VerticalScrollBarVisibility="Auto">
-                <TextBlock x:Name="_debug" FontFamily="Consolas" FontSize="12" Foreground="White"/>
+                <TextBlock x:Name="_debug" FontFamily="Consolas" FontSize="12" Foreground="White"/>
-            </ScrollViewer>-->
+            </ScrollViewer>-->
-        </Grid>
+        </Grid>
-    </tk:DockPanel>
+    </tk:DockPanel>
-</UserControl>
+</UserControl>

Virtu/Silverlight/MainPage.xaml.cs

@@ -1,78 +1,77 @@
-using System;
+using System;
-using System.IO;
+using System.IO;
-using System.Windows;
+using System.Windows;
-using System.Windows.Controls;
+using System.Windows.Controls;
-using System.Windows.Media;
+using System.Windows.Media;
-using Jellyfish.Virtu.Services;
+using Jellyfish.Virtu.Services;
-
+
-namespace Jellyfish.Virtu
+namespace Jellyfish.Virtu
-{
+{
-    public sealed partial class MainPage : UserControl, IDisposable
+    public sealed partial class MainPage : UserControl, IDisposable
-    {
+    {
-        public MainPage()
+        public MainPage()
-        {
+        {
-            InitializeComponent();
+            InitializeComponent();
-
+
-            _storageService = new SilverlightStorageService(_machine);
+            _storageService = new SilverlightStorageService(_machine);
-            _keyboardService = new SilverlightKeyboardService(_machine, this);
+            _keyboardService = new SilverlightKeyboardService(_machine, this);
-            _gamePortService = new GamePortService(_machine); // not connected
+            _gamePortService = new GamePortService(_machine); // not connected
-            _audioService = new SilverlightAudioService(_machine, this, _media);
+            _audioService = new SilverlightAudioService(_machine, this, _media);
-            _videoService = new SilverlightVideoService(_machine, _image);
+            _videoService = new SilverlightVideoService(_machine, _image);
-
+
-            _machine.Services.AddService(typeof(StorageService), _storageService);
+            _machine.Services.AddService(typeof(StorageService), _storageService);
-            _machine.Services.AddService(typeof(KeyboardService), _keyboardService);
+            _machine.Services.AddService(typeof(KeyboardService), _keyboardService);
-            _machine.Services.AddService(typeof(GamePortService), _gamePortService);
+            _machine.Services.AddService(typeof(GamePortService), _gamePortService);
-            _machine.Services.AddService(typeof(AudioService), _audioService);
+            _machine.Services.AddService(typeof(AudioService), _audioService);
-            _machine.Services.AddService(typeof(VideoService), _videoService);
+            _machine.Services.AddService(typeof(VideoService), _videoService);
-
+
-            Loaded += (sender, e) => _machine.Start();
+            Loaded += (sender, e) => _machine.Start();
-            CompositionTarget.Rendering += OnCompositionTargetRendering;
+            CompositionTarget.Rendering += OnCompositionTargetRendering;
-            Application.Current.Exit += (sender, e) => _machine.Stop();
+            Application.Current.Exit += (sender, e) => _machine.Stop();
-
+
-            _disk1Button.Click += (sender, e) => OnDiskButtonClick(0);
+            _disk1Button.Click += (sender, e) => OnDiskButtonClick(0);
-            _disk2Button.Click += (sender, e) => OnDiskButtonClick(1);
+            _disk2Button.Click += (sender, e) => OnDiskButtonClick(1);
-        }
+        }
-
+
-        public void Dispose()
+        public void Dispose()
-        {
+        {
-            _machine.Dispose();
+            _machine.Dispose();
-            _storageService.Dispose();
+            _storageService.Dispose();
-            _keyboardService.Dispose();
+            _keyboardService.Dispose();
-            _gamePortService.Dispose();
+            _gamePortService.Dispose();
-            _audioService.Dispose();
+            _audioService.Dispose();
-            _videoService.Dispose();
+            _videoService.Dispose();
-        }
+        }
-
+
-        private void OnCompositionTargetRendering(object sender, EventArgs e)
+        private void OnCompositionTargetRendering(object sender, EventArgs e)
-        {
+        {
-            _keyboardService.Update();
+            _keyboardService.Update();
-            _gamePortService.Update();
+            _gamePortService.Update();
-            _videoService.Update();
+            _videoService.Update();
-        }
+        }
-
+
-        private void OnDiskButtonClick(int drive)
+        private void OnDiskButtonClick(int drive)
-        {
+        {
-            OpenFileDialog dialog = new OpenFileDialog();
+            var dialog = new OpenFileDialog() { Filter = "Disk Files (*.dsk;*.nib)|*.dsk;*.nib|All Files (*.*)|*.*" };
-            dialog.Filter = "Disk Files (*.dsk;*.nib)|*.dsk;*.nib|All Files (*.*)|*.*";
+
-
+            bool? result = dialog.ShowDialog();
-            bool? result = dialog.ShowDialog();
+            if (result.HasValue && result.Value)
-            if (result.HasValue && result.Value)
+            {
-            {
+                using (var stream = dialog.File.OpenRead())
-                using (FileStream stream = dialog.File.OpenRead())
+                {
-                {
+                    _machine.Pause();
-                    _machine.Pause();
+                    _machine.DiskII.Drives[drive].InsertDisk(dialog.File.Name, stream, false);
-                    _machine.DiskII.Drives[drive].InsertDisk(dialog.File.Name, stream, false);
+                    _machine.Unpause();
-                    _machine.Unpause();
+                }
-                }
+            }
-            }
+        }
-        }
+
-
+        private Machine _machine = new Machine();
-        private Machine _machine = new Machine();
+
-
+        private StorageService _storageService;
-        private StorageService _storageService;
+        private KeyboardService _keyboardService;
-        private KeyboardService _keyboardService;
+        private GamePortService _gamePortService;
-        private GamePortService _gamePortService;
+        private AudioService _audioService;
-        private AudioService _audioService;
+        private VideoService _videoService;
-        private VideoService _videoService;
+    }
-    }
+}
-}

Virtu/Silverlight/Properties/AppManifest.xml

@@ -1,5 +1,5 @@
-<Deployment xmlns="http://schemas.microsoft.com/client/2007/deployment"
+<Deployment xmlns="http://schemas.microsoft.com/client/2007/deployment"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <Deployment.Parts>
+    <Deployment.Parts>
-    </Deployment.Parts>
+    </Deployment.Parts>
-</Deployment>
+</Deployment>

Virtu/Silverlight/Properties/AssemblyInfo.cs

@@ -1,22 +1,22 @@
-using System;
+using System;
-using System.Reflection;
+using System.Reflection;
-using System.Resources;
+using System.Resources;
-using System.Runtime.InteropServices;
+using System.Runtime.InteropServices;
-using Jellyfish.Library;
+using Jellyfish.Library;
-
+
-[assembly: AssemblyTitle("Virtu")]
+[assembly: AssemblyTitle("Virtu")]
-[assembly: AssemblyDescription("Apple IIe Emulator")]
+[assembly: AssemblyDescription("Apple IIe Emulator")]
-[assembly: AssemblyProduct("Jellyfish.Virtu.Silverlight")]
+[assembly: AssemblyProduct("Jellyfish.Virtu.Silverlight")]
-[assembly: AssemblyCompany("Digital Jellyfish Design Ltd")]
+[assembly: AssemblyCompany("Digital Jellyfish Design Ltd")]
-[assembly: AssemblyCopyright("Copyright © 1995-2010 Digital Jellyfish Design Ltd")]
+[assembly: AssemblyCopyright("Copyright © 1995-2010 Digital Jellyfish Design Ltd")]
-[assembly: AssemblyComment("Developed by Sean Fausett & Nick Westgate")]
+[assembly: AssemblyComment("Developed by Sean Fausett & Nick Westgate")]
-
+
-[assembly: AssemblyVersion("0.8.0.0")]
+[assembly: AssemblyVersion("0.8.0.0")]
-[assembly: AssemblyFileVersion("0.8.0.0")]
+[assembly: AssemblyFileVersion("0.8.0.0")]
-[assembly: AssemblyInformationalVersion("0.8.0.0")]
+[assembly: AssemblyInformationalVersion("0.8.0.0")]
-
+
-[assembly: CLSCompliant(false)]
+[assembly: CLSCompliant(false)]
-[assembly: ComVisible(false)]
+[assembly: ComVisible(false)]
-[assembly: Guid("89a50370-1ed9-4cf1-ad08-043b6e6f3c90")]
+[assembly: Guid("89a50370-1ed9-4cf1-ad08-043b6e6f3c90")]
-
+
-[assembly: NeutralResourcesLanguage("en")]
+[assembly: NeutralResourcesLanguage("en")]

Virtu/Silverlight/Services/SilverlightKeyboardService.cs

@@ -1,404 +1,404 @@
-using System;
+using System;
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
-using System.Linq;
+using System.Linq;
-using System.Windows;
+using System.Windows;
-using System.Windows.Controls;
+using System.Windows.Controls;
-using System.Windows.Input;
+using System.Windows.Input;
-
+
-namespace Jellyfish.Virtu.Services
+namespace Jellyfish.Virtu.Services
-{
+{
-    public sealed class SilverlightKeyboardService : KeyboardService
+    public sealed class SilverlightKeyboardService : KeyboardService
-    {
+    {
-        public SilverlightKeyboardService(Machine machine, UserControl page) : 
+        public SilverlightKeyboardService(Machine machine, UserControl page) : 
-            base(machine)
+            base(machine)
-        {
+        {
-            if (page == null)
+            if (page == null)
-            {
+            {
-                throw new ArgumentNullException("page");
+                throw new ArgumentNullException("page");
-            }
+            }
-
+
-            _page = page;
+            _page = page;
-
+
-            _page.KeyDown += OnPageKeyDown;
+            _page.KeyDown += OnPageKeyDown;
-            _page.KeyUp += OnPageKeyUp;
+            _page.KeyUp += OnPageKeyUp;
-            _page.LostFocus += OnPageLostFocus;
+            _page.LostFocus += OnPageLostFocus;
-        }
+        }
-
+
-        public override bool IsKeyDown(int key)
+        public override bool IsKeyDown(int key)
-        {
+        {
-            return IsKeyDown((Key)key);
+            return IsKeyDown((Key)key);
-        }
+        }
-
+
-        public override void Update() // main thread
+        public override void Update() // main thread
-        {
+        {
-            if (_updateAnyKeyDown) // SL is missing access to keyboard state; could lose track of keyboard state after Alt+Tab
+            if (_updateAnyKeyDown) // SL is missing access to keyboard state; could lose track of keyboard state after Alt+Tab
-            {
+            {
-                _updateAnyKeyDown = false;
+                _updateAnyKeyDown = false;
-                IsAnyKeyDown = false;
+                IsAnyKeyDown = false;
-                foreach (Key key in KeyValues)
+                foreach (Key key in KeyValues)
-                {
+                {
-                    if (IsKeyDown(key))
+                    if (IsKeyDown(key))
-                    {
+                    {
-                        IsAnyKeyDown = true;
+                        IsAnyKeyDown = true;
-                        break;
+                        break;
-                    }
+                    }
-                }
+                }
-            }
+            }
-
+
-            ModifierKeys modifiers = System.Windows.Input.Keyboard.Modifiers;
+            var modifiers = System.Windows.Input.Keyboard.Modifiers;
-            bool control = ((modifiers & ModifierKeys.Control) != 0);
+            bool control = ((modifiers & ModifierKeys.Control) != 0);
-
+
-            IsOpenAppleKeyDown = ((modifiers & ModifierKeys.Alt) != 0) || IsKeyDown(Key.NumPad0);
+            IsOpenAppleKeyDown = ((modifiers & ModifierKeys.Alt) != 0) || IsKeyDown(Key.NumPad0);
-            IsCloseAppleKeyDown = ((modifiers & ModifierKeys.Windows) != 0) || IsKeyDown(Key.Decimal);
+            IsCloseAppleKeyDown = ((modifiers & ModifierKeys.Windows) != 0) || IsKeyDown(Key.Decimal);
-            IsResetKeyDown = control && IsKeyDown(Key.Back);
+            IsResetKeyDown = control && IsKeyDown(Key.Back);
-
+
-            base.Update();
+            base.Update();
-        }
+        }
-
+
-        private bool IsKeyDown(Key key)
+        private bool IsKeyDown(Key key)
-        {
+        {
-            return _states[(int)key];
+            return _states[(int)key];
-        }
+        }
-
+
-        private void OnPageKeyDown(object sender, KeyEventArgs e)
+        private void OnPageKeyDown(object sender, KeyEventArgs e)
-        {
+        {
-            //((MainPage)_page)._debug.Text += string.Concat("OnPageKeyDn: Key=", e.Key, " PlatformKeyCode=", e.PlatformKeyCode, Environment.NewLine);
+            //((MainPage)_page)._debug.Text += string.Concat("OnPageKeyDn: Key=", e.Key, " PlatformKeyCode=", e.PlatformKeyCode, Environment.NewLine);
-
+
-            _states[(int)e.Key] = true;
+            _states[(int)e.Key] = true;
-            _updateAnyKeyDown = false;
+            _updateAnyKeyDown = false;
-            IsAnyKeyDown = true;
+            IsAnyKeyDown = true;
-
+
-            int asciiKey = GetAsciiKey(e.Key, e.PlatformKeyCode);
+            int asciiKey = GetAsciiKey(e.Key, e.PlatformKeyCode);
-            if (asciiKey >= 0)
+            if (asciiKey >= 0)
-            {
+            {
-                OnAsciiKeyDown(asciiKey);
+                OnAsciiKeyDown(asciiKey);
-                e.Handled = true;
+                e.Handled = true;
-            }
+            }
-
+
-            Update();
+            Update();
-        }
+        }
-
+
-        private void OnPageKeyUp(object sender, KeyEventArgs e)
+        private void OnPageKeyUp(object sender, KeyEventArgs e)
-        {
+        {
-            //((MainPage)_page)._debug.Text += string.Concat("OnPageKeyUp: Key=", e.Key, " PlatformKeyCode=", e.PlatformKeyCode, Environment.NewLine);
+            //((MainPage)_page)._debug.Text += string.Concat("OnPageKeyUp: Key=", e.Key, " PlatformKeyCode=", e.PlatformKeyCode, Environment.NewLine);
-
+
-            _states[(int)e.Key] = false;
+            _states[(int)e.Key] = false;
-            _updateAnyKeyDown = true;
+            _updateAnyKeyDown = true;
-
+
-            ModifierKeys modifiers = System.Windows.Input.Keyboard.Modifiers;
+            var modifiers = System.Windows.Input.Keyboard.Modifiers;
-            bool control = ((modifiers & ModifierKeys.Control) != 0);
+            bool control = ((modifiers & ModifierKeys.Control) != 0);
-
+
-            if (e.Key == Key.CapsLock)
+            if (e.Key == Key.CapsLock)
-            {
+            {
-                _capsLock ^= true; // SL is missing caps lock support; try to track manually
+                _capsLock ^= true; // SL is missing caps lock support; try to track manually
-            }
+            }
-            else if (control && (e.Key == Key.Divide))
+            else if (control && (e.Key == Key.Divide))
-            {
+            {
-                Machine.Cpu.ToggleThrottle();
+                Machine.Cpu.ToggleThrottle();
-            }
+            }
-            else if (control && (e.Key == Key.Multiply))
+            else if (control && (e.Key == Key.Multiply))
-            {
+            {
-                Machine.Video.ToggleMonochrome();
+                Machine.Video.ToggleMonochrome();
-            }
+            }
-            else if (control && (e.Key == Key.Subtract))
+            else if (control && (e.Key == Key.Subtract))
-            {
+            {
-                Machine.Video.ToggleFullScreen();
+                Machine.Video.ToggleFullScreen();
-            }
+            }
-
+
-            Update();
+            Update();
-        }
+        }
-
+
-        private void OnPageLostFocus(object sender, RoutedEventArgs e) // reset keyboard state on lost focus; can't access keyboard state on got focus
+        private void OnPageLostFocus(object sender, RoutedEventArgs e) // reset keyboard state on lost focus; can't access keyboard state on got focus
-        {
+        {
-            IsAnyKeyDown = false;
+            IsAnyKeyDown = false;
-            foreach (Key key in KeyValues)
+            foreach (Key key in KeyValues)
-            {
+            {
-                _states[(int)key] = false;
+                _states[(int)key] = false;
-            }
+            }
-        }
+        }
-
+
-        [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
+        [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [SuppressMessage("Microsoft.Maintainability", "CA1505:AvoidUnmaintainableCode")]
+        [SuppressMessage("Microsoft.Maintainability", "CA1505:AvoidUnmaintainableCode")]
-        private int GetAsciiKey(Key key, int platformKeyCode)
+        private int GetAsciiKey(Key key, int platformKeyCode)
-        {
+        {
-            ModifierKeys modifiers = System.Windows.Input.Keyboard.Modifiers;
+            var modifiers = System.Windows.Input.Keyboard.Modifiers;
-            bool control = ((modifiers & ModifierKeys.Control) != 0);
+            bool control = ((modifiers & ModifierKeys.Control) != 0);
-            bool shift = ((modifiers & ModifierKeys.Shift) != 0);
+            bool shift = ((modifiers & ModifierKeys.Shift) != 0);
-            bool capsLock = shift ^ _capsLock;
+            bool capsLock = shift ^ _capsLock;
-
+
-            switch (key)
+            switch (key)
-            {
+            {
-            case Key.Left:
+            case Key.Left:
-                return 0x08;
+                return 0x08;
-
+
-            case Key.Tab:
+            case Key.Tab:
-                return 0x09;
+                return 0x09;
-
+
-            case Key.Down:
+            case Key.Down:
-                return 0x0A;
+                return 0x0A;
-
+
-            case Key.Up:
+            case Key.Up:
-                return 0x0B;
+                return 0x0B;
-
+
-            case Key.Enter:
+            case Key.Enter:
-                return 0x0D;
+                return 0x0D;
-
+
-            case Key.Right:
+            case Key.Right:
-                return 0x15;
+                return 0x15;
-
+
-            case Key.Escape:
+            case Key.Escape:
-                return 0x1B;
+                return 0x1B;
-
+
-            case Key.Back:
+            case Key.Back:
-                return control ? -1 : 0x7F;
+                return control ? -1 : 0x7F;
-
+
-            case Key.Space:
+            case Key.Space:
-                return ' ';
+                return ' ';
-
+
-            case Key.D1:
+            case Key.D1:
-                return shift ? '!' : '1';
+                return shift ? '!' : '1';
-
+
-            case Key.D2:
+            case Key.D2:
-                return control ? 0x00 : shift ? '@' : '2';
+                return control ? 0x00 : shift ? '@' : '2';
-
+
-            case Key.D3:
+            case Key.D3:
-                return shift ? '#' : '3';
+                return shift ? '#' : '3';
-
+
-            case Key.D4:
+            case Key.D4:
-                return shift ? '$' : '4';
+                return shift ? '$' : '4';
-
+
-            case Key.D5:
+            case Key.D5:
-                return shift ? '%' : '5';
+                return shift ? '%' : '5';
-
+
-            case Key.D6:
+            case Key.D6:
-                return control ? 0x1E : shift ? '^' : '6';
+                return control ? 0x1E : shift ? '^' : '6';
-
+
-            case Key.D7:
+            case Key.D7:
-                return shift ? '&' : '7';
+                return shift ? '&' : '7';
-
+
-            case Key.D8:
+            case Key.D8:
-                return shift ? '*' : '8';
+                return shift ? '*' : '8';
-
+
-            case Key.D9:
+            case Key.D9:
-                return shift ? '(' : '9';
+                return shift ? '(' : '9';
-
+
-            case Key.D0:
+            case Key.D0:
-                return shift ? ')' : '0';
+                return shift ? ')' : '0';
-
+
-            case Key.A:
+            case Key.A:
-                return control ? 0x01 : capsLock ? 'A' : 'a';
+                return control ? 0x01 : capsLock ? 'A' : 'a';
-
+
-            case Key.B:
+            case Key.B:
-                return control ? 0x02 : capsLock ? 'B' : 'b';
+                return control ? 0x02 : capsLock ? 'B' : 'b';
-
+
-            case Key.C:
+            case Key.C:
-                return control ? 0x03 : capsLock ? 'C' : 'c';
+                return control ? 0x03 : capsLock ? 'C' : 'c';
-
+
-            case Key.D:
+            case Key.D:
-                return control ? 0x04 : capsLock ? 'D' : 'd';
+                return control ? 0x04 : capsLock ? 'D' : 'd';
-
+
-            case Key.E:
+            case Key.E:
-                return control ? 0x05 : capsLock ? 'E' : 'e';
+                return control ? 0x05 : capsLock ? 'E' : 'e';
-
+
-            case Key.F:
+            case Key.F:
-                return control ? 0x06 : capsLock ? 'F' : 'f';
+                return control ? 0x06 : capsLock ? 'F' : 'f';
-
+
-            case Key.G:
+            case Key.G:
-                return control ? 0x07 : capsLock ? 'G' : 'g';
+                return control ? 0x07 : capsLock ? 'G' : 'g';
-
+
-            case Key.H:
+            case Key.H:
-                return control ? 0x08 : capsLock ? 'H' : 'h';
+                return control ? 0x08 : capsLock ? 'H' : 'h';
-
+
-            case Key.I:
+            case Key.I:
-                return control ? 0x09 : capsLock ? 'I' : 'i';
+                return control ? 0x09 : capsLock ? 'I' : 'i';
-
+
-            case Key.J:
+            case Key.J:
-                return control ? 0x0A : capsLock ? 'J' : 'j';
+                return control ? 0x0A : capsLock ? 'J' : 'j';
-
+
-            case Key.K:
+            case Key.K:
-                return control ? 0x0B : capsLock ? 'K' : 'k';
+                return control ? 0x0B : capsLock ? 'K' : 'k';
-
+
-            case Key.L:
+            case Key.L:
-                return control ? 0x0C : capsLock ? 'L' : 'l';
+                return control ? 0x0C : capsLock ? 'L' : 'l';
-
+
-            case Key.M:
+            case Key.M:
-                return control ? 0x0D : capsLock ? 'M' : 'm';
+                return control ? 0x0D : capsLock ? 'M' : 'm';
-
+
-            case Key.N:
+            case Key.N:
-                return control ? 0x0E : capsLock ? 'N' : 'n';
+                return control ? 0x0E : capsLock ? 'N' : 'n';
-
+
-            case Key.O:
+            case Key.O:
-                return control ? 0x0F : capsLock ? 'O' : 'o';
+                return control ? 0x0F : capsLock ? 'O' : 'o';
-
+
-            case Key.P:
+            case Key.P:
-                return control ? 0x10 : capsLock ? 'P' : 'p';
+                return control ? 0x10 : capsLock ? 'P' : 'p';
-
+
-            case Key.Q:
+            case Key.Q:
-                return control ? 0x11 : capsLock ? 'Q' : 'q';
+                return control ? 0x11 : capsLock ? 'Q' : 'q';
-
+
-            case Key.R:
+            case Key.R:
-                return control ? 0x12 : capsLock ? 'R' : 'r';
+                return control ? 0x12 : capsLock ? 'R' : 'r';
-
+
-            case Key.S:
+            case Key.S:
-                return control ? 0x13 : capsLock ? 'S' : 's';
+                return control ? 0x13 : capsLock ? 'S' : 's';
-
+
-            case Key.T:
+            case Key.T:
-                return control ? 0x14 : capsLock ? 'T' : 't';
+                return control ? 0x14 : capsLock ? 'T' : 't';
-
+
-            case Key.U:
+            case Key.U:
-                return control ? 0x15 : capsLock ? 'U' : 'u';
+                return control ? 0x15 : capsLock ? 'U' : 'u';
-
+
-            case Key.V:
+            case Key.V:
-                return control ? 0x16 : capsLock ? 'V' : 'v';
+                return control ? 0x16 : capsLock ? 'V' : 'v';
-
+
-            case Key.W:
+            case Key.W:
-                return control ? 0x17 : capsLock ? 'W' : 'w';
+                return control ? 0x17 : capsLock ? 'W' : 'w';
-
+
-            case Key.X:
+            case Key.X:
-                return control ? 0x18 : capsLock ? 'X' : 'x';
+                return control ? 0x18 : capsLock ? 'X' : 'x';
-
+
-            case Key.Y:
+            case Key.Y:
-                return control ? 0x19 : capsLock ? 'Y' : 'y';
+                return control ? 0x19 : capsLock ? 'Y' : 'y';
-
+
-            case Key.Z:
+            case Key.Z:
-                return control ? 0x1A : capsLock ? 'Z' : 'z';
+                return control ? 0x1A : capsLock ? 'Z' : 'z';
-
+
-            case Key.Unknown:
+            case Key.Unknown:
-                switch (Environment.OSVersion.Platform)
+                switch (Environment.OSVersion.Platform)
-                {
+                {
-                case PlatformID.Win32NT:
+                case PlatformID.Win32NT:
-                    switch (platformKeyCode)
+                    switch (platformKeyCode)
-                    {
+                    {
-                    case 0xBA: // WinForms Keys.Oem1
+                    case 0xBA: // WinForms Keys.Oem1
-                        return shift ? ':' : ';';
+                        return shift ? ':' : ';';
-
+
-                    case 0xBF: // WinForms Keys.Oem2
+                    case 0xBF: // WinForms Keys.Oem2
-                        return shift ? '?' : '/';
+                        return shift ? '?' : '/';
-
+
-                    case 0xC0: // WinForms Keys.Oem3
+                    case 0xC0: // WinForms Keys.Oem3
-                        return shift ? '~' : '`';
+                        return shift ? '~' : '`';
-
+
-                    case 0xDB: // WinForms Keys.Oem4
+                    case 0xDB: // WinForms Keys.Oem4
-                        return shift ? '{' : '[';
+                        return shift ? '{' : '[';
-
+
-                    case 0xDC: // WinForms Keys.Oem5
+                    case 0xDC: // WinForms Keys.Oem5
-                        return control ? 0x1C : shift ? '|' : '\\';
+                        return control ? 0x1C : shift ? '|' : '\\';
-
+
-                    case 0xDD: // WinForms Keys.Oem6
+                    case 0xDD: // WinForms Keys.Oem6
-                        return control ? 0x1D : shift ? '}' : ']';
+                        return control ? 0x1D : shift ? '}' : ']';
-
+
-                    case 0xDE: // WinForms Keys.Oem7
+                    case 0xDE: // WinForms Keys.Oem7
-                        return shift ? '"' : '\'';
+                        return shift ? '"' : '\'';
-
+
-                    case 0xBD: // WinForms Keys.OemMinus
+                    case 0xBD: // WinForms Keys.OemMinus
-                        return control ? 0x1F : shift ? '_' : '-';
+                        return control ? 0x1F : shift ? '_' : '-';
-
+
-                    case 0xBB: // WinForms Keys.OemPlus
+                    case 0xBB: // WinForms Keys.OemPlus
-                        return shift ? '+' : '=';
+                        return shift ? '+' : '=';
-
+
-                    case 0xBC: // WinForms Keys.OemComma
+                    case 0xBC: // WinForms Keys.OemComma
-                        return shift ? '<' : ',';
+                        return shift ? '<' : ',';
-
+
-                    case 0xBE: // WinForms Keys.OemPeriod
+                    case 0xBE: // WinForms Keys.OemPeriod
-                        return shift ? '>' : '.';
+                        return shift ? '>' : '.';
-                    }
+                    }
-                    break;
+                    break;
-
+
-                case PlatformID.MacOSX:
+                case PlatformID.MacOSX:
-                    switch (platformKeyCode)
+                    switch (platformKeyCode)
-                    {
+                    {
-                    case 0x29:
+                    case 0x29:
-                        return shift ? ':' : ';';
+                        return shift ? ':' : ';';
-
+
-                    case 0x2C:
+                    case 0x2C:
-                        return shift ? '?' : '/';
+                        return shift ? '?' : '/';
-
+
-                    case 0x32:
+                    case 0x32:
-                        return shift ? '~' : '`';
+                        return shift ? '~' : '`';
-
+
-                    case 0x21:
+                    case 0x21:
-                        return shift ? '{' : '[';
+                        return shift ? '{' : '[';
-
+
-                    case 0x2A:
+                    case 0x2A:
-                        return control ? 0x1C : shift ? '|' : '\\';
+                        return control ? 0x1C : shift ? '|' : '\\';
-
+
-                    case 0x1E:
+                    case 0x1E:
-                        return control ? 0x1D : shift ? '}' : ']';
+                        return control ? 0x1D : shift ? '}' : ']';
-
+
-                    case 0x27:
+                    case 0x27:
-                        return shift ? '"' : '\'';
+                        return shift ? '"' : '\'';
-
+
-                    case 0x1B:
+                    case 0x1B:
-                        return control ? 0x1F : shift ? '_' : '-';
+                        return control ? 0x1F : shift ? '_' : '-';
-
+
-                    case 0x18:
+                    case 0x18:
-                        return shift ? '+' : '=';
+                        return shift ? '+' : '=';
-
+
-                    case 0x2B:
+                    case 0x2B:
-                        return shift ? '<' : ',';
+                        return shift ? '<' : ',';
-
+
-                    case 0x2F:
+                    case 0x2F:
-                        return shift ? '>' : '.';
+                        return shift ? '>' : '.';
-                    }
+                    }
-                    break;
+                    break;
-
+
-                case PlatformID.Unix:
+                case PlatformID.Unix:
-                    switch (platformKeyCode)
+                    switch (platformKeyCode)
-                    {
+                    {
-                    case 0x2F:
+                    case 0x2F:
-                        return shift ? ':' : ';';
+                        return shift ? ':' : ';';
-
+
-                    case 0x3D:
+                    case 0x3D:
-                        return shift ? '?' : '/';
+                        return shift ? '?' : '/';
-
+
-                    case 0x31:
+                    case 0x31:
-                        return shift ? '~' : '`';
+                        return shift ? '~' : '`';
-
+
-                    case 0x22:
+                    case 0x22:
-                        return shift ? '{' : '[';
+                        return shift ? '{' : '[';
-
+
-                    case 0x33:
+                    case 0x33:
-                        return control ? 0x1C : shift ? '|' : '\\';
+                        return control ? 0x1C : shift ? '|' : '\\';
-
+
-                    case 0x23:
+                    case 0x23:
-                        return control ? 0x1D : shift ? '}' : ']';
+                        return control ? 0x1D : shift ? '}' : ']';
-
+
-                    case 0x30:
+                    case 0x30:
-                        return shift ? '"' : '\'';
+                        return shift ? '"' : '\'';
-
+
-                    case 0x14:
+                    case 0x14:
-                        return control ? 0x1F : shift ? '_' : '-';
+                        return control ? 0x1F : shift ? '_' : '-';
-
+
-                    case 0x15:
+                    case 0x15:
-                        return shift ? '+' : '=';
+                        return shift ? '+' : '=';
-
+
-                    case 0x3B:
+                    case 0x3B:
-                        return shift ? '<' : ',';
+                        return shift ? '<' : ',';
-
+
-                    case 0x3C:
+                    case 0x3C:
-                        return shift ? '>' : '.';
+                        return shift ? '>' : '.';
-                    }
+                    }
-                    break;
+                    break;
-                }
+                }
-                break;
+                break;
-            }
+            }
-
+
-            return -1;
+            return -1;
-        }
+        }
-
+
-        private static readonly Key[] KeyValues = 
+        private static readonly Key[] KeyValues = 
-            (from key in 
+            (from key in 
-                 (from field in typeof(Key).GetFields() // missing Enum.GetValues; use reflection
+                 (from field in typeof(Key).GetFields() // missing Enum.GetValues; use reflection
-                  where field.IsLiteral
+                  where field.IsLiteral
-                  select (Key)field.GetValue(typeof(Key)))
+                  select (Key)field.GetValue(typeof(Key)))
-             where (key != Key.None) // filter Key.None
+             where (key != Key.None) // filter Key.None
-             select key).ToArray();
+             select key).ToArray();
-
+
-        private static readonly int KeyCount = (int)(KeyValues.Max()) + 1;
+        private static readonly int KeyCount = (int)(KeyValues.Max()) + 1;
-
+
-        private UserControl _page;
+        private UserControl _page;
-        private bool[] _states = new bool[KeyCount];
+        private bool[] _states = new bool[KeyCount];
-        private bool _capsLock;
+        private bool _capsLock;
-        private bool _updateAnyKeyDown;
+        private bool _updateAnyKeyDown;
-    }
+    }
-}
+}

Virtu/Silverlight/Services/SilverlightStorageService.cs

@@ -1,61 +1,61 @@
-using System;
+using System;
-using System.IO;
+using System.IO;
-using System.IO.IsolatedStorage;
+using System.IO.IsolatedStorage;
-
+
-namespace Jellyfish.Virtu.Services
+namespace Jellyfish.Virtu.Services
-{
+{
-    public sealed class SilverlightStorageService : StorageService
+    public sealed class SilverlightStorageService : StorageService
-    {
+    {
-        public SilverlightStorageService(Machine machine) : 
+        public SilverlightStorageService(Machine machine) : 
-            base(machine)
+            base(machine)
-        {
+        {
-        }
+        }
-
+
-        public override void Load(string path, Action<Stream> reader)
+        public override void Load(string path, Action<Stream> reader)
-        {
+        {
-            if (reader == null)
+            if (reader == null)
-            {
+            {
-                throw new ArgumentNullException("reader");
+                throw new ArgumentNullException("reader");
-            }
+            }
-
+
-            try
+            try
-            {
+            {
-                using (IsolatedStorageFile store = IsolatedStorageFile.GetUserStoreForApplication())
+                using (var store = IsolatedStorageFile.GetUserStoreForApplication())
-                {
+                {
-                    using (IsolatedStorageFileStream stream = new IsolatedStorageFileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read, store))
+                    using (var stream = new IsolatedStorageFileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read, store))
-                    {
+                    {
-                        reader(stream);
+                        reader(stream);
-                    }
+                    }
-                }
+                }
-            }
+            }
-            catch (FileNotFoundException)
+            catch (FileNotFoundException)
-            {
+            {
-            }
+            }
-            catch (IsolatedStorageException)
+            catch (IsolatedStorageException)
-            {
+            {
-            }
+            }
-        }
+        }
-
+
-        public override void Save(string path, Action<Stream> writer)
+        public override void Save(string path, Action<Stream> writer)
-        {
+        {
-            if (writer == null)
+            if (writer == null)
-            {
+            {
-                throw new ArgumentNullException("writer");
+                throw new ArgumentNullException("writer");
-            }
+            }
-
+
-            try
+            try
-            {
+            {
-                using (IsolatedStorageFile store = IsolatedStorageFile.GetUserStoreForApplication())
+                using (var store = IsolatedStorageFile.GetUserStoreForApplication())
-                {
+                {
-                    using (IsolatedStorageFileStream stream = new IsolatedStorageFileStream(path, FileMode.Create, FileAccess.Write, FileShare.None, store))
+                    using (var stream = new IsolatedStorageFileStream(path, FileMode.Create, FileAccess.Write, FileShare.None, store))
-                    {
+                    {
-                        writer(stream);
+                        writer(stream);
-                    }
+                    }
-                }
+                }
-            }
+            }
-            catch (IsolatedStorageException)
+            catch (IsolatedStorageException)
-            {
+            {
-            }
+            }
-        }
+        }
-    }
+    }
-}
+}

Virtu/Silverlight/Services/SilverlightVideoService.cs

@@ -1,84 +1,84 @@
-using System;
+using System;
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
-using System.Windows;
+using System.Windows;
-using System.Windows.Controls;
+using System.Windows.Controls;
-using System.Windows.Interop;
+using System.Windows.Interop;
-using System.Windows.Media.Imaging;
+using System.Windows.Media.Imaging;
-
+
-namespace Jellyfish.Virtu.Services
+namespace Jellyfish.Virtu.Services
-{
+{
-    public sealed class SilverlightVideoService : VideoService
+    public sealed class SilverlightVideoService : VideoService
-    {
+    {
-        public SilverlightVideoService(Machine machine, Image image) : 
+        public SilverlightVideoService(Machine machine, Image image) : 
-            base(machine)
+            base(machine)
-        {
+        {
-            if (image == null)
+            if (image == null)
-            {
+            {
-                throw new ArgumentNullException("image");
+                throw new ArgumentNullException("image");
-            }
+            }
-
+
-            _image = image;
+            _image = image;
-
+
-            _image.Source = _bitmap;
+            _image.Source = _bitmap;
-            SetImageSize();
+            SetImageSize();
-
+
-            Application.Current.Host.Content.Resized += (sender, e) => SetImageSize();
+            Application.Current.Host.Content.Resized += (sender, e) => SetImageSize();
-        }
+        }
-
+
-        [SuppressMessage("Microsoft.Usage", "CA2233:OperationsShouldNotOverflow", MessageId = "y*560")]
+        [SuppressMessage("Microsoft.Usage", "CA2233:OperationsShouldNotOverflow", MessageId = "y*560")]
-        public override void SetPixel(int x, int y, uint color)
+        public override void SetPixel(int x, int y, uint color)
-        {
+        {
-            _pixels[y * BitmapWidth + x] = (int)color;
+            _pixels[y * BitmapWidth + x] = (int)color;
-            _pixelsDirty = true;
+            _pixelsDirty = true;
-        }
+        }
-
+
-        public override void Update() // main thread
+        public override void Update() // main thread
-        {
+        {
-            if (Application.Current.IsRunningOutOfBrowser && /*_window.IsActive &&*/ (_isFullScreen != IsFullScreen))
+            if (Application.Current.IsRunningOutOfBrowser && /*_window.IsActive &&*/ (_isFullScreen != IsFullScreen))
-            {
+            {
-                if (IsFullScreen) // SL is missing out of browser window control
+                if (IsFullScreen) // SL is missing out of browser window control
-                {
+                {
-                    //_window.SizeToContent = SizeToContent.Manual;
+                    //_window.SizeToContent = SizeToContent.Manual;
-                    //_window.Topmost = true;
+                    //_window.Topmost = true;
-                    //_window.WindowStyle = WindowStyle.None;
+                    //_window.WindowStyle = WindowStyle.None;
-                    //_window.WindowState = WindowState.Maximized;
+                    //_window.WindowState = WindowState.Maximized;
-                }
+                }
-                else
+                else
-                {
+                {
-                    //_window.WindowState = WindowState.Normal;
+                    //_window.WindowState = WindowState.Normal;
-                    //_window.WindowStyle = WindowStyle.SingleBorderWindow;
+                    //_window.WindowStyle = WindowStyle.SingleBorderWindow;
-                    //_window.Topmost = false;
+                    //_window.Topmost = false;
-                    //_window.SizeToContent = SizeToContent.WidthAndHeight;
+                    //_window.SizeToContent = SizeToContent.WidthAndHeight;
-                }
+                }
-                _isFullScreen = IsFullScreen;
+                _isFullScreen = IsFullScreen;
-            }
+            }
-
+
-            if (_pixelsDirty)
+            if (_pixelsDirty)
-            {
+            {
-                _pixelsDirty = false;
+                _pixelsDirty = false;
-                for (int i = 0; i < BitmapWidth * BitmapHeight; i++)
+                for (int i = 0; i < BitmapWidth * BitmapHeight; i++)
-                {
+                {
-                    _bitmap.Pixels[i] = _pixels[i];
+                    _bitmap.Pixels[i] = _pixels[i];
-                }
+                }
-                _bitmap.Invalidate();
+                _bitmap.Invalidate();
-            }
+            }
-        }
+        }
-
+
-        private void SetImageSize()
+        private void SetImageSize()
-        {
+        {
-            Content content = Application.Current.Host.Content;
+            var content = Application.Current.Host.Content;
-            int uniformScale = Math.Min((int)content.ActualWidth / BitmapWidth, (int)content.ActualHeight / BitmapHeight);
+            int uniformScale = Math.Min((int)content.ActualWidth / BitmapWidth, (int)content.ActualHeight / BitmapHeight);
-            _image.Width = uniformScale * BitmapWidth;
+            _image.Width = uniformScale * BitmapWidth;
-            _image.Height = uniformScale * BitmapHeight;
+            _image.Height = uniformScale * BitmapHeight;
-        }
+        }
-
+
-        private const int BitmapWidth = 560;
+        private const int BitmapWidth = 560;
-        private const int BitmapHeight = 384;
+        private const int BitmapHeight = 384;
-
+
-        private Image _image;
+        private Image _image;
-        private WriteableBitmap _bitmap = new WriteableBitmap(BitmapWidth, BitmapHeight);
+        private WriteableBitmap _bitmap = new WriteableBitmap(BitmapWidth, BitmapHeight);
-        private int[] _pixels = new int[BitmapWidth * BitmapHeight];
+        private int[] _pixels = new int[BitmapWidth * BitmapHeight];
-        private bool _pixelsDirty;
+        private bool _pixelsDirty;
-        private bool _isFullScreen;
+        private bool _isFullScreen;
-    }
+    }
-}
+}

Virtu/Speaker.cs

@@ -1,65 +1,65 @@
-using System;
+using System;
-using Jellyfish.Virtu.Services;
+using Jellyfish.Virtu.Services;
-
+
-namespace Jellyfish.Virtu
+namespace Jellyfish.Virtu
-{
+{
-    public sealed class Speaker : MachineComponent
+    public sealed class Speaker : MachineComponent
-    {
+    {
-        public Speaker(Machine machine) :
+        public Speaker(Machine machine) :
-            base(machine)
+            base(machine)
-        {
+        {
-            _flushOutputEvent = FlushOutputEvent; // cache delegates; avoids garbage
+            _flushOutputEvent = FlushOutputEvent; // cache delegates; avoids garbage
-        }
+        }
-
+
-        public override void Initialize()
+        public override void Initialize()
-        {
+        {
-            _audioService = Machine.Services.GetService<AudioService>();
+            _audioService = Machine.Services.GetService<AudioService>();
-
+
-            Machine.Events.AddEvent(CyclesPerFlush * Machine.Settings.Cpu.Multiplier, _flushOutputEvent);
+            Machine.Events.AddEvent(CyclesPerFlush * Machine.Settings.Cpu.Multiplier, _flushOutputEvent);
-        }
+        }
-
+
-        public override void Reset()
+        public override void Reset()
-        {
+        {
-            _audioService.Reset();
+            _audioService.Reset();
-            _isHigh = false;
+            _isHigh = false;
-            _highCycles = _totalCycles = 0;
+            _highCycles = _totalCycles = 0;
-        }
+        }
-
+
-        public void ToggleOutput()
+        public void ToggleOutput()
-        {
+        {
-            UpdateCycles();
+            UpdateCycles();
-            _isHigh ^= true;
+            _isHigh ^= true;
-        }
+        }
-
+
-        private void FlushOutputEvent()
+        private void FlushOutputEvent()
-        {
+        {
-            UpdateCycles();
+            UpdateCycles();
-            _audioService.Output(_highCycles * 255 / _totalCycles); // quick and dirty decimation
+            _audioService.Output(_highCycles * 255 / _totalCycles); // quick and dirty decimation
-            _highCycles = _totalCycles = 0;
+            _highCycles = _totalCycles = 0;
-
+
-            Machine.Events.AddEvent(CyclesPerFlush * Machine.Settings.Cpu.Multiplier, _flushOutputEvent);
+            Machine.Events.AddEvent(CyclesPerFlush * Machine.Settings.Cpu.Multiplier, _flushOutputEvent);
-        }
+        }
-
+
-        private void UpdateCycles()
+        private void UpdateCycles()
-        {
+        {
-            int delta = (int)(Machine.Cpu.Cycles - _lastCycles);
+            int delta = (int)(Machine.Cpu.Cycles - _lastCycles);
-            if (_isHigh)
+            if (_isHigh)
-            {
+            {
-                _highCycles += delta;
+                _highCycles += delta;
-            }
+            }
-            _totalCycles += delta;
+            _totalCycles += delta;
-            _lastCycles = Machine.Cpu.Cycles;
+            _lastCycles = Machine.Cpu.Cycles;
-        }
+        }
-
+
-        private const int CyclesPerFlush = 23;
+        private const int CyclesPerFlush = 23;
-
+
-        private Action _flushOutputEvent;
+        private Action _flushOutputEvent;
-
+
-        private bool _isHigh;
+        private bool _isHigh;
-        private int _highCycles;
+        private int _highCycles;
-        private int _totalCycles;
+        private int _totalCycles;
-        private long _lastCycles;
+        private long _lastCycles;
-
+
-        private AudioService _audioService;
+        private AudioService _audioService;
-    }
+    }
-}
+}

Virtu/Wpf/MainApp.xaml

@@ -1,8 +1,8 @@
-<jl:ApplicationBase x:Class="Jellyfish.Virtu.MainApp"
+<jl:ApplicationBase x:Class="Jellyfish.Virtu.MainApp"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:jl="clr-namespace:Jellyfish.Library;assembly=Jellyfish.Library"
+    xmlns:jl="clr-namespace:Jellyfish.Library;assembly=Jellyfish.Library"
-    StartupUri="MainWindow.xaml">
+    StartupUri="MainWindow.xaml">
-    <Application.Resources>
+    <Application.Resources>
-    </Application.Resources>
+    </Application.Resources>
-</jl:ApplicationBase>
+</jl:ApplicationBase>

Virtu/Wpf/MainApp.xaml.cs

@@ -1,14 +1,14 @@
-using System.Security.Permissions;
+using System.Security.Permissions;
-using Jellyfish.Library;
+using Jellyfish.Library;
-
+
-namespace Jellyfish.Virtu
+namespace Jellyfish.Virtu
-{
+{
-    public sealed partial class MainApp : ApplicationBase
+    public sealed partial class MainApp : ApplicationBase
-    {
+    {
-        [SecurityPermission(SecurityAction.LinkDemand, UnmanagedCode = true)]
+        [SecurityPermission(SecurityAction.LinkDemand, UnmanagedCode = true)]
-        public MainApp() :
+        public MainApp() :
-            base("Virtu")
+            base("Virtu")
-        {
+        {
-        }
+        }
-    }
+    }
-}
+}

Virtu/Wpf/MainWindow.xaml

@@ -1,19 +1,19 @@
-<Window x:Class="Jellyfish.Virtu.MainWindow"
+<Window x:Class="Jellyfish.Virtu.MainWindow"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:jl="clr-namespace:Jellyfish.Library;assembly=Jellyfish.Library"
+    xmlns:jl="clr-namespace:Jellyfish.Library;assembly=Jellyfish.Library"
-    Title="Virtu" ResizeMode="CanMinimize" SizeToContent="WidthAndHeight" WindowStartupLocation="CenterScreen">
+    Title="Virtu" ResizeMode="CanMinimize" SizeToContent="WidthAndHeight" WindowStartupLocation="CenterScreen">
-    <DockPanel Background="Black">
+    <DockPanel Background="Black">
-        <StackPanel Orientation="Horizontal" DockPanel.Dock="Top">
+        <StackPanel Orientation="Horizontal" DockPanel.Dock="Top">
-            <Button x:Name="_disk1Button" Content="Disk 1" Focusable="False" IsTabStop="False" Margin="4 4 0 4"/>
+            <Button x:Name="_disk1Button" Content="Disk 1" Focusable="False" IsTabStop="False" Margin="4 4 0 4"/>
-            <Button x:Name="_disk2Button" Content="Disk 2" Focusable="False" IsTabStop="False" Margin="4 4 0 4"/>
+            <Button x:Name="_disk2Button" Content="Disk 2" Focusable="False" IsTabStop="False" Margin="4 4 0 4"/>
-            <jl:FrameRateCounter Margin="4 4 0 4" VerticalAlignment="Center"/>
+            <jl:FrameRateCounter Margin="4 4 0 4" VerticalAlignment="Center"/>
-        </StackPanel>
+        </StackPanel>
-        <Grid>
+        <Grid>
-            <Image x:Name="_image" MinWidth="560" MinHeight="384" RenderOptions.BitmapScalingMode="NearestNeighbor"/>
+            <Image x:Name="_image" MinWidth="560" MinHeight="384" RenderOptions.BitmapScalingMode="NearestNeighbor"/>
-            <!--<ScrollViewer BorderThickness="0" Focusable="False" IsTabStop="False" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" VerticalScrollBarVisibility="Auto">
+            <!--<ScrollViewer BorderThickness="0" Focusable="False" IsTabStop="False" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" VerticalScrollBarVisibility="Auto">
-                <TextBlock x:Name="_debug" FontFamily="Consolas" FontSize="12" Foreground="White"/>
+                <TextBlock x:Name="_debug" FontFamily="Consolas" FontSize="12" Foreground="White"/>
-            </ScrollViewer>-->
+            </ScrollViewer>-->
-        </Grid>
+        </Grid>
-    </DockPanel>
+    </DockPanel>
-</Window>
+</Window>

Virtu/Wpf/MainWindow.xaml.cs

@@ -1,88 +1,87 @@
-using System;
+using System;
-using System.IO;
+using System.IO;
-using System.Windows;
+using System.Windows;
-using System.Windows.Media;
+using System.Windows.Media;
-using Jellyfish.Virtu.Services;
+using Jellyfish.Virtu.Services;
-using Jellyfish.Virtu.Settings;
+using Jellyfish.Virtu.Settings;
-using Microsoft.Win32;
+using Microsoft.Win32;
-
+
-namespace Jellyfish.Virtu
+namespace Jellyfish.Virtu
-{
+{
-    public sealed partial class MainWindow : Window, IDisposable
+    public sealed partial class MainWindow : Window, IDisposable
-    {
+    {
-        public MainWindow()
+        public MainWindow()
-        {
+        {
-            InitializeComponent();
+            InitializeComponent();
-
+
-            _storageService = new WpfStorageService(_machine);
+            _storageService = new WpfStorageService(_machine);
-            _keyboardService = new WpfKeyboardService(_machine, this);
+            _keyboardService = new WpfKeyboardService(_machine, this);
-            _gamePortService = new GamePortService(_machine); // not connected
+            _gamePortService = new GamePortService(_machine); // not connected
-            _audioService = new WpfAudioService(_machine, this);
+            _audioService = new WpfAudioService(_machine, this);
-            _videoService = new WpfVideoService(_machine, this, _image);
+            _videoService = new WpfVideoService(_machine, this, _image);
-
+
-            _machine.Services.AddService(typeof(StorageService), _storageService);
+            _machine.Services.AddService(typeof(StorageService), _storageService);
-            _machine.Services.AddService(typeof(KeyboardService), _keyboardService);
+            _machine.Services.AddService(typeof(KeyboardService), _keyboardService);
-            _machine.Services.AddService(typeof(GamePortService), _gamePortService);
+            _machine.Services.AddService(typeof(GamePortService), _gamePortService);
-            _machine.Services.AddService(typeof(AudioService), _audioService);
+            _machine.Services.AddService(typeof(AudioService), _audioService);
-            _machine.Services.AddService(typeof(VideoService), _videoService);
+            _machine.Services.AddService(typeof(VideoService), _videoService);
-
+
-            Loaded += (sender, e) => _machine.Start();
+            Loaded += (sender, e) => _machine.Start();
-            CompositionTarget.Rendering += OnCompositionTargetRendering;
+            CompositionTarget.Rendering += OnCompositionTargetRendering;
-            Application.Current.Exit += (sender, e) => _machine.Stop();
+            Application.Current.Exit += (sender, e) => _machine.Stop();
-
+
-            _disk1Button.Click += (sender, e) => OnDiskButtonClick(0);
+            _disk1Button.Click += (sender, e) => OnDiskButtonClick(0);
-            _disk2Button.Click += (sender, e) => OnDiskButtonClick(1);
+            _disk2Button.Click += (sender, e) => OnDiskButtonClick(1);
-        }
+        }
-
+
-        public void Dispose()
+        public void Dispose()
-        {
+        {
-            _machine.Dispose();
+            _machine.Dispose();
-            _storageService.Dispose();
+            _storageService.Dispose();
-            _keyboardService.Dispose();
+            _keyboardService.Dispose();
-            _gamePortService.Dispose();
+            _gamePortService.Dispose();
-            _audioService.Dispose();
+            _audioService.Dispose();
-            _videoService.Dispose();
+            _videoService.Dispose();
-        }
+        }
-
+
-        private void OnCompositionTargetRendering(object sender, EventArgs e)
+        private void OnCompositionTargetRendering(object sender, EventArgs e)
-        {
+        {
-            _keyboardService.Update();
+            _keyboardService.Update();
-            _gamePortService.Update();
+            _gamePortService.Update();
-            _videoService.Update();
+            _videoService.Update();
-        }
+        }
-
+
-        private void OnDiskButtonClick(int drive)
+        private void OnDiskButtonClick(int drive)
-        {
+        {
-            OpenFileDialog dialog = new OpenFileDialog();
+            var dialog = new OpenFileDialog() { Filter = "Disk Files (*.dsk;*.nib)|*.dsk;*.nib|All Files (*.*)|*.*" };
-            dialog.Filter = "Disk Files (*.dsk;*.nib)|*.dsk;*.nib|All Files (*.*)|*.*";
+
-
+            bool? result = dialog.ShowDialog();
-            bool? result = dialog.ShowDialog();
+            if (result.HasValue && result.Value)
-            if (result.HasValue && result.Value)
+            {
-            {
+                using (FileStream stream = File.OpenRead(dialog.FileName))
-                using (FileStream stream = File.OpenRead(dialog.FileName))
+                {
-                {
+                    _machine.Pause();
-                    _machine.Pause();
+                    _machine.DiskII.Drives[drive].InsertDisk(dialog.FileName, stream, false);
-                    _machine.DiskII.Drives[drive].InsertDisk(dialog.FileName, stream, false);
+                    DiskIISettings settings = _machine.Settings.DiskII;
-                    DiskIISettings settings = _machine.Settings.DiskII;
+                    if (drive == 0)
-                    if (drive == 0)
+                    {
-                    {
+                        settings.Disk1.Name = dialog.FileName;
-                        settings.Disk1.Name = dialog.FileName;
+                    }
-                    }
+                    else
-                    else
+                    {
-                    {
+                        settings.Disk2.Name = dialog.FileName;
-                        settings.Disk2.Name = dialog.FileName;
+                    }
-                    }
+                    _machine.Unpause();
-                    _machine.Unpause();
+                }
-                }
+            }
-            }
+        }
-        }
+
-
+        private Machine _machine = new Machine();
-        private Machine _machine = new Machine();
+
-
+        private StorageService _storageService;
-        private StorageService _storageService;
+        private KeyboardService _keyboardService;
-        private KeyboardService _keyboardService;
+        private GamePortService _gamePortService;
-        private GamePortService _gamePortService;
+        private AudioService _audioService;
-        private AudioService _audioService;
+        private VideoService _videoService;
-        private VideoService _videoService;
+    }
-    }
+}
-}

Virtu/Wpf/Properties/AssemblyInfo.cs

@@ -1,25 +1,25 @@
-using System;
+using System;
-using System.Reflection;
+using System.Reflection;
-using System.Resources;
+using System.Resources;
-using System.Runtime.InteropServices;
+using System.Runtime.InteropServices;
-using System.Windows;
+using System.Windows;
-using Jellyfish.Library;
+using Jellyfish.Library;
-
+
-[assembly: AssemblyTitle("Virtu")]
+[assembly: AssemblyTitle("Virtu")]
-[assembly: AssemblyDescription("Apple IIe Emulator")]
+[assembly: AssemblyDescription("Apple IIe Emulator")]
-[assembly: AssemblyProduct("Jellyfish.Virtu.Wpf")]
+[assembly: AssemblyProduct("Jellyfish.Virtu.Wpf")]
-[assembly: AssemblyCompany("Digital Jellyfish Design Ltd")]
+[assembly: AssemblyCompany("Digital Jellyfish Design Ltd")]
-[assembly: AssemblyCopyright("Copyright © 1995-2010 Digital Jellyfish Design Ltd")]
+[assembly: AssemblyCopyright("Copyright © 1995-2010 Digital Jellyfish Design Ltd")]
-[assembly: AssemblyComment("Developed by Sean Fausett & Nick Westgate")]
+[assembly: AssemblyComment("Developed by Sean Fausett & Nick Westgate")]
-
+
-[assembly: AssemblyVersion("0.8.0.0")]
+[assembly: AssemblyVersion("0.8.0.0")]
-[assembly: AssemblyFileVersion("0.8.0.0")]
+[assembly: AssemblyFileVersion("0.8.0.0")]
-[assembly: AssemblyInformationalVersion("0.8.0.0")]
+[assembly: AssemblyInformationalVersion("0.8.0.0")]
-
+
-[assembly: CLSCompliant(false)]
+[assembly: CLSCompliant(false)]
-[assembly: ComVisible(false)]
+[assembly: ComVisible(false)]
-[assembly: Guid("89a50370-1ed9-4cf1-ad08-043b6e6f3c90")]
+[assembly: Guid("89a50370-1ed9-4cf1-ad08-043b6e6f3c90")]
-
+
-[assembly: NeutralResourcesLanguage("en")]
+[assembly: NeutralResourcesLanguage("en")]
-
+
-[assembly: ThemeInfo(ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly)]
+[assembly: ThemeInfo(ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly)]

Virtu/Wpf/Services/WpfKeyboardService.cs

@@ -1,299 +1,299 @@
-using System;
+using System;
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
-using System.Linq;
+using System.Linq;
-using System.Windows;
+using System.Windows;
-using System.Windows.Input;
+using System.Windows.Input;
-
+
-namespace Jellyfish.Virtu.Services
+namespace Jellyfish.Virtu.Services
-{
+{
-    public sealed class WpfKeyboardService : KeyboardService
+    public sealed class WpfKeyboardService : KeyboardService
-    {
+    {
-        public WpfKeyboardService(Machine machine, Window window) : 
+        public WpfKeyboardService(Machine machine, Window window) : 
-            base(machine)
+            base(machine)
-        {
+        {
-            if (window == null)
+            if (window == null)
-            {
+            {
-                throw new ArgumentNullException("window");
+                throw new ArgumentNullException("window");
-            }
+            }
-
+
-            _window = window;
+            _window = window;
-
+
-            _window.KeyDown += OnWindowKeyDown;
+            _window.KeyDown += OnWindowKeyDown;
-            _window.KeyUp += OnWindowKeyUp;
+            _window.KeyUp += OnWindowKeyUp;
-            _window.GotKeyboardFocus += (sender, e) => _updateAnyKeyDown = true;
+            _window.GotKeyboardFocus += (sender, e) => _updateAnyKeyDown = true;
-        }
+        }
-
+
-        public override bool IsKeyDown(int key)
+        public override bool IsKeyDown(int key)
-        {
+        {
-            return IsKeyDown((Key)key);
+            return IsKeyDown((Key)key);
-        }
+        }
-
+
-        public override void Update() // main thread
+        public override void Update() // main thread
-        {
+        {
-            KeyboardDevice keyboard = System.Windows.Input.Keyboard.PrimaryDevice;
+            var keyboard = System.Windows.Input.Keyboard.PrimaryDevice;
-            if (_updateAnyKeyDown)
+            if (_updateAnyKeyDown)
-            {
+            {
-                _updateAnyKeyDown = false;
+                _updateAnyKeyDown = false;
-                IsAnyKeyDown = false;
+                IsAnyKeyDown = false;
-                foreach (Key key in KeyValues)
+                foreach (Key key in KeyValues)
-                {
+                {
-                    bool isKeyDown = keyboard.IsKeyDown(key);
+                    bool isKeyDown = keyboard.IsKeyDown(key);
-                    _states[(int)key] = isKeyDown;
+                    _states[(int)key] = isKeyDown;
-                    if (isKeyDown)
+                    if (isKeyDown)
-                    {
+                    {
-                        IsAnyKeyDown = true;
+                        IsAnyKeyDown = true;
-                    }
+                    }
-                }
+                }
-            }
+            }
-
+
-            bool control = ((keyboard.Modifiers & ModifierKeys.Control) != 0);
+            bool control = ((keyboard.Modifiers & ModifierKeys.Control) != 0);
-
+
-            IsOpenAppleKeyDown = keyboard.IsKeyDown(Key.LeftAlt) || IsKeyDown(Key.NumPad0);
+            IsOpenAppleKeyDown = keyboard.IsKeyDown(Key.LeftAlt) || IsKeyDown(Key.NumPad0);
-            IsCloseAppleKeyDown = keyboard.IsKeyDown(Key.RightAlt) || IsKeyDown(Key.Decimal);
+            IsCloseAppleKeyDown = keyboard.IsKeyDown(Key.RightAlt) || IsKeyDown(Key.Decimal);
-            IsResetKeyDown = control && keyboard.IsKeyDown(Key.Back);
+            IsResetKeyDown = control && keyboard.IsKeyDown(Key.Back);
-
+
-            base.Update();
+            base.Update();
-        }
+        }
-
+
-        private bool IsKeyDown(Key key)
+        private bool IsKeyDown(Key key)
-        {
+        {
-            return _states[(int)key];
+            return _states[(int)key];
-        }
+        }
-
+
-        private void OnWindowKeyDown(object sender, KeyEventArgs e)
+        private void OnWindowKeyDown(object sender, KeyEventArgs e)
-        {
+        {
-            //((MainWindow)_window)._debug.Text += string.Concat("OnWindowKeyDn: Key=", e.Key, Environment.NewLine);
+            //((MainWindow)_window)._debug.Text += string.Concat("OnWindowKeyDn: Key=", e.Key, Environment.NewLine);
-
+
-            _states[(int)((e.Key == Key.System) ? e.SystemKey : e.Key)] = true;
+            _states[(int)((e.Key == Key.System) ? e.SystemKey : e.Key)] = true;
-            _updateAnyKeyDown = false;
+            _updateAnyKeyDown = false;
-            IsAnyKeyDown = true;
+            IsAnyKeyDown = true;
-
+
-            int asciiKey = GetAsciiKey(e.Key, e.KeyboardDevice);
+            int asciiKey = GetAsciiKey(e.Key, e.KeyboardDevice);
-            if (asciiKey >= 0)
+            if (asciiKey >= 0)
-            {
+            {
-                OnAsciiKeyDown(asciiKey);
+                OnAsciiKeyDown(asciiKey);
-                e.Handled = true;
+                e.Handled = true;
-            }
+            }
-
+
-            Update();
+            Update();
-        }
+        }
-
+
-        private void OnWindowKeyUp(object sender, KeyEventArgs e)
+        private void OnWindowKeyUp(object sender, KeyEventArgs e)
-        {
+        {
-            //((MainWindow)_window)._debug.Text += string.Concat("OnWindowKeyUp: Key=", e.Key, Environment.NewLine);
+            //((MainWindow)_window)._debug.Text += string.Concat("OnWindowKeyUp: Key=", e.Key, Environment.NewLine);
-
+
-            _states[(int)((e.Key == Key.System) ? e.SystemKey : e.Key)] = false;
+            _states[(int)((e.Key == Key.System) ? e.SystemKey : e.Key)] = false;
-            _updateAnyKeyDown = true;
+            _updateAnyKeyDown = true;
-
+
-            bool control = ((e.KeyboardDevice.Modifiers & ModifierKeys.Control) != 0);
+            bool control = ((e.KeyboardDevice.Modifiers & ModifierKeys.Control) != 0);
-
+
-            if (control && (e.Key == Key.Divide))
+            if (control && (e.Key == Key.Divide))
-            {
+            {
-                Machine.Cpu.ToggleThrottle();
+                Machine.Cpu.ToggleThrottle();
-            }
+            }
-            else if (control && (e.Key == Key.Multiply))
+            else if (control && (e.Key == Key.Multiply))
-            {
+            {
-                Machine.Video.ToggleMonochrome();
+                Machine.Video.ToggleMonochrome();
-            }
+            }
-            else if (control && (e.Key == Key.Subtract))
+            else if (control && (e.Key == Key.Subtract))
-            {
+            {
-                Machine.Video.ToggleFullScreen();
+                Machine.Video.ToggleFullScreen();
-            }
+            }
-
+
-            Update();
+            Update();
-        }
+        }
-
+
-        [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
+        [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [SuppressMessage("Microsoft.Maintainability", "CA1505:AvoidUnmaintainableCode")]
+        [SuppressMessage("Microsoft.Maintainability", "CA1505:AvoidUnmaintainableCode")]
-        private static int GetAsciiKey(Key key, KeyboardDevice keyboard)
+        private static int GetAsciiKey(Key key, KeyboardDevice keyboard)
-        {
+        {
-            bool control = ((keyboard.Modifiers & ModifierKeys.Control) != 0);
+            bool control = ((keyboard.Modifiers & ModifierKeys.Control) != 0);
-            bool shift = ((keyboard.Modifiers & ModifierKeys.Shift) != 0);
+            bool shift = ((keyboard.Modifiers & ModifierKeys.Shift) != 0);
-            bool capsLock = shift ^ keyboard.IsKeyToggled(Key.CapsLock);
+            bool capsLock = shift ^ keyboard.IsKeyToggled(Key.CapsLock);
-
+
-            switch (key)
+            switch (key)
-            {
+            {
-            case Key.Left:
+            case Key.Left:
-                return 0x08;
+                return 0x08;
-
+
-            case Key.Tab:
+            case Key.Tab:
-                return 0x09;
+                return 0x09;
-
+
-            case Key.Down:
+            case Key.Down:
-                return 0x0A;
+                return 0x0A;
-
+
-            case Key.Up:
+            case Key.Up:
-                return 0x0B;
+                return 0x0B;
-
+
-            case Key.Enter:
+            case Key.Enter:
-                return 0x0D;
+                return 0x0D;
-
+
-            case Key.Right:
+            case Key.Right:
-                return 0x15;
+                return 0x15;
-
+
-            case Key.Escape:
+            case Key.Escape:
-                return 0x1B;
+                return 0x1B;
-
+
-            case Key.Back:
+            case Key.Back:
-                return control ? -1 : 0x7F;
+                return control ? -1 : 0x7F;
-
+
-            case Key.Space:
+            case Key.Space:
-                return ' ';
+                return ' ';
-
+
-            case Key.D1:
+            case Key.D1:
-                return shift ? '!' : '1';
+                return shift ? '!' : '1';
-
+
-            case Key.D2:
+            case Key.D2:
-                return control ? 0x00 : shift ? '@' : '2';
+                return control ? 0x00 : shift ? '@' : '2';
-
+
-            case Key.D3:
+            case Key.D3:
-                return shift ? '#' : '3';
+                return shift ? '#' : '3';
-
+
-            case Key.D4:
+            case Key.D4:
-                return shift ? '$' : '4';
+                return shift ? '$' : '4';
-
+
-            case Key.D5:
+            case Key.D5:
-                return shift ? '%' : '5';
+                return shift ? '%' : '5';
-
+
-            case Key.D6:
+            case Key.D6:
-                return control ? 0x1E : shift ? '^' : '6';
+                return control ? 0x1E : shift ? '^' : '6';
-
+
-            case Key.D7:
+            case Key.D7:
-                return shift ? '&' : '7';
+                return shift ? '&' : '7';
-
+
-            case Key.D8:
+            case Key.D8:
-                return shift ? '*' : '8';
+                return shift ? '*' : '8';
-
+
-            case Key.D9:
+            case Key.D9:
-                return shift ? '(' : '9';
+                return shift ? '(' : '9';
-
+
-            case Key.D0:
+            case Key.D0:
-                return shift ? ')' : '0';
+                return shift ? ')' : '0';
-
+
-            case Key.A:
+            case Key.A:
-                return control ? 0x01 : capsLock ? 'A' : 'a';
+                return control ? 0x01 : capsLock ? 'A' : 'a';
-
+
-            case Key.B:
+            case Key.B:
-                return control ? 0x02 : capsLock ? 'B' : 'b';
+                return control ? 0x02 : capsLock ? 'B' : 'b';
-
+
-            case Key.C:
+            case Key.C:
-                return control ? 0x03 : capsLock ? 'C' : 'c';
+                return control ? 0x03 : capsLock ? 'C' : 'c';
-
+
-            case Key.D:
+            case Key.D:
-                return control ? 0x04 : capsLock ? 'D' : 'd';
+                return control ? 0x04 : capsLock ? 'D' : 'd';
-
+
-            case Key.E:
+            case Key.E:
-                return control ? 0x05 : capsLock ? 'E' : 'e';
+                return control ? 0x05 : capsLock ? 'E' : 'e';
-
+
-            case Key.F:
+            case Key.F:
-                return control ? 0x06 : capsLock ? 'F' : 'f';
+                return control ? 0x06 : capsLock ? 'F' : 'f';
-
+
-            case Key.G:
+            case Key.G:
-                return control ? 0x07 : capsLock ? 'G' : 'g';
+                return control ? 0x07 : capsLock ? 'G' : 'g';
-
+
-            case Key.H:
+            case Key.H:
-                return control ? 0x08 : capsLock ? 'H' : 'h';
+                return control ? 0x08 : capsLock ? 'H' : 'h';
-
+
-            case Key.I:
+            case Key.I:
-                return control ? 0x09 : capsLock ? 'I' : 'i';
+                return control ? 0x09 : capsLock ? 'I' : 'i';
-
+
-            case Key.J:
+            case Key.J:
-                return control ? 0x0A : capsLock ? 'J' : 'j';
+                return control ? 0x0A : capsLock ? 'J' : 'j';
-
+
-            case Key.K:
+            case Key.K:
-                return control ? 0x0B : capsLock ? 'K' : 'k';
+                return control ? 0x0B : capsLock ? 'K' : 'k';
-
+
-            case Key.L:
+            case Key.L:
-                return control ? 0x0C : capsLock ? 'L' : 'l';
+                return control ? 0x0C : capsLock ? 'L' : 'l';
-
+
-            case Key.M:
+            case Key.M:
-                return control ? 0x0D : capsLock ? 'M' : 'm';
+                return control ? 0x0D : capsLock ? 'M' : 'm';
-
+
-            case Key.N:
+            case Key.N:
-                return control ? 0x0E : capsLock ? 'N' : 'n';
+                return control ? 0x0E : capsLock ? 'N' : 'n';
-
+
-            case Key.O:
+            case Key.O:
-                return control ? 0x0F : capsLock ? 'O' : 'o';
+                return control ? 0x0F : capsLock ? 'O' : 'o';
-
+
-            case Key.P:
+            case Key.P:
-                return control ? 0x10 : capsLock ? 'P' : 'p';
+                return control ? 0x10 : capsLock ? 'P' : 'p';
-
+
-            case Key.Q:
+            case Key.Q:
-                return control ? 0x11 : capsLock ? 'Q' : 'q';
+                return control ? 0x11 : capsLock ? 'Q' : 'q';
-
+
-            case Key.R:
+            case Key.R:
-                return control ? 0x12 : capsLock ? 'R' : 'r';
+                return control ? 0x12 : capsLock ? 'R' : 'r';
-
+
-            case Key.S:
+            case Key.S:
-                return control ? 0x13 : capsLock ? 'S' : 's';
+                return control ? 0x13 : capsLock ? 'S' : 's';
-
+
-            case Key.T:
+            case Key.T:
-                return control ? 0x14 : capsLock ? 'T' : 't';
+                return control ? 0x14 : capsLock ? 'T' : 't';
-
+
-            case Key.U:
+            case Key.U:
-                return control ? 0x15 : capsLock ? 'U' : 'u';
+                return control ? 0x15 : capsLock ? 'U' : 'u';
-
+
-            case Key.V:
+            case Key.V:
-                return control ? 0x16 : capsLock ? 'V' : 'v';
+                return control ? 0x16 : capsLock ? 'V' : 'v';
-
+
-            case Key.W:
+            case Key.W:
-                return control ? 0x17 : capsLock ? 'W' : 'w';
+                return control ? 0x17 : capsLock ? 'W' : 'w';
-
+
-            case Key.X:
+            case Key.X:
-                return control ? 0x18 : capsLock ? 'X' : 'x';
+                return control ? 0x18 : capsLock ? 'X' : 'x';
-
+
-            case Key.Y:
+            case Key.Y:
-                return control ? 0x19 : capsLock ? 'Y' : 'y';
+                return control ? 0x19 : capsLock ? 'Y' : 'y';
-
+
-            case Key.Z:
+            case Key.Z:
-                return control ? 0x1A : capsLock ? 'Z' : 'z';
+                return control ? 0x1A : capsLock ? 'Z' : 'z';
-
+
-            case Key.Oem1:
+            case Key.Oem1:
-                return shift ? ':' : ';';
+                return shift ? ':' : ';';
-
+
-            case Key.Oem2:
+            case Key.Oem2:
-                return shift ? '?' : '/';
+                return shift ? '?' : '/';
-
+
-            case Key.Oem3:
+            case Key.Oem3:
-                return shift ? '~' : '`';
+                return shift ? '~' : '`';
-
+
-            case Key.Oem4:
+            case Key.Oem4:
-                return shift ? '{' : '[';
+                return shift ? '{' : '[';
-
+
-            case Key.Oem5:
+            case Key.Oem5:
-                return control ? 0x1C : shift ? '|' : '\\';
+                return control ? 0x1C : shift ? '|' : '\\';
-
+
-            case Key.Oem6:
+            case Key.Oem6:
-                return control ? 0x1D : shift ? '}' : ']';
+                return control ? 0x1D : shift ? '}' : ']';
-
+
-            case Key.Oem7:
+            case Key.Oem7:
-                return shift ? '"' : '\'';
+                return shift ? '"' : '\'';
-
+
-            case Key.OemMinus:
+            case Key.OemMinus:
-                return control ? 0x1F : shift ? '_' : '-';
+                return control ? 0x1F : shift ? '_' : '-';
-
+
-            case Key.OemPlus:
+            case Key.OemPlus:
-                return shift ? '+' : '=';
+                return shift ? '+' : '=';
-
+
-            case Key.OemComma:
+            case Key.OemComma:
-                return shift ? '<' : ',';
+                return shift ? '<' : ',';
-
+
-            case Key.OemPeriod:
+            case Key.OemPeriod:
-                return shift ? '>' : '.';
+                return shift ? '>' : '.';
-            }
+            }
-
+
-            return -1;
+            return -1;
-        }
+        }
-
+
-        private static readonly Key[] KeyValues = 
+        private static readonly Key[] KeyValues = 
-            (from key in (Key[])Enum.GetValues(typeof(Key))
+            (from key in (Key[])Enum.GetValues(typeof(Key))
-             where (key != Key.None) // filter Key.None; avoids validation exception
+             where (key != Key.None) // filter Key.None; avoids validation exception
-             select key).ToArray();
+             select key).ToArray();
-
+
-        private static readonly int KeyCount = (int)(KeyValues.Max()) + 1;
+        private static readonly int KeyCount = (int)(KeyValues.Max()) + 1;
-
+
-        private Window _window;
+        private Window _window;
-        private bool[] _states = new bool[KeyCount];
+        private bool[] _states = new bool[KeyCount];
-        private bool _updateAnyKeyDown;
+        private bool _updateAnyKeyDown;
-    }
+    }
-}
+}

Virtu/Wpf/Services/WpfStorageService.cs

@@ -1,68 +1,68 @@
-using System;
+using System;
-using System.Deployment.Application;
+using System.Deployment.Application;
-using System.IO;
+using System.IO;
-using System.IO.IsolatedStorage;
+using System.IO.IsolatedStorage;
-
+
-namespace Jellyfish.Virtu.Services
+namespace Jellyfish.Virtu.Services
-{
+{
-    public sealed class WpfStorageService : StorageService
+    public sealed class WpfStorageService : StorageService
-    {
+    {
-        public WpfStorageService(Machine machine) : 
+        public WpfStorageService(Machine machine) : 
-            base(machine)
+            base(machine)
-        {
+        {
-        }
+        }
-
+
-        public override void Load(string path, Action<Stream> reader)
+        public override void Load(string path, Action<Stream> reader)
-        {
+        {
-            if (reader == null)
+            if (reader == null)
-            {
+            {
-                throw new ArgumentNullException("reader");
+                throw new ArgumentNullException("reader");
-            }
+            }
-
+
-            try
+            try
-            {
+            {
-                using (IsolatedStorageFile store = GetStore())
+                using (var store = GetStore())
-                {
+                {
-                    using (IsolatedStorageFileStream stream = new IsolatedStorageFileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read, store))
+                    using (var stream = new IsolatedStorageFileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read, store))
-                    {
+                    {
-                        reader(stream);
+                        reader(stream);
-                    }
+                    }
-                }
+                }
-            }
+            }
-            catch (FileNotFoundException)
+            catch (FileNotFoundException)
-            {
+            {
-            }
+            }
-            catch (IsolatedStorageException)
+            catch (IsolatedStorageException)
-            {
+            {
-            }
+            }
-        }
+        }
-
+
-        public override void Save(string path, Action<Stream> writer)
+        public override void Save(string path, Action<Stream> writer)
-        {
+        {
-            if (writer == null)
+            if (writer == null)
-            {
+            {
-                throw new ArgumentNullException("writer");
+                throw new ArgumentNullException("writer");
-            }
+            }
-
+
-            try
+            try
-            {
+            {
-                using (IsolatedStorageFile store = GetStore())
+                using (var store = GetStore())
-                {
+                {
-                    using (IsolatedStorageFileStream stream = new IsolatedStorageFileStream(path, FileMode.Create, FileAccess.Write, FileShare.None, store))
+                    using (var stream = new IsolatedStorageFileStream(path, FileMode.Create, FileAccess.Write, FileShare.None, store))
-                    {
+                    {
-                        writer(stream);
+                        writer(stream);
-                    }
+                    }
-                }
+                }
-            }
+            }
-            catch (IsolatedStorageException)
+            catch (IsolatedStorageException)
-            {
+            {
-            }
+            }
-        }
+        }
-
+
-        private static IsolatedStorageFile GetStore()
+        private static IsolatedStorageFile GetStore()
-        {
+        {
-            return ApplicationDeployment.IsNetworkDeployed ? // clickonce
+            return ApplicationDeployment.IsNetworkDeployed ? // clickonce
-                IsolatedStorageFile.GetUserStoreForApplication() : IsolatedStorageFile.GetUserStoreForAssembly();
+                IsolatedStorageFile.GetUserStoreForApplication() : IsolatedStorageFile.GetUserStoreForAssembly();
-        }
+        }
-    }
+    }
-}
+}

Virtu/Wpf/Services/WpfVideoService.cs

@@ -1,94 +1,94 @@
-using System;
+using System;
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
-using System.Security.Permissions;
+using System.Security.Permissions;
-using System.Windows;
+using System.Windows;
-using System.Windows.Controls;
+using System.Windows.Controls;
-using System.Windows.Media;
+using System.Windows.Media;
-using System.Windows.Media.Imaging;
+using System.Windows.Media.Imaging;
-using Microsoft.Win32;
+using Microsoft.Win32;
-
+
-namespace Jellyfish.Virtu.Services
+namespace Jellyfish.Virtu.Services
-{
+{
-    public sealed class WpfVideoService : VideoService
+    public sealed class WpfVideoService : VideoService
-    {
+    {
-        [SecurityPermission(SecurityAction.LinkDemand, UnmanagedCode = true)]
+        [SecurityPermission(SecurityAction.LinkDemand, UnmanagedCode = true)]
-        public WpfVideoService(Machine machine, Window window, Image image) : 
+        public WpfVideoService(Machine machine, Window window, Image image) : 
-            base(machine)
+            base(machine)
-        {
+        {
-            if (window == null)
+            if (window == null)
-            {
+            {
-                throw new ArgumentNullException("window");
+                throw new ArgumentNullException("window");
-            }
+            }
-            if (image == null)
+            if (image == null)
-            {
+            {
-                throw new ArgumentNullException("image");
+                throw new ArgumentNullException("image");
-            }
+            }
-
+
-            _window = window;
+            _window = window;
-            _image = image;
+            _image = image;
-
+
-            _image.Source = _bitmap;
+            _image.Source = _bitmap;
-            SetImageSize();
+            SetImageSize();
-
+
-            SystemEvents.DisplaySettingsChanged += (sender, e) => SetImageSize();
+            SystemEvents.DisplaySettingsChanged += (sender, e) => SetImageSize();
-        }
+        }
-
+
-        [SuppressMessage("Microsoft.Usage", "CA2233:OperationsShouldNotOverflow", MessageId = "y*560")]
+        [SuppressMessage("Microsoft.Usage", "CA2233:OperationsShouldNotOverflow", MessageId = "y*560")]
-        public override void SetPixel(int x, int y, uint color)
+        public override void SetPixel(int x, int y, uint color)
-        {
+        {
-            _pixels[y * BitmapWidth + x] = color;
+            _pixels[y * BitmapWidth + x] = color;
-            _pixelsDirty = true;
+            _pixelsDirty = true;
-        }
+        }
-
+
-        public override void Update() // main thread
+        public override void Update() // main thread
-        {
+        {
-            if (_window.IsActive && (_isFullScreen != IsFullScreen))
+            if (_window.IsActive && (_isFullScreen != IsFullScreen))
-            {
+            {
-                if (IsFullScreen)
+                if (IsFullScreen)
-                {
+                {
-                    _window.SizeToContent = SizeToContent.Manual;
+                    _window.SizeToContent = SizeToContent.Manual;
-                    _window.Topmost = true;
+                    _window.Topmost = true;
-                    _window.WindowStyle = WindowStyle.None;
+                    _window.WindowStyle = WindowStyle.None;
-                    _window.WindowState = WindowState.Maximized;
+                    _window.WindowState = WindowState.Maximized;
-                }
+                }
-                else
+                else
-                {
+                {
-                    _window.WindowState = WindowState.Normal;
+                    _window.WindowState = WindowState.Normal;
-                    _window.WindowStyle = WindowStyle.SingleBorderWindow;
+                    _window.WindowStyle = WindowStyle.SingleBorderWindow;
-                    _window.Topmost = false;
+                    _window.Topmost = false;
-                    _window.SizeToContent = SizeToContent.WidthAndHeight;
+                    _window.SizeToContent = SizeToContent.WidthAndHeight;
-                }
+                }
-                _isFullScreen = IsFullScreen;
+                _isFullScreen = IsFullScreen;
-                SetImageSize();
+                SetImageSize();
-            }
+            }
-
+
-            if (_pixelsDirty)
+            if (_pixelsDirty)
-            {
+            {
-                _pixelsDirty = false;
+                _pixelsDirty = false;
-                _bitmap.WritePixels(BitmapRect, _pixels, BitmapStride, 0);
+                _bitmap.WritePixels(BitmapRect, _pixels, BitmapStride, 0);
-            }
+            }
-        }
+        }
-
+
-        private void SetImageSize()
+        private void SetImageSize()
-        {
+        {
-            int uniformScale = IsFullScreen ? Math.Min((int)SystemParameters.PrimaryScreenWidth / BitmapWidth, (int)SystemParameters.PrimaryScreenHeight / BitmapHeight) : 
+            int uniformScale = IsFullScreen ? Math.Min((int)SystemParameters.PrimaryScreenWidth / BitmapWidth, (int)SystemParameters.PrimaryScreenHeight / BitmapHeight) : 
-                Math.Min((int)SystemParameters.FullPrimaryScreenWidth / BitmapWidth, (int)SystemParameters.FullPrimaryScreenHeight / BitmapHeight);
+                Math.Min((int)SystemParameters.FullPrimaryScreenWidth / BitmapWidth, (int)SystemParameters.FullPrimaryScreenHeight / BitmapHeight);
-            _image.Width = uniformScale * BitmapWidth;
+            _image.Width = uniformScale * BitmapWidth;
-            _image.Height = uniformScale * BitmapHeight;
+            _image.Height = uniformScale * BitmapHeight;
-        }
+        }
-
+
-        private const int BitmapWidth = 560;
+        private const int BitmapWidth = 560;
-        private const int BitmapHeight = 384;
+        private const int BitmapHeight = 384;
-        private const int BitmapDpi = 96;
+        private const int BitmapDpi = 96;
-        private static readonly PixelFormat BitmapPixelFormat = PixelFormats.Bgr32;
+        private static readonly PixelFormat BitmapPixelFormat = PixelFormats.Bgr32;
-        private static readonly int BitmapStride = (BitmapWidth * BitmapPixelFormat.BitsPerPixel + 7) / 8;
+        private static readonly int BitmapStride = (BitmapWidth * BitmapPixelFormat.BitsPerPixel + 7) / 8;
-        private static readonly Int32Rect BitmapRect = new Int32Rect(0, 0, BitmapWidth, BitmapHeight);
+        private static readonly Int32Rect BitmapRect = new Int32Rect(0, 0, BitmapWidth, BitmapHeight);
-
+
-        private Window _window;
+        private Window _window;
-        private Image _image;
+        private Image _image;
-        private WriteableBitmap _bitmap = new WriteableBitmap(BitmapWidth, BitmapHeight, BitmapDpi, BitmapDpi, BitmapPixelFormat, null);
+        private WriteableBitmap _bitmap = new WriteableBitmap(BitmapWidth, BitmapHeight, BitmapDpi, BitmapDpi, BitmapPixelFormat, null);
-        private uint[] _pixels = new uint[BitmapWidth * BitmapHeight];
+        private uint[] _pixels = new uint[BitmapWidth * BitmapHeight];
-        private bool _pixelsDirty;
+        private bool _pixelsDirty;
-        private bool _isFullScreen;
+        private bool _isFullScreen;
-    }
+    }
-}
+}

Virtu/Xna/MainApp.cs

@@ -1,13 +1,13 @@
-namespace Jellyfish.Virtu
+namespace Jellyfish.Virtu
-{
+{
-    static class MainApp
+    static class MainApp
-    {
+    {
-        static void Main()
+        static void Main()
-        {
+        {
-            using (MainGame game = new MainGame())
+            using (var game = new MainGame())
-            {
+            {
-                game.Run();
+                game.Run();
-            }
+            }
-        }
+        }
-    }
+    }
-}
+}

Virtu/Xna/MainGame.cs

@@ -1,81 +1,81 @@
-using Jellyfish.Library;
+using Jellyfish.Library;
-using Jellyfish.Virtu.Services;
+using Jellyfish.Virtu.Services;
-using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
+using Microsoft.Xna.Framework.Graphics;
-
+
-namespace Jellyfish.Virtu
+namespace Jellyfish.Virtu
-{
+{
-    public sealed class MainGame : GameBase
+    public sealed class MainGame : GameBase
-    {
+    {
-        public MainGame() : 
+        public MainGame() : 
-            base("Virtu")
+            base("Virtu")
-        {
+        {
-            Components.Add(new FrameRateCounter(this) { DrawOrder = 1, FontName = "Consolas" });
+            Components.Add(new FrameRateCounter(this) { DrawOrder = 1, FontName = "Consolas" });
-
+
-            _storageService = new XnaStorageService(_machine, this);
+            _storageService = new XnaStorageService(_machine, this);
-            _keyboardService = new XnaKeyboardService(_machine);
+            _keyboardService = new XnaKeyboardService(_machine);
-            _gamePortService = new XnaGamePortService(_machine);
+            _gamePortService = new XnaGamePortService(_machine);
-#if XBOX
+#if XBOX
-            _audioService = new AudioService(_machine); // not connected
+            _audioService = new AudioService(_machine); // not connected
-#else
+#else
-            _audioService = new XnaAudioService(_machine, this);
+            _audioService = new XnaAudioService(_machine, this);
-#endif
+#endif
-            _videoService = new XnaVideoService(_machine, this);
+            _videoService = new XnaVideoService(_machine, this);
-
+
-            _machine.Services.AddService(typeof(StorageService), _storageService);
+            _machine.Services.AddService(typeof(StorageService), _storageService);
-            _machine.Services.AddService(typeof(KeyboardService), _keyboardService);
+            _machine.Services.AddService(typeof(KeyboardService), _keyboardService);
-            _machine.Services.AddService(typeof(GamePortService), _gamePortService);
+            _machine.Services.AddService(typeof(GamePortService), _gamePortService);
-            _machine.Services.AddService(typeof(AudioService), _audioService);
+            _machine.Services.AddService(typeof(AudioService), _audioService);
-            _machine.Services.AddService(typeof(VideoService), _videoService);
+            _machine.Services.AddService(typeof(VideoService), _videoService);
-        }
+        }
-
+
-        protected override void Dispose(bool disposing)
+        protected override void Dispose(bool disposing)
-        {
+        {
-            if (disposing)
+            if (disposing)
-            {
+            {
-                _machine.Dispose();
+                _machine.Dispose();
-                _storageService.Dispose();
+                _storageService.Dispose();
-                _keyboardService.Dispose();
+                _keyboardService.Dispose();
-                _gamePortService.Dispose();
+                _gamePortService.Dispose();
-                _audioService.Dispose();
+                _audioService.Dispose();
-                _videoService.Dispose();
+                _videoService.Dispose();
-            }
+            }
-
+
-            base.Dispose(disposing);
+            base.Dispose(disposing);
-        }
+        }
-
+
-        protected override void BeginRun()
+        protected override void BeginRun()
-        {
+        {
-            _machine.Start();
+            _machine.Start();
-        }
+        }
-
+
-        protected override void Update(GameTime gameTime)
+        protected override void Update(GameTime gameTime)
-        {
+        {
-            _keyboardService.Update();
+            _keyboardService.Update();
-            _gamePortService.Update();
+            _gamePortService.Update();
-
+
-            base.Update(gameTime);
+            base.Update(gameTime);
-        }
+        }
-
+
-        protected override void Draw(GameTime gameTime)
+        protected override void Draw(GameTime gameTime)
-        {
+        {
-            GraphicsDevice.Clear(Color.Black);
+            GraphicsDevice.Clear(Color.Black);
-            _videoService.Update();
+            _videoService.Update();
-
+
-            base.Draw(gameTime);
+            base.Draw(gameTime);
-        }
+        }
-
+
-        protected override void EndRun()
+        protected override void EndRun()
-        {
+        {
-            _machine.Stop();
+            _machine.Stop();
-        }
+        }
-
+
-        private Machine _machine = new Machine();
+        private Machine _machine = new Machine();
-
+
-        private StorageService _storageService;
+        private StorageService _storageService;
-        private KeyboardService _keyboardService;
+        private KeyboardService _keyboardService;
-        private GamePortService _gamePortService;
+        private GamePortService _gamePortService;
-        private AudioService _audioService;
+        private AudioService _audioService;
-        private VideoService _videoService;
+        private VideoService _videoService;
-    }
+    }
-}
+}

Virtu/Xna/Properties/AssemblyInfo.cs

@@ -1,28 +1,28 @@
-using System;
+using System;
-using System.Reflection;
+using System.Reflection;
-using System.Resources;
+using System.Resources;
-using System.Runtime.InteropServices;
+using System.Runtime.InteropServices;
-using Jellyfish.Library;
+using Jellyfish.Library;
-
+
-[assembly: AssemblyTitle("Virtu")]
+[assembly: AssemblyTitle("Virtu")]
-[assembly: AssemblyDescription("Apple IIe Emulator")]
+[assembly: AssemblyDescription("Apple IIe Emulator")]
-#if XBOX
+#if XBOX
-[assembly: AssemblyProduct("Jellyfish.Virtu.Xna.Xbox")]
+[assembly: AssemblyProduct("Jellyfish.Virtu.Xna.Xbox")]
-#else
+#else
-[assembly: AssemblyProduct("Jellyfish.Virtu.Xna")]
+[assembly: AssemblyProduct("Jellyfish.Virtu.Xna")]
-#endif
+#endif
-[assembly: AssemblyCompany("Digital Jellyfish Design Ltd")]
+[assembly: AssemblyCompany("Digital Jellyfish Design Ltd")]
-[assembly: AssemblyCopyright("Copyright © 1995-2010 Digital Jellyfish Design Ltd")]
+[assembly: AssemblyCopyright("Copyright © 1995-2010 Digital Jellyfish Design Ltd")]
-[assembly: AssemblyComment("Developed by Sean Fausett & Nick Westgate")]
+[assembly: AssemblyComment("Developed by Sean Fausett & Nick Westgate")]
-
+
-[assembly: AssemblyVersion("0.8.0.0")]
+[assembly: AssemblyVersion("0.8.0.0")]
-#if WINDOWS
+#if WINDOWS
-[assembly: AssemblyFileVersion("0.8.0.0")]
+[assembly: AssemblyFileVersion("0.8.0.0")]
-#endif
+#endif
-[assembly: AssemblyInformationalVersion("0.8.0.0")]
+[assembly: AssemblyInformationalVersion("0.8.0.0")]
-
+
-[assembly: CLSCompliant(false)]
+[assembly: CLSCompliant(false)]
-[assembly: ComVisible(false)]
+[assembly: ComVisible(false)]
-[assembly: Guid("89a50370-1ed9-4cf1-ad08-043b6e6f3c90")]
+[assembly: Guid("89a50370-1ed9-4cf1-ad08-043b6e6f3c90")]
-
+
-[assembly: NeutralResourcesLanguage("en")]
+[assembly: NeutralResourcesLanguage("en")]

Virtu/Xna/Services/XnaAudioService.cs

@@ -32,10 +32,7 @@ protected override void Dispose(bool disposing)
 
         private void OnDirectSoundUpdate(object sender, DirectSoundUpdateEventArgs e) // audio thread
         {
-            Update(e.BufferSize, (source, count) => 
+            Update(e.BufferSize, (source, count) => Marshal.Copy(source, 0, e.Buffer, count));
-            {
-                Marshal.Copy(source, 0, e.Buffer, count);
-            });
         }
 
         private GameBase _game;

Virtu/Xna/Services/XnaGamePortService.cs

@@ -1,64 +1,64 @@
-using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Input;
+using Microsoft.Xna.Framework.Input;
-
+
-namespace Jellyfish.Virtu.Services
+namespace Jellyfish.Virtu.Services
-{
+{
-    public sealed class XnaGamePortService : GamePortService
+    public sealed class XnaGamePortService : GamePortService
-    {
+    {
-        public XnaGamePortService(Machine machine) : 
+        public XnaGamePortService(Machine machine) : 
-            base(machine)
+            base(machine)
-        {
+        {
-        }
+        }
-
+
-        public override void Update() // main thread
+        public override void Update() // main thread
-        {
+        {
-            _lastState = _state;
+            _lastState = _state;
-            _state = GamePad.GetState(PlayerIndex.One);
+            _state = GamePad.GetState(PlayerIndex.One);
-
+
-            if (_state.IsConnected && (_state != _lastState))
+            if (_state.IsConnected && (_state != _lastState))
-            {
+            {
-                Vector2 left = _state.ThumbSticks.Left;
+                var left = _state.ThumbSticks.Left;
-                Vector2 right = _state.ThumbSticks.Right;
+                var right = _state.ThumbSticks.Right;
-                GamePadDPad dpad = _state.DPad;
+                var dpad = _state.DPad;
-
+
-                Paddle0 = (int)((1 + left.X) * PaddleScale);
+                Paddle0 = (int)((1 + left.X) * PaddleScale);
-                Paddle1 = (int)((1 - left.Y) * PaddleScale); // invert y
+                Paddle1 = (int)((1 - left.Y) * PaddleScale); // invert y
-                Paddle2 = (int)((1 + right.X) * PaddleScale);
+                Paddle2 = (int)((1 + right.X) * PaddleScale);
-                Paddle3 = (int)((1 - right.Y) * PaddleScale); // invert y
+                Paddle3 = (int)((1 - right.Y) * PaddleScale); // invert y
-
+
-                Joystick0 = GetJoystick(ref left, ref dpad);
+                Joystick0 = GetJoystick(ref left, ref dpad);
-                Joystick1 = GetJoystick(ref right);
+                Joystick1 = GetJoystick(ref right);
-
+
-                IsButton0Down = ((_state.Buttons.A == ButtonState.Pressed) || (_state.Buttons.LeftShoulder == ButtonState.Pressed));
+                IsButton0Down = ((_state.Buttons.A == ButtonState.Pressed) || (_state.Buttons.LeftShoulder == ButtonState.Pressed));
-                IsButton1Down = ((_state.Buttons.B == ButtonState.Pressed) || (_state.Buttons.RightShoulder == ButtonState.Pressed));
+                IsButton1Down = ((_state.Buttons.B == ButtonState.Pressed) || (_state.Buttons.RightShoulder == ButtonState.Pressed));
-                IsButton2Down = (_state.Buttons.X == ButtonState.Pressed);
+                IsButton2Down = (_state.Buttons.X == ButtonState.Pressed);
-            }
+            }
-        }
+        }
-
+
-        private static Joystick GetJoystick(ref Vector2 thumbstick)
+        private static Joystick GetJoystick(ref Vector2 thumbstick)
-        {
+        {
-            bool isUp = (thumbstick.Y > JoystickDeadZone);
+            bool isUp = (thumbstick.Y > JoystickDeadZone);
-            bool isLeft = (thumbstick.X < -JoystickDeadZone);
+            bool isLeft = (thumbstick.X < -JoystickDeadZone);
-            bool isRight = (thumbstick.X > JoystickDeadZone);
+            bool isRight = (thumbstick.X > JoystickDeadZone);
-            bool isDown = (thumbstick.Y < -JoystickDeadZone);
+            bool isDown = (thumbstick.Y < -JoystickDeadZone);
-
+
-            return new Joystick(isUp, isLeft, isRight, isDown);
+            return new Joystick(isUp, isLeft, isRight, isDown);
-        }
+        }
-
+
-        private static Joystick GetJoystick(ref Vector2 thumbstick, ref GamePadDPad dpad)
+        private static Joystick GetJoystick(ref Vector2 thumbstick, ref GamePadDPad dpad)
-        {
+        {
-            bool isUp = ((thumbstick.Y > JoystickDeadZone) || (dpad.Up == ButtonState.Pressed));
+            bool isUp = ((thumbstick.Y > JoystickDeadZone) || (dpad.Up == ButtonState.Pressed));
-            bool isLeft = ((thumbstick.X < -JoystickDeadZone) || (dpad.Left == ButtonState.Pressed));
+            bool isLeft = ((thumbstick.X < -JoystickDeadZone) || (dpad.Left == ButtonState.Pressed));
-            bool isRight = ((thumbstick.X > JoystickDeadZone) || (dpad.Right == ButtonState.Pressed));
+            bool isRight = ((thumbstick.X > JoystickDeadZone) || (dpad.Right == ButtonState.Pressed));
-            bool isDown = ((thumbstick.Y < -JoystickDeadZone) || (dpad.Down == ButtonState.Pressed));
+            bool isDown = ((thumbstick.Y < -JoystickDeadZone) || (dpad.Down == ButtonState.Pressed));
-
+
-            return new Joystick(isUp, isLeft, isRight, isDown);
+            return new Joystick(isUp, isLeft, isRight, isDown);
-        }
+        }
-
+
-        private const int PaddleScale = 128;
+        private const int PaddleScale = 128;
-        private const float JoystickDeadZone = 0.5f;
+        private const float JoystickDeadZone = 0.5f;
-
+
-        private GamePadState _state;
+        private GamePadState _state;
-        private GamePadState _lastState;
+        private GamePadState _lastState;
-    }
+    }
-}
+}

Virtu/Xna/Services/XnaKeyboardService.cs

@@ -1,325 +1,325 @@
-using System;
+using System;
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
-using System.Linq;
+using System.Linq;
-using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Input;
+using Microsoft.Xna.Framework.Input;
-
+
-namespace Jellyfish.Virtu.Services
+namespace Jellyfish.Virtu.Services
-{
+{
-    public sealed class XnaKeyboardService : KeyboardService
+    public sealed class XnaKeyboardService : KeyboardService
-    {
+    {
-        public XnaKeyboardService(Machine machine) : 
+        public XnaKeyboardService(Machine machine) : 
-            base(machine)
+            base(machine)
-        {
+        {
-        }
+        }
-
+
-        public override bool IsKeyDown(int key)
+        public override bool IsKeyDown(int key)
-        {
+        {
-            return IsKeyDown((Keys)key);
+            return IsKeyDown((Keys)key);
-        }
+        }
-
+
-        public override void Update() // main thread
+        public override void Update() // main thread
-        {
+        {
-            _lastState = _state;
+            _lastState = _state;
-            _state = Microsoft.Xna.Framework.Input.Keyboard.GetState();
+            _state = Microsoft.Xna.Framework.Input.Keyboard.GetState();
-
+
-            GamePadState gamePadState = GamePad.GetState(PlayerIndex.One);
+            var gamePadState = GamePad.GetState(PlayerIndex.One);
-            bool gamePadControl = (gamePadState.Buttons.LeftStick == ButtonState.Pressed);
+            bool gamePadControl = (gamePadState.Buttons.LeftStick == ButtonState.Pressed);
-
+
-            if (_state != _lastState)
+            if (_state != _lastState)
-            {
+            {
-                IsAnyKeyDown = false;
+                IsAnyKeyDown = false;
-                foreach (Keys key in KeyValues) // xna doesn't support buffered input; loses input order and could lose keys between updates
+                foreach (Keys key in KeyValues) // xna doesn't support buffered input; loses input order and could lose keys between updates
-                {
+                {
-                    if (_state.IsKeyDown(key))
+                    if (_state.IsKeyDown(key))
-                    {
+                    {
-                        IsAnyKeyDown = true;
+                        IsAnyKeyDown = true;
-                        if (!_lastState.IsKeyDown(key))
+                        if (!_lastState.IsKeyDown(key))
-                        {
+                        {
-                            _lastKey = key;
+                            _lastKey = key;
-                            _lastTime = DateTime.UtcNow.Ticks;
+                            _lastTime = DateTime.UtcNow.Ticks;
-                            _repeatTime = RepeatDelay;
+                            _repeatTime = RepeatDelay;
-                            OnKeyDown(key, gamePadControl);
+                            OnKeyDown(key, gamePadControl);
-                        }
+                        }
-                    }
+                    }
-                    else
+                    else
-                    {
+                    {
-                        if (key == _lastKey)
+                        if (key == _lastKey)
-                        {
+                        {
-                            _lastKey = Keys.None;
+                            _lastKey = Keys.None;
-                        }
+                        }
-                        if (_lastState.IsKeyDown(key))
+                        if (_lastState.IsKeyDown(key))
-                        {
+                        {
-                            OnKeyUp(key, gamePadControl);
+                            OnKeyUp(key, gamePadControl);
-                        }
+                        }
-                    }
+                    }
-                }
+                }
-            }
+            }
-
+
-            if (_lastKey != Keys.None) // repeat last key
+            if (_lastKey != Keys.None) // repeat last key
-            {
+            {
-                long time = DateTime.UtcNow.Ticks;
+                long time = DateTime.UtcNow.Ticks;
-                if (time - _lastTime >= _repeatTime)
+                if (time - _lastTime >= _repeatTime)
-                {
+                {
-                    _lastTime = time;
+                    _lastTime = time;
-                    _repeatTime = RepeatSpeed;
+                    _repeatTime = RepeatSpeed;
-                    OnKeyDown(_lastKey, gamePadControl);
+                    OnKeyDown(_lastKey, gamePadControl);
-                }
+                }
-            }
+            }
-
+
-            bool control = IsKeyDown(Keys.LeftControl) || IsKeyDown(Keys.RightControl);
+            bool control = IsKeyDown(Keys.LeftControl) || IsKeyDown(Keys.RightControl);
-
+
-            IsOpenAppleKeyDown = IsKeyDown(Keys.LeftAlt) || IsKeyDown(Keys.NumPad0) || (gamePadState.Buttons.LeftShoulder == ButtonState.Pressed);
+            IsOpenAppleKeyDown = IsKeyDown(Keys.LeftAlt) || IsKeyDown(Keys.NumPad0) || (gamePadState.Buttons.LeftShoulder == ButtonState.Pressed);
-            IsCloseAppleKeyDown = IsKeyDown(Keys.RightAlt) || IsKeyDown(Keys.Decimal) || (gamePadState.Buttons.RightShoulder == ButtonState.Pressed);
+            IsCloseAppleKeyDown = IsKeyDown(Keys.RightAlt) || IsKeyDown(Keys.Decimal) || (gamePadState.Buttons.RightShoulder == ButtonState.Pressed);
-            IsResetKeyDown = (control && IsKeyDown(Keys.Back)) || (gamePadControl && (gamePadState.Buttons.Start == ButtonState.Pressed));
+            IsResetKeyDown = (control && IsKeyDown(Keys.Back)) || (gamePadControl && (gamePadState.Buttons.Start == ButtonState.Pressed));
-
+
-            base.Update();
+            base.Update();
-        }
+        }
-
+
-        private bool IsKeyDown(Keys key)
+        private bool IsKeyDown(Keys key)
-        {
+        {
-            return _state.IsKeyDown(key);
+            return _state.IsKeyDown(key);
-        }
+        }
-
+
-        private void OnKeyDown(Keys key, bool gamePadControl)
+        private void OnKeyDown(Keys key, bool gamePadControl)
-        {
+        {
-            int asciiKey = GetAsciiKey(key, gamePadControl);
+            int asciiKey = GetAsciiKey(key, gamePadControl);
-            if (asciiKey >= 0)
+            if (asciiKey >= 0)
-            {
+            {
-                OnAsciiKeyDown(asciiKey);
+                OnAsciiKeyDown(asciiKey);
-            }
+            }
-        }
+        }
-
+
-        private void OnKeyUp(Keys key, bool gamePadControl)
+        private void OnKeyUp(Keys key, bool gamePadControl)
-        {
+        {
-            bool control = IsKeyDown(Keys.LeftControl) || IsKeyDown(Keys.RightControl);
+            bool control = IsKeyDown(Keys.LeftControl) || IsKeyDown(Keys.RightControl);
-
+
-            if (key == Keys.CapsLock)
+            if (key == Keys.CapsLock)
-            {
+            {
-                _capsLock ^= true;
+                _capsLock ^= true;
-            }
+            }
-            else if ((control && (key == Keys.Divide)) || (gamePadControl && (key == Keys.D8)))
+            else if ((control && (key == Keys.Divide)) || (gamePadControl && (key == Keys.D8)))
-            {
+            {
-                Machine.Cpu.ToggleThrottle();
+                Machine.Cpu.ToggleThrottle();
-            }
+            }
-            else if ((control && (key == Keys.Multiply)) || (gamePadControl && (key == Keys.D9)))
+            else if ((control && (key == Keys.Multiply)) || (gamePadControl && (key == Keys.D9)))
-            {
+            {
-                Machine.Video.ToggleMonochrome();
+                Machine.Video.ToggleMonochrome();
-            }
+            }
-#if WINDOWS
+#if WINDOWS
-            else if ((control && (key == Keys.Subtract)) || (gamePadControl && (key == Keys.D0)))
+            else if ((control && (key == Keys.Subtract)) || (gamePadControl && (key == Keys.D0)))
-            {
+            {
-                Machine.Video.ToggleFullScreen();
+                Machine.Video.ToggleFullScreen();
-            }
+            }
-#endif
+#endif
-        }
+        }
-
+
-        [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
+        [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [SuppressMessage("Microsoft.Maintainability", "CA1505:AvoidUnmaintainableCode")]
+        [SuppressMessage("Microsoft.Maintainability", "CA1505:AvoidUnmaintainableCode")]
-        private int GetAsciiKey(Keys key, bool gamePadControl)
+        private int GetAsciiKey(Keys key, bool gamePadControl)
-        {
+        {
-            bool control = IsKeyDown(Keys.LeftControl) || IsKeyDown(Keys.RightControl) || gamePadControl;
+            bool control = IsKeyDown(Keys.LeftControl) || IsKeyDown(Keys.RightControl) || gamePadControl;
-            bool shift = IsKeyDown(Keys.LeftShift) || IsKeyDown(Keys.RightShift);
+            bool shift = IsKeyDown(Keys.LeftShift) || IsKeyDown(Keys.RightShift);
-            bool capsLock = shift ^ _capsLock;
+            bool capsLock = shift ^ _capsLock;
-            bool green = IsKeyDown(Keys.ChatPadGreen);
+            bool green = IsKeyDown(Keys.ChatPadGreen);
-            bool orange = IsKeyDown(Keys.ChatPadOrange);
+            bool orange = IsKeyDown(Keys.ChatPadOrange);
-
+
-            switch (key)
+            switch (key)
-            {
+            {
-            case Keys.Left:
+            case Keys.Left:
-                return 0x08;
+                return 0x08;
-
+
-            case Keys.Tab:
+            case Keys.Tab:
-                return 0x09;
+                return 0x09;
-
+
-            case Keys.Down:
+            case Keys.Down:
-                return 0x0A;
+                return 0x0A;
-
+
-            case Keys.Up:
+            case Keys.Up:
-                return 0x0B;
+                return 0x0B;
-
+
-            case Keys.Enter:
+            case Keys.Enter:
-                return 0x0D;
+                return 0x0D;
-
+
-            case Keys.Right:
+            case Keys.Right:
-                return 0x15;
+                return 0x15;
-
+
-            case Keys.Escape:
+            case Keys.Escape:
-                return 0x1B;
+                return 0x1B;
-
+
-            case Keys.Back:
+            case Keys.Back:
-                return control ? -1 : 0x7F;
+                return control ? -1 : 0x7F;
-
+
-            case Keys.Space:
+            case Keys.Space:
-                return ' ';
+                return ' ';
-
+
-            case Keys.D1:
+            case Keys.D1:
-                return shift ? '!' : '1';
+                return shift ? '!' : '1';
-
+
-            case Keys.D2:
+            case Keys.D2:
-                return control ? 0x00 : shift ? '@' : '2';
+                return control ? 0x00 : shift ? '@' : '2';
-
+
-            case Keys.D3:
+            case Keys.D3:
-                return shift ? '#' : '3';
+                return shift ? '#' : '3';
-
+
-            case Keys.D4:
+            case Keys.D4:
-                return shift ? '$' : '4';
+                return shift ? '$' : '4';
-
+
-            case Keys.D5:
+            case Keys.D5:
-                return shift ? '%' : '5';
+                return shift ? '%' : '5';
-
+
-            case Keys.D6:
+            case Keys.D6:
-                return control ? 0x1E : shift ? '^' : '6';
+                return control ? 0x1E : shift ? '^' : '6';
-
+
-            case Keys.D7:
+            case Keys.D7:
-                return shift ? '&' : '7';
+                return shift ? '&' : '7';
-
+
-            case Keys.D8:
+            case Keys.D8:
-                return gamePadControl ? -1 : shift ? '*' : '8';
+                return gamePadControl ? -1 : shift ? '*' : '8';
-
+
-            case Keys.D9:
+            case Keys.D9:
-                return gamePadControl ? -1 : shift ? '(' : '9';
+                return gamePadControl ? -1 : shift ? '(' : '9';
-
+
-            case Keys.D0:
+            case Keys.D0:
-                return gamePadControl ? -1 : shift ? ')' : '0';
+                return gamePadControl ? -1 : shift ? ')' : '0';
-
+
-            case Keys.A:
+            case Keys.A:
-                return control ? 0x01 : green ? '~' : capsLock ? 'A' : 'a';
+                return control ? 0x01 : green ? '~' : capsLock ? 'A' : 'a';
-
+
-            case Keys.B:
+            case Keys.B:
-                return control ? 0x02 : green ? '|' : orange ? '+' : capsLock ? 'B' : 'b';
+                return control ? 0x02 : green ? '|' : orange ? '+' : capsLock ? 'B' : 'b';
-
+
-            case Keys.C:
+            case Keys.C:
-                return control ? 0x03 : capsLock ? 'C' : 'c';
+                return control ? 0x03 : capsLock ? 'C' : 'c';
-
+
-            case Keys.D:
+            case Keys.D:
-                return control ? 0x04 : green ? '{' : capsLock ? 'D' : 'd';
+                return control ? 0x04 : green ? '{' : capsLock ? 'D' : 'd';
-
+
-            case Keys.E:
+            case Keys.E:
-                return control ? 0x05 : capsLock ? 'E' : 'e';
+                return control ? 0x05 : capsLock ? 'E' : 'e';
-
+
-            case Keys.F:
+            case Keys.F:
-                return control ? 0x06 : green ? '}' : capsLock ? 'F' : 'f';
+                return control ? 0x06 : green ? '}' : capsLock ? 'F' : 'f';
-
+
-            case Keys.G:
+            case Keys.G:
-                return control ? 0x07 : capsLock ? 'G' : 'g';
+                return control ? 0x07 : capsLock ? 'G' : 'g';
-
+
-            case Keys.H:
+            case Keys.H:
-                return control ? 0x08 : green ? '/' : orange ? '\\' : capsLock ? 'H' : 'h';
+                return control ? 0x08 : green ? '/' : orange ? '\\' : capsLock ? 'H' : 'h';
-
+
-            case Keys.I:
+            case Keys.I:
-                return control ? 0x09 : green ? '*' : capsLock ? 'I' : 'i';
+                return control ? 0x09 : green ? '*' : capsLock ? 'I' : 'i';
-
+
-            case Keys.J:
+            case Keys.J:
-                return control ? 0x0A : green ? '\'' : orange ? '"' : capsLock ? 'J' : 'j';
+                return control ? 0x0A : green ? '\'' : orange ? '"' : capsLock ? 'J' : 'j';
-
+
-            case Keys.K:
+            case Keys.K:
-                return control ? 0x0B : green ? '[' : capsLock ? 'K' : 'k';
+                return control ? 0x0B : green ? '[' : capsLock ? 'K' : 'k';
-
+
-            case Keys.L:
+            case Keys.L:
-                return control ? 0x0C : green ? ']' : capsLock ? 'L' : 'l';
+                return control ? 0x0C : green ? ']' : capsLock ? 'L' : 'l';
-
+
-            case Keys.M:
+            case Keys.M:
-                return control ? 0x0D : green ? '>' : capsLock ? 'M' : 'm';
+                return control ? 0x0D : green ? '>' : capsLock ? 'M' : 'm';
-
+
-            case Keys.N:
+            case Keys.N:
-                return control ? 0x0E : green ? '<' : capsLock ? 'N' : 'n';
+                return control ? 0x0E : green ? '<' : capsLock ? 'N' : 'n';
-
+
-            case Keys.O:
+            case Keys.O:
-                return control ? 0x0F : green ? '(' : capsLock ? 'O' : 'o';
+                return control ? 0x0F : green ? '(' : capsLock ? 'O' : 'o';
-
+
-            case Keys.P:
+            case Keys.P:
-                return control ? 0x10 : green ? ')' : orange ? '=' : capsLock ? 'P' : 'p';
+                return control ? 0x10 : green ? ')' : orange ? '=' : capsLock ? 'P' : 'p';
-
+
-            case Keys.Q:
+            case Keys.Q:
-                return control ? 0x11 : green ? '!' : capsLock ? 'Q' : 'q';
+                return control ? 0x11 : green ? '!' : capsLock ? 'Q' : 'q';
-
+
-            case Keys.R:
+            case Keys.R:
-                return control ? 0x12 : green ? '#' : orange ? '$' : capsLock ? 'R' : 'r';
+                return control ? 0x12 : green ? '#' : orange ? '$' : capsLock ? 'R' : 'r';
-
+
-            case Keys.S:
+            case Keys.S:
-                return control ? 0x13 : capsLock ? 'S' : 's';
+                return control ? 0x13 : capsLock ? 'S' : 's';
-
+
-            case Keys.T:
+            case Keys.T:
-                return control ? 0x14 : green ? '%' : capsLock ? 'T' : 't';
+                return control ? 0x14 : green ? '%' : capsLock ? 'T' : 't';
-
+
-            case Keys.U:
+            case Keys.U:
-                return control ? 0x15 : green ? '&' : capsLock ? 'U' : 'u';
+                return control ? 0x15 : green ? '&' : capsLock ? 'U' : 'u';
-
+
-            case Keys.V:
+            case Keys.V:
-                return control ? 0x16 : green ? '-' : orange ? '_' : capsLock ? 'V' : 'v';
+                return control ? 0x16 : green ? '-' : orange ? '_' : capsLock ? 'V' : 'v';
-
+
-            case Keys.W:
+            case Keys.W:
-                return control ? 0x17 : green ? '@' : capsLock ? 'W' : 'w';
+                return control ? 0x17 : green ? '@' : capsLock ? 'W' : 'w';
-
+
-            case Keys.X:
+            case Keys.X:
-                return control ? 0x18 : capsLock ? 'X' : 'x';
+                return control ? 0x18 : capsLock ? 'X' : 'x';
-
+
-            case Keys.Y:
+            case Keys.Y:
-                return control ? 0x19 : green ? '^' : capsLock ? 'Y' : 'y';
+                return control ? 0x19 : green ? '^' : capsLock ? 'Y' : 'y';
-
+
-            case Keys.Z:
+            case Keys.Z:
-                return control ? 0x1A : green ? '`' : capsLock ? 'Z' : 'z';
+                return control ? 0x1A : green ? '`' : capsLock ? 'Z' : 'z';
-
+
-            case Keys.OemSemicolon:
+            case Keys.OemSemicolon:
-                return shift ? ':' : ';';
+                return shift ? ':' : ';';
-
+
-            case Keys.OemQuestion:
+            case Keys.OemQuestion:
-                return shift ? '?' : '/';
+                return shift ? '?' : '/';
-
+
-            case Keys.OemTilde:
+            case Keys.OemTilde:
-                return shift ? '~' : '`';
+                return shift ? '~' : '`';
-
+
-            case Keys.OemOpenBrackets:
+            case Keys.OemOpenBrackets:
-                return shift ? '{' : '[';
+                return shift ? '{' : '[';
-
+
-            case Keys.OemBackslash:
+            case Keys.OemBackslash:
-            case Keys.OemPipe:
+            case Keys.OemPipe:
-                return control ? 0x1C : shift ? '|' : '\\';
+                return control ? 0x1C : shift ? '|' : '\\';
-
+
-            case Keys.OemCloseBrackets:
+            case Keys.OemCloseBrackets:
-                return control ? 0x1D : shift ? '}' : ']';
+                return control ? 0x1D : shift ? '}' : ']';
-
+
-            case Keys.OemQuotes:
+            case Keys.OemQuotes:
-                return shift ? '"' : '\'';
+                return shift ? '"' : '\'';
-
+
-            case Keys.OemMinus:
+            case Keys.OemMinus:
-                return control ? 0x1F : shift ? '_' : '-';
+                return control ? 0x1F : shift ? '_' : '-';
-
+
-            case Keys.OemPlus:
+            case Keys.OemPlus:
-                return shift ? '+' : '=';
+                return shift ? '+' : '=';
-
+
-            case Keys.OemComma:
+            case Keys.OemComma:
-                return shift ? '<' : green ? ':' : orange ? ';' : ',';
+                return shift ? '<' : green ? ':' : orange ? ';' : ',';
-
+
-            case Keys.OemPeriod:
+            case Keys.OemPeriod:
-                return shift ? '>' : green ? '?' : '.';
+                return shift ? '>' : green ? '?' : '.';
-            }
+            }
-
+
-            return -1;
+            return -1;
-        }
+        }
-
+
-        private static readonly Keys[] KeyValues = 
+        private static readonly Keys[] KeyValues = 
-#if XBOX
+#if XBOX
-            (from key in 
+            (from key in 
-                (from field in typeof(Keys).GetFields() // missing Enum.GetValues; use reflection
+                (from field in typeof(Keys).GetFields() // missing Enum.GetValues; use reflection
-                where field.IsLiteral
+                where field.IsLiteral
-                select (Keys)field.GetValue(typeof(Keys)))
+                select (Keys)field.GetValue(typeof(Keys)))
-            where (key != Keys.None) // filter Keys.None
+            where (key != Keys.None) // filter Keys.None
-            select key).ToArray();
+            select key).ToArray();
-#else
+#else
-            (from key in (Keys[])Enum.GetValues(typeof(Keys))
+            (from key in (Keys[])Enum.GetValues(typeof(Keys))
-             where (key != Keys.None) // filter Keys.None
+             where (key != Keys.None) // filter Keys.None
-             select key).ToArray();
+             select key).ToArray();
-#endif
+#endif
-        private static readonly long RepeatDelay = TimeSpan.FromMilliseconds(500).Ticks;
+        private static readonly long RepeatDelay = TimeSpan.FromMilliseconds(500).Ticks;
-        private static readonly long RepeatSpeed = TimeSpan.FromMilliseconds(32).Ticks;
+        private static readonly long RepeatSpeed = TimeSpan.FromMilliseconds(32).Ticks;
-
+
-        private KeyboardState _state;
+        private KeyboardState _state;
-        private KeyboardState _lastState;
+        private KeyboardState _lastState;
-        private bool _capsLock;
+        private bool _capsLock;
-        private Keys _lastKey;
+        private Keys _lastKey;
-        private long _lastTime;
+        private long _lastTime;
-        private long _repeatTime;
+        private long _repeatTime;
-    }
+    }
-}
+}

Virtu/Xna/Services/XnaStorageService.cs

@@ -1,63 +1,63 @@
-using System;
+using System;
-using System.IO;
+using System.IO;
-using Jellyfish.Library;
+using Jellyfish.Library;
-using Microsoft.Xna.Framework.GamerServices;
+using Microsoft.Xna.Framework.GamerServices;
-using Microsoft.Xna.Framework.Storage;
+using Microsoft.Xna.Framework.Storage;
-
+
-namespace Jellyfish.Virtu.Services
+namespace Jellyfish.Virtu.Services
-{
+{
-    public sealed class XnaStorageService : StorageService
+    public sealed class XnaStorageService : StorageService
-    {
+    {
-        public XnaStorageService(Machine machine, GameBase game) : 
+        public XnaStorageService(Machine machine, GameBase game) : 
-            base(machine)
+            base(machine)
-        {
+        {
-            if (game == null)
+            if (game == null)
-            {
+            {
-                throw new ArgumentNullException("game");
+                throw new ArgumentNullException("game");
-            }
+            }
-
+
-            _game = game;
+            _game = game;
-        }
+        }
-
+
-        public override void Load(string path, Action<Stream> reader)
+        public override void Load(string path, Action<Stream> reader)
-        {
+        {
-            if (reader == null)
+            if (reader == null)
-            {
+            {
-                throw new ArgumentNullException("reader");
+                throw new ArgumentNullException("reader");
-            }
+            }
-
+
-            try
+            try
-            {
+            {
-                using (StorageContainer storageContainer = _storageDevice.Value.OpenContainer(_game.Name))
+                using (var storageContainer = _storageDevice.Value.OpenContainer(_game.Name))
-                {
+                {
-                    using (FileStream stream = new FileStream(Path.Combine(storageContainer.Path, path), FileMode.Open, FileAccess.Read, FileShare.Read))
+                    using (var stream = new FileStream(Path.Combine(storageContainer.Path, path), FileMode.Open, FileAccess.Read, FileShare.Read))
-                    {
+                    {
-                        reader(stream);
+                        reader(stream);
-                    }
+                    }
-                }
+                }
-            }
+            }
-            catch (FileNotFoundException)
+            catch (FileNotFoundException)
-            {
+            {
-            }
+            }
-        }
+        }
-
+
-        public override void Save(string path, Action<Stream> writer)
+        public override void Save(string path, Action<Stream> writer)
-        {
+        {
-            if (writer == null)
+            if (writer == null)
-            {
+            {
-                throw new ArgumentNullException("writer");
+                throw new ArgumentNullException("writer");
-            }
+            }
-
+
-            using (StorageContainer storageContainer = _storageDevice.Value.OpenContainer(_game.Name))
+            using (var storageContainer = _storageDevice.Value.OpenContainer(_game.Name))
-            {
+            {
-                using (FileStream stream = new FileStream(Path.Combine(storageContainer.Path, path), FileMode.Create, FileAccess.Write, FileShare.None))
+                using (var stream = new FileStream(Path.Combine(storageContainer.Path, path), FileMode.Create, FileAccess.Write, FileShare.None))
-                {
+                {
-                    writer(stream);
+                    writer(stream);
-                }
+                }
-            }
+            }
-        }
+        }
-
+
-        private GameBase _game;
+        private GameBase _game;
-        private Lazy<StorageDevice> _storageDevice = new Lazy<StorageDevice>(() => Guide.EndShowStorageDeviceSelector(Guide.BeginShowStorageDeviceSelector(null, null)));
+        private Lazy<StorageDevice> _storageDevice = new Lazy<StorageDevice>(() => Guide.EndShowStorageDeviceSelector(Guide.BeginShowStorageDeviceSelector(null, null)));
-    }
+    }
-}
+}

Virtu/Xna/Services/XnaVideoService.cs

@@ -1,117 +1,117 @@
-using System;
+using System;
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
-#if WINDOWS
+#if WINDOWS
-using System.Windows;
+using System.Windows;
-#endif
+#endif
-using Jellyfish.Library;
+using Jellyfish.Library;
-using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
+using Microsoft.Xna.Framework.Graphics;
-
+
-namespace Jellyfish.Virtu.Services
+namespace Jellyfish.Virtu.Services
-{
+{
-    public sealed class XnaVideoService : VideoService
+    public sealed class XnaVideoService : VideoService
-    {
+    {
-        public XnaVideoService(Machine machine, GameBase game) : 
+        public XnaVideoService(Machine machine, GameBase game) : 
-            base(machine)
+            base(machine)
-        {
+        {
-            if (game == null)
+            if (game == null)
-            {
+            {
-                throw new ArgumentNullException("game");
+                throw new ArgumentNullException("game");
-            }
+            }
-
+
-            _game = game;
+            _game = game;
-
+
-            _game.GraphicsDeviceManager.PreparingDeviceSettings += OnGraphicsDeviceManagerPreparingDeviceSettings;
+            _game.GraphicsDeviceManager.PreparingDeviceSettings += OnGraphicsDeviceManagerPreparingDeviceSettings;
-            _game.GraphicsDeviceService.DeviceCreated += OnGraphicsDeviceServiceDeviceCreated;
+            _game.GraphicsDeviceService.DeviceCreated += OnGraphicsDeviceServiceDeviceCreated;
-            _game.GraphicsDeviceService.DeviceReset += (sender, e) => SetTexturePosition();
+            _game.GraphicsDeviceService.DeviceReset += (sender, e) => SetTexturePosition();
-        }
+        }
-
+
-        [SuppressMessage("Microsoft.Usage", "CA2233:OperationsShouldNotOverflow", MessageId = "y*560")]
+        [SuppressMessage("Microsoft.Usage", "CA2233:OperationsShouldNotOverflow", MessageId = "y*560")]
-        public override void SetPixel(int x, int y, uint color)
+        public override void SetPixel(int x, int y, uint color)
-        {
+        {
-            _pixels[y * TextureWidth + x] = color;
+            _pixels[y * TextureWidth + x] = color;
-            _pixelsDirty = true;
+            _pixelsDirty = true;
-        }
+        }
-
+
-        public override void Update() // main thread
+        public override void Update() // main thread
-        {
+        {
-#if WINDOWS
+#if WINDOWS
-            if (_game.GraphicsDeviceManager.IsFullScreen != IsFullScreen)
+            if (_game.GraphicsDeviceManager.IsFullScreen != IsFullScreen)
-            {
+            {
-                _game.GraphicsDeviceManager.ToggleFullScreen();
+                _game.GraphicsDeviceManager.ToggleFullScreen();
-            }
+            }
-#endif
+#endif
-            if (_pixelsDirty)
+            if (_pixelsDirty)
-            {
+            {
-                _pixelsDirty = false;
+                _pixelsDirty = false;
-                _texture.SetData(_pixels);
+                _texture.SetData(_pixels);
-            }
+            }
-
+
-            _spriteBatch.Begin(SpriteBlendMode.None, SpriteSortMode.Immediate, SaveStateMode.None);
+            _spriteBatch.Begin(SpriteBlendMode.None, SpriteSortMode.Immediate, SaveStateMode.None);
-            _graphicsDevice.SamplerStates[0].MagFilter = TextureFilter.Point;
+            _graphicsDevice.SamplerStates[0].MagFilter = TextureFilter.Point;
-            _spriteBatch.Draw(_texture, _texturePosition, null, Color.White, 0, Vector2.Zero, _textureScale, SpriteEffects.None, 0);
+            _spriteBatch.Draw(_texture, _texturePosition, null, Color.White, 0, Vector2.Zero, _textureScale, SpriteEffects.None, 0);
-            _spriteBatch.End();
+            _spriteBatch.End();
-        }
+        }
-
+
-        protected override void Dispose(bool disposing)
+        protected override void Dispose(bool disposing)
-        {
+        {
-            if (disposing)
+            if (disposing)
-            {
+            {
-                _spriteBatch.Dispose();
+                _spriteBatch.Dispose();
-                _texture.Dispose();
+                _texture.Dispose();
-            }
+            }
-        }
+        }
-
+
-        private void OnGraphicsDeviceManagerPreparingDeviceSettings(object sender, PreparingDeviceSettingsEventArgs e)
+        private void OnGraphicsDeviceManagerPreparingDeviceSettings(object sender, PreparingDeviceSettingsEventArgs e)
-        {
+        {
-            DisplayMode displayMode = e.GraphicsDeviceInformation.Adapter.CurrentDisplayMode;
+            var displayMode = e.GraphicsDeviceInformation.Adapter.CurrentDisplayMode;
-            PresentationParameters presentationParameters = e.GraphicsDeviceInformation.PresentationParameters;
+            var presentationParameters = e.GraphicsDeviceInformation.PresentationParameters;
-
+
-#if WINDOWS
+#if WINDOWS
-            if (presentationParameters.IsFullScreen)
+            if (presentationParameters.IsFullScreen)
-            {
+            {
-                _textureScale = Math.Min((int)SystemParameters.PrimaryScreenWidth / TextureWidth, (int)SystemParameters.PrimaryScreenHeight / TextureHeight);
+                _textureScale = Math.Min((int)SystemParameters.PrimaryScreenWidth / TextureWidth, (int)SystemParameters.PrimaryScreenHeight / TextureHeight);
-                presentationParameters.BackBufferWidth = displayMode.Width; // avoids changing display mode
+                presentationParameters.BackBufferWidth = displayMode.Width; // avoids changing display mode
-                presentationParameters.BackBufferHeight = displayMode.Height;
+                presentationParameters.BackBufferHeight = displayMode.Height;
-            }
+            }
-            else
+            else
-            {
+            {
-                _textureScale = Math.Min((int)SystemParameters.FullPrimaryScreenWidth / TextureWidth, (int)SystemParameters.FullPrimaryScreenHeight / TextureHeight);
+                _textureScale = Math.Min((int)SystemParameters.FullPrimaryScreenWidth / TextureWidth, (int)SystemParameters.FullPrimaryScreenHeight / TextureHeight);
-                presentationParameters.BackBufferWidth = _textureScale * TextureWidth;
+                presentationParameters.BackBufferWidth = _textureScale * TextureWidth;
-                presentationParameters.BackBufferHeight = _textureScale * TextureHeight;
+                presentationParameters.BackBufferHeight = _textureScale * TextureHeight;
-            }
+            }
-#else
+#else
-            _textureScale = Math.Min(displayMode.TitleSafeArea.Width / TextureWidth, displayMode.TitleSafeArea.Height / TextureHeight);
+            _textureScale = Math.Min(displayMode.TitleSafeArea.Width / TextureWidth, displayMode.TitleSafeArea.Height / TextureHeight);
-            presentationParameters.BackBufferWidth = displayMode.Width; // always use display mode
+            presentationParameters.BackBufferWidth = displayMode.Width; // always use display mode
-            presentationParameters.BackBufferHeight = displayMode.Height;
+            presentationParameters.BackBufferHeight = displayMode.Height;
-#endif
+#endif
-        }
+        }
-
+
-        private void OnGraphicsDeviceServiceDeviceCreated(object sender, EventArgs e)
+        private void OnGraphicsDeviceServiceDeviceCreated(object sender, EventArgs e)
-        {
+        {
-            _graphicsDevice = _game.GraphicsDevice;
+            _graphicsDevice = _game.GraphicsDevice;
-            _spriteBatch = new SpriteBatch(_graphicsDevice);
+            _spriteBatch = new SpriteBatch(_graphicsDevice);
-            _texture = new Texture2D(_graphicsDevice, TextureWidth, TextureHeight, 1, TextureUsage.None, SurfaceFormat.Bgr32);
+            _texture = new Texture2D(_graphicsDevice, TextureWidth, TextureHeight, 1, TextureUsage.None, SurfaceFormat.Bgr32);
-            _pixels = new uint[TextureWidth * TextureHeight];
+            _pixels = new uint[TextureWidth * TextureHeight];
-            SetTexturePosition();
+            SetTexturePosition();
-        }
+        }
-
+
-        private void SetTexturePosition()
+        private void SetTexturePosition()
-        {
+        {
-            _texturePosition.X = (_graphicsDevice.PresentationParameters.BackBufferWidth - TextureWidth * _textureScale) / 2; // centered
+            _texturePosition.X = (_graphicsDevice.PresentationParameters.BackBufferWidth - TextureWidth * _textureScale) / 2; // centered
-            _texturePosition.Y = (_graphicsDevice.PresentationParameters.BackBufferHeight - TextureHeight * _textureScale) / 2;
+            _texturePosition.Y = (_graphicsDevice.PresentationParameters.BackBufferHeight - TextureHeight * _textureScale) / 2;
-        }
+        }
-
+
-        private const int TextureWidth = 560;
+        private const int TextureWidth = 560;
-        private const int TextureHeight = 384;
+        private const int TextureHeight = 384;
-
+
-        private GameBase _game;
+        private GameBase _game;
-        private GraphicsDevice _graphicsDevice;
+        private GraphicsDevice _graphicsDevice;
-        private SpriteBatch _spriteBatch;
+        private SpriteBatch _spriteBatch;
-        private Texture2D _texture;
+        private Texture2D _texture;
-        private Vector2 _texturePosition;
+        private Vector2 _texturePosition;
-        private int _textureScale;
+        private int _textureScale;
-        private uint[] _pixels;
+        private uint[] _pixels;
-        private bool _pixelsDirty;
+        private bool _pixelsDirty;
-    }
+    }
-}
+}