-

CSScriptAddon/CSScriptAddon.vbproj

@@ -47,6 +47,48 @@
   <PropertyGroup>
     <OptionInfer>On</OptionInfer>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <DefineDebug>true</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <OutputPath>..\mpv.net\bin\x86\Addons\CSScriptAddon\</OutputPath>
+    <NoWarn>42105,42106,42107,42353,42354,42355</NoWarn>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <WarningsAsErrors>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</WarningsAsErrors>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <DefineTrace>true</DefineTrace>
+    <OutputPath>..\mpv.net\bin\x86\Addons\CSScriptAddon\</OutputPath>
+    <Optimize>true</Optimize>
+    <NoWarn>42105,42106,42107,42353,42354,42355</NoWarn>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <WarningsAsErrors>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</WarningsAsErrors>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <DefineDebug>true</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <OutputPath>..\mpv.net\bin\x64\Addons\CSScriptAddon\</OutputPath>
+    <NoWarn>42105,42106,42107,42353,42354,42355</NoWarn>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <WarningsAsErrors>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</WarningsAsErrors>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <DefineTrace>true</DefineTrace>
+    <OutputPath>..\mpv.net\bin\x64\Addons\CSScriptAddon\</OutputPath>
+    <Optimize>true</Optimize>
+    <NoWarn>42105,42106,42107,42353,42354,42355</NoWarn>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <WarningsAsErrors>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</WarningsAsErrors>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="CSScriptLibrary, Version=3.27.5.0, Culture=neutral, PublicKeyToken=70fcc3d18c749033, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

README.md

@@ -201,6 +201,12 @@ mpv.net bugs and requests: <https://github.com/stax76/mpv.net/issues>
 
 ### Changelog
 
