Refactoring, Bug fixes and a couple new features.

.editorconfig

@@ -0,0 +1,58 @@
+
+[*.proto]
+indent_style=tab
+indent_size=tab
+tab_width=4
+
+[*.{asax,ascx,aspx,cs,cshtml,css,htm,html,js,jsx,master,razor,skin,ts,tsx,vb,xaml,xamlx,xoml}]
+indent_style=space
+indent_size=4
+tab_width=4
+
+[*.{appxmanifest,axml,build,config,csproj,dbml,discomap,dtd,json,jsproj,lsproj,njsproj,nuspec,proj,props,resjson,resw,resx,StyleCop,targets,tasks,vbproj,xml,xsd}]
+indent_style=space
+indent_size=2
+tab_width=2
+
+[*]
+
+# Microsoft .NET properties
+csharp_new_line_before_members_in_object_initializers=false
+csharp_preferred_modifier_order=public, private, protected, internal, new, abstract, virtual, sealed, override, static, readonly, extern, unsafe, volatile, async:suggestion
+csharp_style_var_elsewhere=true:suggestion
+csharp_style_var_for_built_in_types=true:suggestion
+csharp_style_var_when_type_is_apparent=true:suggestion
+dotnet_naming_rule.local_functions_rule.severity=warning
+dotnet_naming_rule.local_functions_rule.style=lower_camel_case_style
+dotnet_naming_rule.local_functions_rule.symbols=local_functions_symbols
+dotnet_naming_style.lower_camel_case_style.capitalization=camel_case
+dotnet_naming_symbols.local_functions_symbols.applicable_accessibilities=*
+dotnet_naming_symbols.local_functions_symbols.applicable_kinds=local_function
+dotnet_style_parentheses_in_arithmetic_binary_operators=never_if_unnecessary:none
+dotnet_style_parentheses_in_other_binary_operators=never_if_unnecessary:none
+dotnet_style_parentheses_in_relational_binary_operators=never_if_unnecessary:none
+dotnet_style_predefined_type_for_locals_parameters_members=true:suggestion
+dotnet_style_predefined_type_for_member_access=true:suggestion
+dotnet_style_qualification_for_event=false:suggestion
+dotnet_style_qualification_for_field=false:suggestion
+dotnet_style_qualification_for_method=false:suggestion
+dotnet_style_qualification_for_property=false:suggestion
+dotnet_style_require_accessibility_modifiers=for_non_interface_members:suggestion
+
+# ReSharper properties
+resharper_csharp_naming_rule.local_functions=aaBb, AaBb
+
+# ReSharper inspection severities
+resharper_arrange_redundant_parentheses_highlighting=hint
+resharper_arrange_this_qualifier_highlighting=hint
+resharper_arrange_type_member_modifiers_highlighting=hint
+resharper_arrange_type_modifiers_highlighting=hint
+resharper_built_in_type_reference_style_for_member_access_highlighting=hint
+resharper_built_in_type_reference_style_highlighting=hint
+resharper_check_namespace_highlighting=none
+resharper_invalid_xml_doc_comment_highlighting=none
+resharper_redundant_base_qualifier_highlighting=warning
+resharper_suggest_var_or_type_built_in_types_highlighting=hint
+resharper_suggest_var_or_type_elsewhere_highlighting=hint
+resharper_suggest_var_or_type_simple_types_highlighting=hint
+resharper_use_deconstruction_highlighting=none

Core/AV/Audio.cs

@@ -9,23 +9,28 @@ public class Audio : Ffcc
         /// <summary>
         /// Opens filename and init class.
         /// </summary>
-        public static Audio Load(string filename, int loopstart = -1) =>
-            Load<Audio>(filename, AVMediaType.AVMEDIA_TYPE_AUDIO, FfccMode.STATE_MACH, loopstart);
+        public static Audio Load(string filename, int loopStart = -1) =>
+            Load<Audio>(filename, AVMediaType.AVMEDIA_TYPE_AUDIO, FfccMode.StateMach, loopStart);
 
         /// <summary>
         /// Opens filename and init class.
         /// </summary>
         /// <remarks>
-        /// Could be better, but theres alot of hoops to jump through.
+        /// Could be better, but there are many hoops to jump through.
         /// </remarks>
         /// <see cref="https://stackoverflow.com/questions/9604633/reading-a-file-located-in-memory-with-libavformat"/>
         /// <seealso cref="http://www.ffmpeg.org/doxygen/trunk/doc_2examples_2avio_reading_8c-example.html"/>
         /// <seealso cref="https://stackoverflow.com/questions/24758386/intptr-to-callback-function"/>
-        public static unsafe Audio Load(BufferData buffer_Data, byte[] headerData, int loopstart = -1, FfccMode ffccMode = FfccMode.PROCESS_ALL) =>
-            Load(&buffer_Data, headerData, loopstart, ffccMode);
+        ///
 
-        public static unsafe Audio Load(BufferData* buffer_Data, byte[] headerData, int loopstart = -1, FfccMode ffccMode = FfccMode.PROCESS_ALL) => 
-            Load<Audio>(buffer_Data, headerData, loopstart = -1, ffccMode, AVMediaType.AVMEDIA_TYPE_AUDIO);
+        public static Audio Load(Sound.Entry entryData, int loopStart = -1, FfccMode ffccMode = FfccMode.ProcessAll) =>
+            Load(entryData, entryData.HeaderData, loopStart, ffccMode);
+
+        public static unsafe Audio Load(BufferData bufferData, byte[] headerData, int loopStart = -1, FfccMode ffccMode = FfccMode.ProcessAll) =>
+            Load<Audio>(&bufferData, headerData, loopStart, ffccMode, AVMediaType.AVMEDIA_TYPE_AUDIO);
+
+        public static unsafe Audio Load(BufferData* bufferData, byte[] headerData, int loopStart = -1, FfccMode ffccMode = FfccMode.ProcessAll) =>
+            Load<Audio>(bufferData, headerData, loopStart, ffccMode, AVMediaType.AVMEDIA_TYPE_AUDIO);
 
         #endregion Methods
     }

Core/AV/BufferData.cs

@@ -1,6 +1,6 @@
-using System;
+using FFmpeg.AutoGen;
+using System;
 using System.IO;
-using FFmpeg.AutoGen;
 
 namespace OpenVIII.AV
 {
@@ -9,45 +9,73 @@ namespace OpenVIII.AV
     /// </summary>
     public struct BufferData
     {
+        #region Fields
+
+        private IntPtr _header;
+
+        private long _totalReadData;
+
+        #endregion Fields
+
+        #region Enums
+
         public enum TargetFile
         {
             SoundDat,
             OtherZzz
         }
 
-        #region Fields
+        #endregion Enums
+
+        #region Properties
 
+        public static string DataFileName { get; set; }
         public long DataSeekLoc { get; set; }
-        private long _totalReadData;
         public long DataSize { get; set; }
         public uint HeaderSize { get; set; }
-        private IntPtr _header;
         public TargetFile Target { get; set; }
 
-        #endregion Fields
-
-        #region Properties
-
-        public static string DataFileName { get; private set; }
-
         #endregion Properties
 
         #region Methods
-        
+
         public unsafe int Read(byte* buf, int bufSize)
-        {   
+        {
             int ret;
-            if (HeaderSize >0 && (ret = ReadHeader(buf, bufSize)) != ffmpeg.AVERROR_EOF)
+            if (HeaderSize > 0 && (ret = ReadHeader(buf, bufSize)) != ffmpeg.AVERROR_EOF)
                 return ret;
             return ReadData(buf, bufSize);
         }
 
         public unsafe void SetHeader(byte* value) => _header = (IntPtr)value;
 
+        internal long Seek(long offset, int whence)
+        {
+            switch (whence)
+            {
+                case ffmpeg.AVSEEK_SIZE:
+                    return offset == 0
+                        ? _totalReadData
+                        : throw new Exception($"unknown {nameof(whence)}: {whence}, {nameof(offset)}: {offset}");
+
+                case 0:
+                    offset -= _totalReadData;
+                    break;
+
+                default:
+                    throw new Exception($"unknown {nameof(whence)}: {whence}");
+            }
+
+            DataSeekLoc += offset;
+            _totalReadData += offset;
+            DataSize -= offset;
+            return _totalReadData;
+        }
+
         private unsafe int ReadData(byte* buf, int bufSize)
         {
             if (string.IsNullOrWhiteSpace(DataFileName))
-                DataFileName = Path.Combine(Memory.FF8DIRdata, "Sound", "audio.dat");
+                DataFileName = Path.Combine(Memory.FF8DirData, "Sound", "audio.dat");
 
             bufSize = Math.Min(bufSize, (int)DataSize);
 
@@ -70,6 +98,7 @@ private unsafe int ReadData(byte* buf, int bufSize)
                         s = new MemoryStream(other.GetBinaryFile("audio.dat", true), false);
                     }
                     break;
+
                 case TargetFile.OtherZzz:
                     other = (ArchiveZzz)ArchiveZzz.Load(Memory.Archives.ZZZ_OTHER);
                     s = other.OpenStream();
@@ -81,11 +110,11 @@ private unsafe int ReadData(byte* buf, int bufSize)
             }
 
             // binaryReader disposes of fs
-            if(s == null) throw new NullReferenceException($"{nameof(BufferData)}::{nameof(ReadData)} stream is null");
-            using (BinaryReader br = new BinaryReader(s))
+            if (s == null) throw new NullReferenceException($"{nameof(BufferData)}::{nameof(ReadData)} stream is null");
+            using (var br = new BinaryReader(s))
             {
                 s.Seek(DataSeekLoc, SeekOrigin.Begin);
-                using (UnmanagedMemoryStream ums = new UnmanagedMemoryStream(buf, bufSize, bufSize, FileAccess.Write))
+                using (var ums = new UnmanagedMemoryStream(buf, bufSize, bufSize, FileAccess.Write))
                 {
                     // copy public buffer data to buf
                     ums.Write(br.ReadBytes(bufSize), 0, bufSize);
@@ -115,28 +144,6 @@ private unsafe int ReadHeader(byte* buf, int bufSize)
             return bufSize;
         }
 
-        internal long Seek(long offset, int whence)
-        {
-            switch (whence)
-            {
-                case ffmpeg.AVSEEK_SIZE:
-                    return offset == 0
-                        ? _totalReadData
-                        : throw new Exception($"unknown {nameof(whence)}: {whence}, {nameof(offset)}: {offset}");
-
-                case 0:
-                    offset -= _totalReadData;
-                    break;
-                default:
-                    throw new Exception($"unknown {nameof(whence)}: {whence}");
-             }
-
-            DataSeekLoc += offset;
-            _totalReadData += offset;
-            DataSize -= offset;
-            return _totalReadData;
-        }
-
         #endregion Methods
     }
 }