+### 3.4 (2019-05-03)
+
+- new feature added to manage file associations from within the app. It can be found in the menu at: Tools > Manage... [Default Binding](https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/inputConf.txt#L149)
+- new zip download option added
+- new x86 download option added
+
 ### 3.3 (2019-05-01)
 
 - dark mode support was added to the command palette and partly to the input editor
@@ -231,46 +237,3 @@ mpv.net bugs and requests: <https://github.com/stax76/mpv.net/issues>
 - the input editor don't show confusing menu separators any longer. [Screenshot](https://github.com/stax76/mpv.net#input-editor)
 - new Command Palette feature added. [Screenshot](https://github.com/stax76/mpv.net#command-palette), [Default input binding](https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/inputConf.txt#L141)
 - the history feature had a bug causing files to be logged more than once
-
-### 3.1 (2019-04-23)
-
-- the Tracks and Chapters menu are now only added if default bindings exist and
-  it's now possible to move the chapters menu to the top level by editing input.conf
-- mpvnet supports now like mpv a portable settings directory. If a directory named portable_config
-  next to the mpvnet.exe exists, all config will be loaded and written in this directory.
-- there is now a portable download in 7zip format.
-
-### 3.0 (2019-04-20)
-
-- the history feature logs now only files that were opened longer than 90 seconds
-- the default input command for cycling the audio tracks was replaced with an
-  mpv.net command that shows detailed track info and has no 'no audio' track. [Default binding](https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/inputConf.txt#L89).
-- new website at <https://mpv-net.github.io/mpv.net-web-site/>
-- the Tracks menu supports now MKV edition selection. [Default binding](https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/inputConf.txt#L106).
-- the Navigate menu supports now chapter selection. [Default binding](https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/inputConf.txt#L57).
-- opening the context menu was crashing if the default binding for Tracks was missing
-
-### 2.9 (2019-04-16)
-
-- clicking the right top corner in full screen mode
-  closes the player but it did not work on all displays
-- the info display was changed to display the filename on top
-  so it's not displayed in the middle of the screen
-- on start up of the config editor all text is now selected in the
-  search text box so it's ready for a new search to be typed
-- the config editor was changed to write the settings to disk
-  only if the settings were actually modified, also the message
-  that says that the settings will be available on next start
-  is now only shown if the settings were actually modified.
-- there was an instance in the context menu where the sub menu
-  arrow was overlapping with the text
-- in the input editor when only one character is entered in the
-  search text box the search is performed only in the input and
-  not in the command or menu
-- in the input editor the routine that generates the input string
-  was completely rewritten because it was adding Shift where it
-  wasn't necessary (it took a huge amount of time to implement)
-- the context menu has a new track menu where the active track
-  can be seen and selected, it shows video, audio and subtitle
-  tracks with various metadata. [Menu default definition](https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/inputConf.txt#L104).
-  The screenshots were updated showing the [new track menu](https://github.com/stax76/mpv.net#screenshots).

RatingAddon/RatingAddon.csproj

@@ -30,6 +30,42 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>..\mpv.net\bin\x86\Addons\RatingAddon\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>..\mpv.net\bin\x86\Addons\RatingAddon\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>..\mpv.net\bin\x64\Addons\RatingAddon\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>..\mpv.net\bin\x64\Addons\RatingAddon\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.Composition" />

mpv.net.sln

@@ -11,22 +11,36 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "CSScriptAddon", "CSScriptAd
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
-		Release|Any CPU = Release|Any CPU
+		Debug|x86 = Debug|x86
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{1751F378-8EDF-4B62-BE6D-304C7C287089}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1751F378-8EDF-4B62-BE6D-304C7C287089}.Debug|x64.ActiveCfg = Debug|x64
-		{1751F378-8EDF-4B62-BE6D-304C7C287089}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1751F378-8EDF-4B62-BE6D-304C7C287089}.Debug|x64.Build.0 = Debug|x64
-		{1751F378-8EDF-4B62-BE6D-304C7C287089}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1751F378-8EDF-4B62-BE6D-304C7C287089}.Debug|x86.ActiveCfg = Debug|x86
-		{1751F378-8EDF-4B62-BE6D-304C7C287089}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1751F378-8EDF-4B62-BE6D-304C7C287089}.Debug|x86.Build.0 = Debug|x86
-		{55C88710-539D-4402-84C8-31694841C731}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1751F378-8EDF-4B62-BE6D-304C7C287089}.Release|x64.ActiveCfg = Release|x64
-		{55C88710-539D-4402-84C8-31694841C731}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1751F378-8EDF-4B62-BE6D-304C7C287089}.Release|x64.Build.0 = Release|x64
-		{55C88710-539D-4402-84C8-31694841C731}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1751F378-8EDF-4B62-BE6D-304C7C287089}.Release|x86.ActiveCfg = Release|x86
-		{55C88710-539D-4402-84C8-31694841C731}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1751F378-8EDF-4B62-BE6D-304C7C287089}.Release|x86.Build.0 = Release|x86
-		{71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{55C88710-539D-4402-84C8-31694841C731}.Debug|x64.ActiveCfg = Debug|x64
-		{71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{55C88710-539D-4402-84C8-31694841C731}.Debug|x64.Build.0 = Debug|x64
-		{71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{55C88710-539D-4402-84C8-31694841C731}.Debug|x86.ActiveCfg = Debug|x86
-		{71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{55C88710-539D-4402-84C8-31694841C731}.Debug|x86.Build.0 = Debug|x86
+		{55C88710-539D-4402-84C8-31694841C731}.Release|x64.ActiveCfg = Release|x64
+		{55C88710-539D-4402-84C8-31694841C731}.Release|x64.Build.0 = Release|x64
+		{55C88710-539D-4402-84C8-31694841C731}.Release|x86.ActiveCfg = Release|x86
+		{55C88710-539D-4402-84C8-31694841C731}.Release|x86.Build.0 = Release|x86
+		{71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Debug|x64.ActiveCfg = Debug|x64
+		{71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Debug|x64.Build.0 = Debug|x64
+		{71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Debug|x86.ActiveCfg = Debug|x86
+		{71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Debug|x86.Build.0 = Debug|x86
+		{71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Release|x64.ActiveCfg = Release|x64
+		{71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Release|x64.Build.0 = Release|x64
+		{71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Release|x86.ActiveCfg = Release|x86
+		{71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

mpv.net/Command.cs

@@ -46,14 +46,9 @@ namespace mpvnet
         public static void open_files(string[] args)
         {
             MainForm.Instance.Invoke(new Action(() => {
-                using (var d = new OpenFileDialog())
+                using (var d = new OpenFileDialog() { Multiselect = true })
-                {
-                    d.Multiselect = true;
-                    d.Filter = Sys.GetFilter();
-
                     if (d.ShowDialog() == DialogResult.OK)
                         mp.LoadFiles(d.FileNames);
-                }
             }));
         }
 
@@ -126,7 +121,7 @@ namespace mpvnet
                 {
                     fileSize = new FileInfo(path).Length;
 
-                    if (FileAssociation.AudioTypes.Contains(Path.GetExtension(path).ToLower().TrimStart('.')))
+                    if (App.AudioTypes.Contains(Path.GetExtension(path).ToLower().TrimStart('.')))
                     {
                         using (MediaInfo mediaInfo = new MediaInfo(path))
                         {
@@ -239,5 +234,35 @@ namespace mpvnet
                 mp.commandv("show-text", audTracks[aid - 1].Text.Substring(3), "5000");
             }
         }
+
+        public static void manage_file_associations(string[] args)
+        {
+            using (var td = new TaskDialog<string>())
+            {
+                td.MainInstruction = "Choose an option.";
+                td.MainIcon = MsgIcon.Shield;
+
+                td.AddCommandLink("Register video file extensions", "video");
+                td.AddCommandLink("Register audio file extensions", "audio");
+                td.AddCommandLink("Unregister file extensions",     "unreg");
+
+                string result = td.Show();
+
+                if (!string.IsNullOrEmpty(result))
+                {
+                    using (var proc = new Process())
+                    {
+                        proc.StartInfo.FileName = Application.ExecutablePath;
+                        proc.StartInfo.Arguments = "--reg-file-assoc " + result;
+                        proc.StartInfo.Verb = "runas";
+                        try {
+                            proc.Start();
+                        }
+                        catch (Exception)
+                        { }
+                    }
+                }
+            }
+        }
     }
 }

mpv.net/Misc.cs

@@ -17,6 +17,9 @@ namespace mpvnet
 {
     public class App
     {
+        public static string[] VideoTypes { get; } = "mpg avi vob mp4 mkv avs 264 mov wmv flv h264 asf webm mpeg mpv y4m avc hevc 265 h265 m2v m2ts vpy mts webm m4v".Split(" ".ToCharArray());
+        public static string[] AudioTypes { get; } = "mp2 mp3 ac3 wav w64 m4a dts dtsma dtshr dtshd eac3 thd thd+ac3 ogg mka aac opus flac mpa".Split(" ".ToCharArray());
+
         public static bool IsDarkMode { 
             get {
                 string darkMode = MainForm.Instance.MpvNetDarkMode;
@@ -51,12 +54,6 @@ namespace mpvnet
             { }
             return false;
         }
-
-        public static string GetFilter()
-        {
-            string[] fileTypes = "264 265 3gp aac ac3 avc avi avs bmp divx dts dtshd dtshr dtsma eac3 evo flac flv h264 h265 hevc hvc jpg jpeg m2t m2ts m2v m4a m4v mka mkv mlp mov mp2 mp3 mp4 mpa mpeg mpg mpv mts ogg ogm opus pcm png pva raw rmvb thd thd+ac3 true-hd truehd ts vdr vob vpy w64 wav webm wmv y4m".Split(' ');
-            return "*." + String.Join(";*.", fileTypes) + "|*." + String.Join(";*.", fileTypes) + "|All Files|*.*";
-        }
     }
 
     public class StringLogicalComparer : IComparer, IComparer<string>
@@ -76,8 +73,6 @@ namespace mpvnet
         static string ExeFilename = Path.GetFileName(Application.ExecutablePath);
         static string ExeFilenameNoExt = Path.GetFileNameWithoutExtension(Application.ExecutablePath);
         static string[] Types;
-        public static string[] VideoTypes = "mpg avi vob mp4 mkv avs 264 mov wmv flv h264 asf webm mpeg mpv y4m avc hevc 265 h265 m2v m2ts vpy mts webm m4v".Split(" ".ToCharArray());
-        public static string[] AudioTypes = "mp2 mp3 ac3 wav w64 m4a dts dtsma dtshr dtshd eac3 thd thd+ac3 ogg mka aac opus flac mpa".Split(" ".ToCharArray());
 
         public static void Register(string[] types)
         {
@@ -96,9 +91,9 @@ namespace mpvnet
                 RegistryHelp.SetObject($"HKCR\\Applications\\{ExeFilename}\\SupportedTypes", "." + ext, "");
                 RegistryHelp.SetObject($"HKCR\\" + "." + ext, null, ExeFilenameNoExt + "." + ext);
                 RegistryHelp.SetObject($"HKCR\\" + "." + ext + "\\OpenWithProgIDs", ExeFilenameNoExt + "." + ext, "");
-                if (VideoTypes.Contains(ext))
+                if (App.VideoTypes.Contains(ext))
                     RegistryHelp.SetObject($"HKCR\\" + "." + ext, "PerceivedType", "video");
-                if (AudioTypes.Contains(ext))
+                if (App.AudioTypes.Contains(ext))
                     RegistryHelp.SetObject($"HKCR\\" + "." + ext, "PerceivedType", "audio");
                 RegistryHelp.SetObject($"HKCR\\" + ExeFilenameNoExt + "." + ext + "\\shell\\open", null, "Play with " +  Application.ProductName);
                 RegistryHelp.SetObject($"HKCR\\" + ExeFilenameNoExt + "." + ext + "\\shell\\open\\command", null, $"\"{ExePath}\" \"%1\"");

mpv.net/Native.cs

@@ -24,12 +24,23 @@ namespace mpvnet
         [DllImport("user32.dll")]
         public static extern bool AdjustWindowRect(ref RECT lpRect, uint dwStyle, bool bMenu);
 
-        [DllImport("user32.dll")]
-        public static extern IntPtr GetWindowLongPtrW(IntPtr hWnd, int nIndex);
-
         [DllImport("user32.dll", SetLastError = true)]
         public static extern bool SetWindowPos(IntPtr hWnd, IntPtr hWndInsertAfter, int X, int Y, int cx, int cy, int uFlags);
 
+        [DllImport("user32.dll", EntryPoint = "GetWindowLong")]
+        private static extern IntPtr GetWindowLong32(IntPtr hWnd, int nIndex);
+
+        [DllImport("user32.dll", EntryPoint = "GetWindowLongPtr")]
+        private static extern IntPtr GetWindowLong64(IntPtr hWnd, int nIndex);
+
+        public static IntPtr GetWindowLongPtr(IntPtr hWnd, int nIndex)
+        {
+            if (IntPtr.Size == 8)
+                return GetWindowLong64(hWnd, nIndex);
+            else
+                return GetWindowLong32(hWnd, nIndex);
+        }
+
         [StructLayout(LayoutKind.Sequential)]
         public struct RECT
         {

mpv.net/NativeHelp.cs

@@ -32,7 +32,7 @@ namespace mpvnet
 
         public static void AddWindowBorders(IntPtr hwnd, ref Native.RECT rc)
         {
-            Native.AdjustWindowRect(ref rc, (uint)Native.GetWindowLongPtrW(hwnd, -16 /* GWL_STYLE */), false);
+            Native.AdjustWindowRect(ref rc, (uint)Native.GetWindowLongPtr(hwnd, -16 /* GWL_STYLE */), false);
         }
     }
 }

mpv.net/Program.cs

@@ -16,9 +16,9 @@ namespace mpvnet
 
                 if (args.Length == 3 && args[1] == "--reg-file-assoc")
                 {
-                    if (args[2] == "audio") FileAssociation.Register(FileAssociation.AudioTypes);
+                    if (args[2] == "audio") FileAssociation.Register(App.AudioTypes);
-                    if (args[2] == "video") FileAssociation.Register(FileAssociation.VideoTypes);
+                    if (args[2] == "video") FileAssociation.Register(App.VideoTypes);
-                    if (args[2] == "unregister") FileAssociation.Unregister();
+                    if (args[2] == "unreg") FileAssociation.Unregister();
                     return;
                 }
 

mpv.net/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.3.0.0")]
+[assembly: AssemblyVersion("3.4.0.0")]
-[assembly: AssemblyFileVersion("3.3.0.0")]
+[assembly: AssemblyFileVersion("3.4.0.0")]

mpv.net/Resources/inputConf.txt

@@ -146,6 +146,7 @@
  L      cycle-values loop-file "inf" "no"           #menu: Tools > Toggle infinite file looping
  Ctrl+h cycle-values hwdec "auto" "no"              #menu: Tools > Cycle Hardware Decoding
  _ script-message mpv.net execute-mpv-command       #menu: Tools > Execute mpv command...
+ _ script-message mpv.net manage-file-associations  #menu: Tools > Manage File Associations...
 
  _ script-message mpv.net shell-execute https://mpv.io/manual/stable/ #menu: Help > Show mpv manual
  _ script-message mpv.net shell-execute https://github.com/mpv-player/mpv/blob/master/etc/input.conf #menu: Help > Show mpv default keys

mpv.net/mpv.net.csproj

@@ -56,6 +56,46 @@
   <PropertyGroup>
     <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <GenerateSerializationAssemblies>On</GenerateSerializationAssemblies>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\x86\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <GenerateSerializationAssemblies>On</GenerateSerializationAssemblies>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="IKVM.Reflection, Version=7.2.4630.5, Culture=neutral, PublicKeyToken=13235d27fcbfff58, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

portable.ps1

@@ -1,7 +0,0 @@
-$scriptDir = Split-Path -Path $PSCommandPath -Parent
-$exePath = $scriptDir + "\mpv.net\bin\mpvnet.exe"
-$version = [Diagnostics.FileVersionInfo]::GetVersionInfo($exePath).FileVersion
-$desktopDir = [Environment]::GetFolderPath("Desktop")
-$targetDir = $desktopDir + "\mpv.net-portable-x64-" + $version
-Copy-Item $scriptDir\mpv.net\bin $targetDir -Recurse -Exclude System.Management.Automation.xml -Force
-& "C:\Program Files\7-Zip\7z.exe" a -t7z -mx9 "$targetDir.7z" -r "$targetDir\*"

setup.iss

@@ -1,18 +1,30 @@
 #define MyAppName "mpv.net"
-#define MyAppVersion GetFileVersion("mpv.net\bin\mpvnet.exe")
 #define MyAppExeName "mpvnet.exe"
-#define MyAppSourceDir "mpv.net\bin"
+
+#ifndef arch
+  #define arch "x64"
+#endif
+
+#if arch == "x64"
+  #define MyAppSourceDir "mpv.net\bin\x64"
+  #define MyAppVersion GetFileVersion("mpv.net\bin\x64\mpvnet.exe")
+#else
+  #define MyAppSourceDir "mpv.net\bin\x86"
+  #define MyAppVersion GetFileVersion("mpv.net\bin\x86\mpvnet.exe")
+#endif
 
 [Setup]
 AppId={{9AA2B100-BEF3-44D0-B819-D8FC3C4D557D}}
 AppName={#MyAppName}
 AppVersion={#MyAppVersion}
 AppPublisher=Frank Skare (stax76)
+#if arch == "x64"
   ArchitecturesInstallIn64BitMode=x64
+#endif
 Compression=lzma2
-DefaultDirName={pf}\{#MyAppName}
+DefaultDirName={commonpf}\{#MyAppName}
-OutputBaseFilename=mpvnet-setup-x64-{#MyAppVersion}
+OutputBaseFilename=mpvnet-setup-{#arch}-{#MyAppVersion}
-OutputDir=C:\Users\frank\Desktop
+OutputDir={#GetEnv('USERPROFILE')}\Desktop
 DefaultGroupName={#MyAppName}
 SetupIconFile=mpv.net\mpvnet.ico
 UninstallDisplayIcon={app}\{#MyAppExeName}
@@ -29,4 +41,4 @@ Filename: "{app}\{#MyAppExeName}"; Description: "Associate video file extensions
 Filename: "{app}\{#MyAppExeName}"; Description: "Associate audio file extensions?"; Flags: postinstall unchecked runascurrentuser runhidden nowait; Parameters: "--reg-file-assoc audio"
 
 [UninstallRun]
-Filename: "{app}\{#MyAppExeName}"; Flags: runascurrentuser runhidden; Parameters: "--reg-file-assoc unregister"
+Filename: "{app}\{#MyAppExeName}"; Flags: runascurrentuser runhidden; Parameters: "--reg-file-assoc unreg"

setup.ps1

@@ -0,0 +1,52 @@
+function CheckExitCode {
+    if ($LastExitCode -gt 0)
+    {
+        Write-Host "`nExit code $LastExitCode was returned.`n" -ForegroundColor Red
+        exit
+    }
+}
+
+$msbuild = "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\MSBuild.exe"
+
+& $msbuild mpv.net.sln /p:Configuration=Debug /p:Platform=x64
+
+CheckExitCode
+
+& $msbuild mpv.net.sln /p:Configuration=Debug /p:Platform=x86
+
+CheckExitCode
+
+& "C:\Program Files (x86)\Inno Setup 6\ISCC.exe" /Darch="x64" setup.iss
+
+CheckExitCode
+
+& "C:\Program Files (x86)\Inno Setup 6\ISCC.exe" /Darch="x86" setup.iss
+
+CheckExitCode
+
+$scriptDir = Split-Path -Path $PSCommandPath -Parent
+$desktopDir = [Environment]::GetFolderPath("Desktop")
+
+$exePath = $scriptDir + "\mpv.net\bin\x64\mpvnet.exe"
+$version = [Diagnostics.FileVersionInfo]::GetVersionInfo($exePath).FileVersion
+$targetDir = $desktopDir + "\mpv.net-portable-x64-" + $version
+Copy-Item $scriptDir\mpv.net\bin\x64 $targetDir -Recurse -Exclude System.Management.Automation.xml -Force
+& "C:\Program Files\7-Zip\7z.exe" a -t7z  -mx9 "$targetDir.7z"  -r "$targetDir\*"
+
+CheckExitCode
+
+& "C:\Program Files\7-Zip\7z.exe" a -tzip -mx9 "$targetDir.zip" -r "$targetDir\*"
+
+CheckExitCode
+
+$exePath = $scriptDir + "\mpv.net\bin\x86\mpvnet.exe"
+$version = [Diagnostics.FileVersionInfo]::GetVersionInfo($exePath).FileVersion
+$targetDir = $desktopDir + "\mpv.net-portable-x86-" + $version
+Copy-Item $scriptDir\mpv.net\bin\x86 $targetDir -Recurse -Exclude System.Management.Automation.xml -Force
+& "C:\Program Files\7-Zip\7z.exe" a -t7z  -mx9 "$targetDir.7z"  -r "$targetDir\*"
+
+CheckExitCode
+
+& "C:\Program Files\7-Zip\7z.exe" a -tzip -mx9 "$targetDir.zip" -r "$targetDir\*"
+
+CheckExitCode