-

CSScriptAddon/CSScriptAddon.vb

@@ -1,8 +1,8 @@
 Imports System.ComponentModel.Composition
 Imports System.IO
+Imports System.Windows.Forms
 
 Imports mpvnet
-Imports mpvnet.StaticUsing
 
 Imports CSScriptLibrary
 
@@ -11,17 +11,24 @@ Public Class CSScriptAddon
     Implements IAddon
 
     Sub New()
-        Dim scriptDir = mp.mpvConfFolderPath + "scripts"
-        If Not Directory.Exists(scriptDir) Then Return
-        Dim csFiles = Directory.GetFiles(scriptDir, "*.cs")
-        If csFiles.Count = 0 Then Return
+        Dim scriptFiles As New List(Of String)
+
+        If Directory.Exists(mp.MpvConfFolder + "scripts") Then
+            scriptFiles.AddRange(Directory.GetFiles(mp.MpvConfFolder + "scripts", "*.cs"))
+        End If
+
+        If Directory.Exists(Application.StartupPath + "\scripts") Then
+            scriptFiles.AddRange(Directory.GetFiles(Application.StartupPath + "\scripts", "*.cs"))
+        End If
+
+        If scriptFiles.Count = 0 Then Return
         CSScriptLibrary.CSScript.EvaluatorConfig.Engine = EvaluatorEngine.CodeDom
 
-        For Each i In csFiles
+        For Each i In scriptFiles
             Try
                 CSScriptLibrary.CSScript.Evaluator.LoadCode(File.ReadAllText(i))
             Catch ex As Exception
-                MsgError(ex.ToString)
+                Sys.Msg.ShowException(ex)
             End Try
         Next
     End Sub

CSScriptAddon/CSScriptAddon.vbproj

@@ -18,7 +18,7 @@
     <DebugType>full</DebugType>
     <DefineDebug>true</DefineDebug>
     <DefineTrace>true</DefineTrace>
-    <OutputPath>..\mpv.net\bin\Debug\Addons\CSScriptAddon\</OutputPath>
+    <OutputPath>..\mpv.net\bin\Addons\CSScriptAddon\</OutputPath>
     <DocumentationFile>
     </DocumentationFile>
     <NoWarn>42105,42106,42107,42353,42354,42355</NoWarn>
@@ -29,7 +29,7 @@
     <DefineDebug>false</DefineDebug>
     <DefineTrace>true</DefineTrace>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>..\mpv.net\bin\Addons\CSScriptAddon\</OutputPath>
     <DocumentationFile>
     </DocumentationFile>
     <NoWarn>42105,42106,42107,42353,42354,42355</NoWarn>
@@ -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>
@@ -55,6 +97,7 @@
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Data" />
+    <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />

LICENSE.txt

@@ -1,674 +1,21 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    {one line to give the program's name and a brief idea of what it does.}
-    Copyright (C) {year}  {name of author}
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    {project}  Copyright (C) {year}  {fullname}
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+MIT License
+
+Copyright (c) 2017-2019 Frank Skare (stax76)
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and ssociated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH
+THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

README.md

@@ -1,159 +1,239 @@
 # mpv.net
 
-mpv.net is a libmpv based media player for Windows, it looks and works like mpv, even shares the settings and therefore the mpv documentation applies.
+mpv.net is a modern media player for Windows that looks and works just like [mpv](https://mpv.io).
 
-mpv and mpv.net have a learning curve and are only suitable for experienced users.
+#### Based on libmpv
 
-mpv manual: https://mpv.io/manual/master/
+mpv.net is based on libmpv which offers a straightforward C API that was designed from the ground up to make mpv usable as a library and facilitate easy integration into other applications.
+
+#### CLI options
+
+mpv.net has the same [CLI options](https://mpv.io/manual/master/#options) as mpv.
+
+#### High quality video output
+
+mpv/libmpv has an OpenGL based video output that is capable of many features loved by videophiles, such as video scaling with popular high quality algorithms, color management, frame timing, interpolation, HDR, and more.
+
+#### On Screen Controller
+
+mpv.net uses the OSC of mpv/libmpv offering play controls with a modern flat design.
+
+#### GPU video decoding
+
+mpv/libmpv leverages the FFmpeg hwaccel APIs to support DXVA2 video decoding acceleration.
+
+#### Active development
+
+mpv.net is under active development. Want a feature? Post a [patch](https://github.com/stax76/mpv.net/pulls) or [request it](https://github.com/stax76/mpv.net/issues)!
+
+Table of contents
+-----------------
+
+- [Features](#features)
+- [Screenshots](#screenshots)
+- [Context Menu](#context-menu)
+- [Settings](#settings)
+- [Scripting](#scripting)
+- [Add-ons](#add-ons)
+- [Architecture](#architecture)
+- [Support](#support)
+- [Links](#links)
+- [Download](#download)
+- [Changelog](#changelog)
 
 ### Features
 
-- Customizable context menu defined in the same file as the keybindings
-- Addon API for .NET languages
-- 5 different scripting languages are supported, Python scripting implemented with IronPython, C# implemented with CS-Script, Lua and JavaScript implemented in libmpv and PowerShell
-- C# scripting implemented with CS-Script
-- mpv's OSC, IPC, Lua/JS, conf files and more
+- Customizable context menu defined in the same file as the key bindings ([Screenshot](#context-menu))
+- Searchable config dialog ([Screenshot](#config-editor))
+- Searchable input (key/mouse) binding editor ([Screenshot](#input-editor))
+- Searchable command palette to quickly launch commands and look for keys ([Screenshot](#command-palette))
+- Modern UI with dark mode ([Screenshot](#config-editor))
+- Addon/extension API for .NET languages
+- Scripting API for Python, C#, Lua, JavaScript and PowerShell ([wiki](https://github.com/stax76/mpv.net/wiki/Scripting))
+- mpv's OSC, IPC and conf files
+- Support of the same [CLI options](https://mpv.io/manual/master/#options) as mpv
+- DXVA2 video decoding acceleration
+- OpenGL based video output capable of features loved by videophiles, such as video scaling with popular high quality algorithms, color management, frame timing, interpolation, HDR, and more
 
-![](https://raw.githubusercontent.com/stax76/mpv.net/master/screenshot.png)
+### Screenshots
+
+#### Main Window Screenshot
+
+![Main Window](https://raw.githubusercontent.com/stax76/mpv.net/master/img/Main.png)
+
+#### Context Menu Screenshot
+
+Context menu defined in the input.conf file with dark mode support.
+
+![Context Menu](https://raw.githubusercontent.com/stax76/mpv.net/master/img/Menu.png)
+
+#### Config Editor Screenshot
+
+A searchable config editor as alternative to edit the mpv.conf file manually.
+
+![](https://raw.githubusercontent.com/stax76/mpv.net/master/img/ConfEditor.png)
+
+#### Input Editor Screenshot
+
+A searchable key and mouse binding editor.
+
+![Input Editor](https://raw.githubusercontent.com/stax76/mpv.net/master/img/InputEditor.png)
+
+#### Command Palette Screenshot
+
+Forgot where a command in the menu is located or what shortcut key it has?
+Just press Ctrl+Shift+P and find it easily in the searchable command palette.
+
+![Command Palette](https://raw.githubusercontent.com/stax76/mpv.net/master/img/CommandPalette.png)
 
 ### Context Menu
 
-The context menu can be customized via input.conf file located at:
+The context menu can be customized via input.conf file located in the config directory:
 
-C:\Users\Frank\AppData\Roaming\mpv\input.conf
-
-if it misses mpv.net generates it with the following defaults:
-
-https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/input_conf.txt
-
-### C# Scripting
-
-A simple C# script located at:
-
-C:\Users\Frank\AppData\Roaming\mpv\scripts\test.cs
-
-or
-
-startup\scripts\test.cs
-
-```
-using mpvnet;
-
-class Script
-{
-    public Script()
-    {
-        var fs = mpv.GetStringProp("fullscreen");
-        mpv.Command("show-text", "fullscreen: " + fs);
-        mpv.ObserveBoolProp("fullscreen", FullscreenChange);
-    }
-
-    void FullscreenChange(bool val)
-    {
-        mpv.Command("show-text", "fullscreen: " + val.ToString());
-    }
-}
+```Text
+C:\Users\%username%\AppData\Roaming\mpv\input.conf
 ```
 
-### Python Scripting
+if it's missing mpv.net generates it with the following defaults:
 
-A simple Python script located at:
+<https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/inputConf.txt>
 
-C:\Users\user\AppData\Roaming\mpv\scripts
+input.conf defines mpv's key and mouse bindings and mpv.net uses comments to define the context menu.
 
-or
+### Settings
 
-startup\scripts
+mpv.net shares the settings with mpv, settings can be edited in a settings dialog or in a config file called mpv.conf located in the config directory:
 
-```
-# when seeking displays position and
-# duration like so: 70:00 / 80:00
-# which is different from mpv which
-# uses 01:10:00 / 01:20:00
-
-import math
-
-def seek():
-    mp.commandv('show-text',
-        format(mp.get_property_number("time-pos")) + " / " + format(mp.get_property_number("duration")))
-
-def format(f):
-    sec = round(f)
-    
-    if sec < 0:
-        sec = 0
-    
-    pos_min_floor = math.floor(sec / 60)
-    sec_rest = sec - pos_min_floor * 60
-    return add_zero(pos_min_floor) + ":" + add_zero(sec_rest)
-
-def add_zero(val):
-    val = round(val)
-    return "" + str(int(val)) if (val > 9) else "0" + str(int(val))
-
-mp.register_event("seek", seek) # or use: mp.Seek += seek
+```Text
+C:\Users\%username%\AppData\Roaming\mpv\mpv.conf
 ```
 
-### PowerShell Scripting
+or in a portable setup at:
 
-A simple PowerShell script located at:
-
-C:\Users\user\AppData\Roaming\mpv\scripts
-
-or
-
-startup\scripts
-
-Please note that PowerShell don't allow assigning to events and mpv.net uses as workaround the script filename.
-
-```
-$position = [mp]::get_property_number("time-pos");
-[mp]::commandv("show-text", $position.ToString() + " seconds")
+```Text
+<startup>\portable_config\mpv.conf
 ```
 
-### Changes
+if it's missing mpv.net generates it with the following defaults:
 
-### 1.3
+<https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/mpvConf.txt>
 
-- besides Lua/JavaScript/C#/Python there is now PowerShell supported as fifth scripting language
+### Scripting
 
-- in case there isn't yet a mpv.conf file mpv.net creates the file with certain default settings that were previously set on every mpv.net start. This was changed to provide transparency on which settings mpv.net uses. These default settings can be seen here: https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/mpv.conf.txt
+Scripting is supported via Python, C#, Lua, JavaScript and PowerShell
 
-### 1.2
+[Scripting wiki page](https://github.com/stax76/mpv.net/wiki/Scripting)
 
-- a thread synchonisation bug which caused the shutdown to be delayed or frozen was fixed, it also caused the Shutdown event not to fire which caused the rating plugin not to work
+### Add-ons
 
-### 1.1
+Add-ons are located in the config directory:
 
-- added support for Python scripting via IronPython
-- show tracks and show playlist didn't work because the duration wasn't defined in the key bindings
+```Text
+C:\Users\%username%\AppData\Roaming\mpv\Addons\ExampleAddon\ExampleAddon.dll
+```
 
-### 1.0
+The add-on filename must end with 'Addon.dll'.
 
-- much more feature packed context menu
+Examples:
 
-### 0.2.5
+[RatingAddon.cs](https://github.com/stax76/mpv.net/blob/master/RatingAddon/RatingAddon.cs)
 
-- mpv lib updated to 2019-02-24
-- UI glitch fixed the appeared when started in fullscreen mode
-- fixed default video output mode which caused video playback to fail
+[CSScriptAddon.vb](https://github.com/stax76/mpv.net/blob/master/CSScriptAddon/CSScriptAddon.vb)
 
-### 0.2.4
+### Architecture
 
-- changed minimum runtime to .NET 4.7.2
-- fixed mpv.net not working with new mpv lib
-- the track name in the title bar was sometimes wrong
-- mpv lib updated to 2018-12-16
-- quit-watch-later added to context menu (Shift+Q) to exit and resume at the last position
-- ab loop added to menu
-- added the possibility to modify mpv.conf settings using the context menu
-- added link to the manual and default keys to the menu
+mpv.net is written in C# 7.0 and runs on the .NET framework 4.7 or higher.
 
-### 0.2.2
+The Add-on implementation is based on the Managed Extensibility Framework,
+the entire application code is accessible for add-ons and Python scripts.
 
-- history feature added
-- mpv lib updated
+Python scripting is implemented with IronPython which uses Python 2.7.
 
-### 0.2.1
+The main/video window is WinForms based, other windows are WPF based.
 
-- right-click in fullscreen in the right-left corner closes the app
+The config editor adds it's controls dynamically and uses TOML to define it's
+content, there are only two simple types, StringSetting and OptionSetting.
+
+mpv.net was started 2017 and consists of about 9000 lines of code.
+
+Third party components are:
+
+- [libmpv](https://mpv.io/)
+- [MediaInfo](https://mediaarea.net/en/MediaInfo)
+- [Tommy (TOML parser)](https://github.com/dezhidki/Tommy)
+- [IronPython](https://ironpython.net/)
+
+### Support
+
+[Support thread in Doom9 forum](https://forum.doom9.org/showthread.php?t=174841)
+
+[Support thread in VideoHelp forum](https://forum.videohelp.com/threads/392514-mpv-net-a-extendable-media-player-for-windows)
+
+[Issue tracker to report bugs and request features](https://github.com/stax76/mpv.net/issues)
+
+### Links
+
+mpv manual: <https://mpv.io/manual/master/>
+
+mpv wiki: <https://github.com/mpv-player/mpv/wiki>
+
+mpv.net wiki: <https://github.com/stax76/mpv.net/wiki>
+
+mpv apps: <https://github.com/mpv-player/mpv/wiki/Applications-using-mpv>
+
+mpv user scripts: <https://github.com/mpv-player/mpv/wiki/User-Scripts>
+
+mpv default key bindings: <https://github.com/mpv-player/mpv/blob/master/etc/input.conf>
+
+mpv.net default key bindings: <https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/inputConf.txt>
+
+mpv download: <https://mpv.io/installation/>
+
+mpv.net download: <https://github.com/stax76/mpv.net/releases>
+
+mpv bugs and requests: <https://mpv.io/bug-reports/>
+
+mpv.net bugs and requests: <https://github.com/stax76/mpv.net/issues>
+
+### Download
+
+<https://github.com/stax76/mpv.net/releases>
+
+### 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
+- a new icon was designed. [Website](https://mpv-net.github.io/mpv.net-web-site/)
+- all windows (main, conf, input, about, command palette) can now be closed
+  by just pressing the Escape key
+- new feature added to open recent files and URLs with the context menu. [Default Binding](https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/inputConf.txt#L33)
+- the info command (i key) now works also for URLs
+- CSScriptAddon add-on didn't load cs scripts from \<startup\>\\scripts
+- error handling was improved by showing an improved message box that supports a text copy feature, a support link and text heading and text folding
+- libmpv was updated
+
+### 3.2 (2019-04-27)
+
+- mpvInputEdit and mpvConfEdit were discontinued and merged into
+  mpvnet because separate apps were to difficult to work with
+- portable mode: in case no config folder exists and the
+  startup folder has write access mpvnet will ask where
+  the config folder should be created (portable or appdata)
+- there was an issue causing keys not working after a modal window was shown
+- there was a crash when no script folder existed in the conf folder
+- MediaInfo and youtube-dl were updated
+- a new JavaScript example script was added to the wiki and the
+  script descriptions were improved. [Scripting Page](https://github.com/stax76/mpv.net/wiki/Scripting).
+- greatly improved README.md file and [github startpage](https://github.com/stax76/mpv.net)
+- About dialog added
+- the input editor shows only a closing message if actually a change was made
+- 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

RatingAddon/RatingAddon.cs

@@ -10,7 +10,7 @@ namespace RatingAddon
     [Export(typeof(IAddon))]
     public class RatingAddon : IAddon
     {
-        private Dictionary<string, int> Dic = new Dictionary<string, int>();
+        Dictionary<string, int> Dic = new Dictionary<string, int>();
 
         public RatingAddon()
         {
@@ -18,7 +18,7 @@ namespace RatingAddon
             mp.Shutdown += mpv_Shutdown;
         }
 
-        private void mpv_Shutdown()
+        void mpv_Shutdown()
         {
             foreach (var i in Dic)
             {
@@ -44,15 +44,15 @@ namespace RatingAddon
             }            
         }
 
-        private void mpv_ClientMessage(string[] args)
+        void mpv_ClientMessage(string[] args)
         {
             int rating;
 
             if (args?.Length != 2 || args[0] != "rate-file" || ! int.TryParse(args[1], out rating))
                 return;
 
-            Dic[mp.GetStringProp("path")] = rating;
-            mp.Command("show-text", $"Rating: {rating}");
+            Dic[mp.get_property_string("path")] = rating;
+            mp.commandv("show-text", $"Rating: {rating}");
         }
     }
 }

RatingAddon/RatingAddon.csproj

@@ -17,7 +17,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\mpv.net\bin\Debug\Addons\RatingAddon\</OutputPath>
+    <OutputPath>..\mpv.net\bin\Addons\RatingAddon\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -25,14 +25,14 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\mpv.net\bin\Release\</OutputPath>
+    <OutputPath>..\mpv.net\bin\Addons\RatingAddon\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..\mpv.net\bin\x86\Debug\</OutputPath>
+    <OutputPath>..\mpv.net\bin\x86\Addons\RatingAddon\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x86</PlatformTarget>
@@ -40,7 +40,7 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>..\mpv.net\bin\x86\Release\</OutputPath>
+    <OutputPath>..\mpv.net\bin\x86\Addons\RatingAddon\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -50,7 +50,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..\mpv.net\bin\x64\Debug\</OutputPath>
+    <OutputPath>..\mpv.net\bin\x64\Addons\RatingAddon\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x64</PlatformTarget>
@@ -58,7 +58,7 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>..\mpv.net\bin\x64\Release\</OutputPath>
+    <OutputPath>..\mpv.net\bin\x64\Addons\RatingAddon\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>

mpv.net.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26730.8
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.28729.10
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mpv.net", "mpv.net\mpv.net.csproj", "{1751F378-8EDF-4B62-BE6D-304C7C287089}"
 EndProject
@@ -11,50 +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
 		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
 		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|Any CPU.Build.0 = Debug|Any CPU
 		{1751F378-8EDF-4B62-BE6D-304C7C287089}.Debug|x64.ActiveCfg = Debug|x64
 		{1751F378-8EDF-4B62-BE6D-304C7C287089}.Debug|x64.Build.0 = Debug|x64
 		{1751F378-8EDF-4B62-BE6D-304C7C287089}.Debug|x86.ActiveCfg = Debug|x86
 		{1751F378-8EDF-4B62-BE6D-304C7C287089}.Debug|x86.Build.0 = Debug|x86
-		{1751F378-8EDF-4B62-BE6D-304C7C287089}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1751F378-8EDF-4B62-BE6D-304C7C287089}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1751F378-8EDF-4B62-BE6D-304C7C287089}.Release|x64.ActiveCfg = Release|x64
 		{1751F378-8EDF-4B62-BE6D-304C7C287089}.Release|x64.Build.0 = Release|x64
 		{1751F378-8EDF-4B62-BE6D-304C7C287089}.Release|x86.ActiveCfg = Release|x86
 		{1751F378-8EDF-4B62-BE6D-304C7C287089}.Release|x86.Build.0 = Release|x86
-		{55C88710-539D-4402-84C8-31694841C731}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{55C88710-539D-4402-84C8-31694841C731}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{55C88710-539D-4402-84C8-31694841C731}.Debug|x64.ActiveCfg = Debug|x64
 		{55C88710-539D-4402-84C8-31694841C731}.Debug|x64.Build.0 = Debug|x64
 		{55C88710-539D-4402-84C8-31694841C731}.Debug|x86.ActiveCfg = Debug|x86
 		{55C88710-539D-4402-84C8-31694841C731}.Debug|x86.Build.0 = Debug|x86
-		{55C88710-539D-4402-84C8-31694841C731}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{55C88710-539D-4402-84C8-31694841C731}.Release|Any CPU.Build.0 = Release|Any CPU
 		{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|Any CPU.ActiveCfg = Debug|Any CPU
-		{71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Debug|x64.Build.0 = Debug|Any CPU
-		{71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Debug|x86.Build.0 = Debug|Any CPU
-		{71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Release|x64.ActiveCfg = Release|Any CPU
-		{71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Release|x64.Build.0 = Release|Any CPU
-		{71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Release|x86.ActiveCfg = Release|Any CPU
-		{71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Release|x86.Build.0 = Release|Any CPU
+		{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/Addon.cs

@@ -5,7 +5,7 @@ using System.ComponentModel.Composition.Hosting;
 using System.IO;
 using System.Windows.Forms;
 
-using static mpvnet.StaticUsing;
+using Sys;
 
 namespace mpvnet
 {
@@ -14,7 +14,7 @@ namespace mpvnet
         [ImportMany]
         public IEnumerable<IAddon> Addons = null;
 
-        private readonly CompositionContainer CompositionContainer;
+        readonly CompositionContainer CompositionContainer;
 
         public Addon()
         {
@@ -28,7 +28,7 @@ namespace mpvnet
                     foreach (string i in Directory.GetDirectories(dir))
                         catalog.Catalogs.Add(new DirectoryCatalog(i, "*Addon.dll"));
 
-                dir = mp.mpvConfFolderPath + "\\Addons";
+                dir = mp.MpvConfFolder + "\\Addons";
 
                 if (Directory.Exists(dir))
                     foreach (string i in Directory.GetDirectories(dir))
@@ -40,9 +40,9 @@ namespace mpvnet
                     CompositionContainer.ComposeParts(this);
                 }
             }
-            catch (Exception e)
+            catch (Exception ex)
             {
-                MsgError(e.ToString());
+                Msg.ShowException(ex);
             }
         }
     }

mpv.net/App.config

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
+    <configSections>
+    </configSections>
     <startup> 
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
     </startup>

mpv.net/Command.cs

@@ -2,9 +2,12 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
+using System.Linq;
+using System.Reflection;
 using System.Windows.Forms;
+using System.Windows.Interop;
 
-using static mpvnet.StaticUsing;
+using Sys;
 
 namespace mpvnet
 {
@@ -13,7 +16,7 @@ namespace mpvnet
         public string Name { get; set; }
         public Action<string[]> Action { get; set; }
 
-        private static List<Command> commands;
+        static List<Command> commands;
 
         public static List<Command> Commands
         {
@@ -22,21 +25,20 @@ namespace mpvnet
                 if (commands == null)
                 {
                     commands = new List<Command>();
-                    var type = typeof(Command);
-                    var methods = type.GetMethods(System.Reflection.BindingFlags.Static | System.Reflection.BindingFlags.Public);
+                    Type type = typeof(Command);
+                    MethodInfo[] methods = type.GetMethods(System.Reflection.BindingFlags.Static | System.Reflection.BindingFlags.Public);
 
                     foreach (var i in methods)
                     {
-                        var parameters = i.GetParameters();
+                        ParameterInfo[] parameters = i.GetParameters();
 
                         if (parameters == null || parameters.Length != 1 || parameters[0].ParameterType != typeof(string[]))
                             continue;
 
-                        var cmd = new Command() { Name = i.Name.Replace("_","-"), Action = (Action<string[]>)i.CreateDelegate(typeof(Action<string[]>)) };
+                        Command cmd = new Command() { Name = i.Name.Replace("_","-"), Action = (Action<string[]>)i.CreateDelegate(typeof(Action<string[]>)) };
                         commands.Add(cmd);
                     }
                 }
-
                 return commands;
             }
         }
@@ -44,123 +46,222 @@ namespace mpvnet
         public static void open_files(string[] args)
         {
             MainForm.Instance.Invoke(new Action(() => {
-                using (var d = new OpenFileDialog())
-                {
-                    d.Multiselect = true;
-                    d.Filter = Misc.GetFilter(Misc.FileTypes);
-
+                using (var d = new OpenFileDialog() { Multiselect = true })
                     if (d.ShowDialog() == DialogResult.OK)
                         mp.LoadFiles(d.FileNames);
-                }
             }));
         }
 
-        public static void open_config_folder(string[] args)
+        public static void open_conf_folder(string[] args)
         {
-            Process.Start(mp.mpvConfFolderPath);
+            Process.Start(mp.MpvConfFolder);
         }
 
-        public static void show_keys(string[] args)
+        public static void show_input_editor(string[] args)
         {
-            Process.Start(mp.InputConfPath);
+            MainForm.Instance.Invoke(new Action(() => {
+                InputWindow w = new InputWindow();
+                new WindowInteropHelper(w).Owner = MainForm.Instance.Handle;
+                w.ShowDialog();
+            }));
         }
 
-        private static void CreateMpvConf()
+        public static void show_conf_editor(string[] args)
         {
-            if (!File.Exists(mp.mpvConfPath))
-            {
-                if (!Directory.Exists(mp.mpvConfFolderPath))
-                    Directory.CreateDirectory(mp.mpvConfFolderPath);
-
-                File.WriteAllText(mp.mpvConfPath, "# https://mpv.io/manual/master/#configuration-files");
-            }
+            MainForm.Instance.Invoke(new Action(() => {
+                ConfWindow w = new ConfWindow();
+                new WindowInteropHelper(w).Owner = MainForm.Instance.Handle;
+                w.ShowDialog();
+            }));
         }
 
-        public static void show_prefs(string[] args)
+        public static void show_about(string[] args)
         {
-            CreateMpvConf();
-            Process.Start(mp.mpvConfPath);
+            MainForm.Instance.Invoke(new Action(() => {
+                AboutWindow w = new AboutWindow();
+                new WindowInteropHelper(w).Owner = MainForm.Instance.Handle;
+                w.ShowDialog();
+            }));
         }
 
-        public static void history(string[] args)
+        public static void show_command_palette(string[] args)
         {
-            var fp = mp.mpvConfFolderPath + "history.txt";
+            MainForm.Instance.Invoke(new Action(() => {
+                var w = new CommandPaletteWindow();
+                new WindowInteropHelper(w).Owner = MainForm.Instance.Handle;
+                w.ShowDialog();
+            }));
+        }
+
+        public static void show_history(string[] args)
+        {
+            var fp = mp.MpvConfFolder + "history.txt";
 
             if (File.Exists(fp))
                 Process.Start(fp);
             else
-                if (MsgQuestion("Create history.txt file in config folder?\r\n\r\nmpv.net will write the date, time and filename of opened files to it.") == DialogResult.OK)
+                if (Msg.ShowQuestion("Create history.txt file in config folder?",
+                    "mpv.net will write the date, time and filename of opened files to it.") == MsgResult.OK)
                     File.WriteAllText(fp, "");
         }
 
-        public static void shell_execute(string[] args)
-        {
-            Process.Start(args[0]);
-        }
-
-        public static void set_setting(string[] args)
-        {
-            CreateMpvConf();
-
-            bool changed = false;
-            string fp = mp.mpvConfPath;
-            var confLines = File.ReadAllLines(fp);
-
-            for (int i = 0; i < confLines.Length; i++)
-            {
-                if (confLines[i].Left("=").Trim() == args[0])
-                {
-                    confLines[i] = args[0] + "=" + args[1];
-                    changed = true;
-                }
-            }
-
-            if (changed)
-            {
-                File.WriteAllText(fp, String.Join(Environment.NewLine, confLines));
-            }
-            else
-            {
-                File.WriteAllText(fp,
-                    File.ReadAllText(fp) + Environment.NewLine + args[0] + "=" + args[1]);
-            }
-
-            MsgInfo("Please restart mpv.net");
-        }
+        public static void shell_execute(string[] args) => Process.Start(args[0]);
 
         public static void show_info(string[] args)
         {
-            var fi = new FileInfo(mp.GetStringProp("path"));
-
-            using (var mi = new MediaInfo(fi.FullName))
+            try
             {
-                var w = mi.GetInfo(MediaInfoStreamKind.Video, "Width");
-                var h = mi.GetInfo(MediaInfoStreamKind.Video, "Height");
-                var pos = TimeSpan.FromSeconds(mp.GetIntProp("time-pos"));
-                var dur = TimeSpan.FromSeconds(mp.GetIntProp("duration"));
-                string mibr = mi.GetInfo(MediaInfoStreamKind.Video, "BitRate");
+                string performer, title, album, genre, date, duration, text = "";
+                long fileSize = 0;
+                string path = mp.get_property_string("path");
+                int width = mp.get_property_int("video-params/w");
+                int height = mp.get_property_int("video-params/h");
 
-                if (mibr == "")
-                    mibr = "0";
+                if (File.Exists(path))
+                {
+                    fileSize = new FileInfo(path).Length;
 
-                var br = Convert.ToInt32(mibr) / 1000.0 / 1000.0;
-                var vf = mp.GetStringProp("video-format").ToUpper();
-                var fn = fi.Name;
+                    if (App.AudioTypes.Contains(Path.GetExtension(path).ToLower().TrimStart('.')))
+                    {
+                        using (MediaInfo mediaInfo = new MediaInfo(path))
+                        {
+                            performer = mediaInfo.GetInfo(MediaInfoStreamKind.General, "Performer");
+                            title = mediaInfo.GetInfo(MediaInfoStreamKind.General, "Title");
+                            album = mediaInfo.GetInfo(MediaInfoStreamKind.General, "Album");
+                            genre = mediaInfo.GetInfo(MediaInfoStreamKind.General, "Genre");
+                            date = mediaInfo.GetInfo(MediaInfoStreamKind.General, "Recorded_Date");
+                            duration = mediaInfo.GetInfo(MediaInfoStreamKind.Audio, "Duration/String");
 
-                if (fn.Length > 60)
-                    fn = fn.Insert(59, "\r\n");
+                            if (performer != "") text += "Artist: " + performer + "\n";
+                            if (title != "") text += "Title: " + title + "\n";
+                            if (album != "") text += "Album: " + album + "\n";
+                            if (genre != "") text += "Genre: " + genre + "\n";
+                            if (date != "") text += "Year: " + date + "\n";
+                            if (duration != "") text += "Length: " + duration + "\n";
 
-                var info =
-                    FormatTime(pos.TotalMinutes) + ":" +
-                    FormatTime(pos.Seconds) + " / " +
-                    FormatTime(dur.TotalMinutes) + ":" +
-                    FormatTime(dur.Seconds) + "\n" +
-                    ((int)(fi.Length / 1024 / 1024)).ToString() +
-                    $" MB - {w} x {h}\n{vf} - {br.ToString("f1")} Mb/s" + "\n" + fn;
+                            mp.commandv("show-text", text, "5000");
+                            return;
+                        }
+                    }
+                }
 
-                mp.Command("show-text", info, "5000");
+                TimeSpan position = TimeSpan.FromSeconds(mp.get_property_number("time-pos"));
+                TimeSpan duration2 = TimeSpan.FromSeconds(mp.get_property_number("duration"));
+                string videoCodec = mp.get_property_string("video-format").ToUpper();
 
-                string FormatTime(double value) => ((int)(Math.Floor(value))).ToString("00");
+                text = Path.GetFileName(path) + "\n" +
+                    FormatTime(position.TotalMinutes) + ":" +
+                    FormatTime(position.Seconds) + " / " +
+                    FormatTime(duration2.TotalMinutes) + ":" +
+                    FormatTime(duration2.Seconds) + "\n" +
+                    $"{width} x {height}\n";
+
+                if (fileSize > 0)
+                    text += Convert.ToInt32(fileSize / 1024.0 / 1024.0).ToString() + " MB\n";
+
+                text += $"{videoCodec}\n";
+
+                mp.commandv("show-text", text, "5000");
+                string FormatTime(double value) => ((int)value).ToString("00");
+            }
+            catch (Exception)
+            {
+            }
+        }
+
+        public static void execute_mpv_command(string[] args)
+        {
+            MainForm.Instance.Invoke(new Action(() => {
+                string command = Microsoft.VisualBasic.Interaction.InputBox("Enter a mpv command to be executed.", "Execute Command", RegistryHelp.GetString("HKCU\\Software\\" + Application.ProductName, "RecentExecutedCommand"));
+                if (string.IsNullOrEmpty(command)) return;
+                RegistryHelp.SetObject("HKCU\\Software\\" + Application.ProductName, "RecentExecutedCommand", command);
+                mp.command_string(command, false);
+            }));
+        }
+        
+        public static void open_url(string[] args)
+        {
+            MainForm.Instance.Invoke(new Action(() => {
+                string command = Microsoft.VisualBasic.Interaction.InputBox("Enter URL to be opened.");
+                if (string.IsNullOrEmpty(command)) return;
+                mp.LoadFiles(command);
+            }));
+        }
+
+        public static void load_sub(string[] args)
+        {
+            MainForm.Instance.Invoke(new Action(() => {
+                using (var d = new OpenFileDialog())
+                {
+                    d.InitialDirectory = Path.GetDirectoryName(mp.get_property_string("path", false));
+                    d.Multiselect = true;
+
+                    if (d.ShowDialog() == DialogResult.OK)
+                        foreach (string i in d.FileNames)
+                            mp.commandv("sub-add", i);
+                }
+            }));
+        }
+
+        public static void load_audio(string[] args)
+        {
+            MainForm.Instance.Invoke(new Action(() => {
+                using (var d = new OpenFileDialog())
+                {
+                    d.InitialDirectory = Path.GetDirectoryName(mp.get_property_string("path", false));
+                    d.Multiselect = true;
+
+                    if (d.ShowDialog() == DialogResult.OK)
+                        foreach (string i in d.FileNames)
+                            mp.commandv("audio-add", i);
+                }
+            }));
+        }
+
+        public static void cycle_audio(string[] args)
+        {
+            string filePath = mp.get_property_string("path", false);
+            if (!File.Exists(filePath)) return;
+
+            using (MediaInfo mi = new MediaInfo(filePath))
+            {
+                MediaTrack[] audTracks = mp.MediaTracks.Where(track => track.Type == "a").ToArray();
+                if (audTracks.Length < 2) return;
+                int aid = mp.get_property_int("aid");
+                aid += 1;
+                if (aid > audTracks.Length) aid = 1;
+                mp.commandv("set", "aid", aid.ToString());
+                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/Controls/SearchTextBoxUserControl.xaml

@@ -0,0 +1,13 @@
+<UserControl x:Class="Controls.SearchTextBoxUserControl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <Grid x:Name="SearchTextBoxUserControl1" Background="{Binding Path=Background, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}">
+        <TextBlock x:Name="HintTextBlock" Margin="5,2" Text="Find a setting" Foreground="LightSteelBlue" VerticalAlignment="Center" Background="{Binding Path=Background, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}" />
+        <TextBox Name="SearchTextBox" Height="25" Padding="1,2,0,0" BorderThickness="2" Background="Transparent" TextChanged="SearchTextBox_TextChanged" Foreground="{Binding Path=Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}" CaretBrush="{Binding Path=Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}" />
+        <Button x:Name="SearchClearButton" Background="Transparent" HorizontalAlignment="Right" Margin="2,0,4,0" FontSize="10" Width="17" Height="17" Visibility="Hidden" Click="SearchClearButton_Click" FontFamily="Marlett" Foreground="{Binding Path=Foreground2, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}">r</Button>
+    </Grid>
+</UserControl>

mpv.net/Controls/SearchTextBoxUserControl.xaml.cs

@@ -0,0 +1,47 @@
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+
+namespace Controls
+{
+    public partial class SearchTextBoxUserControl : UserControl
+    {
+        public SearchTextBoxUserControl()
+        {
+            InitializeComponent();
+        }
+
+        public string Text { get => SearchTextBox.Text; set => SearchTextBox.Text = value; }
+
+        private string _HintText;
+
+        public string HintText {
+            get => _HintText;
+            set {
+                _HintText = value;
+                UpdateControls();
+            }
+        }
+
+        private void SearchClearButton_Click(object sender, RoutedEventArgs e)
+        {
+            SearchTextBox.Text = "";
+            Keyboard.Focus(SearchTextBox);
+        }
+
+        private void SearchTextBox_TextChanged(object sender, TextChangedEventArgs e)
+        {
+            UpdateControls();
+        }
+
+        void UpdateControls()
+        {
+            HintTextBlock.Text = SearchTextBox.Text == "" ? HintText : "";
+
+            if (SearchTextBox.Text == "")
+                SearchClearButton.Visibility = Visibility.Hidden;
+            else
+                SearchClearButton.Visibility = Visibility.Visible;
+        }
+    }
+}

mpv.net/DynamicGUI/DynamicGUI.cs

@@ -0,0 +1,135 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Windows.Documents;
+using System.Windows.Navigation;
+
+using Tommy;
+
+namespace DynamicGUI
+{
+    public class Settings
+    {
+        public static List<SettingBase> LoadSettings(string content)
+        {
+            TomlTable table;
+            using (StringReader reader = new StringReader(content))
+                table = TOML.Parse(reader);
+            List<SettingBase> settingsList = new List<SettingBase>(); 
+
+            foreach (TomlTable setting in table["settings"])
+            {
+                SettingBase baseSetting = null;
+
+                if (setting.HasKey("options"))
+                {
+                    OptionSetting optionSetting = new OptionSetting();
+                    baseSetting = optionSetting;
+                    optionSetting.Default = setting["default"];
+                    optionSetting.Value = optionSetting.Default;
+                    optionSetting.StartValue = optionSetting.Default;
+
+                    foreach (TomlTable option in setting["options"])
+                    {
+                        var opt = new OptionSettingOption();
+                        opt.Name = option["name"];
+                        if (option.HasKey("help"))
+                            opt.Help = option["help"];
+                        if (option.HasKey("text"))
+                            opt.Text = option["text"];
+                        else if (opt.Name == optionSetting.Default)
+                            opt.Text = opt.Name + " (Default)";
+                        opt.OptionSetting = optionSetting;
+                        optionSetting.Options.Add(opt);
+                    }
+                }
+                else if (setting["default"].IsString)
+                {
+                    StringSetting stringSetting = new StringSetting();
+                    baseSetting = stringSetting;
+                    stringSetting.Default = setting["default"];
+                    if (setting.HasKey("folder")) stringSetting.IsFolder = true;
+                }
+
+                baseSetting.Name = setting["name"];
+                baseSetting.Filter = setting["filter"];
+                if (setting.HasKey("help")) baseSetting.Help = setting["help"];
+                if (setting.HasKey("helpurl")) baseSetting.HelpURL = setting["helpurl"];
+                if (setting.HasKey("width")) baseSetting.Width = setting["width"];
+                settingsList.Add(baseSetting);
+            }
+            return settingsList;
+        }
+    }
+
+    public abstract class SettingBase
+    {
+        public string Name { get; set; }
+        public string Value { get; set; }
+        public string StartValue { get; set; }
+        public string Help { get; set; }
+        public string Default { get; set; }
+        public string HelpURL { get; set; }
+        public string Filter { get; set; }
+        public int Width { get; set; }
+    }
+
+    public class StringSetting : SettingBase
+    {
+        public bool IsFolder { get; set; }
+    }
+
+    public class OptionSetting : SettingBase
+    {
+        public List<OptionSettingOption> Options = new List<OptionSettingOption>();
+    }
+
+    public class OptionSettingOption
+    {
+        public string Name { get; set; }
+        public string Help { get; set; }
+
+        public OptionSetting OptionSetting { get; set; }
+
+        private string _Text;
+
+        public string Text
+        {
+            get => string.IsNullOrEmpty(_Text) ? Name : _Text;
+            set => _Text = value;
+        }
+
+        public bool IsChecked
+        {
+            get => OptionSetting.Value == Name ;
+            set {
+                if (value)
+                    OptionSetting.Value = Name;
+            }
+        }
+    }
+
+    interface ISettingControl
+    {
+        bool Contains(string searchString);
+        SettingBase SettingBase { get; }
+    }
+
+    public class HyperlinkEx : Hyperlink
+    {
+        private void HyperLinkEx_RequestNavigate(object sender, RequestNavigateEventArgs e)
+        {
+            Process.Start(e.Uri.AbsoluteUri);
+        }
+
+        public void SetURL(string url)
+        {
+            if (string.IsNullOrEmpty(url)) return;
+            NavigateUri = new Uri(url);
+            RequestNavigate += HyperLinkEx_RequestNavigate;
+            Inlines.Clear();
+            Inlines.Add(url);
+        }
+    }
+}

mpv.net/DynamicGUI/OptionSettingControl.xaml

@@ -0,0 +1,28 @@
+<UserControl x:Name="OptionSettingControl1" x:Class="DynamicGUI.OptionSettingControl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:DynamicGUI"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <Grid Margin="20,0">
+        <StackPanel>
+            <TextBox x:Name="TitleTextBox" FontSize="24" Margin="0,10" BorderThickness="0" IsReadOnly="True" Foreground="{Binding Path=Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}" Background="{Binding Path=Background, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}"></TextBox>
+            <ItemsControl x:Name="ItemsControl">
+                <ItemsControl.ItemTemplate>
+                    <DataTemplate>
+                        <WrapPanel Orientation="Vertical">
+                            <RadioButton x:Name="RadioButton" VerticalContentAlignment="Center" IsChecked="{Binding IsChecked}" GroupName="{Binding OptionSetting.Name}" Content="{Binding Text}" FontSize="16" FontWeight="Normal" VerticalAlignment="Top" Foreground="{Binding Path=Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}"></RadioButton>
+                            <TextBox x:Name="ItemHelpTextBox" TextWrapping="WrapWithOverflow" Text="{Binding Help}" Margin="10,0,0,0" BorderThickness="0" IsReadOnly="True" Padding="7,0,0,0" MinHeight="0" Foreground="{Binding Path=Foreground2, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}" Background="{Binding Path=Background, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}"></TextBox>
+                        </WrapPanel>
+                    </DataTemplate>
+                </ItemsControl.ItemTemplate>
+            </ItemsControl>
+            <TextBox x:Name="HelpTextBox" TextWrapping="WrapWithOverflow" BorderThickness="0" IsReadOnly="True" Margin="0,10,0,0" Foreground="{Binding Path=Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}" Background="{Binding Path=Background, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}"></TextBox>
+            <TextBlock x:Name="LinkTextBlock" Margin="0,10">
+                <local:HyperlinkEx x:Name="Link"></local:HyperlinkEx>
+            </TextBlock>
+        </StackPanel>
+    </Grid>
+</UserControl>

mpv.net/DynamicGUI/OptionSettingControl.xaml.cs

@@ -0,0 +1,40 @@
+using System.Windows;
+using System.Windows.Controls;
+
+namespace DynamicGUI
+{
+    public partial class OptionSettingControl : UserControl, ISettingControl
+    {
+        private OptionSetting OptionSetting;
+
+        public OptionSettingControl(OptionSetting optionSetting)
+        {
+            OptionSetting = optionSetting;
+            InitializeComponent();
+            TitleTextBox.Text = optionSetting.Name;
+            HelpTextBox.Text = optionSetting.Help;
+            ItemsControl.ItemsSource = optionSetting.Options;
+            Link.SetURL(optionSetting.HelpURL);
+            if (string.IsNullOrEmpty(optionSetting.HelpURL))
+                LinkTextBlock.Visibility = Visibility.Collapsed;
+        }
+
+        private string _SearchableText;
+
+        public string SearchableText {
+            get {
+                if (_SearchableText is null)
+                {
+                    _SearchableText = TitleTextBox.Text + HelpTextBox.Text;
+                    foreach (var i in OptionSetting.Options)
+                        _SearchableText += i.Text + i.Help + i.Name;
+                    _SearchableText = _SearchableText.ToLower();
+                }
+                return _SearchableText;
+            }
+        }
+
+        public SettingBase SettingBase => OptionSetting;
+        public bool Contains(string searchString) => SearchableText.Contains(searchString.ToLower());
+    }
+}

mpv.net/DynamicGUI/StringSettingControl.xaml

@@ -0,0 +1,27 @@
+<UserControl x:Name="StringSettingControl1" x:Class="DynamicGUI.StringSettingControl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:DynamicGUI"
+             mc:Ignorable="d" 
+             d:DesignHeight="450"
+             d:DesignWidth="800" >
+    <Grid Margin="20,0">
+        <StackPanel>
+            <TextBox x:Name="TitleTextBox" FontSize="24" Margin="0,10" BorderThickness="0" IsReadOnly="True" Foreground="{Binding Path=Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}" Background="{Binding Path=Background, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}"></TextBox>
+            <Grid Margin="0,0,0,10">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+                <TextBox x:Name="ValueTextBox" Text="{Binding Path=Text, ElementName=StringSettingControl1, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Width="150" HorizontalAlignment="Left" Height="20" Foreground="{Binding Path=Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}" Background="{Binding Path=Background, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}"/>
+                <Button x:Name="Button" Height="20" Grid.Column="1" Visibility="{Binding Path=Text, ElementName=StringSettingControl1}" Margin="5,0,0,0" Width="20" Click="Button_Click">...</Button>
+            </Grid>
+            <TextBox x:Name="HelpTextBox" TextWrapping="WrapWithOverflow" Margin="0,0,0,10" BorderThickness="0" IsReadOnly="True" Foreground="{Binding Path=Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}" Background="{Binding Path=Background, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}"></TextBox>
+            <TextBlock x:Name="LinkTextBlock" Margin="0,10">
+                <local:HyperlinkEx x:Name="Link"></local:HyperlinkEx>
+            </TextBlock>
+        </StackPanel>
+    </Grid>
+</UserControl>

mpv.net/DynamicGUI/StringSettingControl.xaml.cs

@@ -0,0 +1,57 @@
+using System.Windows;
+using System.Windows.Controls;
+
+namespace DynamicGUI
+{
+    public partial class StringSettingControl : UserControl, ISettingControl
+    {
+        private StringSetting StringSetting;
+        
+        public StringSettingControl(StringSetting stringSetting)
+        {
+            StringSetting = stringSetting;
+            InitializeComponent();
+            TitleTextBox.Text = stringSetting.Name;
+            HelpTextBox.Text = stringSetting.Help;
+            ValueTextBox.Text = stringSetting.Value;
+            if (stringSetting.Width > 0)
+                ValueTextBox.Width = stringSetting.Width;
+            if (!StringSetting.IsFolder)
+                Button.Visibility = Visibility.Hidden;
+            Link.SetURL(StringSetting.HelpURL);
+            if (string.IsNullOrEmpty(stringSetting.HelpURL))
+                LinkTextBlock.Visibility = Visibility.Collapsed;
+        }
+
+        private string _SearchableText;
+
+        public string SearchableText {
+            get {
+                if (_SearchableText is null)
+                    _SearchableText = (TitleTextBox.Text + HelpTextBox.Text +ValueTextBox.Text).ToLower();
+
+                return _SearchableText;
+            }
+        }
+
+        public bool Contains(string searchString) => SearchableText.Contains(searchString.ToLower());
+        public SettingBase SettingBase => StringSetting;
+
+        public string Text
+        {
+            get => StringSetting.Value;
+            set => StringSetting.Value = value;
+        }
+
+        private void Button_Click(object sender, RoutedEventArgs e)
+        {
+            using (var d = new System.Windows.Forms.FolderBrowserDialog())
+            {
+                d.Description = "Choose a folder.";
+                d.SelectedPath = ValueTextBox.Text;
+                if (d.ShowDialog() == System.Windows.Forms.DialogResult.OK)
+                    ValueTextBox.Text = d.SelectedPath;
+            }
+        }
+    }
+}

mpv.net/Extensions.cs

@@ -1,30 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-
-namespace mpvnet
-{
-    public static class Extensions
-    {
-        public static string Join(this IEnumerable<string> instance, string delimiter, bool removeEmpty = false)
-        {
-            if (instance == null)
-                return null;
-
-            bool containsEmpty = false;
-
-            foreach (var i in instance)
-            {
-                if (string.IsNullOrEmpty(i))
-                {
-                    containsEmpty = true;
-                    break;
-                }
-            }
-
-            if (containsEmpty && removeEmpty)
-                instance = instance.Where(arg => !string.IsNullOrEmpty(arg));
-
-            return string.Join(delimiter, instance);
-        }
-    }
-}

mpv.net/MainForm.Designer.cs

@@ -42,10 +42,10 @@
             // MainForm
             // 
             this.AllowDrop = true;
-            this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 25F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
+            this.AutoScaleDimensions = new System.Drawing.SizeF(288F, 288F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
             this.BackColor = System.Drawing.Color.Black;
-            this.ClientSize = new System.Drawing.Size(1553, 1000);
+            this.ClientSize = new System.Drawing.Size(606, 368);
             this.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);

mpv.net/MainForm.cs

@@ -4,21 +4,36 @@ using System.IO;
 using System.Runtime.InteropServices;
 using System.Threading;
 using System.Windows.Forms;
+using System.Linq;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Globalization;
 using System.Diagnostics;
-using static mpvnet.StaticUsing;
+
+using Sys;
 
 namespace mpvnet
 {
     public partial class MainForm : Form
     {
         public static MainForm Instance { get; set; }
-        public static IntPtr Hwnd;
+        public static IntPtr Hwnd { get; set; }
 
-        private Point LastCursorPosChanged;
-        private int LastCursorChangedTickCount;
-        private bool IsClosed;
+        public new ContextMenuStripEx ContextMenu { get; set; }
 
-        public ContextMenuStripEx CMS;
+        Point  LastCursorPosChanged;
+        int    LastCursorChangedTickCount;
+        bool   IgnoreDpiChanged = true;
+        List<string> RecentFiles;
+
+        public string MpvNetDarkMode { get; set; } = "always";
+        public bool   MpvFullscreen  { get; set; }
+        public float  MpvAutofit { get; set; } = 0.50f;
+        public int    MpvScreen  { get; set; } = -1;
+        public string MpvSid     { get; set; } = "";
+        public string MpvAid     { get; set; } = "";
+        public string MpvVid     { get; set; } = "";
+        public int    MpvEdition { get; set; }
 
         public MainForm()
         {
@@ -26,106 +41,364 @@ namespace mpvnet
 
             try
             {
+                AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
                 Application.ThreadException += Application_ThreadException;
-                SetFormPosSize();
+                Msg.SupportURL = "https://github.com/stax76/mpv.net#support";
                 Instance = this;
+                WPF.WPF.Init();
+                System.Windows.Application.Current.ShutdownMode = System.Windows.ShutdownMode.OnExplicitShutdown;
                 Hwnd = Handle;
-                ChangeFullscreen((mp.mpvConv.ContainsKey("fullscreen") && mp.mpvConv["fullscreen"] == "yes") || (mp.mpvConv.ContainsKey("fs") && mp.mpvConv["fs"] == "yes"));
+                MinimumSize = new Size(FontHeight * 16, FontHeight * 9);
+                Text += " " + Application.ProductVersion;
+
+                object recent = RegistryHelp.GetObject("HKCU\\Software\\" + Application.ProductName, "Recent");
+
+                if (recent is string[] r)
+                    RecentFiles = new List<string>(r);
+                else
+                    RecentFiles = new List<string>();
+
+                foreach (var i in mp.mpvConf)
+                    ProcessMpvProperty(i.Key, i.Value);
+
+                foreach (var i in mp.mpvNetConf)
+                    ProcessMpvNetProperty(i.Key, i.Value);
+
+                ProcessCommandLineEarly();
+
+                if (MpvScreen == -1) MpvScreen = Array.IndexOf(Screen.AllScreens, Screen.PrimaryScreen);
+                SetScreen(MpvScreen);
+
+                ChangeFullscreen(MpvFullscreen);
             }
             catch (Exception ex)
             {
-                HandleException(ex);
+                Msg.ShowException(ex);
+            }
+        }
+
+        void ContextMenu_Opening(object sender, CancelEventArgs e)
+        {
+            lock (mp.MediaTracks)
+            {
+                MenuItem trackMenuItem = FindMenuItem("Track");
+
+                if (trackMenuItem != null)
+                {
+                    trackMenuItem.DropDownItems.Clear();
+
+                    MediaTrack[] audTracks = mp.MediaTracks.Where(track => track.Type == "a").ToArray();
+                    MediaTrack[] subTracks = mp.MediaTracks.Where(track => track.Type == "s").ToArray();
+                    MediaTrack[] vidTracks = mp.MediaTracks.Where(track => track.Type == "v").ToArray();
+                    MediaTrack[] ediTracks = mp.MediaTracks.Where(track => track.Type == "e").ToArray();
+
+                    foreach (MediaTrack track in vidTracks)
+                    {
+                        MenuItem mi = new MenuItem(track.Text);
+                        mi.Action = () => { mp.commandv("set", "vid", track.ID.ToString()); };
+                        mi.Checked = MpvVid == track.ID.ToString();
+                        trackMenuItem.DropDownItems.Add(mi);
+                    }
+
+                    if (vidTracks.Length > 0)
+                        trackMenuItem.DropDownItems.Add(new ToolStripSeparator());
+
+                    foreach (MediaTrack track in audTracks)
+                    {
+                        MenuItem mi = new MenuItem(track.Text);
+                        mi.Action = () => { mp.commandv("set", "aid", track.ID.ToString()); };
+                        mi.Checked = MpvAid == track.ID.ToString();
+                        trackMenuItem.DropDownItems.Add(mi);
+                    }
+
+                    if (subTracks.Length > 0)
+                        trackMenuItem.DropDownItems.Add(new ToolStripSeparator());
+
+                    foreach (MediaTrack track in subTracks)
+                    {
+                        MenuItem mi = new MenuItem(track.Text);
+                        mi.Action = () => { mp.commandv("set", "sid", track.ID.ToString()); };
+                        mi.Checked = MpvSid == track.ID.ToString();
+                        trackMenuItem.DropDownItems.Add(mi);
+                    }
+
+                    if (subTracks.Length > 0)
+                    {
+                        MenuItem mi = new MenuItem("S: No subtitles");
+                        mi.Action = () => { mp.commandv("set", "sid", "no"); };
+                        mi.Checked = MpvSid == "no";
+                        trackMenuItem.DropDownItems.Add(mi);
+                    }
+
+                    if (ediTracks.Length > 0)
+                        trackMenuItem.DropDownItems.Add(new ToolStripSeparator());
+
+                    foreach (MediaTrack track in ediTracks)
+                    {
+                        MenuItem mi = new MenuItem(track.Text);
+                        mi.Action = () => { mp.commandv("set", "edition", track.ID.ToString()); };
+                        mi.Checked = MpvEdition == track.ID;
+                        trackMenuItem.DropDownItems.Add(mi);
+                    }
+                }
+            }
+
+            lock (mp.Chapters)
+            {
+                MenuItem chaptersMenuItem = FindMenuItem("Chapters");
+
+                if (chaptersMenuItem != null)
+                {
+                    chaptersMenuItem.DropDownItems.Clear();
+
+                    foreach (var i in mp.Chapters)
+                    {
+                        MenuItem mi = new MenuItem(i.Key);
+                        mi.ShortcutKeyDisplayString = TimeSpan.FromSeconds(i.Value).ToString().Substring(0, 8) + "     ";
+                        mi.Action = () => { mp.commandv("seek", i.Value.ToString(CultureInfo.InvariantCulture), "absolute"); };
+                        chaptersMenuItem.DropDownItems.Add(mi);
+                    }
+                }
+            }
+
+            MenuItem recent = FindMenuItem("Recent");
+
+            if (recent != null)
+            {
+                recent.DropDownItems.Clear();
+
+                foreach (string path in RecentFiles)
+                    MenuItem.Add(recent.DropDownItems, path, () => mp.LoadFiles(path));
+
+                recent.DropDownItems.Add(new ToolStripSeparator());
+                MenuItem mi = new MenuItem("Clear List");
+                mi.Action = () => RecentFiles.Clear();
+                recent.DropDownItems.Add(mi);
+            }
+        }
+
+        public MenuItem FindMenuItem(string text) => FindMenuItem(text, ContextMenu.Items);
+
+        MenuItem FindMenuItem(string text, ToolStripItemCollection items)
+        {
+            foreach (var item in items)
+            {
+                if (item is MenuItem mi)
+                {
+                    if (mi.Text.StartsWith(text) && mi.Text.Trim() == text)
+                        return mi;
+                    if (mi.DropDownItems.Count > 0)
+                    {
+                        MenuItem val = FindMenuItem(text, mi.DropDownItems);
+                        if (val != null) return val;
+                    }
+                }
+            }
+            return null;
+        }
+
+        protected void SetScreen(int targetIndex)
+        {
+            Screen[] screens = Screen.AllScreens;
+            if (targetIndex < 0) targetIndex = 0;
+            if (targetIndex > screens.Length - 1) targetIndex = screens.Length - 1;
+            SetScreen(screens[Array.IndexOf(screens, screens[targetIndex])]);
+        }
+
+        protected void SetScreen(Screen screen)
+        {
+            Rectangle target = screen.Bounds;
+            Left = target.X + Convert.ToInt32((target.Width - Width) / 2.0);
+            Top = target.Y + Convert.ToInt32((target.Height - Height) / 2.0);
+            SetStartFormPositionAndSize();
+        }
+
+        void SetStartFormPositionAndSize()
+        {
+            if (IsFullscreen || mp.VideoSize.Width == 0) return;
+            Screen screen = Screen.FromControl(this);
+            int height = Convert.ToInt32(screen.Bounds.Height * MpvAutofit);
+            int width = Convert.ToInt32(height * mp.VideoSize.Width / (double)mp.VideoSize.Height);
+            Point middlePos = new Point(Left + Width / 2, Top + Height / 2);
+            var rect = new Native.RECT(new Rectangle(screen.Bounds.X, screen.Bounds.Y, width, height));
+            NativeHelp.AddWindowBorders(Handle, ref rect);
+            int left = middlePos.X - rect.Width / 2;
+            int top = middlePos.Y - rect.Height / 2;
+            Native.SetWindowPos(Handle, IntPtr.Zero /* HWND_TOP */, left, top, rect.Width, rect.Height, 4 /* SWP_NOZORDER */);
+        }
+
+        void SetFormPositionAndSizeKeepHeight()
+        {
+            if (IsFullscreen || mp.VideoSize.Width == 0) return;
+            Screen screen = Screen.FromControl(this);
+            int height = ClientSize.Height;
+            if (height > screen.Bounds.Height * 0.9) height = Convert.ToInt32(screen.Bounds.Height * MpvAutofit);
+            int width = Convert.ToInt32(height * mp.VideoSize.Width / (double)mp.VideoSize.Height);
+            Point middlePos = new Point(Left + Width / 2, Top + Height / 2);
+            var rect = new Native.RECT(new Rectangle(screen.Bounds.X, screen.Bounds.Y, width, height));
+            NativeHelp.AddWindowBorders(Handle, ref rect);
+            int left = middlePos.X - rect.Width / 2;
+            int top = middlePos.Y - rect.Height / 2;
+            Screen[] screens = Screen.AllScreens;
+            if (left < screens[0].Bounds.Left) left = screens[0].Bounds.Left;
+            int maxLeft = screens[0].Bounds.Left + screens.Select((sc) => sc.Bounds.Width).Sum() - rect.Width - SystemInformation.CaptionHeight;
+            if (left > maxLeft) left = maxLeft;
+            Native.SetWindowPos(Handle, IntPtr.Zero /* HWND_TOP */, left, top, rect.Width, rect.Height, 4 /* SWP_NOZORDER */);
+        }
+
+        protected void ProcessCommandLineEarly()
+        {
+            var args = Environment.GetCommandLineArgs().Skip(1);
+
+            foreach (string i in args)
+            {
+                if (i.StartsWith("--"))
+                {
+                    if (i.Contains("="))
+                    {
+                        string left = i.Substring(2, i.IndexOf("=") - 2);
+                        string right = i.Substring(left.Length + 3);
+                        ProcessMpvProperty(left, right);
+                        ProcessMpvNetProperty(left, right);
+                    }
+                    else
+                    {
+                        string switchName = i.Substring(2);
+
+                        switch (switchName)
+                        {
+                            case "fs":
+                            case "fullscreen":
+                                MpvFullscreen = true;
+                                break;
+                        }
+                    }
+                }
+            }
+        }
+
+        void ProcessMpvProperty(string name, string value)
+        {
+            switch (name)
+            {
+                case "autofit":
+                    if (value.Length == 3 && value.EndsWith("%"))
+                        if (int.TryParse(value.Substring(0, 2), out int result))
+                            MpvAutofit = result / 100f;
+                    break;
+                case "fs":
+                case "fullscreen":
+                    MpvFullscreen = value == "yes";
+                    break;
+                case "screen":
+                    MpvScreen = Convert.ToInt32(value);
+                    break;
+            }
+        }
+
+        void ProcessMpvNetProperty(string name, string value)
+        {
+            switch (name)
+            {
+                case "dark-mode":
+                    MpvNetDarkMode = value;
+                    break;
             }
         }
 
         public void BuildMenu()
         {
-            foreach (var i in File.ReadAllText(mp.InputConfPath).SplitLinesNoEmpty())
+            string content = File.ReadAllText(mp.InputConfPath);
+            List<string> lines = null;
+            Dictionary<string, string> commandInputDic = new Dictionary<string, string>();
+
+            if (content.Contains("#menu:"))
+                lines = content.Split("\r\n".ToCharArray()).ToList();
+            else
             {
-                if (!i.Contains("#menu:"))
-                    continue;
+                lines = Properties.Resources.inputConf.Split("\r\n".ToCharArray()).ToList();
+                
+                foreach (string i in content.Split("\r\n".ToCharArray()))
+                {
+                    string line = i.Trim();
+                    if (line.StartsWith("#") || !line.Contains(" ")) continue;
+                    string input = line.Substring(0, line.IndexOf(" ")).Trim();
+                    string command = line.Substring(line.IndexOf(" ") + 1).Trim();
+                    commandInputDic[command] = input;
+                }
+            }
 
-                var left = i.Left("#menu:").Trim();
+            foreach (string line in lines)
+            {
+                if (!line.Contains("#menu:")) continue;
+                string left = line.Substring(0, line.IndexOf("#menu:")).Trim();
+                if (left.StartsWith("#")) continue;
+                string command = left.Substring(left.IndexOf(" ") + 1).Trim();
+                string menu = line.Substring(line.IndexOf("#menu:") + "#menu:".Length).Trim();
+                string input = left.Substring(0, left.IndexOf(" "));
+                if (input == "_") input = "";
+                if (menu.Contains(";")) input = menu.Substring(0, menu.IndexOf(";")).Trim();
+                string path = menu.Substring(menu.IndexOf(";") + 1).Trim().Replace("&", "&&");
+                if (path == "" || command == "") continue;
 
-                if (left.StartsWith("#"))
-                    continue;
+                if (commandInputDic.Count > 0)
+                    if (commandInputDic.ContainsKey(command))
+                        input = commandInputDic[command];
+                    else
+                        input = "";
 
-                var cmd = left.Right(" ").Trim();
-                var menu = i.Right("#menu:").Trim();
-                var key = menu.Left(";").Trim();
-                var path = menu.Right(";").Trim();
-
-                if (path == "" || cmd == "")
-                    continue;
-
-                var menuItem = CMS.Add(path, () => {
-                    try
-                    {
-                        mp.CommandString(cmd, false);
+                MenuItem menuItem = ContextMenu.Add(path, () => {
+                    try {
+                        mp.command_string(command);
                     }
-                    catch (Exception e)
-                    {
-                        MsgError(e.ToString());
+                    catch (Exception ex) {
+                        Msg.ShowException(ex);
                     }
                 });
                 
                 if (menuItem != null)
-                    menuItem.ShortcutKeyDisplayString = key.Replace("_","") + "   ";
+                    menuItem.ShortcutKeyDisplayString = input + "    ";
             }
         }
 
-        private void CMS_Opened(object sender, EventArgs e)
+        void ContextMenu_Opened(object sender, EventArgs e) => CursorHelp.Show();
+
+        private void Mp_FileLoaded()
         {
-            CursorHelp.Show();
+            string path = mp.get_property_string("path");
+            BeginInvoke(new Action(() => { Text = Path.GetFileName(path) + " - mpv.net " + Application.ProductVersion; }));
+            if (RecentFiles.Contains(path)) RecentFiles.Remove(path);
+            RecentFiles.Insert(0, path);
+            if (RecentFiles.Count > 15) RecentFiles.RemoveAt(15);
         }
 
-        private string LastHistory;
+        void Mp_Idle() => BeginInvoke(new Action(() => { Text = "mpv.net " + Application.ProductVersion; }));
 
-        private void mp_PlaybackRestart()
+        void CM_Popup(object sender, EventArgs e) => CursorHelp.Show();
+
+        void Application_ThreadException(object sender, ThreadExceptionEventArgs e)
         {
-            var fn = mp.GetStringProp("filename");
-            BeginInvoke(new Action(() => { Text = fn + " - mpv.net " + Application.ProductVersion; }));
-            var fp = mp.mpvConfFolderPath + "history.txt";
-
-            if (LastHistory != fn && File.Exists(fp))
-            {
-                File.AppendAllText(fp, DateTime.Now.ToString() + " " + Path.GetFileNameWithoutExtension(fn) + "\r\n");
-                LastHistory = fn;
-            }
+            Msg.ShowException(e.Exception);
         }
 
-        private void CM_Popup(object sender, EventArgs e)
+        void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
         {
-            CursorHelp.Show();
+           Msg.ShowError(e.ExceptionObject.ToString());
         }
 
-        private void Application_ThreadException(object sender, ThreadExceptionEventArgs e)
+        void mp_VideoSizeChanged()
         {
-            HandleException(e.Exception);
+            BeginInvoke(new Action(() => SetFormPositionAndSizeKeepHeight()));
         }
 
-        void HandleException(Exception e)
+        void mp_Shutdown()
         {
-            MsgError(e.ToString());
+            BeginInvoke(new Action(() => Close()));  
         }
 
-        private void mp_VideoSizeChanged()
-        {
-            BeginInvoke(new Action(() => SetFormPosSize()));
-        }
+        public bool IsFullscreen => WindowState == FormWindowState.Maximized;
 
-        private void mp_Shutdown()
-        {
-            if (!IsClosed)
-                BeginInvoke(new Action(() => Close()));
-        }
-
-        public bool IsFullscreen
-        {
-            get => WindowState == FormWindowState.Maximized;
-        }
-
-        void mp_ChangeFullscreen(bool value)
+        void mpPropChangeFullscreen(bool value)
         {
             BeginInvoke(new Action(() => ChangeFullscreen(value)));
         }
@@ -134,32 +407,48 @@ namespace mpvnet
         {
             if (value)
             {
-                FormBorderStyle = FormBorderStyle.None;
-                WindowState = FormWindowState.Maximized;
+                if (FormBorderStyle != FormBorderStyle.None)
+                {
+                    FormBorderStyle = FormBorderStyle.None;
+                    WindowState = FormWindowState.Maximized;
+                }
             }
             else
             {
                 WindowState = FormWindowState.Normal;
                 FormBorderStyle = FormBorderStyle.Sizable;
-                SetFormPosSize();
+                SetFormPositionAndSizeKeepHeight();
             }
         }
 
         protected override void WndProc(ref Message m)
         {
+            //Debug.WriteLine(m);
+
             switch (m.Msg)
             {
                 case 0x0201: // WM_LBUTTONDOWN
                 case 0x0202: // WM_LBUTTONUP
                 case 0x0100: // WM_KEYDOWN
                 case 0x0101: // WM_KEYUP
+                case 0x0104: // WM_SYSKEYDOWN
+                case 0x0105: // WM_SYSKEYUP
                 case 0x020A: // WM_MOUSEWHEEL
                     if (mp.MpvWindowHandle != IntPtr.Zero)
                         Native.SendMessage(mp.MpvWindowHandle, m.Msg, m.WParam, m.LParam);
                     break;
+                case 0x319: // WM_APPCOMMAND
+                    if (mp.MpvWindowHandle != IntPtr.Zero)
+                        Native.PostMessage(mp.MpvWindowHandle, m.Msg, m.WParam, m.LParam);
+                    break;
                 case 0x203: // Native.WM.LBUTTONDBLCLK
                     if (!IsMouseInOSC())
-                        mp.CommandString("cycle fullscreen");
+                        mp.command_string("cycle fullscreen");
+                    break;
+                case 0x02E0: // WM_DPICHANGED
+                    if (IgnoreDpiChanged) break;
+                    var r2 = Marshal.PtrToStructure<Native.RECT>(m.LParam);
+                    Native.SetWindowPos(Handle, IntPtr.Zero, r2.Left, r2.Top, r2.Width, r2.Height, 0);
                     break;
                 case 0x0214: // WM_SIZING
                     var rc = Marshal.PtrToStructure<Native.RECT>(m.LParam);
@@ -167,8 +456,8 @@ namespace mpvnet
                     NativeHelp.SubtractWindowBorders(Handle, ref r);
                     int c_w = r.Right - r.Left, c_h = r.Bottom - r.Top;
                     float aspect = mp.VideoSize.Width / (float)mp.VideoSize.Height;
-                    int d_w = (int)(c_h * aspect - c_w);
-                    int d_h = (int)(c_w / aspect - c_h);
+                    int d_w = Convert.ToInt32(c_h * aspect - c_w);
+                    int d_h = Convert.ToInt32(c_w / aspect - c_h);
                     int[] d_corners = { d_w, d_h, -d_w, -d_h };
                     int[] corners = { rc.Left, rc.Top, rc.Right, rc.Bottom };
                     int corner = NativeHelp.GetResizeBorder(m.WParam.ToInt32());
@@ -180,49 +469,29 @@ namespace mpvnet
                     m.Result = new IntPtr(1);
                     return;
             }
-
             base.WndProc(ref m);
         }
 
-        void SetFormPosSize()
-        {
-            if (IsFullscreen || mp.VideoSize.Width == 0) return;
-            var wa = Screen.GetWorkingArea(this);
-            int h = (int)(wa.Height * 0.6);
-            int w = (int)(h * mp.VideoSize.Width / (float)mp.VideoSize.Height);
-            Point middlePos = new Point(Left + Width / 2, Top + Height / 2);
-            var r = new Native.RECT(new Rectangle(0, 0, w, h));
-            NativeHelp.AddWindowBorders(Handle, ref r);
-            int l = middlePos.X - r.Width / 2;
-            int t = middlePos.Y - r.Height / 2;
-            if (l < 0) l = 0;
-            if (t < 0) t = 0;
-            if (l + r.Width > wa.Width ) l = wa.Width - r.Width;
-            if (t + r.Height > wa.Height ) t = wa.Height - r.Height;
-            Native.SetWindowPos(Handle, IntPtr.Zero /* HWND_TOP */, l, t, r.Width, r.Height, 4 /* SWP_NOZORDER */);
-        }
-
         protected override void OnDragEnter(DragEventArgs e)
         {
             base.OnDragEnter(e);
-
-            if (e.Data.GetDataPresent(DataFormats.FileDrop))
+            if (e.Data.GetDataPresent(DataFormats.FileDrop) || e.Data.GetDataPresent(DataFormats.Text))
                 e.Effect = DragDropEffects.Copy;
         }
 
         protected override void OnDragDrop(DragEventArgs e)
         {
             base.OnDragDrop(e);
-
             if (e.Data.GetDataPresent(DataFormats.FileDrop))
                 mp.LoadFiles(e.Data.GetData(DataFormats.FileDrop) as String[]);
+            if (e.Data.GetDataPresent(DataFormats.Text))
+                mp.LoadFiles(e.Data.GetData(DataFormats.Text).ToString());
         }
 
         protected override void OnMouseDown(MouseEventArgs e)
         {
             base.OnMouseDown(e);
 
-            // window-dragging
             if (WindowState == FormWindowState.Normal &&
                 e.Button == MouseButtons.Left &&
                 e.Y < ClientSize.Height * 0.9)
@@ -232,31 +501,22 @@ namespace mpvnet
                 Native.PostMessage(Handle, 0xA1 /* WM_NCLBUTTONDOWN */, HTCAPTION, IntPtr.Zero);
             }
 
-            var sb = Screen.FromControl(this).Bounds;
-            var p1 = new Point(sb.Width, 0);
-            var p2 = PointToScreen(e.Location);
-
-            if (Math.Abs(p1.X - p2.X) < 10 && Math.Abs(p1.Y - p2.Y) < 10)
-                mp.Command("quit");
+            if (Width - e.Location.X < 10 && e.Location.Y < 10)
+                mp.commandv("quit");
         }
 
         protected override void OnMouseMove(MouseEventArgs e)
         {
             base.OnMouseMove(e);
-
-            // send mouse command to make OSC show
-            mp.CommandString($"mouse {e.X} {e.Y}");
+            mp.command_string($"mouse {e.X} {e.Y}");
 
             if (CursorHelp.IsPosDifferent(LastCursorPosChanged))
                 CursorHelp.Show();
         }
 
-        bool IsMouseInOSC()
-        {
-            return PointToClient(Control.MousePosition).Y > ClientSize.Height * 0.9;
-        }
+        bool IsMouseInOSC() => PointToClient(Control.MousePosition).Y > ClientSize.Height * 0.9;
 
-        private void Timer_Tick(object sender, EventArgs e)
+        void Timer_Tick(object sender, EventArgs e)
         {
             if (CursorHelp.IsPosDifferent(LastCursorPosChanged))
             {
@@ -265,7 +525,7 @@ namespace mpvnet
             }
             else if (Environment.TickCount - LastCursorChangedTickCount > 1500 &&
                 !IsMouseInOSC() && ClientRectangle.Contains(PointToClient(MousePosition)) &&
-                Form.ActiveForm == this && !CMS.Visible)
+                Form.ActiveForm == this && !ContextMenu.Visible)
             {
                 CursorHelp.Hide();
             }
@@ -275,31 +535,72 @@ namespace mpvnet
         {
             base.OnLoad(e);
             mp.Init();
-            mp.ObserveBoolProp("fullscreen", mp_ChangeFullscreen);
+            mp.observe_property_bool("fullscreen", mpPropChangeFullscreen);
+            mp.observe_property_bool("ontop", mpPropChangeOnTop);
+            mp.observe_property_string("sid", mpPropChangeSid);
+            mp.observe_property_string("aid", mpPropChangeAid);
+            mp.observe_property_string("vid", mpPropChangeVid);
+            mp.observe_property_int("edition", mpPropChangeEdition);
             mp.Shutdown += mp_Shutdown;
             mp.VideoSizeChanged += mp_VideoSizeChanged;
-            mp.PlaybackRestart += mp_PlaybackRestart;
+            mp.FileLoaded += Mp_FileLoaded;
+            mp.Idle += Mp_Idle;
         }
 
+        void mpPropChangeOnTop(bool value) => BeginInvoke(new Action(() => TopMost = value));
+
+        void mpPropChangeAid(string value) => MpvAid = value;
+
+        void mpPropChangeSid(string value) => MpvSid = value;
+
+        void mpPropChangeVid(string value) => MpvVid = value;
+
+        void mpPropChangeEdition(int value) => MpvEdition = value;
+
         protected override void OnShown(EventArgs e)
         {
             base.OnShown(e);
-            CMS = new ContextMenuStripEx(components);
-            CMS.Opened += CMS_Opened;
-            ContextMenuStrip = CMS;
+            if ((MpvNetDarkMode == "system" && Sys.IsDarkTheme) || MpvNetDarkMode == "always")
+                ToolStripRendererEx.ColorTheme = Color.Black;
+            ContextMenu = new ContextMenuStripEx(components);
+            ContextMenu.Opened += ContextMenu_Opened;
+            ContextMenu.Opening += ContextMenu_Opening;
             BuildMenu();
+            ContextMenuStrip = ContextMenu;
+            IgnoreDpiChanged = false;
+            CheckYouTube();
         }
 
         protected override void OnFormClosed(FormClosedEventArgs e)
         {
             base.OnFormClosed(e);
-            IsClosed = true;
-            mp.Command("quit");
+            RegistryHelp.SetObject("HKCU\\Software\\" + Application.ProductName, "Recent", RecentFiles.ToArray());
+            mp.commandv("quit");
+            mp.AutoResetEvent.WaitOne(3000);
+        }
 
-            for (int i = 0; i < 99; i++)
+        protected override void OnLostFocus(EventArgs e)
+        {
+            base.OnLostFocus(e);
+            CursorHelp.Show();
+        }
+
+        protected override void OnActivated(EventArgs e)
+        {
+            base.OnActivated(e);
+            CheckYouTube();
+        }
+
+        void CheckYouTube()
+        {
+            string clipboard = Clipboard.GetText();
+
+            if (clipboard.StartsWith("https://www.youtube.com/watch?") && RegistryHelp.GetString("HKCU\\Software\\" + Application.ProductName, "LastYouTubeURL") != clipboard && Visible)
             {
-                if (mp.IsShutdownComplete) break;
-                Thread.Sleep(100);
+                RegistryHelp.SetObject("HKCU\\Software\\" + Application.ProductName, "LastYouTubeURL", clipboard);
+
+                if (Msg.ShowQuestion("Play YouTube URL?", clipboard) == MsgResult.OK)
+                    mp.LoadFiles(clipboard);
             }
         }
     }

mpv.net/MediaInfo.cs

@@ -3,8 +3,8 @@ using System.Runtime.InteropServices;
 
 public class MediaInfo : IDisposable
 {
-    private IntPtr Handle;
-    private static bool Loaded;
+    IntPtr Handle;
+    static bool Loaded;
 
     public MediaInfo(string sourcepath)
     {
@@ -25,7 +25,24 @@ public class MediaInfo : IDisposable
         return Marshal.PtrToStringUni(MediaInfo_Get(Handle, streamKind, 0, parameter, MediaInfoInfoKind.Text, MediaInfoInfoKind.Name));
     }
 
-    private bool Disposed;
+    public int GetCount(MediaInfoStreamKind streamKind) => MediaInfo_Count_Get(Handle, streamKind, -1);
+
+    public string GetVideo(int streamNumber, string parameter)
+    {
+        return Marshal.PtrToStringUni(MediaInfo_Get(Handle, MediaInfoStreamKind.Video, streamNumber, parameter, MediaInfoInfoKind.Text, MediaInfoInfoKind.Name));
+    }
+
+    public string GetAudio(int streamNumber, string parameter)
+    {
+        return Marshal.PtrToStringUni(MediaInfo_Get(Handle, MediaInfoStreamKind.Audio, streamNumber, parameter, MediaInfoInfoKind.Text, MediaInfoInfoKind.Name));
+    }
+
+    public string GetText(int streamNumber, string parameter)
+    {
+        return Marshal.PtrToStringUni(MediaInfo_Get(Handle, MediaInfoStreamKind.Text, streamNumber, parameter, MediaInfoInfoKind.Text, MediaInfoInfoKind.Name));
+    }
+
+    bool Disposed;
 
     public void Dispose()
     {
@@ -37,28 +54,35 @@ public class MediaInfo : IDisposable
         }
     }
 
-    ~MediaInfo()
-    {
-        Dispose();
-    }
+    ~MediaInfo() { Dispose(); }
 
     [DllImport("kernel32.dll", CharSet = CharSet.Unicode)]
-    private static extern IntPtr LoadLibrary(string path);
+    static extern IntPtr LoadLibrary(string path);
 
     [DllImport("MediaInfo.dll")]
-    private static extern IntPtr MediaInfo_New();
+    static extern IntPtr MediaInfo_New();
 
     [DllImport("MediaInfo.dll")]
-    private static extern void MediaInfo_Delete(IntPtr Handle);
+    static extern void MediaInfo_Delete(IntPtr handle);
 
     [DllImport("MediaInfo.dll", CharSet = CharSet.Unicode)]
-    private static extern int MediaInfo_Open(IntPtr Handle, string FileName);
+    static extern int MediaInfo_Open(IntPtr handle, string fileName);
 
     [DllImport("MediaInfo.dll")]
-    private static extern int MediaInfo_Close(IntPtr Handle);
+    static extern int MediaInfo_Close(IntPtr handle);
 
     [DllImport("MediaInfo.dll", CharSet = CharSet.Unicode)]
-    private static extern IntPtr MediaInfo_Get(IntPtr Handle, MediaInfoStreamKind StreamKind, int StreamNumber, string Parameter, MediaInfoInfoKind KindOfInfo, MediaInfoInfoKind KindOfSearch);
+    static extern IntPtr MediaInfo_Get(IntPtr handle,
+                                       MediaInfoStreamKind streamKind,
+                                       int streamNumber,
+                                       string parameter,
+                                       MediaInfoInfoKind kindOfInfo,
+                                       MediaInfoInfoKind kindOfSearch);
+
+    [DllImport("MediaInfo.dll", CharSet = CharSet.Unicode)]
+    static extern int MediaInfo_Count_Get(IntPtr handle,
+                                          MediaInfoStreamKind streamKind,
+                                          int streamNumber);
 }
 
 public enum MediaInfoStreamKind
@@ -67,8 +91,10 @@ public enum MediaInfoStreamKind
     Video,
     Audio,
     Text,
-    Chapters,
-    Image
+    Other,
+    Image,
+    Menu,
+    Max,
 }
 
 public enum MediaInfoInfoKind

mpv.net/Menu.cs

@@ -23,76 +23,61 @@ public class ContextMenuStripEx : ContextMenuStrip
         Renderer = new ToolStripRendererEx();
     }
 
-    public ActionMenuItem Add(string path)
+    public MenuItem Add(string path)
     {
         return Add(path, null);
     }
 
-    public ActionMenuItem Add(string path, Action action)
+    public MenuItem Add(string path, Action action, bool enabled = true)
     {
-        return Add(path, action, true);
-    }
-
-    public ActionMenuItem Add(string path, Action action, bool enabled)
-    {
-        var ret = ActionMenuItem.Add(Items, path, action);
-        if (ret == null)
-            return null;
+        MenuItem ret = MenuItem.Add(Items, path, action);
+        if (ret == null) return null;
         ret.Enabled = enabled;
         return ret;
     }
-
-    public ActionMenuItem Add(string path, Action action, Func<bool> enabledFunc)
-    {
-        var ret = ActionMenuItem.Add(Items, path, action);
-        return ret;
-    }
 }
 
-public class ActionMenuItem : MenuItemEx
+public class MenuItem : ToolStripMenuItem
 {
-    private Action Action;
+    public Action Action { get; set; }
 
-    public ActionMenuItem()
+    public MenuItem()
     {
     }
 
-    public ActionMenuItem(string text, Action action)
+    public MenuItem(string text) : base(text)
     {
-        this.Text = text;
-        this.Action = action;
+    }
+
+    public MenuItem(string text, Action action) : base(text)
+    {
+        Action = action;
     }
 
     protected override void OnClick(EventArgs e)
     {
         Application.DoEvents();
-        if (Action != null)
-            Action();
+        Action?.Invoke();
         base.OnClick(e);
     }
 
-    public static ActionMenuItem Add<T>(ToolStripItemCollection items, string path, Action<T> action, T value)
+    public static MenuItem Add(ToolStripItemCollection items, string path, Action action)
     {
-        return Add(items, path, () => action(value));
-    }
+        string[] a = path.Split(new[] { " > ", " | " }, StringSplitOptions.RemoveEmptyEntries);
+        var itemsCollection = items;
 
-    public static ActionMenuItem Add(ToolStripItemCollection items, string path, Action action)
-    {
-        var a = path.Split(new[] { " > ", " | " }, StringSplitOptions.RemoveEmptyEntries);
-        var l = items;
-
-        for (var x = 0; x <= a.Length - 1; x++)
+        for (int x = 0; x < a.Length; x++)
         {
-            var found = false;
+            bool found = false;
 
-            foreach (var i in l.OfType<ToolStripMenuItem>())
+            foreach (var i in itemsCollection.OfType<ToolStripMenuItem>())
             {
                 if (x < a.Length - 1)
                 {
-                    if (i.Text == a[x] + " ")
+                    if (i.Text == a[x] + "    ")
                     {
                         found = true;
-                        l = i.DropDownItems;
+                        itemsCollection = i.DropDownItems;
                     }
                 }
             }
@@ -102,54 +87,38 @@ public class ActionMenuItem : MenuItemEx
                 if (x == a.Length - 1)
                 {
                     if (a[x] == "-")
-                        l.Add(new ToolStripSeparator());
+                        itemsCollection.Add(new ToolStripSeparator());
                     else
                     {
-                        ActionMenuItem item = new ActionMenuItem(a[x] + " ", action);
-                        l.Add(item);
-                        l = item.DropDownItems;
+                        MenuItem item = new MenuItem(a[x] + "    ", action);
+                        itemsCollection.Add(item);
+                        itemsCollection = item.DropDownItems;
                         return item;
                     }
                 }
                 else
                 {
-                    ActionMenuItem item = new ActionMenuItem();
-                    item.Text = a[x] + " ";
-                    l.Add(item);
-                    l = item.DropDownItems;
+                    MenuItem item = new MenuItem();
+                    item.Text = a[x] + "    ";
+                    itemsCollection.Add(item);
+                    itemsCollection = item.DropDownItems;
                 }
             }
         }
         return null;
     }
-}
-
-public class MenuItemEx : ToolStripMenuItem
-{
-    public static bool UseTooltips { get; set; }
-
-    public MenuItemEx()
-    {
-    }
-
-    public MenuItemEx(string text) : base(text)
-    {
-    }
 
     public override Size GetPreferredSize(Size constrainingSize)
     {
-        var ret = base.GetPreferredSize(constrainingSize);
-        ret.Height = Convert.ToInt32(Font.Height * 1.4);
-        return ret;
+        Size size = base.GetPreferredSize(constrainingSize);
+        size.Height = Convert.ToInt32(Font.Height * 1.4);
+        return size;
     }
 
     public void CloseAll(object item)
     {
         if (item is ToolStripItem)
-        {
-            var d = (ToolStripItem)item;
-            CloseAll(d.Owner);
-        }
+            CloseAll(((ToolStripItem)item).Owner);
 
         if (item is ToolStripDropDown)
         {
@@ -158,20 +127,16 @@ public class MenuItemEx : ToolStripMenuItem
             CloseAll(d.OwnerItem);
         }
     }
-
-    protected override void OnClick(EventArgs e)
-    {
-        Application.DoEvents();
-        base.OnClick(e);
-    }
 }
 
 public class ToolStripRendererEx : ToolStripSystemRenderer
 {
+    public static Color ColorForeground { get; set; } = Color.Black;
+    public static Color ColorTheme { get; set; } = Color.Empty;
     public static Color ColorChecked { get; set; }
     public static Color ColorBorder { get; set; }
     public static Color ColorTop { get; set; }
-    public static Color ColorBottom { get; set; }
+    public static Color ColorSelection { get; set; }
     public static Color ColorBackground { get; set; }
 
     public static Color ColorToolStrip1 { get; set; }
@@ -179,24 +144,37 @@ public class ToolStripRendererEx : ToolStripSystemRenderer
     public static Color ColorToolStrip3 { get; set; }
     public static Color ColorToolStrip4 { get; set; }
 
-    private int TextOffset;
+    int TextOffset;
 
     public ToolStripRendererEx()
     {
         var argb = Convert.ToInt32(Registry.GetValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\DWM", "ColorizationColor", 0));
+
         if (argb == 0)
             argb = Color.LightBlue.ToArgb();
-        InitColors(Color.FromArgb(argb));
+        if (ColorTheme == Color.Empty)
+            InitColors(Color.FromArgb(argb));
+        else
+            InitColors(ColorTheme);
     }
 
     public static void InitColors(Color c)
     {
         ColorBorder = HSLColor.Convert(c).ToColorSetLuminosity(100);
-        ColorChecked = HSLColor.Convert(c).ToColorSetLuminosity(200);
-        ColorBottom = HSLColor.Convert(c).ToColorSetLuminosity(220);
-        ColorBackground = HSLColor.Convert(c).ToColorSetLuminosity(230);
+        ColorChecked = HSLColor.Convert(c).ToColorSetLuminosity(160);
+        ColorSelection = HSLColor.Convert(c).ToColorSetLuminosity(180);
+        ColorBackground = HSLColor.Convert(c).ToColorSetLuminosity(210);
         ColorTop = HSLColor.Convert(c).ToColorSetLuminosity(240);
 
+        if (ColorTheme == Color.Black)
+        {
+            ColorBorder = Color.White;
+            ColorBackground = Color.FromArgb(50, 50, 50);
+            ColorSelection = Color.FromArgb(80, 80, 80);
+            ColorForeground = Color.White;
+            ColorChecked = Color.FromArgb(90, 90, 90);
+        }
+
         ColorToolStrip1 = ControlPaint.LightLight(ControlPaint.LightLight(ControlPaint.Light(ColorBorder, 1)));
         ColorToolStrip2 = ControlPaint.LightLight(ControlPaint.LightLight(ControlPaint.Light(ColorBorder, 0.7f)));
         ColorToolStrip3 = ControlPaint.LightLight(ControlPaint.LightLight(ControlPaint.Light(ColorBorder, 0.1f)));
@@ -205,7 +183,10 @@ public class ToolStripRendererEx : ToolStripSystemRenderer
 
     protected override void OnRenderToolStripBorder(ToolStripRenderEventArgs e)
     {
-        ControlPaint.DrawBorder(e.Graphics, e.AffectedBounds, Color.FromArgb(160, 175, 195), ButtonBorderStyle.Solid);
+        Rectangle r = e.AffectedBounds;
+        r.Inflate(-1, -1);
+        ControlPaint.DrawBorder(e.Graphics, r, ColorBackground, ButtonBorderStyle.Solid);
+        ControlPaint.DrawBorder(e.Graphics, e.AffectedBounds, ColorBorder, ButtonBorderStyle.Solid);
     }
 
     protected override void OnRenderItemText(ToolStripItemTextRenderEventArgs e)
@@ -214,8 +195,7 @@ public class ToolStripRendererEx : ToolStripSystemRenderer
 
         if (e.Item is ToolStripMenuItem && !(e.Item.Owner is MenuStrip))
         {
-            var r = e.TextRectangle;
-
+            Rectangle rect = e.TextRectangle;
             var dropDown = e.ToolStrip as ToolStripDropDownMenu;
 
             if (dropDown == null || dropDown.ShowImageMargin || dropDown.ShowCheckMargin)
@@ -223,7 +203,8 @@ public class ToolStripRendererEx : ToolStripSystemRenderer
             else
                 TextOffset = Convert.ToInt32(e.Item.Height * 0.2);
 
-            e.TextRectangle = new Rectangle(TextOffset, Convert.ToInt32((e.Item.Height - r.Height) / 2.0), r.Width, r.Height);
+            e.TextColor = ColorForeground;
+            e.TextRectangle = new Rectangle(TextOffset, Convert.ToInt32((e.Item.Height - rect.Height) / 2.0), rect.Width, rect.Height);
         }
 
         base.OnRenderItemText(e);
@@ -236,134 +217,88 @@ public class ToolStripRendererEx : ToolStripSystemRenderer
             Rectangle r = new Rectangle(-1, -1, e.AffectedBounds.Width, e.AffectedBounds.Height);
 
             using (SolidBrush b = new SolidBrush(ColorToolStrip2))
-            {
                 e.Graphics.FillRectangle(b, r);
-            }
         }
     }
 
     protected override void OnRenderMenuItemBackground(ToolStripItemRenderEventArgs e)
     {
-        e.Item.ForeColor = Color.Black;
-
-        var r = new Rectangle(Point.Empty, e.Item.Size);
-        var g = e.Graphics;
+        Rectangle rect = new Rectangle(Point.Empty, e.Item.Size);
 
         if (!(e.Item.Owner is MenuStrip))
-            g.Clear(ColorBackground);
+            e.Graphics.Clear(ColorBackground);
 
         if (e.Item.Selected && e.Item.Enabled)
         {
-            if (e.Item.Owner is MenuStrip)
-                DrawButton(e);
-            else
-            {
-                g.SmoothingMode = SmoothingMode.AntiAlias;
-
-                var r2 = new Rectangle(r.X + 2, r.Y, r.Width - 4, r.Height - 1);
-
-                using (Pen pen = new Pen(ColorBorder))
-                {
-                    g.DrawRectangle(pen, r2);
-                }
-
-                r2.Inflate(-1, -1);
-
-                using (SolidBrush b = new SolidBrush(ColorBottom))
-                {
-                    g.FillRectangle(b, r2);
-                }
-            }
+            e.Graphics.SmoothingMode = SmoothingMode.AntiAlias;
+            rect = new Rectangle(rect.X + 2, rect.Y, rect.Width - 4, rect.Height - 1);
+            rect.Inflate(-1, -1);
+            using (SolidBrush b = new SolidBrush(ColorSelection))
+                e.Graphics.FillRectangle(b, rect);
         }
     }
 
-    public void DrawButton(ToolStripItemRenderEventArgs e)
-    {
-        var g = e.Graphics;
-        var r = new Rectangle(Point.Empty, e.Item.Size);
-        var r2 = new Rectangle(r.X, r.Y, r.Width - 1, r.Height - 1);
-
-        using (Pen pen = new Pen(ColorBorder))
-        {
-            g.DrawRectangle(pen, r2);
-        }
-
-        r2.Inflate(-1, -1);
-
-        var tsb = e.Item as ToolStripButton;
-
-        if (!(tsb == null) && tsb.Checked)
-        {
-            using (SolidBrush brush = new SolidBrush(ColorChecked))
-            {
-                g.FillRectangle(brush, r2);
-            }
-        }
-        else
-            using (SolidBrush brush = new SolidBrush(ColorBottom))
-            {
-                g.FillRectangle(brush, r2);
-            }
-    }
-
-    protected override void OnRenderDropDownButtonBackground(ToolStripItemRenderEventArgs e)
-    {
-        if (e.Item.Selected)
-            DrawButton(e);
-    }
-
-    protected override void OnRenderButtonBackground(ToolStripItemRenderEventArgs e)
-    {
-        var button = (ToolStripButton)e.Item;
-        if (e.Item.Selected || button.Checked)
-            DrawButton(e);
-    }
-
     protected override void OnRenderArrow(ToolStripArrowRenderEventArgs e)
     {
-        var value = e.Direction == ArrowDirection.Down ? 0x36 : 0x34;
-        var s = Convert.ToChar(value).ToString();
-        var font = new Font("Marlett", e.Item.Font.Size - 2);
-        var size = e.Graphics.MeasureString(s, font);
-        var x = Convert.ToInt32(e.Item.Width - size.Width);
-        var y = Convert.ToInt32((e.Item.Height - size.Height) / 2.0) + 1;
-        e.Graphics.DrawString(s, font, Brushes.Black, x, y);
+        if (e.Direction == ArrowDirection.Down) throw new NotImplementedException();
+        float x1 = e.Item.Width - e.Item.Height * 0.6f;
+        float y1 = e.Item.Height * 0.25f;
+        float x2 = x1 + e.Item.Height * 0.25f;
+        float y2 = e.Item.Height / 2f;
+        float x3 = x1;
+        float y3 = e.Item.Height * 0.75f;
+        e.Graphics.SmoothingMode = SmoothingMode.HighQuality;
+
+        using (Brush b = new SolidBrush(ColorForeground))
+        {
+            using (Pen p = new Pen(b, Control.DefaultFont.Height / 20f))
+            {
+                e.Graphics.DrawLine(p, x1, y1, x2, y2);
+                e.Graphics.DrawLine(p, x2, y2, x3, y3);
+            }
+        }
     }
 
     protected override void OnRenderItemCheck(ToolStripItemImageRenderEventArgs e)
     {
-        var x = Convert.ToInt32(e.ImageRectangle.Height * 0.2);
-        e.Graphics.DrawImage(e.Image, new Point(x, x));
+        if (e.Item.GetType() != typeof(MenuItem))
+            return;
+
+        MenuItem item = e.Item as MenuItem;
+
+        e.Graphics.SmoothingMode = SmoothingMode.AntiAlias;
+
+        if (!item.Checked)
+            return;
+
+        Rectangle rect = new Rectangle(Point.Empty, e.Item.Size);
+        rect = new Rectangle(rect.X + 2, rect.Y, rect.Height - 1, rect.Height - 1);
+        rect.Inflate(-1, -1);
+
+        using (Brush brush = new SolidBrush(ColorChecked))
+            e.Graphics.FillRectangle(brush, rect);
+
+        float ellipseWidth = rect.Height / 3f;
+
+        RectangleF rectF = new RectangleF(rect.X + rect.Height / 2f - ellipseWidth / 2f,
+                                          rect.Y + rect.Height / 2f - ellipseWidth / 2f,
+                                          ellipseWidth,
+                                          ellipseWidth);
+
+        using (Brush brush = new SolidBrush(ColorForeground))
+            e.Graphics.FillEllipse(brush, rectF);
     }
 
     protected override void OnRenderSeparator(ToolStripSeparatorRenderEventArgs e)
     {
-        if (e.Item.IsOnDropDown)
-        {
-            e.Graphics.Clear(ColorBackground);
-            var right = e.Item.Width - Convert.ToInt32(TextOffset / 5.0);
-            var top = e.Item.Height / 2;
-            top -= 1;
-            var b = e.Item.Bounds;
-
-            using (Pen p = new Pen(Color.Gray))
-            {
-                e.Graphics.DrawLine(p, new Point(TextOffset, top), new Point(right, top));
-            }
-        }
-        else if (e.Vertical)
-        {
-            var b = e.Item.Bounds;
-
-            using (Pen p = new Pen(SystemColors.ControlDarkDark))
-            {
-                e.Graphics.DrawLine(p, 
-                    Convert.ToInt32(b.Width / 2.0),
-                    Convert.ToInt32(b.Height * 0.15), 
-                    Convert.ToInt32(b.Width / 2.0),
-                    Convert.ToInt32(b.Height * 0.85));
-            }
-        }
+        e.Graphics.Clear(ColorBackground);
+        int top = e.Item.Height / 2;
+        top -= 1;
+        int offset = Convert.ToInt32(e.Item.Font.Height * 0.7);
+        using (Pen p = new Pen(ColorBorder))
+            e.Graphics.DrawLine(p,
+                new Point(offset, top),
+                new Point(e.Item.Width - offset, top));
     }
 }
 
@@ -381,34 +316,33 @@ public struct HSLColor
         Luminosity = l;
     }
 
-    private double hue;
+    double _Hue;
 
     public int Hue {
-        get => System.Convert.ToInt32(hue * 240);       
-        set => hue = CheckRange(value / 240.0);
+        get => System.Convert.ToInt32(_Hue * 240);
+        set => _Hue = CheckRange(value / 240.0);
     }
 
-    private double saturation;
+    double _Saturation;
 
     public int Saturation {
-        get => System.Convert.ToInt32(saturation * 240);
-        set => saturation = CheckRange(value / 240.0);
+        get => System.Convert.ToInt32(_Saturation * 240);
+        set => _Saturation = CheckRange(value / 240.0);
     }
 
-    private double luminosity;
+    double _Luminosity;
 
     public int Luminosity {
-        get => System.Convert.ToInt32(luminosity * 240);
-        set => luminosity = CheckRange(value / 240.0);
+        get => System.Convert.ToInt32(_Luminosity * 240);
+        set => _Luminosity = CheckRange(value / 240.0);
     }
 
-    private double CheckRange(double value)
+    double CheckRange(double value)
     {
         if (value < 0)
             value = 0;
         else if (value > 1)
             value = 1;
-
         return value;
     }
 
@@ -428,32 +362,31 @@ public struct HSLColor
     {
         double r = 0, g = 0, b = 0;
 
-        if (luminosity != 0)
+        if (_Luminosity != 0)
         {
-            if (saturation == 0)
+            if (_Saturation == 0)
             {
-                b = luminosity;
-                g = luminosity;
-                r = luminosity;
+                b = _Luminosity;
+                g = _Luminosity;
+                r = _Luminosity;
             }
             else
             {
-                var temp2 = GetTemp2(this);
-                var temp1 = 2.0 * luminosity - temp2;
-
-                r = GetColorComponent(temp1, temp2, hue + 1.0 / 3.0);
-                g = GetColorComponent(temp1, temp2, hue);
-                b = GetColorComponent(temp1, temp2, hue - 1.0 / 3.0);
+                double temp2 = GetTemp2(this);
+                double temp1 = 2.0 * _Luminosity - temp2;
+                r = GetColorComponent(temp1, temp2, _Hue + 1.0 / 3.0);
+                g = GetColorComponent(temp1, temp2, _Hue);
+                b = GetColorComponent(temp1, temp2, _Hue - 1.0 / 3.0);
             }
         }
 
         return Color.FromArgb(
             System.Convert.ToInt32(255 * r),
-            System.Convert.ToInt32(255 * g), 
+            System.Convert.ToInt32(255 * g),
             System.Convert.ToInt32(255 * b));
     }
 
-    private static double GetColorComponent(double temp1, double temp2, double temp3)
+    static double GetColorComponent(double temp1, double temp2, double temp3)
     {
         temp3 = MoveIntoRange(temp3);
 
@@ -467,24 +400,23 @@ public struct HSLColor
             return temp1;
     }
 
-    private static double MoveIntoRange(double temp3)
+    static double MoveIntoRange(double temp3)
     {
         if (temp3 < 0)
             temp3 += 1;
         else if (temp3 > 1)
             temp3 -= 1;
-
         return temp3;
     }
 
-    private static double GetTemp2(HSLColor hslColor)
+    static double GetTemp2(HSLColor hslColor)
     {
         double temp2;
 
-        if (hslColor.luminosity < 0.5)
-            temp2 = hslColor.luminosity * (1.0 + hslColor.saturation);
+        if (hslColor._Luminosity < 0.5)
+            temp2 = hslColor._Luminosity * (1.0 + hslColor._Saturation);
         else
-            temp2 = hslColor.luminosity + hslColor.saturation - (hslColor.luminosity * hslColor.saturation);
+            temp2 = hslColor._Luminosity + hslColor._Saturation - (hslColor._Luminosity * hslColor._Saturation);
 
         return temp2;
     }
@@ -492,17 +424,17 @@ public struct HSLColor
     public static HSLColor Convert(Color c)
     {
         HSLColor r = new HSLColor();
-        r.hue = c.GetHue() / 360.0;
-        r.luminosity = c.GetBrightness();
-        r.saturation = c.GetSaturation();
+        r._Hue = c.GetHue() / 360.0;
+        r._Luminosity = c.GetBrightness();
+        r._Saturation = c.GetSaturation();
         return r;
     }
 
     public void SetRGB(int red, int green, int blue)
     {
-        var hc = HSLColor.Convert(Color.FromArgb(red, green, blue));
-        hue = hc.hue;
-        saturation = hc.saturation;
-        luminosity = hc.luminosity;
+        HSLColor hc = HSLColor.Convert(Color.FromArgb(red, green, blue));
+        _Hue = hc._Hue;
+        _Saturation = hc._Saturation;
+        _Luminosity = hc._Luminosity;
     }
 }

mpv.net/Misc.cs

@@ -1,17 +1,58 @@
-using System.Collections;
+using System;
+using System.Collections;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Drawing;
+using System.IO;
+using System.Linq;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using System.Runtime.Serialization;
 using System.Windows.Forms;
 
+using Microsoft.Win32;
+
 namespace mpvnet
 {
-    public class Misc
+    public class App
     {
-        public static readonly 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(' ');
+        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 string GetFilter(IEnumerable<string> values)
+        public static bool IsDarkMode { 
+            get {
+                string darkMode = MainForm.Instance.MpvNetDarkMode;
+                object value = Registry.GetValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Themes\Personalize", "AppsUseLightTheme", 1);
+                if (value is null) value = 1;
+                bool isDarkTheme = (int)value == 0;
+                return (darkMode == "system" && isDarkTheme) || darkMode == "always";
+            }
+        }
+    }
+
+    public class Sys
+    {
+        public static bool IsDarkTheme {
+            get {
+                object value = Registry.GetValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Themes\Personalize", "AppsUseLightTheme", 1);
+                if (value is null) value = 1;
+                return (int)value == 0;
+            }
+        }
+
+        public static bool IsDirectoryWritable(string dirPath)
         {
-            return "*." + values.Join(";*.") + "|*." + values.Join(";*.") + "|All Files|*.*";
+            try
+            {
+                using (FileStream fs = File.Create(Path.Combine(dirPath,
+                    Path.GetRandomFileName()), 1, FileOptions.DeleteOnClose))
+                { }
+                return true;
+            }
+            catch
+            { }
+            return false;
         }
     }
 
@@ -26,21 +67,210 @@ namespace mpvnet
         int IComparer<string>.Compare(string x, string y) => IComparerOfString_Compare(x, y);
     }
 
-    public class StaticUsing
+    public class FileAssociation
     {
-        public static void MsgInfo(string message)
+        static string ExePath = Application.ExecutablePath;
+        static string ExeFilename = Path.GetFileName(Application.ExecutablePath);
+        static string ExeFilenameNoExt = Path.GetFileNameWithoutExtension(Application.ExecutablePath);
+        static string[] Types;
+
+        public static void Register(string[] types)
         {
-            MessageBox.Show(message, Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Information);
+            Types = types;
+
+            RegistryHelp.SetObject(@"HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\" + ExeFilename, null, ExePath);
+            RegistryHelp.SetObject($"HKCR\\Applications\\{ExeFilename}", "FriendlyAppName", "mpv.net media player");
+            RegistryHelp.SetObject($"HKCR\\Applications\\{ExeFilename}\\shell\\open\\command", null, $"\"{ExePath}\" \"%1\"");
+            RegistryHelp.SetObject(@"HKLM\SOFTWARE\Clients\Media\mpv\Capabilities", "ApplicationDescription", "mpv.net media player");
+            RegistryHelp.SetObject(@"HKLM\SOFTWARE\Clients\Media\mpv\Capabilities", "ApplicationName", "mpv.net");
+            RegistryHelp.SetObject($"HKCR\\SystemFileAssociations\\video\\OpenWithList\\{ExeFilename}", null, "");
+            RegistryHelp.SetObject($"HKCR\\SystemFileAssociations\\audio\\OpenWithList\\{ExeFilename}", null, "");
+
+            foreach (string ext in Types)
+            {
+                RegistryHelp.SetObject($"HKCR\\Applications\\{ExeFilename}\\SupportedTypes", "." + ext, "");
+                RegistryHelp.SetObject($"HKCR\\" + "." + ext, null, ExeFilenameNoExt + "." + ext);
+                RegistryHelp.SetObject($"HKCR\\" + "." + ext + "\\OpenWithProgIDs", ExeFilenameNoExt + "." + ext, "");
+                if (App.VideoTypes.Contains(ext))
+                    RegistryHelp.SetObject($"HKCR\\" + "." + ext, "PerceivedType", "video");
+                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\"");
+                RegistryHelp.SetObject(@"HKLM\SOFTWARE\Clients\Media\mpv.net\Capabilities\FileAssociations", "." + ext, ExeFilenameNoExt + "." + ext);
+            }
         }
 
-        public static void MsgError(string message)
+        public static void Unregister()
         {
-            MessageBox.Show(message, Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Error);
+            RegistryHelp.RemoveKey(@"HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\" + ExeFilename);
+            RegistryHelp.RemoveKey($"HKCR\\Applications\\{ExeFilename}");
+            RegistryHelp.RemoveKey(@"HKLM\SOFTWARE\Clients\Media\mpv.net");
+            RegistryHelp.RemoveKey($"HKCR\\SystemFileAssociations\\video\\OpenWithList\\{ExeFilename}");
+            RegistryHelp.RemoveKey($"HKCR\\SystemFileAssociations\\audio\\OpenWithList\\{ExeFilename}");
+
+            foreach (string id in Registry.ClassesRoot.GetSubKeyNames())
+            {
+                if (id.StartsWith(ExeFilenameNoExt + "."))
+                    Registry.ClassesRoot.DeleteSubKeyTree(id);
+
+                RegistryHelp.RemoveValue($"HKCR\\Software\\Classes\\" + id + "\\OpenWithProgIDs", ExeFilenameNoExt + id);
+                RegistryHelp.RemoveValue($"HKLM\\Software\\Classes\\" + id + "\\OpenWithProgIDs", ExeFilenameNoExt + id);
+            }
+        }
+    }
+
+    public class RegistryHelp
+    {
+        public static void SetObject(string path, string name, object value)
+        {
+            using (RegistryKey rk = GetRootKey(path).CreateSubKey(path.Substring(5), RegistryKeyPermissionCheck.ReadWriteSubTree))
+                rk.SetValue(name, value);
         }
 
-        public static DialogResult MsgQuestion(string message)
+        public static string GetString(string path, string name)
         {
-            return MessageBox.Show(message, Application.ProductName, MessageBoxButtons.OKCancel, MessageBoxIcon.Question);
+            object val = GetObject(path, name);
+            if (val == null || !(val is string)) return "";
+            return val.ToString();
+        }
+
+        public static object GetObject(string path, string name)
+        {
+            using (RegistryKey rk = GetRootKey(path).OpenSubKey(path.Substring(5)))
+                if (rk != null)
+                    return rk.GetValue(name, "");
+                else
+                    return null;
+        }
+
+        public static void RemoveKey(string path)
+        {
+            GetRootKey(path).DeleteSubKeyTree(path.Substring(5), false);
+        }
+
+        public static void RemoveValue(string path, string name)
+        {
+            using (RegistryKey rk = GetRootKey(path).OpenSubKey(path.Substring(5), true))
+                if (!(rk is null))
+                    rk.DeleteValue(name, false);
+        }
+
+        static RegistryKey GetRootKey(string path)
+        {
+            switch (path.Substring(0, 4))
+            {
+                case "HKLM": return Registry.LocalMachine;
+                case "HKCU": return Registry.CurrentUser;
+                case "HKCR": return Registry.ClassesRoot;
+                default: throw new Exception();
+            }
+        }
+    }
+
+    public class MediaTrack
+    {
+        public string Text { get; set; }
+        public string Type { get; set; }
+        public int    ID   { get; set; }
+    }
+
+    [Serializable]
+    public class CommandItem : INotifyPropertyChanged
+    {
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        public string Path { get; set; } = "";
+        public string Command { get; set; } = "";
+
+        public CommandItem() { }
+
+        public CommandItem(SerializationInfo info, StreamingContext context) { }
+
+        private void NotifyPropertyChanged([CallerMemberName] string propertyName = "")
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
+
+        private string _Input = "";
+
+        public string Input {
+            get => _Input;
+            set {
+                _Input = value;
+                NotifyPropertyChanged();
+            }
+        }
+
+        private static ObservableCollection<CommandItem> _Items;
+
+        public static ObservableCollection<CommandItem> Items {
+            get {
+                if (_Items is null)
+                {
+                    _Items = new ObservableCollection<CommandItem>();
+
+                    if (File.Exists(mp.InputConfPath))
+                    {
+                        foreach (string line in File.ReadAllLines(mp.InputConfPath))
+                        {
+                            string val = line.Trim();
+                            if (val.StartsWith("#")) continue;
+                            if (!val.Contains(" ")) continue;
+                            CommandItem item = new CommandItem();
+                            item.Input = val.Substring(0, val.IndexOf(" ")).Replace("_", "");
+                            val = val.Substring(val.IndexOf(" ") + 1);
+
+                            if (val.Contains("#menu:"))
+                            {
+                                item.Path = val.Substring(val.IndexOf("#menu:") + 6).Trim();
+                                val = val.Substring(0, val.IndexOf("#menu:"));
+
+                                if (item.Path.Contains(";"))
+                                    item.Path = item.Path.Substring(item.Path.IndexOf(";") + 1).Trim();
+                            }
+
+                            item.Command = val.Trim();
+                            if (item.Command == "")
+                                continue;
+                            if (item.Command.ToLower() == "ignore")
+                                item.Command = "";
+                            _Items.Add(item);
+                        }
+                    }
+                }
+                return _Items;
+            }
+        }
+    }
+
+    public class CursorHelp
+    {
+        static bool IsVisible = true;
+
+        public static void Show()
+        {
+            if (!IsVisible)
+            {
+                Cursor.Show();
+                IsVisible = true;
+            }
+        }
+
+        public static void Hide()
+        {
+            if (IsVisible)
+            {
+                Cursor.Hide();
+                IsVisible = false;
+            }
+        }
+
+        public static bool IsPosDifferent(Point screenPos)
+        {
+            return
+                Math.Abs(screenPos.X - Control.MousePosition.X) > 10 ||
+                Math.Abs(screenPos.Y - Control.MousePosition.Y) > 10;
         }
     }
 }

mpv.net/Native.cs

@@ -12,11 +12,11 @@ namespace mpvnet
         [DllImport("user32.dll", CharSet = CharSet.Unicode)]
         public static extern IntPtr FindWindowEx(IntPtr parentHandle, IntPtr childAfter, string lclassName, string windowTitle);
 
-        [DllImport("user32.dll", CharSet = CharSet.Auto)]
-        public static extern string SendMessage(IntPtr hWnd, int msg, IntPtr wParam, IntPtr lParam);
+        [DllImport("user32.dll", CharSet = CharSet.Unicode)]
+        public static extern IntPtr SendMessage(IntPtr hWnd, int msg, IntPtr wParam, IntPtr lParam);
 
-        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Auto)]
-        public static extern bool PostMessage(IntPtr hWnd, int Msg, IntPtr wParam, IntPtr lParam);
+        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
+        public static extern IntPtr PostMessage(IntPtr hWnd, int Msg, IntPtr wParam, IntPtr lParam);
 
         [DllImport("user32.dll")]
         public static extern void ReleaseCapture();
@@ -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
         {
@@ -54,25 +65,10 @@ namespace mpvnet
                 Bottom = bottom;
             }
 
-            public Rectangle ToRectangle()
-            {
-                return Rectangle.FromLTRB(Left, Top, Right, Bottom);
-            }
-
-            public Size Size
-            {
-                get => new Size(Right - Left, Bottom - Top);
-            }
-
-            public int Width
-            {
-                get => Right - Left;
-            }
-
-            public int Height
-            {
-                get => Bottom - Top;
-            }
+            public Rectangle ToRectangle() { return Rectangle.FromLTRB(Left, Top, Right, Bottom); }
+            public Size Size => new Size(Right - Left, Bottom - Top);
+            public int Width => Right - Left;
+            public int Height => Bottom - Top;
         }
     }
 }

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/PowerShellScript.cs

@@ -2,11 +2,11 @@
 using System.IO;
 using System.Threading;
 using System.Management.Automation.Runspaces;
-
-using static mpvnet.StaticUsing;
 using System.Reflection;
 using System.Threading.Tasks;
 
+using Sys;
+
 namespace mpvnet
 {
     public class PowerShellScript
@@ -48,12 +48,12 @@ Using namespace System;
                                     throw new Exception();
                             }
                         }
-                        catch
+                        catch (Exception ex2)
                         {
-                            MsgError("PowerShell Setup Problem\r\n\r\nEnsure you have at least PowerShell 5.1 installed.");
+                            Msg.ShowError("PowerShell Setup Problem\n\nEnsure you have at least PowerShell 5.1 installed.", ex2.ToString());
                             return null;
                         }
-                        MsgError(ex.ToString());
+                        Msg.ShowException(ex);
                     }
                 }
             }

mpv.net/Program.cs

@@ -1,6 +1,8 @@
 using System;
 using System.Windows.Forms;
 
+using Sys;
+
 namespace mpvnet
 {
     static class Program
@@ -8,9 +10,26 @@ namespace mpvnet
         [STAThread]
         static void Main()
         {
-            Application.EnableVisualStyles();
-            Application.SetCompatibleTextRenderingDefault(false);
-            Application.Run(new MainForm());
+            try
+            {
+                string[] args = Environment.GetCommandLineArgs();
+
+                if (args.Length == 3 && args[1] == "--reg-file-assoc")
+                {
+                    if (args[2] == "audio") FileAssociation.Register(App.AudioTypes);
+                    if (args[2] == "video") FileAssociation.Register(App.VideoTypes);
+                    if (args[2] == "unreg") FileAssociation.Unregister();
+                    return;
+                }
+
+                Application.EnableVisualStyles();
+                Application.SetCompatibleTextRenderingDefault(false);
+                Application.Run(new MainForm());
+            }
+            catch (Exception ex)
+            {
+                Msg.ShowException(ex);
+            }
         }
     }
 }

mpv.net/Properties/AssemblyInfo.cs

@@ -6,11 +6,11 @@ using System.Runtime.InteropServices;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("mpv.net")]
-[assembly: AssemblyDescription("mpv/libmpv based player with pure mpv experience")]
+[assembly: AssemblyDescription("A lightweight media player")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("mpv.net")]
-[assembly: AssemblyCopyright("Copyright © 2019 stax76")]
+[assembly: AssemblyCopyright("Copyright © 2017-2019 stax76")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -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("1.3.0.0")]
-[assembly: AssemblyFileVersion("1.3.0.0")]
+[assembly: AssemblyVersion("3.4.0.0")]
+[assembly: AssemblyFileVersion("3.4.0.0")]

mpv.net/Properties/Resources.Designer.cs

@@ -1,97 +1,93 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace mpvnet.Properties {
-    using System;
-    
-    
-    /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
-    /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // class via a tool like ResGen or Visual Studio.
-    // To add or remove a member, edit your .ResX file then rerun ResGen
-    // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources {
-        
-        private static global::System.Resources.ResourceManager resourceMan;
-        
-        private static global::System.Globalization.CultureInfo resourceCulture;
-        
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources() {
-        }
-        
-        /// <summary>
-        ///   Returns the cached ResourceManager instance used by this class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
-            get {
-                if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("mpvnet.Properties.Resources", typeof(Resources).Assembly);
-                    resourceMan = temp;
-                }
-                return resourceMan;
-            }
-        }
-        
-        /// <summary>
-        ///   Overrides the current thread's CurrentUICulture property for all
-        ///   resource lookups using this strongly typed resource class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
-            get {
-                return resourceCulture;
-            }
-            set {
-                resourceCulture = value;
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to  # mpv.net key bindings, mouse bindings and context menu configuration
-        /// 
-        /// o           script-message mpv.net open-files #menu: O  ; Open Files...
-        /// _           ignore                 #menu: _             ; -
-        /// Space       cycle pause            #menu: Space, Enter  ; Play/Pause
-        /// Enter       cycle pause
-        /// s           stop                   #menu: S             ; Stop
-        /// _           ignore                 #menu: _             ; -
-        /// f           cycle fullscreen       #menu: F             ; Toggle Fullscreen
        /// [rest of string was truncated]&quot;;.
-        /// </summary>
-        internal static string input_conf {
-            get {
-                return ResourceManager.GetString("input_conf", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to input-ar-delay = 500
-        ///input-ar-rate = 20
-        ///volume = 50
-        ///hwdec = yes
-        ///vo = direct3d
-        ///keep-open = yes
-        ///keep-open-pause = no
-        ///osd-playing-msg = &apos;${filename}&apos;
-        ///screenshot-directory = ~~desktop/.
-        /// </summary>
-        internal static string mpv_conf {
-            get {
-                return ResourceManager.GetString("mpv_conf", resourceCulture);
-            }
-        }
-    }
-}
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace mpvnet.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("mpvnet.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        internal static string inputConf {
+            get {
+                return ResourceManager.GetString("inputConf", resourceCulture);
+            }
+        }
+        
+        internal static string inputConfHeader {
+            get {
+                return ResourceManager.GetString("inputConfHeader", resourceCulture);
+            }
+        }
+        
+        internal static string mpvConf {
+            get {
+                return ResourceManager.GetString("mpvConf", resourceCulture);
+            }
+        }
+        
+        internal static string mpvConfToml {
+            get {
+                return ResourceManager.GetString("mpvConfToml", resourceCulture);
+            }
+        }
+        
+        internal static string mpvNetConfToml {
+            get {
+                return ResourceManager.GetString("mpvNetConfToml", resourceCulture);
+            }
+        }
+    }
+}

mpv.net/Properties/Resources.resx

@@ -118,10 +118,19 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="input_conf" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\input.conf.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  <data name="inputConf" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\inputConf.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
   </data>
-  <data name="mpv_conf" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\mpv.conf.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  <data name="inputConfHeader" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\inputConfHeader.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  </data>
+  <data name="mpvConf" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\mpvConf.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  </data>
+  <data name="mpvConfToml" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\mpvConfToml.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  </data>
+  <data name="mpvNetConfToml" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\mpvNetConfToml.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
   </data>
 </root>

mpv.net/Properties/Settings.Designer.cs

@@ -12,7 +12,7 @@ namespace mpvnet.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.0.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));

mpv.net/Properties/Settings.settings

@@ -1,7 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
 <SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
-  <Profiles>
-    <Profile Name="(Default)" />
-  </Profiles>
+  <Profiles />
   <Settings />
-</SettingsFile>
+</SettingsFile>

mpv.net/PythonScript.cs

@@ -1,9 +1,10 @@
 using System;
+using System.Reflection;
 
-using IronPython.Hosting;
 using Microsoft.Scripting.Hosting;
-
-using static mpvnet.StaticUsing;
+using IronPython.Hosting;
+using Sys;
+using PyRT = IronPython.Runtime;
 
 namespace mpvnet
 {
@@ -26,8 +27,30 @@ namespace mpvnet
             }
             catch (Exception ex)
             {
-                MsgError(ex.ToString());
+                Msg.ShowException(ex);
             }
         }
     }
+
+    public class PythonEventObject
+    {
+        public PyRT.PythonFunction PythonFunction { get; set; }
+        public EventInfo EventInfo { get; set; }
+        public Delegate Delegate { get; set; }
+
+        public void Invoke()
+        {
+            PyRT.Operations.PythonCalls.Call(PythonFunction);
+        }
+
+        public void InvokeEndFileEventMode(EndFileEventMode arg)
+        {
+            PyRT.Operations.PythonCalls.Call(PythonFunction, new[] { arg });
+        }
+
+        public void InvokeStrings(string[] arg)
+        {
+            PyRT.Operations.PythonCalls.Call(PythonFunction, new[] { arg });
+        }
+    }
 }

mpv.net/Resources/input.conf.txt

@@ -1,139 +0,0 @@
- # mpv.net key bindings, mouse bindings and context menu configuration
- 
- o           script-message mpv.net open-files #menu: O  ; Open Files...
- _           ignore                 #menu: _             ; -
- Space       cycle pause            #menu: Space, Enter  ; Play/Pause
- Enter       cycle pause
- s           stop                   #menu: S             ; Stop
- _           ignore                 #menu: _             ; -
- f           cycle fullscreen       #menu: F             ; Toggle Fullscreen
- 
- F11         playlist-prev          #menu: F11           ; Navigate > Previous
- F12         playlist-next          #menu: F12           ; Navigate > Next
- _           ignore                 #menu: _             ; Navigate > -
- PGUP        add chapter  1         #menu: Page Up       ; Navigate > Next Chapter
- PGDWN       add chapter -1         #menu: Page Down     ; Navigate > Previous Chapter
- 
- .           frame-step             #menu: .             ; Seek > Next Frame
- ,           frame-back-step        #menu: ,             ; Seek > Previous Frame
- _           ignore                 #menu: _             ; Seek > -
- Right       no-osd seek  7         #menu: Right         ; Seek > 7 sec forward
- Left        no-osd seek -7         #menu: Left          ; Seek > 7 sec backward
- _           ignore                 #menu: _             ; Seek > -
- Up          no-osd seek  40        #menu: Up            ; Seek > 40 sec forward
- Down        no-osd seek -40        #menu: Down          ; Seek > 40 sec backward
- _           ignore                 #menu: _             ; Seek > -
- Ctrl+Right  no-osd seek  300       #menu: Ctrl+Right    ; Seek > 5 min forward
- Ctrl+Left   no-osd seek -300       #menu: Ctrl+Left     ; Seek > 5 min backward
- 
- Ctrl++      add video-zoom  0.1    #menu: Ctrl++        ; Pan && Scan > Increase Size
- Ctrl+-      add video-zoom -0.1    #menu: Ctrl+-        ; Pan && Scan > Decrease Size
- _           ignore                 #menu: _             ; Pan && Scan > -
- Shift+Left  add video-pan-x -0.01  #menu: Shift+Left    ; Pan && Scan > Move Left
- Shift+Right add video-pan-x  0.01  #menu: Shift+Right   ; Pan && Scan > Move Right
- _           ignore                 #menu: _             ; Pan && Scan > -
- Shift+Up    add video-pan-y -0.01  #menu: Shift+Up      ; Pan && Scan > Move Up
- Shift+Down  add video-pan-y  0.01  #menu: Shift+Down    ; Pan && Scan > Move Down
- _           ignore                 #menu: _             ; Pan && Scan > -
- w           add panscan -0.1       #menu: W             ; Pan && Scan > Decrease Height
- W           add panscan +0.1       #menu: Shift+W       ; Pan && Scan > Increase Height
- _           ignore                 #menu: _             ; Pan && Scan > -
- Shift+BS    set video-zoom 0 ; set video-pan-x 0 ; set video-pan-y 0 #menu: Shift+Backspace ; Pan && Scan > Reset
- 
- Ctrl+1      add contrast -1        #menu: Ctrl+1        ; Video > Decrease Contrast
- Ctrl+2      add contrast 1         #menu: Ctrl+2        ; Video > Increase Contrast
- _           ignore                 #menu: _             ; Video > -
- Ctrl+3      add brightness -1      #menu: Ctrl+3        ; Video > Decrease Brightness
- Ctrl+4      add brightness 1       #menu: Ctrl+4        ; Video > Increase Brightness
- _           ignore                 #menu: _             ; Video > -
- Ctrl+5      add gamma -1           #menu: Ctrl+5        ; Video > Decrease Gamma
- Ctrl+6      add gamma 1            #menu: Ctrl+6        ; Video > Increase Gamma
- _           ignore                 #menu: _             ; Video > -
- Ctrl+7      add saturation -1      #menu: Ctrl+7        ; Video > Decrease Saturation
- Ctrl+8      add saturation 1       #menu: Ctrl+8        ; Video > Increase Saturation
- _           ignore                 #menu: _             ; Video > -
- Ctrl+S      async screenshot       #menu: Ctrl+S        ; Video > Take Screenshot
- Ctrl+Shift+S screenshot each-frame #menu: Ctrl+Shift+S  ; Video > Take Screenshots All Frames
- _           ignore                 #menu: _             ; Video > -
- d           cycle deinterlace      #menu: D             ; Video > Toggle Deinterlace
- a           cycle-values video-aspect "16:9" "4:3" "2.35:1" "-1" #menu: A ; Video > Cycle Aspect Ratio
-
- KP7         cycle audio            #menu: Keypad 7      ; Audio > Cycle/Next
- _           ignore                 #menu: _             ; Audio > -
- KP6         add audio-delay  0.100 #menu: Keypad 6      ; Audio > Delay +0.1
- KP9         add audio-delay -0.100 #menu: Keypad 9      ; Audio > Delay -0.1
- 
- KP8         cycle sub              #menu: Keypad 8      ; Subtitle > Cycle/Next
- v           cycle sub-visibility   #menu: V             ; Subtitle > Toggle Visibility
- _           ignore                 #menu: _             ; Subtitle > -
- z           add sub-delay -0.1     #menu: Z             ; Subtitle > Delay -0.1
- Z           add sub-delay +0.1     #menu: Shift+Z       ; Subtitle > Delay +0.1
- _           ignore                 #menu: _             ; Subtitle > -
- r           add sub-pos -1         #menu: R             ; Subtitle > Move Up
- R           add sub-pos +1         #menu: Shift+R       ; Subtitle > Move Down
- _           ignore                 #menu: _             ; Subtitle > -
- _           add sub-scale -0.1     #menu: _             ; Subtitle > Decrease Subtitle Font Size
- _           add sub-scale +0.1     #menu: _             ; Subtitle > Increase Subtitle Font Size
-
- +           add volume  10         #menu: +             ; Volume > Up
- -           add volume -10         #menu: -             ; Volume > Down
- WHEEL_UP    add volume  10
- WHEEL_DOWN  add volume -10
- _           ignore                 #menu: _             ; Volume > -
- m           cycle mute             #menu: M             ; Volume > Mute
- 
- [           multiply speed 0.9     #menu: [             ; Speed > -10%
- ]           multiply speed 1.1     #menu: ]             ; Speed > +10%
- _           ignore                 #menu: _             ; Speed > -
- {           multiply speed 0.5     #menu: {             ; Speed > Half
- }           multiply speed 2.0     #menu: }             ; Speed > Double
- _           ignore                 #menu: _             ; Speed > -
- BS          set speed 1            #menu: Backspace     ; Speed > Reset
- 
- KP0 script-message rate-file 0     #menu: Keypad 0      ; Addons > Rating > 0stars
- KP1 script-message rate-file 1     #menu: Keypad 1      ; Addons > Rating > 1stars
- KP2 script-message rate-file 2     #menu: Keypad 2      ; Addons > Rating > 2stars
- KP3 script-message rate-file 3     #menu: Keypad 3      ; Addons > Rating > 3stars
- KP4 script-message rate-file 4     #menu: Keypad 4      ; Addons > Rating > 4stars
- KP5 script-message rate-file 5     #menu: Keypad 5      ; Addons > Rating > 5stars
- 
- _ script-message mpv.net set-setting hwdec yes #menu: _ ; Settings > Hardware Decoding > Enable
- _ script-message mpv.net set-setting hwdec no  #menu: _ ; Settings > Hardware Decoding > Disable
- p script-message mpv.net show-prefs            #menu: P ; Settings > Show Preferences
- k script-message mpv.net show-keys             #menu: K ; Settings > Show Keys
- c script-message mpv.net open-config-folder    #menu: C ; Settings > Open Config Folder
- 
- i script-message mpv.net show-info                 #menu: I       ; Tools | Info
- t script-binding stats/display-stats               #menu: T       ; Tools > Show Statistics
- T script-binding stats/display-stats-toggle        #menu: Shift+T ; Tools > Toggle Statistics
- _ ignore                                           #menu: _       ; Tools > -
- h script-message mpv.net history                   #menu: H       ; Tools > Show History
- l ab-loop                                          #menu: L       ; Tools > Set/clear A-B loop points
- L cycle-values loop-file "inf" "no"                #menu: Shift+L ; Tools > Toggle Infinite Looping
- DEL script-binding osc/visibility                  #menu: Delete  ; Tools > Toggle OSC Visibility
- Ctrl+H cycle-values hwdec "auto" "no"              #menu: Ctrl+H  ; Tools > Cycle Hardware Decoding
- F8 show-text ${playlist}   5000                    #menu: F8      ; Tools > Show Playlist
- F9 show-text ${track-list} 5000                    #menu: F9      ; Tools > Show Audio/Video/Subtitle List
-
- _ script-message mpv.net shell-execute https://mpv.io/manual/stable/ #menu: _ ; Tools > Web > Show mpv manual
- _ script-message mpv.net shell-execute https://github.com/mpv-player/mpv/blob/master/etc/input.conf #menu: _ ; Tools > Web > Show mpv default keys
- _ script-message mpv.net shell-execute https://github.com/stax76/mpvnet #menu: _ ; Tools > Web > Show mpv.net web site
- _ ignore                                       #menu: _       ; -
- Esc quit                                       #menu: Escape  ; Exit
- Q quit-watch-later                             #menu: Shift+Q ; Exit Watch Later
-  
- > playlist-next
- < playlist-prev
- 
- POWER quit
- PLAY cycle pause
- PAUSE cycle pause
- PLAYPAUSE cycle pause
- STOP quit
- FORWARD seek 60
- REWIND seek -60
- VOLUME_UP add volume 2
- VOLUME_DOWN add volume -2
- MUTE cycle mute
- CLOSE_WIN quit
- CLOSE_WIN {encode} quit 4

mpv.net/Resources/inputConf.txt

@@ -0,0 +1,177 @@
+
+ # This file defines the input (keys and mouse) bindings of mpv and mpv.net
+ # and it also defines the context menu of mpv.net. mpv.net has an input
+ # editor and an config editor as alternative to editing conf text files.
+ # The input and config editor can be found in mpv.net's context menu at:
+
+ # Settings > Show Config Editor
+ # Settings > Show Input Editor
+
+ # The defaults of this file can be found at:
+
+ # https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/inputConf.txt
+
+ # the defaults of mpv can be found at:
+
+ # https://github.com/mpv-player/mpv/blob/master/etc/input.conf
+
+ # mpv.net's defaults of mpv.conf contain: 'input-default-bindings = no'
+ # which disables mpv's input defaults. Every line in this file begins with a
+ # space character to make it easier to do a text search, so if you want to know
+ # if 'o' has already a binding you can make a text search on ' o '.
+
+ # mpv input commands: https://github.com/stax76/mpv.net/wiki/mpv-input-commands
+
+ # mpv input keys:     https://github.com/stax76/mpv.net/wiki/mpv-input-keys
+
+ o           script-message mpv.net open-files #menu: Open > Open Files...
+ u           script-message mpv.net open-url   #menu: Open > Open URL...
+ _           ignore                            #menu: Open > -
+ Alt+a       script-message mpv.net load-audio #menu: Open > Load external audio files...
+ Alt+s       script-message mpv.net load-sub   #menu: Open > Load external subtitle files...
+ _           ignore                            #menu: Open > -
+ _           ignore                            #menu: Open > Recent
+
+ _           ignore                 #menu: -
+ Space       cycle pause            #menu: Play/Pause
+ s           stop                   #menu: Stop
+ _           ignore                 #menu: -
+ Enter       cycle fullscreen       #menu: Toggle Fullscreen
+ 
+ F11         playlist-prev          #menu: Navigate > Previous File
+ F12         playlist-next          #menu: Navigate > Next File
+ _           ignore                 #menu: Navigate > -
+ PGUP        add chapter  1         #menu: Navigate > Next Chapter
+ PGDWN       add chapter -1         #menu: Navigate > Previous Chapter
+ _           ignore                 #menu: Navigate > -
+ .           frame-step             #menu: Navigate > Jump Next Frame
+ ,           frame-back-step        #menu: Navigate > Jump Previous Frame
+ _           ignore                 #menu: Navigate > -
+ Right       no-osd seek  7         #menu: Navigate > Jump 7 sec forward
+ Left        no-osd seek -7         #menu: Navigate > Jump 7 sec backward
+ _           ignore                 #menu: Navigate > -
+ Up          no-osd seek  40        #menu: Navigate > Jump 40 sec forward
+ Down        no-osd seek -40        #menu: Navigate > Jump 40 sec backward
+ _           ignore                 #menu: Navigate > -
+ Ctrl+Right  no-osd seek  300       #menu: Navigate > Jump 5 min forward
+ Ctrl+Left   no-osd seek -300       #menu: Navigate > Jump 5 min backward
+ _           ignore                 #menu: Navigate > -
+ _           ignore                 #menu: Navigate > Chapters
+
+ Ctrl++      add video-zoom  0.1    #menu: Pan & Scan > Increase Size
+ Ctrl+-      add video-zoom -0.1    #menu: Pan & Scan > Decrease Size
+ _           ignore                 #menu: Pan & Scan > -
+ Ctrl+KP4    add video-pan-x -0.01  #menu: Pan & Scan > Move Left
+ Ctrl+KP6    add video-pan-x  0.01  #menu: Pan & Scan > Move Right
+ _           ignore                 #menu: Pan & Scan > -
+ Ctrl+KP8    add video-pan-y -0.01  #menu: Pan & Scan > Move Up
+ Ctrl+KP2    add video-pan-y  0.01  #menu: Pan & Scan > Move Down
+ _           ignore                 #menu: Pan & Scan > -
+ w           add panscan -0.1       #menu: Pan & Scan > Decrease Height
+ W           add panscan  0.1       #menu: Pan & Scan > Increase Height
+ _           ignore                 #menu: Pan & Scan > -
+ Ctrl+BS     set video-zoom 0; set video-pan-x 0; set video-pan-y 0 #menu: Pan & Scan > Reset
+
+ Ctrl+1      add contrast -1        #menu: Video > Decrease Contrast
+ Ctrl+2      add contrast           #menu: Video > Increase Contrast
+ _           ignore                 #menu: Video > -
+ Ctrl+3      add brightness -1      #menu: Video > Decrease Brightness
+ Ctrl+4      add brightness  1      #menu: Video > Increase Brightness
+ _           ignore                 #menu: Video > -
+ Ctrl+5      add gamma -1           #menu: Video > Decrease Gamma
+ Ctrl+6      add gamma  1           #menu: Video > Increase Gamma
+ _           ignore                 #menu: Video > -
+ Ctrl+7      add saturation -1      #menu: Video > Decrease Saturation
+ Ctrl+8      add saturation  1      #menu: Video > Increase Saturation
+ _           ignore                 #menu: Video > -
+ Ctrl+s      async screenshot       #menu: Video > Take Screenshot
+ d           cycle deinterlace      #menu: Video > Toggle Deinterlace
+ a           cycle-values video-aspect "16:9" "4:3" "2.35:1" "-1" #menu: Video > Cycle Aspect Ratio
+
+ KP7         script-message mpv.net cycle-audio #menu: Audio > Cycle/Next
+ _           ignore                 #menu: Audio > -
+ KP6         add audio-delay  0.100 #menu: Audio > Delay +0.1
+ KP9         add audio-delay -0.100 #menu: Audio > Delay -0.1
+
+ KP8         cycle sub              #menu: Subtitle > Cycle/Next
+ v           cycle sub-visibility   #menu: Subtitle > Toggle Visibility
+ _           ignore                 #menu: Subtitle > -
+ z           add sub-delay -0.1     #menu: Subtitle > Delay -0.1
+ Z           add sub-delay  0.1     #menu: Subtitle > Delay +0.1
+ _           ignore                 #menu: Subtitle > -
+ r           add sub-pos -1         #menu: Subtitle > Move Up
+ R           add sub-pos +1         #menu: Subtitle > Move Down
+ _           ignore                 #menu: Subtitle > -
+ _           add sub-scale -0.1     #menu: Subtitle > Decrease Subtitle Font Size
+ _           add sub-scale  0.1     #menu: Subtitle > Increase Subtitle Font Size
+
+ _           ignore                 #menu: Track
+
+ +           add volume  10         #menu: Volume > Up
+ -           add volume -10         #menu: Volume > Down
+ _           ignore                 #menu: Volume > -
+ m           cycle mute             #menu: Volume > Mute
+
+ [           multiply speed 0.9     #menu: Speed > -10%
+ ]           multiply speed 1.1     #menu: Speed > +10%
+ _           ignore                 #menu: Speed > -
+ {           multiply speed 0.5     #menu: Speed > Half
+ }           multiply speed 2.0     #menu: Speed > Double
+ _           ignore                 #menu: Speed > -
+ BS          set speed 1            #menu: Speed > Reset
+
+ KP0 script-message rate-file 0     #menu: Extensions > Rating > 0stars
+ KP1 script-message rate-file 1     #menu: Extensions > Rating > 1stars
+ KP2 script-message rate-file 2     #menu: Extensions > Rating > 2stars
+ KP3 script-message rate-file 3     #menu: Extensions > Rating > 3stars
+ KP4 script-message rate-file 4     #menu: Extensions > Rating > 4stars
+ KP5 script-message rate-file 5     #menu: Extensions > Rating > 5stars
+
+ Ctrl+t set ontop yes                             #menu: View > On Top > Enable
+ Ctrl+T set ontop no                              #menu: View > On Top > Disable
+ i      script-message mpv.net show-info          #menu: View > File Info
+ t      script-binding stats/display-stats        #menu: View > Show Statistics
+ T      script-binding stats/display-stats-toggle #menu: View > Toggle Statistics
+ Del    script-binding osc/visibility             #menu: View > Toggle OSC Visibility
+ F8     show-text ${playlist}   5000              #menu: View > Show Playlist
+ F9     show-text ${track-list} 5000              #menu: View > Show Audio/Video/Subtitle List
+
+ Ctrl+c script-message mpv.net show-conf-editor   #menu: Settings > Show Config Editor
+ Ctrl+i script-message mpv.net show-input-editor  #menu: Settings > Show Input Editor
+ Ctrl+f script-message mpv.net open-conf-folder   #menu: Settings > Open Config Folder
+
+ Ctrl+P script-message mpv.net show-command-palette #menu: Tools > Command Palette
+ h      script-message mpv.net show-history         #menu: Tools > Show History
+ l      ab-loop                                     #menu: Tools > Set/clear A-B loop points
+ 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
+ _ script-message mpv.net shell-execute https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/inputConf.txt #menu: Help > Show mpv.net default keys
+ _ script-message mpv.net shell-execute https://mpv-net.github.io/mpv.net-web-site/ #menu: Help > Show mpv.net web site
+ _ ignore                                         #menu: Help > -
+ _ script-message mpv.net show-about              #menu: Help > About mpv.net
+
+ _ ignore           #menu: -
+ Esc quit           #menu: Exit
+ Q quit-watch-later #menu: Exit Watch Later
+
+ > playlist-next
+ < playlist-prev
+ Power quit
+ Play      cycle pause
+ Pause     cycle pause
+ PlayPause cycle pause
+ Stop stop
+ Forward seek  60
+ Rewind  seek -60
+ Mute cycle mute
+ Volume_Up   add volume  10
+ Volume_Down add volume -10
+ Wheel_Up    add volume  10
+ Wheel_Down  add volume -10
+ Prev playlist-prev
+ Next playlist-next

mpv.net/Resources/inputConfHeader.txt

@@ -0,0 +1,25 @@
+
+ # This file defines the input (keys and mouse) bindings of mpv and mpv.net
+ # and it also defines the context menu of mpv.net. mpv.net has an input
+ # editor and an config editor as alternatives to editing conf text files.
+ # The input and config editor can be found in mpv.net's context menu at:
+
+ # Settings > Show Config Editor
+ # Settings > Show Input Editor
+
+ # The defaults of this file can be found at:
+
+ # https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/inputConf.txt
+
+ # the defaults of mpv can be found at:
+
+ # https://github.com/mpv-player/mpv/blob/master/etc/inputConf
+
+ # mpv.net's defaults of mpv.conf contain: 'input-default-bindings = no'
+ # which disables mpv's input defaults. Every line in this file begins with a
+ # space character to make it easier to do a text search, so if you want to know
+ # if 'o' has already a binding you can make a text search on ' o '.
+
+ # mpv input commands: https://github.com/stax76/mpv.net/wiki/mpv-input-commands
+
+ # mpv input keys:     https://github.com/stax76/mpv.net/wiki/mpv-input-keys

mpv.net/Resources/mpv.conf.txt

@@ -1,11 +0,0 @@
-# https://mpv.io/manual/master/
-
-input-ar-delay = 500
-input-ar-rate = 20
-volume = 50
-hwdec = yes
-vo = direct3d
-keep-open = yes
-keep-open-pause = no
-osd-playing-msg = ${filename}
-screenshot-directory = ~~desktop/

mpv.net/Resources/mpvConf.txt

@@ -0,0 +1,14 @@
+
+# mpv manual: https://mpv.io/manual/master/
+
+# mpv.net mpv.conf defaults: https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/mpvConf.txt
+
+input-ar-delay = 500
+input-ar-rate = 20
+volume = 50
+hwdec = yes
+keep-open = yes
+keep-open-pause = no
+osd-playing-msg = ${filename}
+screenshot-directory = ~~desktop/
+input-default-bindings = no

mpv.net/Resources/mpvConfToml.txt

@@ -0,0 +1,282 @@
+[[settings]]
+name = "hwdec"
+default = "no"
+filter = "Video"
+helpurl = "https://mpv.io/manual/master/#options-hwdec"
+help = "--hwdec=<mode> Specify the hardware video decoding API that should be used if possible. Whether hardware decoding is actually done depends on the video codec. If hardware decoding is not possible, mpv will fall back on software decoding.\n\nFor more information visit:"
+options = [{ name = "no",           help = "always use software decoding (Default)" },
+           { name = "auto",         help = "enable best hw decoder (see below)" },
+           { name = "yes",          help = "exactly the same as auto" },
+           { name = "auto-copy",    help = "enable best hw decoder with copy-back (see below)" },
+           { name = "dxva2",        help = "requires --vo=gpu with --gpu-context=d3d11, --gpu-context=angle or --gpu-context=dxinterop (Windows only)" },
+           { name = "dxva2-copy",   help = "copies video back to system RAM (Windows only)" },
+           { name = "d3d11va",      help = "requires --vo=gpu with --gpu-context=d3d11 or --gpu-context=angle (Windows 8+ only)" },
+           { name = "d3d11va-copy", help = "copies video back to system RAM (Windows 8+ only)" },
+           { name = "cuda",         help = "requires --vo=gpu (Any platform CUDA is available)" },
+           { name = "cuda-copy",    help = "copies video back to system RAM (Any platform CUDA is available)" },
+           { name = "nvdec",        help = "requires --vo=gpu (Any platform CUDA is available)" },
+           { name = "nvdec-copy",   help = "copies video back to system RAM (Any platform CUDA is available)" },
+           { name = "crystalhd",    help = "copies video back to system RAM (Any platform supported by hardware)" },
+           { name = "rkmpp",        help = "requires --vo=gpu (some RockChip devices only)" }]
+
+[[settings]]
+name = "gpu-api"
+default = "auto"
+filter = "Video"
+help = "--gpu-api=<type> Controls which type of graphics APIs will be accepted."
+options = [{ name = "auto",   help = "Use any available API (Default)" },
+           { name = "opengl", help = "Allow only OpenGL (requires OpenGL 2.1+ or GLES 2.0+)" },
+           { name = "vulkan", help = "Allow only Vulkan (requires a valid/working --spirv-compiler)" },
+           { name = "d3d11",  help = "Allow only --gpu-context=d3d11" }]
+
+[[settings]]
+name = "gpu-context"
+default = "auto"
+filter = "Video"
+help = "--gpu-context=<sys> The value auto (the default) selects the GPU context. You can also pass help to get a complete list of compiled in backends (sorted by autoprobe order)."
+options = [{ name = "auto",      help = "auto-select (Default)" },
+           { name = "win",       help = "Win32/WGL" },
+           { name = "winvk",     help = "VK_KHR_win32_surface" },
+           { name = "angle",     help = "Direct3D11 through the OpenGL ES translation layer ANGLE. This supports almost everything the win backend does (if the ANGLE build is new enough)." },
+           { name = "dxinterop", help = "(experimental) Win32, using WGL for rendering and Direct3D 9Ex for presentation. Works on Nvidia and AMD. Newer Intel chips with the latest drivers may also work." },
+           { name = "d3d11",     help = "Win32, with native Direct3D 11 rendering." }]
+
+[[settings]]
+name = "vo"
+default = "gpu"
+filter = "Video"
+helpurl = "https://mpv.io/manual/master/#video-output-drivers-vo"
+help = "--gpu=<mode> Video output drivers to be used. Default = gpu.\n\nFor more information visit:"
+options = [{ name = "gpu",      help = "General purpose, customizable, GPU-accelerated video output driver. It supports extended scaling methods, dithering, color management, custom shaders, HDR, and more. (Default)" },
+           { name = "direct3d", help = "Video output driver that uses the Direct3D interface" }]
+
+[[settings]]
+name = "video-sync"
+default = "audio"
+filter = "Video"
+help = "--video-sync=<audio|...> How the player synchronizes audio and video.\n\nFor more information visit:"
+helpurl = "https://mpv.io/manual/master/#options-video-sync"
+options = [{ name = "audio" },
+           { name = "display-resample" },
+           { name = "display-resample-vdrop" },
+           { name = "display-resample-desync" },
+           { name = "display-vdrop" },
+           { name = "display-adrop" },
+           { name = "display-desync" },
+           { name = "desync" }]
+
+[[settings]]
+name = "scale"
+default = "bilinear"
+filter = "Video"
+help = "--scale=<filter> The GPU renderer filter function to use when upscaling video. There are some more filters, but most are not as useful. For a complete list, pass help as value, e.g.: mpv --scale=help"
+options = [{ name = "bilinear",         help = "Bilinear hardware texture filtering (fastest, very low quality). This is the default for compatibility reasons." },
+           { name = "spline36",         help = "Mid quality and speed. This is the default when using gpu-hq." },
+           { name = "lanczos",          help = "Lanczos scaling. Provides mid quality and speed. Generally worse than spline36, but it results in a slightly sharper image which is good for some content types. The number of taps can be controlled with  scale-radius, but is best left unchanged. (This filter is an alias for sinc-windowed sinc)" },
+           { name = "ewa_lanczos",      help = "Elliptic weighted average Lanczos scaling. Also known as Jinc. Relatively slow, but very good quality. The radius can be controlled with scale-radius. Increasing the radius makes the filter sharper but adds more ringing. (This filter is an alias for jinc-windowed jinc)" },
+           { name = "ewa_lanczossharp", help = "A slightly sharpened version of ewa_lanczos, preconfigured to use an ideal radius and parameter. If your hardware can run it, this is probably what you should use by default." },
+           { name = "mitchell",         help = "Mitchell-Netravali. The B and C parameters can be set with  --scale-param1 and --scale-param2. This filter is very good at downscaling (see --dscale)." },
+           { name = "oversample",       help = "A version of nearest neighbour that (naively) oversamples pixels, so that pixels overlapping edges get linearly interpolated instead of rounded. This essentially removes the small imperfections and judder artifacts caused by nearest-neighbour interpolation, in exchange for adding some blur. This filter is good at temporal interpolation, and also known as \"smoothmotion\" (see --tscale)." },
+           { name = "linear",           help = "A --tscale filter." }]
+
+[[settings]]
+name = "cscale"
+default = "bilinear"
+filter = "Video"
+help = "--cscale=<filter> As --scale, but for interpolating chroma information. If the image is not subsampled, this option is ignored entirely."
+options = [{ name = "bilinear",         help = "Bilinear hardware texture filtering (fastest, very low quality). This is the default for compatibility reasons." },
+           { name = "spline36",         help = "Mid quality and speed. This is the default when using gpu-hq." },
+           { name = "lanczos",          help = "Lanczos scaling. Provides mid quality and speed. Generally worse than spline36, but it results in a slightly sharper image which is good for some content types. The number of taps can be controlled with  scale-radius, but is best left unchanged. (This filter is an alias for sinc-windowed sinc)" },
+           { name = "ewa_lanczos",      help = "Elliptic weighted average Lanczos scaling. Also known as Jinc. Relatively slow, but very good quality. The radius can be controlled with scale-radius. Increasing the radius makes the filter sharper but adds more ringing. (This filter is an alias for jinc-windowed jinc)" },
+           { name = "ewa_lanczossharp", help = "A slightly sharpened version of ewa_lanczos, preconfigured to use an ideal radius and parameter. If your hardware can run it, this is probably what you should use by default." },
+           { name = "mitchell",         help = "Mitchell-Netravali. The B and C parameters can be set with  --scale-param1 and --scale-param2. This filter is very good at downscaling (see --dscale)." },
+           { name = "oversample",       help = "A version of nearest neighbour that (naively) oversamples pixels, so that pixels overlapping edges get linearly interpolated instead of rounded. This essentially removes the small imperfections and judder artifacts caused by nearest-neighbour interpolation, in exchange for adding some blur. This filter is good at temporal interpolation, and also known as \"smoothmotion\" (see --tscale)." },
+           { name = "linear",           help = "A --tscale filter." }]
+
+[[settings]]
+name = "dscale"
+default = "bilinear"
+filter = "Video"
+help = "--dscale=<filter> Like --scale, but apply these filters on downscaling instead. If this option is unset, the filter implied by --scale will be applied."
+options = [{ name = "bilinear",         help = "Bilinear hardware texture filtering (fastest, very low quality). This is the default for compatibility reasons." },
+           { name = "spline36",         help = "Mid quality and speed. This is the default when using gpu-hq." },
+           { name = "lanczos",          help = "Lanczos scaling. Provides mid quality and speed. Generally worse than spline36, but it results in a slightly sharper image which is good for some content types. The number of taps can be controlled with  scale-radius, but is best left unchanged. (This filter is an alias for sinc-windowed sinc)" },
+           { name = "ewa_lanczos",      help = "Elliptic weighted average Lanczos scaling. Also known as Jinc. Relatively slow, but very good quality. The radius can be controlled with scale-radius. Increasing the radius makes the filter sharper but adds more ringing. (This filter is an alias for jinc-windowed jinc)" },
+           { name = "ewa_lanczossharp", help = "A slightly sharpened version of ewa_lanczos, preconfigured to use an ideal radius and parameter. If your hardware can run it, this is probably what you should use by default." },
+           { name = "mitchell",         help = "Mitchell-Netravali. The B and C parameters can be set with  --scale-param1 and --scale-param2. This filter is very good at downscaling (see --dscale)." },
+           { name = "oversample",       help = "A version of nearest neighbour that (naively) oversamples pixels, so that pixels overlapping edges get linearly interpolated instead of rounded. This essentially removes the small imperfections and judder artifacts caused by nearest-neighbour interpolation, in exchange for adding some blur. This filter is good at temporal interpolation, and also known as \"smoothmotion\" (see --tscale)." },
+           { name = "linear",           help = "A --tscale filter." }]
+
+[[settings]]
+name = "dither-depth"
+default = "no"
+filter = "Video"
+help = "--dither-depth=<N|no|auto> Set dither target depth to N. Default: no. Note that the depth of the connected video display device cannot be detected. Often, LCD panels will do dithering on their own, which conflicts with this option and leads to ugly output."
+options = [{ name = "no",   help = "Disable any dithering done by mpv." },
+           { name = "auto", help = "Automatic selection. If output bit depth cannot be detected, 8 bits per component are assumed." },
+           { name = "8",    help = "Dither to 8 bit output." }]
+
+[[settings]]
+name = "correct-downscaling"
+default = "no"
+filter = "Video"
+help = "--correct-downscaling When using convolution based filters, extend the filter size when downscaling. Increases quality, but reduces performance while downscaling.\n\nThis will perform slightly sub-optimally for anamorphic video (but still better than without it) since it will extend the size to match only the milder of the scale factors between the axes."
+options = [{ name = "yes" },
+           { name = "no" }]
+
+[[settings]]
+name = "sigmoid-upscaling"
+default = "no"
+filter = "Video"
+help = "--sigmoid-upscaling When upscaling, use a sigmoidal color transform to avoid emphasizing ringing artifacts. This also implies --linear-scaling."
+options = [{ name = "yes" },
+           { name = "no" }]
+
+[[settings]]
+name = "deband"
+default = "no"
+filter = "Video"
+help = "--deband Enable the debanding algorithm. This greatly reduces the amount of visible banding, blocking and other quantization artifacts, at the expense of very slightly blurring some of the finest details. In practice, it's virtually always an improvement - the only reason to disable it would be for performance."
+options = [{ name = "yes" },
+           { name = "no" }]
+
+[[settings]]
+name = "volume"
+default = "100"
+filter = "Audio"
+help = "--volume=<integer> Set the startup volume. 0 means silence, 100 means no volume reduction or amplification. Negative values can be passed for compatibility, but are treated as 0. Since mpv 0.18.1, this always controls the internal mixer (aka \"softvol\"). Default: 100"
+
+[[settings]]
+name = "alang"
+default = ""
+filter = "Audio"
+help = "--alang=<languagecode[,languagecode,...]> Specify a priority list of audio languages to use. Different container formats employ different language codes. DVDs use ISO 639-1 two-letter language codes, Matroska, MPEG-TS and NUT use ISO 639-2 three-letter language codes, while OGM uses a free-form identifier. See also --aid.\n\nExamples\n\nmpv dvd://1 --alang=hu,en chooses the Hungarian language track on a DVD and falls back on English if Hungarian is not available.\n\nmpv --alang=jpn example.mkv plays a Matroska file with Japanese audio."
+
+[[settings]]
+name = "audio-file-auto"
+default = "no"
+filter = "Audio"
+help = "--audio-file-auto=<no|exact|fuzzy|all>, --no-audio-file-auto Load additional audio files matching the video filename. The parameter specifies how external audio files are matched."
+options = [{ name = "no",    help = "Don't automatically load external audio files (default)." },
+           { name = "exact", help = "Load the media filename with audio file extension." },
+           { name = "fuzzy", help = "Load all audio files containing media filename." },
+           { name = "all",   help = "Load all audio files in the current and --audio-file-paths directories." }]
+
+[[settings]]
+name = "slang"
+default = ""
+filter = "Subtitle"
+help = "--slang=<languagecode[,languagecode,...]> Specify a priority list of subtitle languages to use. Different container formats employ different language codes. DVDs use ISO 639-1 two letter language codes, Matroska uses ISO 639-2 three letter language codes while OGM uses a free-form identifier. See also --sid."
+
+[[settings]]
+name = "sub-auto"
+default = "exact"
+filter = "Subtitle"
+help = "--sub-auto=<no|exact|fuzzy|all>, --no-sub-auto Load additional subtitle files matching the video filename. The parameter specifies how external subtitle files are matched. exact is enabled by default."
+options = [{ name = "no",    help = "Don't automatically load external subtitle files." },
+           { name = "exact", help = "Load the media filename with subtitle file extension (Default)." },
+           { name = "fuzzy", help = "Load all subs containing media filename." },
+           { name = "all",   help = "Load all subs in the current and --sub-file-paths directories." }]
+
+[[settings]]
+name = "screen"
+default = ""
+filter = "Screen"
+help = "--screen=<default|0-32> In multi-monitor configurations (i.e. a single desktop that spans across multiple displays), this option tells mpv which screen to display the video on. Default: default."
+
+[[settings]]
+name = "osd-playing-msg"
+default = ""
+width = 300
+filter = "Screen"
+help = "--osd-playing-msg=<value> Show a message on OSD when playback starts. The string is expanded for properties, e.g. --osd-playing-msg='file: ${filename}' will show the message file: followed by a space and the currently played filename. For more information visit:"
+helpurl = "https://mpv.io/manual/master/#property-expansion"
+
+[[settings]]
+name = "fullscreen"
+default = "no"
+filter = "Screen"
+help = "--fullscreen=<yes|no>, fs=<yes|no> Start the player in fullscreen mode. Default: no."
+options = [{ name = "yes" },
+           { name = "no" }]
+
+[[settings]]
+name = "screenshot-directory"
+default = ""
+width = 500
+folder = true
+filter = "Screen"
+help = "--screenshot-directory=<value> Store screenshots in this directory. This path is joined with the filename generated by --screenshot-template. If the template filename is already absolute, the directory is ignored.\n\nIf the directory does not exist, it is created on the first screenshot. If it is not a directory, an error is generated when trying to write a screenshot.\n\nThis option is not set by default, and thus will write screenshots to the directory from which mpv was started. In pseudo-gui mode (see PSEUDO GUI MODE), this is set to the desktop."
+
+[[settings]]
+name = "autofit"
+default = "50%"
+filter = "Screen"
+help = "--autofit=<percent value> Set the initial window size in percent. Please note that this setting is only partly implemented in mpv.net, accepted are only integer values with percent sign added. Default: 50%."
+
+[[settings]]
+name = "keep-open-pause"
+default = "yes"
+filter = "Playback"
+help = "--keep-open-pause=<yes|no> If set to no, instead of pausing when --keep-open is active, just stop at end of file and continue playing forward when you seek backwards until end where it stops again. Default: yes."
+options = [{ name = "yes" },
+           { name = "no" }]
+
+[[settings]]
+name = "keep-open"
+default = "no"
+filter = "Playback"
+help = "--keep-open=<yes|no|always> Do not terminate when playing or seeking beyond the end of the file, and there is not next file to be played (and --loop is not used). Instead, pause the player. When trying to seek beyond end of the file, the player will attempt to seek to the last frame.\n\nNormally, this will act like set pause yes on EOF, unless the  --keep-open-pause=no option is set."
+options = [{ name = "yes",    help = "Don't terminate if the current file is the last playlist entry. Equivalent to --keep-open without arguments."},
+           { name = "no",     help = "If the current file ends, go to the next file or terminate. (Default.)" },
+           { name = "always", help = "Like yes, but also applies to files before the last playlist entry. This means playback will never automatically advance to the next file."}]
+
+[[settings]]
+name = "loop-file"
+default = ""
+filter = "Playback"
+help = "--loop-file=<N|inf|no>, loop=<N|inf|no> Loop a single file N times. inf means forever, no means normal playback. For compatibility, --loop-file and --loop-file=yes are also accepted, and are the same as --loop-file=inf.\n\nThe difference to --loop-playlist is that this doesn't loop the playlist, just the file itself. If the playlist contains only a single file, the difference between the two option is that this option performs a seek on loop, instead of reloading the file.\n\n--loop is an alias for this option."
+
+[[settings]]
+name = "save-position-on-quit"
+default = "no"
+filter = "Playback"
+help = "--save-position-on-quit=<yes|no> Always save the current playback position on quit. When this file is played again later, the player will seek to the old playback position on start. This does not happen if playback of a file is stopped in any other way than quitting. For example, going to the next file in the playlist will not save the position, and start playback at beginning the next time the file is played.\n\nThis behavior is disabled by default, but is always available when quitting the player with Shift+Q."
+options = [{ name = "yes" },
+           { name = "no" }]
+
+[[settings]]
+name = "input-ar-delay"
+default = ""
+filter = "Input"
+help = "--input-ar-delay=<integer> Delay in milliseconds before we start to autorepeat a key (0 to disable)."
+
+[[settings]]
+name = "input-ar-rate"
+default = ""
+filter = "Input"
+help = "--input-ar-rate=<integer> Number of key presses to generate per second on autorepeat."
+
+[[settings]]
+name = "hr-seek"
+default = "absolute"
+filter = "Playback"
+help = "--hr-seek=<no|absolute|yes> Select when to use precise seeks that are not limited to keyframes. Such seeks require decoding video from the previous keyframe up to the target position and so can take some time depending on decoding performance. For some video formats, precise seeks are disabled. This option selects the default choice to use for seeks; it is possible to explicitly override that default in the definition of key bindings and in input commands."
+options = [{ name = "yes",      help = "Use precise seeks whenever possible." },
+           { name = "no",       help = "Never use precise seeks." },
+           { name = "absolute", help = "Use precise seeks if the seek is to an absolute position in the file, such as a chapter seek, but not for relative seeks like the default behavior of arrow keys (default)." },
+           { name = "always",   help = "Same as yes (for compatibility)." }]
+
+[[settings]]
+name = "track-auto-selection"
+default = "yes"
+filter = "Playback"
+help = "--track-auto-selection=<yes|no> Enable the default track auto-selection (default: yes). Enabling this will make the player select streams according to --aid, --alang, and others. If it is disabled, no tracks are selected. In addition, the player will not exit if no tracks are selected, and wait instead (this wait mode is similar to pausing, but the pause option is not set).\n\nThis is useful with --lavfi-complex: you can start playback in this mode, and then set select tracks at runtime by setting the filter graph. Note that if --lavfi-complex is set before playback is started, the referenced tracks are always selected."
+options = [{ name = "yes" },
+           { name = "no" }]
+
+[[settings]]
+name = "loop-playlist"
+default = ""
+filter = "Playback"
+help = "--loop-playlist=<N|inf|force|no>, --loop-playlist Loops playback N times. A value of 1 plays it one time (default), 2 two times, etc. inf means forever. no is the same as 1 and disables looping. If several files are specified on command line, the entire playlist is looped. --loop-playlist is the same as  --loop-playlist=inf.\n\nThe force mode is like inf, but does not skip playlist entries which have been marked as failing. This means the player might waste CPU time trying to loop a file that doesn't exist. But it might be useful for playing webradios under very bad network conditions."

mpv.net/Resources/mpvNetConfToml.txt

@@ -0,0 +1,8 @@
+[[settings]]
+name = "dark-mode"
+default = "always"
+filter = "mpv.net"
+help = "Enables a dark theme."
+options = [{ name = "always" },
+           { name = "system" , help = "Available on Windows 10 or higher" },
+		   { name = "never" }]

mpv.net/StringExtensions.cs

@@ -1,120 +0,0 @@
-using System;
-using System.Linq;
-using System.IO;
-
-public static class StringExtensions
-{
-    public static string ExtFull(this string filepath)
-    {
-        return Ext(filepath, true);
-    }
-
-    public static string Ext(this string filepath)
-    {
-        return Ext(filepath, false);
-    }
-
-    public static string Ext(this string filepath, bool dot)
-    {
-        if (string.IsNullOrEmpty(filepath))
-            return "";
-
-        var chars = filepath.ToCharArray();
-
-        for (var x = filepath.Length - 1; x >= 0; x += -1)
-        {
-            if (chars[x] == Path.DirectorySeparatorChar)
-                return "";
-
-            if (chars[x] == '.')
-                return filepath.Substring(x + (dot ? 0 : 1)).ToLower();
-        }
-
-        return "";
-    }
-
-    public static string Left(this string value, int index)
-    {
-        if (string.IsNullOrEmpty(value) || index < 0)
-            return "";
-
-        if (index > value.Length)
-            return value;
-
-        return value.Substring(0, index);
-    }
-
-    public static string Left(this string value, string start)
-    {
-        if (string.IsNullOrEmpty(value) || string.IsNullOrEmpty(start))
-            return "";
-
-        if (!value.Contains(start))
-            return "";
-
-        return value.Substring(0, value.IndexOf(start));
-    }
-
-    public static string LeftLast(this string value, string start)
-    {
-        if (!value.Contains(start))
-            return "";
-
-        return value.Substring(0, value.LastIndexOf(start));
-    }
-
-    public static string Right(this string value, string start)
-    {
-        if (string.IsNullOrEmpty(value) || string.IsNullOrEmpty(start))
-            return "";
-
-        if (!value.Contains(start))
-            return "";
-
-        return value.Substring(value.IndexOf(start) + start.Length);
-    }
-
-    public static string RightLast(this string value, string start)
-    {
-        if (string.IsNullOrEmpty(value) || string.IsNullOrEmpty(start))
-            return "";
-
-        if (!value.Contains(start))
-            return "";
-
-        return value.Substring(value.LastIndexOf(start) + start.Length);
-    }
-    
-    public static string[] SplitNoEmpty(this string value, params string[] delimiters)
-    {
-        return value.Split(delimiters, StringSplitOptions.RemoveEmptyEntries);
-    }
-
-    public static string[] SplitKeepEmpty(this string value, params string[] delimiters)
-    {
-        return value.Split(delimiters, StringSplitOptions.None);
-    }
-
-    public static string[] SplitNoEmptyAndWhiteSpace(this string value, params string[] delimiters)
-    {
-        if (string.IsNullOrEmpty(value))
-            return null;
-
-        var a = SplitNoEmpty(value, delimiters);
-
-        for (var i = 0; i <= a.Length - 1; i++)
-            a[i] = a[i].Trim();
-
-        var l = a.ToList();
-
-        while (l.Contains(""))
-            l.Remove("");
-
-        return l.ToArray();
-    }
-
-    public static string[] SplitLinesNoEmpty(this string value)
-    {
-        return SplitNoEmpty(value, Environment.NewLine);
-    }
-}

mpv.net/Sys/TaskDialog.cs

@@ -0,0 +1,659 @@
+using System;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Reflection;
+using System.Text.RegularExpressions;
+using System.Threading;
+using System.Windows.Forms;
+
+namespace Sys
+{
+    public class Msg
+    {
+        private static string ShownMessages;
+
+        public static string SupportURL { get; set; }
+
+        public static void Show(string mainInstruction, string content = null)
+        {
+            Msg.Show(mainInstruction, content, MsgIcon.Info, MsgButtons.Ok, MsgResult.None);
+        }
+
+        public static void ShowError(string mainInstruction, string content = null)
+        {
+            try
+            {
+                using (TaskDialog<string> td = new TaskDialog<string>())
+                {
+                    td.AllowCancel = false;
+
+                    if (string.IsNullOrEmpty(content))
+                    {
+                        if (mainInstruction.Length < 80)
+                            td.MainInstruction = mainInstruction;
+                        else
+                            td.Content = mainInstruction;
+                    }
+                    else
+                    {
+                        td.MainInstruction = mainInstruction;
+                        td.Content = content;
+                    }
+
+                    td.MainIcon = MsgIcon.Error;
+                    td.Footer = "[Copy Message](copymsg)";
+
+                    if (!string.IsNullOrEmpty(Msg.SupportURL))
+                        td.Footer += $"   [Contact Support]({SupportURL})";
+
+                    td.Show();
+                }
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(ex.GetType().Name + "\n\n" + ex.Message + "\n\n" + ex.ToString(),
+                    Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+        }
+
+        public static void ShowException(Exception e)
+        {
+            try
+            {
+                using (TaskDialog<string> td = new TaskDialog<string>())
+                {
+                    td.MainInstruction = e.GetType().Name;
+                    td.Content = e.Message;
+                    td.MainIcon = MsgIcon.Error;
+                    td.ExpandedInformation = e.ToString();
+                    td.Footer = "[Copy Message](copymsg)";
+
+                    if (!string.IsNullOrEmpty(Msg.SupportURL))
+                        td.Footer += $"   [Contact Support]({SupportURL})";
+
+                    td.Show();
+                }
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(ex.GetType().Name + "\n\n" + ex.Message + "\n\n" + ex.ToString(),
+                    Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+        }
+
+        public static void ShowWarning(string mainInstruction,
+                                       string content = null,
+                                       bool onlyOnce = false)
+        {
+            if (onlyOnce && Msg.ShownMessages != null &&
+                Msg.ShownMessages.Contains(mainInstruction + content))
+                return;
+
+            Msg.Show(mainInstruction, content, MsgIcon.Warning, MsgButtons.Ok, MsgResult.None);
+            if (!onlyOnce) return;
+            Msg.ShownMessages += mainInstruction + content;
+        }
+
+        public static MsgResult ShowQuestion(string mainInstruction,
+                                             MsgButtons buttons = MsgButtons.OkCancel)
+        {
+            return Msg.Show(mainInstruction, null, MsgIcon.None, buttons, MsgResult.None);
+        }
+
+        public static MsgResult ShowQuestion(string mainInstruction,
+                                             string content,
+                                             MsgButtons buttons = MsgButtons.OkCancel)
+        {
+            return Msg.Show(mainInstruction, content, MsgIcon.None, buttons, MsgResult.None);
+        }
+
+        public static MsgResult Show(string mainInstruction,
+                                     string content,
+                                     MsgIcon icon,
+                                     MsgButtons buttons,
+                                     MsgResult defaultButton = MsgResult.None)
+        {
+            try
+            {
+                using (TaskDialog<MsgResult> td = new TaskDialog<MsgResult>())
+                {
+                    td.AllowCancel = false;
+                    td.DefaultButton = defaultButton;
+                    td.MainIcon = icon;
+
+                    if (content == null)
+                    {
+                        if (mainInstruction.Length < 80)
+                            td.MainInstruction = mainInstruction;
+                        else
+                            td.Content = mainInstruction;
+                    }
+                    else
+                    {
+                        td.MainInstruction = mainInstruction;
+                        td.Content = content;
+                    }
+                    if (buttons == MsgButtons.OkCancel)
+                    {
+                        td.AddButton("OK", MsgResult.OK);
+                        td.AddButton("Cancel", MsgResult.Cancel);
+                    }
+                    else
+                        td.CommonButtons = buttons;
+                    return td.Show();
+                }
+            }
+            catch (Exception ex)
+            {
+                return (MsgResult)MessageBox.Show(ex.GetType().Name + "\n\n" + ex.Message + "\n\n" + ex.ToString(),
+                    Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+        }
+    }
+
+    public class TaskDialog<T> : TaskDialogNative, IDisposable
+    {
+        private Dictionary<int, T> IdValueDic;
+        private Dictionary<int, string> IdTextDic;
+        private List<int> CommandLinkShieldList;
+        private IntPtr ButtonArray;
+        private IntPtr RadioButtonArray;
+        private List<TaskDialogNative.TASKDIALOG_BUTTON> Buttons;
+        private List<TaskDialogNative.TASKDIALOG_BUTTON> RadioButtons;
+        private TaskDialogNative.TASKDIALOGCONFIG Config;
+        const int TDE_CONTENT = 0;
+        const int TDE_EXPANDED_INFORMATION = 1;
+        const int TDE_FOOTER = 2;
+        const int TDE_MAIN_INSTRUCTION = 3;
+        const int TDN_CREATED = 0;
+        const int TDN_NAVIGATED = 1;
+        const int TDN_BUTTON_CLICKED = 2;
+        const int TDN_HYPERLINK_CLICKED = 3;
+        const int TDN_TIMER = 4;
+        const int TDN_DESTROYED = 5;
+        const int TDN_RADIO_BUTTON_CLICKED = 6;
+        const int TDN_DIALOG_CONSTRUCTED = 7;
+        const int TDN_VERIFICATION_CLICKED = 8;
+        const int TDN_HELP = 9;
+        const int TDN_EXPANDO_BUTTON_CLICKED = 10;
+        const int TDM_NAVIGATE_PAGE = 1125;
+        const int TDM_CLICK_BUTTON = 1126;
+        const int TDM_SET_MARQUEE_PROGRESS_BAR = 1127;
+        const int TDM_SET_PROGRESS_BAR_STATE = 1128;
+        const int TDM_SET_PROGRESS_BAR_RANGE = 1129;
+        const int TDM_SET_PROGRESS_BAR_POS = 1130;
+        const int TDM_SET_PROGRESS_BAR_MARQUEE = 1131;
+        const int TDM_SET_ELEMENT_TEXT = 1132;
+        const int TDM_CLICK_RADIO_BUTTON = 1134;
+        const int TDM_ENABLE_BUTTON = 1135;
+        const int TDM_ENABLE_RADIO_BUTTON = 1136;
+        const int TDM_CLICK_VERIFICATION = 1137;
+        const int TDM_UPDATE_ELEMENT_TEXT = 1138;
+        const int TDM_SET_BUTTON_ELEVATION_REQUIRED_STATE = 1139;
+        const int TDM_UPDATE_ICON = 1140;
+        private T SelectedValueValue;
+        private string SelectedTextValue;
+        private int TimeoutValue;
+        private int ExitTickCount;
+        private bool disposed;
+
+        public TaskDialog()
+        {
+            IdValueDic = new Dictionary<int, T>();
+            IdTextDic = new Dictionary<int, string>();
+            CommandLinkShieldList = new List<int>();
+            Buttons = new List<TaskDialogNative.TASKDIALOG_BUTTON>();
+            RadioButtons = new List<TaskDialogNative.TASKDIALOG_BUTTON>();
+            _SelectedID = -1;
+            Config = new TaskDialogNative.TASKDIALOGCONFIG();
+            Config.cbSize = (uint)Marshal.SizeOf(Config);
+            Config.hwndParent = GetHandle();
+            Config.hInstance = IntPtr.Zero;
+            Config.dwFlags = TaskDialogNative.TASKDIALOG_FLAGS.TDF_ALLOW_DIALOG_CANCELLATION;
+            Config.dwCommonButtons = MsgButtons.None;
+            Config.MainIcon = new TaskDialogNative.TASKDIALOGCONFIG_ICON_UNION(0);
+            Config.FooterIcon = new TaskDialogNative.TASKDIALOGCONFIG_ICON_UNION(0);
+            Config.cxWidth = 0U;
+            Config.cButtons = 0U;
+            Config.cRadioButtons = 0U;
+            Config.pButtons = IntPtr.Zero;
+            Config.pRadioButtons = IntPtr.Zero;
+            Config.nDefaultButton = 0;
+            Config.nDefaultRadioButton = 0;
+            Config.pszWindowTitle = ((AssemblyProductAttribute)Assembly.GetEntryAssembly().GetCustomAttributes(typeof(AssemblyProductAttribute), true)[0]).Product;
+            Config.pszMainInstruction = "";
+            Config.pszContent = "";
+            Config.pfCallback = new PFTASKDIALOGCALLBACK(this.DialogProc);
+        }
+
+        public IntPtr GetHandle()
+        {
+            StringBuilder lpszFileName = new StringBuilder(260);
+            IntPtr foregroundWindow = TaskDialogNative.GetForegroundWindow();
+            TaskDialogNative.GetWindowModuleFileName(foregroundWindow, lpszFileName, 260U);
+
+            if (Path.GetFileName(lpszFileName.ToString().Replace(".vshost", "")) ==
+                Path.GetFileName(Assembly.GetEntryAssembly().Location))
+                return foregroundWindow;
+
+            return IntPtr.Zero;
+        }
+
+        public bool AllowCancel {
+            set {
+                if (value)
+                    Config.dwFlags |= TaskDialogNative.TASKDIALOG_FLAGS.TDF_ALLOW_DIALOG_CANCELLATION;
+                else
+                    Config.dwFlags ^= TaskDialogNative.TASKDIALOG_FLAGS.TDF_ALLOW_DIALOG_CANCELLATION;
+            }
+        }
+
+        public string MainInstruction {
+            get => Config.pszMainInstruction;
+            set => Config.pszMainInstruction = value;
+        }
+
+        public string Content {
+            get => Config.pszContent;
+            set => Config.pszContent = ExpandMarkdownMarkup(value);
+        }
+
+        public string ExpandedInformation {
+            get => Config.pszExpandedInformation;
+            set => Config.pszExpandedInformation = ExpandMarkdownMarkup(value);
+        }
+
+        public string VerificationText {
+            get => Config.pszVerificationText;
+            set => Config.pszVerificationText = value;
+        }
+
+        public MsgResult DefaultButton {
+            get => (MsgResult)Config.nDefaultButton;
+            set => Config.nDefaultButton = (int)value;
+        }
+
+        public string Footer {
+            get => Config.pszFooter;
+            set => Config.pszFooter = ExpandMarkdownMarkup(value);
+        }
+
+        public MsgIcon MainIcon {
+            set => Config.MainIcon = new TaskDialogNative.TASKDIALOGCONFIG_ICON_UNION((int)value);
+        }
+
+        private int _SelectedID;
+
+        public int SelectedID {
+            get => _SelectedID;
+            set {
+                foreach (var i in IdValueDic)
+                    if (i.Key == value) _SelectedID = value;
+            }
+        }
+
+        public T SelectedValue {
+            get {
+                if (IdValueDic.ContainsKey(SelectedID))
+                    return IdValueDic[SelectedID];
+                return SelectedValueValue;
+            }
+            set => SelectedValueValue = value;
+        }
+
+        public string SelectedText {
+            get {
+                if (IdTextDic.ContainsKey(SelectedID))
+                    return IdTextDic[SelectedID];
+                return SelectedTextValue;
+            }
+            set => SelectedTextValue = value;
+        }
+
+        public bool CheckBoxChecked {
+            get => (Config.dwFlags & TaskDialogNative.TASKDIALOG_FLAGS.TDF_VERIFICATION_FLAG_CHECKED) == TaskDialogNative.TASKDIALOG_FLAGS.TDF_VERIFICATION_FLAG_CHECKED;
+            set {
+                if (value)
+                    Config.dwFlags |= TaskDialogNative.TASKDIALOG_FLAGS.TDF_VERIFICATION_FLAG_CHECKED;
+                else
+                    Config.dwFlags ^= TaskDialogNative.TASKDIALOG_FLAGS.TDF_VERIFICATION_FLAG_CHECKED;
+            }
+        }
+
+        public MsgButtons CommonButtons {
+            get => Config.dwCommonButtons;
+            set => Config.dwCommonButtons = value;
+        }
+
+        public int Timeout {
+            get => Convert.ToInt32(TimeoutValue / 1000.0);
+            set {
+                TimeoutValue = value * 1000;
+                Config.dwFlags |= TaskDialogNative.TASKDIALOG_FLAGS.TDF_CALLBACK_TIMER;
+            }
+        }
+
+        public void AddButton(string text, T value)
+        {
+            int n = 1000 + IdValueDic.Count + 1;
+            IdValueDic[n] = value;
+            Buttons.Add(new TaskDialogNative.TASKDIALOG_BUTTON(n, text));
+        }
+
+        public string ExpandMarkdownMarkup(string value)
+        {
+            if (value.Contains("["))
+            {
+                Regex regex = new Regex(@"\[(.+)\]\((.+)\)");
+
+                if (regex.Match(value).Success)
+                {
+                    Config.dwFlags |= TaskDialogNative.TASKDIALOG_FLAGS.TDF_ENABLE_HYPERLINKS;
+                    value = regex.Replace(value, "<a href=\"$2\">$1</a>");
+                }
+            }
+            return value;
+        }
+
+        public void AddCommandLink(string text, T value)
+        {
+            int n = 1000 + IdValueDic.Count + 1;
+            IdValueDic[n] = value == null ? (T)(object)text : value;
+            IdTextDic[n] = text;
+            Buttons.Add(new TaskDialogNative.TASKDIALOG_BUTTON(n, text));
+            Config.dwFlags |= TaskDialogNative.TASKDIALOG_FLAGS.TDF_USE_COMMAND_LINKS;
+        }
+
+        public void AddCommandLink(string text, string description, T value, bool setShield = false)
+        {
+            int n = 1000 + IdValueDic.Count + 1;
+            IdValueDic[n] = value;
+            if (setShield) CommandLinkShieldList.Add(n);
+            if (!string.IsNullOrEmpty(description)) text += "\n" + description;
+            Buttons.Add(new TaskDialogNative.TASKDIALOG_BUTTON(n, text));
+            Config.dwFlags |= TaskDialogNative.TASKDIALOG_FLAGS.TDF_USE_COMMAND_LINKS;
+        }
+
+        public void AddRadioButton(string text, T value)
+        {
+            int n = 1000 + IdValueDic.Count + 1;
+            IdValueDic[n] = value;
+            RadioButtons.Add(new TaskDialogNative.TASKDIALOG_BUTTON(n, text));
+        }
+
+        public T Show()
+        {
+            MarshalDialogControlStructs();
+            TaskDialogNative.TASKDIALOGCONFIG config = Config;
+            int errorCode = TaskDialogNative.TaskDialogIndirect(config, out int dummy1, out int dummy2, out bool isChecked);
+            if (errorCode < 0) Marshal.ThrowExceptionForHR(errorCode);
+            CheckBoxChecked = isChecked;
+            if (SelectedValue is MsgResult) SelectedValue = (T)(object)SelectedID;
+            return SelectedValue;
+        }
+
+        public int DialogProc(IntPtr hwnd, uint msg, IntPtr wParam, IntPtr lParam, IntPtr lpRefData)
+        {
+            switch (msg)
+            {
+                case 0: //TDN_CREATED
+                    foreach (var i in CommandLinkShieldList)
+                        SendMessage(hwnd, TDM_SET_BUTTON_ELEVATION_REQUIRED_STATE, new IntPtr(i), new IntPtr(1));
+                    break;
+                case 2: //TDN_BUTTON_CLICKED
+                case 6: //TDN_RADIO_BUTTON_CLICKED
+                    if (SelectedValue is MsgResult)
+                        _SelectedID = wParam.ToInt32();
+                    else
+                        SelectedID = wParam.ToInt32();
+                    break;
+                case 3: //TDN_HYPERLINK_CLICKED
+                    string stringUni = Marshal.PtrToStringUni(lParam);
+                    if (stringUni.StartsWith("mailto") || stringUni.StartsWith("http"))
+                        Process.Start(stringUni);
+                    if (stringUni == "copymsg")
+                    {
+                        Thread thread = new Thread((ThreadStart)(() => {
+                            Clipboard.SetText(MainInstruction + "\r\n\r\n" + Content + "\r\n\r\n" + ExpandedInformation);
+                            MessageBox.Show("Message was copied to clipboard.", Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Information);
+                        }));
+                        thread.SetApartmentState(ApartmentState.STA);
+                        thread.Start();
+                    }
+                    break;
+                case 4: //TDN_TIMER
+                    if (ExitTickCount == 0) ExitTickCount = Environment.TickCount + Timeout * 1000;
+                    if (Environment.TickCount > ExitTickCount)
+                        TaskDialogNative.SendMessage(hwnd, 1126, new IntPtr(1), IntPtr.Zero);
+                    break;
+            }
+            return 0;
+        }
+
+        public void MarshalDialogControlStructs()
+        {
+            if (Buttons != null && Buttons.Count > 0)
+            {
+                ButtonArray = TaskDialog<T>.AllocateAndMarshalButtons(Buttons);
+                Config.pButtons = ButtonArray;
+                Config.cButtons = (uint)Buttons.Count;
+            }
+
+            if (RadioButtons == null || RadioButtons.Count <= 0) return;
+            RadioButtonArray = TaskDialog<T>.AllocateAndMarshalButtons(RadioButtons);
+            Config.pRadioButtons = RadioButtonArray;
+            Config.cRadioButtons = (uint)RadioButtons.Count;
+        }
+
+        public static IntPtr AllocateAndMarshalButtons(List<TaskDialogNative.TASKDIALOG_BUTTON> structs)
+        {
+            var initialPtr = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(TASKDIALOG_BUTTON)) * structs.Count);
+            var currentPtr = initialPtr;
+
+            foreach (var button in structs)
+            {
+                Marshal.StructureToPtr(button, currentPtr, false);
+                currentPtr = (IntPtr)(currentPtr.ToInt64() + Marshal.SizeOf(button));
+            }
+
+            return initialPtr;
+        }
+
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        ~TaskDialog()
+        {
+            Dispose(false);
+        }
+
+        protected void Dispose(bool disposing)
+        {
+            if (disposed) return;
+            disposed = true;
+
+            if (ButtonArray != IntPtr.Zero)
+            {
+                Marshal.FreeHGlobal(ButtonArray);
+                ButtonArray = IntPtr.Zero;
+            }
+
+            if (RadioButtonArray != IntPtr.Zero)
+            {
+                Marshal.FreeHGlobal(RadioButtonArray);
+                RadioButtonArray = IntPtr.Zero;
+            }
+        }
+    }
+
+    public delegate int PFTASKDIALOGCALLBACK(
+        IntPtr hwnd,
+        uint msg,
+        IntPtr wParam,
+        IntPtr lParam,
+        IntPtr lpRefData);
+
+    public class TaskDialogNative
+    {
+        [DllImport("comctl32", CharSet = CharSet.Unicode, SetLastError = true)]
+        public static extern int TaskDialogIndirect(
+            [In] TaskDialogNative.TASKDIALOGCONFIG pTaskConfig,
+            out int pnButton,
+            out int pnRadioButton,
+            [MarshalAs(UnmanagedType.Bool)] out bool pVerificationFlagChecked);
+
+        [DllImport("user32.dll")]
+        public static extern IntPtr GetForegroundWindow();
+
+        [DllImport("user32.dll", CharSet = CharSet.Unicode)]
+        public static extern uint GetWindowModuleFileName(
+            IntPtr hwnd,
+            StringBuilder lpszFileName,
+            uint cchFileNameMax);
+
+        [DllImport("user32.dll")]
+        public static extern IntPtr SendMessage(
+            IntPtr handle,
+            int message,
+            IntPtr wParam,
+            IntPtr lParam);
+
+        [StructLayout(LayoutKind.Sequential, Pack = 4, CharSet = CharSet.Unicode)]
+        public class TASKDIALOGCONFIG
+        {
+            public uint cbSize;
+            public IntPtr hwndParent;
+            public IntPtr hInstance;
+            public TaskDialogNative.TASKDIALOG_FLAGS dwFlags;
+            public MsgButtons dwCommonButtons;
+            [MarshalAs(UnmanagedType.LPWStr)]
+            public string pszWindowTitle;
+            public TaskDialogNative.TASKDIALOGCONFIG_ICON_UNION MainIcon;
+            [MarshalAs(UnmanagedType.LPWStr)]
+            public string pszMainInstruction;
+            [MarshalAs(UnmanagedType.LPWStr)]
+            public string pszContent;
+            public uint cButtons;
+            public IntPtr pButtons;
+            public int nDefaultButton;
+            public uint cRadioButtons;
+            public IntPtr pRadioButtons;
+            public int nDefaultRadioButton;
+            [MarshalAs(UnmanagedType.LPWStr)]
+            public string pszVerificationText;
+            [MarshalAs(UnmanagedType.LPWStr)]
+            public string pszExpandedInformation;
+            [MarshalAs(UnmanagedType.LPWStr)]
+            public string pszExpandedControlText;
+            [MarshalAs(UnmanagedType.LPWStr)]
+            public string pszCollapsedControlText;
+            public TaskDialogNative.TASKDIALOGCONFIG_ICON_UNION FooterIcon;
+            [MarshalAs(UnmanagedType.LPWStr)]
+            public string pszFooter;
+            public PFTASKDIALOGCALLBACK pfCallback;
+            public IntPtr lpCallbackData;
+            public uint cxWidth;
+        }
+
+        public enum TASKDIALOG_FLAGS
+        {
+            NONE = 0,
+            TDF_ENABLE_HYPERLINKS = 1,
+            TDF_USE_HICON_MAIN = 2,
+            TDF_USE_HICON_FOOTER = 4,
+            TDF_ALLOW_DIALOG_CANCELLATION = 8,
+            TDF_USE_COMMAND_LINKS = 16,
+            TDF_USE_COMMAND_LINKS_NO_ICON = 32,
+            TDF_EXPAND_FOOTER_AREA = 64,
+            TDF_EXPANDED_BY_DEFAULT = 128,
+            TDF_VERIFICATION_FLAG_CHECKED = 256,
+            TDF_SHOW_PROGRESS_BAR = 512,
+            TDF_SHOW_MARQUEE_PROGRESS_BAR = 1024,
+            TDF_CALLBACK_TIMER = 2048,
+            TDF_POSITION_RELATIVE_TO_WINDOW = 4096,
+            TDF_RTL_LAYOUT = 8192,
+            TDF_NO_DEFAULT_RADIO_BUTTON = 16384,
+        }
+
+        [StructLayout(LayoutKind.Explicit, CharSet = CharSet.Unicode)]
+        public struct TASKDIALOGCONFIG_ICON_UNION
+        {
+            [FieldOffset(0)]
+            public int hMainIcon;
+            [FieldOffset(0)]
+            public int pszIcon;
+            [FieldOffset(0)]
+            public IntPtr spacer;
+
+            public TASKDIALOGCONFIG_ICON_UNION(int i)
+            {
+                this = new TaskDialogNative.TASKDIALOGCONFIG_ICON_UNION();
+                spacer = IntPtr.Zero;
+                pszIcon = 0;
+                hMainIcon = i;
+            }
+        }
+
+        [StructLayout(LayoutKind.Sequential, Pack = 4, CharSet = CharSet.Unicode)]
+        public struct TASKDIALOG_BUTTON
+        {
+            public int nButtonID;
+            [MarshalAs(UnmanagedType.LPWStr)]
+            public string pszButtonText;
+
+            public TASKDIALOG_BUTTON(int n, string txt)
+            {
+                this = new TaskDialogNative.TASKDIALOG_BUTTON();
+                nButtonID = n;
+                pszButtonText = txt;
+            }
+        }
+    }
+
+    public enum MsgButtons
+    {
+        None = 0,
+        Ok = 1,
+        Yes = 2,
+        No = 4,
+        YesNo = 6,
+        Cancel = 8,
+        OkCancel = 9,
+        YesNoCancel = 14,
+        Retry = 16,
+        RetryCancel = 24,
+        Close = 32,
+    }
+
+    public enum MsgResult
+    {
+        None,
+        OK,
+        Cancel,
+        Abort,
+        Retry,
+        Ignore,
+        Yes,
+        No,
+    }
+
+    public enum MsgIcon
+    {
+        None = 0,
+        SecurityShieldGray = 65527,
+        SecuritySuccess = 65528,
+        SecurityError = 65529,
+        SecurityWarning = 65530,
+        SecurityShieldBlue = 65531,
+        Shield = 65532,
+        Info = 65533,
+        Error = 65534,
+        Warning = 65535,
+    }
+}

mpv.net/UI.cs

@@ -1,36 +0,0 @@
-using System;
-using System.Drawing;
-using System.Windows.Forms;
-
-namespace mpvnet
-{
-    public class CursorHelp
-    {
-        static bool IsVisible = true;
-
-        public static void Show()
-        {
-            if (!IsVisible)
-            {
-                Cursor.Show();
-                IsVisible = true;
-            }
-        }
-
-        public static void Hide()
-        {
-            if (IsVisible)
-            {
-                Cursor.Hide();
-                IsVisible = false;
-            }
-        }
-
-        public static bool IsPosDifferent(Point screenPos)
-        {
-            return
-                Math.Abs(screenPos.X - Control.MousePosition.X) > 10 ||
-                Math.Abs(screenPos.Y - Control.MousePosition.Y) > 10;
-        }
-    }
-}

mpv.net/WPF/Resources.xaml

@@ -0,0 +1,27 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:WPF="clr-namespace:WPF">
+    
+        <Style TargetType="TextBox">
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type TextBox}">
+                        <Border x:Name="border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
+                            <ScrollViewer x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"/>
+                        </Border>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsEnabled" Value="false">
+                                <Setter Property="Opacity" TargetName="border" Value="0.56"/>
+                            </Trigger>
+                            <Trigger Property="IsMouseOver" Value="true">
+                                <Setter Property="BorderBrush" TargetName="border" Value="#FF7EB4EA"/>
+                            </Trigger>
+                            <Trigger Property="IsFocused" Value="true">
+                                <Setter Property="BorderBrush" TargetName="border" Value="{x:Static WPF:WPF.ThemeBrush}"/>
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+</ResourceDictionary>

mpv.net/WPF/WPF.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Windows;
+using System.Windows.Media;
+
+namespace WPF
+{
+    public class WPF
+    {
+        public static void Init()
+        {
+            EnsureApplicationResources();
+        }
+
+        public static void EnsureApplicationResources()
+        {
+            if (Application.Current == null)
+            {
+                new Application();
+                Application.Current.Resources.MergedDictionaries.Add(
+                    Application.LoadComponent(new Uri("mpvnet;component/WPF/Resources.xaml",
+                        UriKind.Relative)) as ResourceDictionary);
+            }
+        }
+
+        public static Brush ThemeBrush {
+            get {
+                if (Environment.OSVersion.Version.Major < 10)
+                    return new SolidColorBrush(Colors.DarkSlateGray);
+                else
+                    return SystemParameters.WindowGlassBrush;
+            }
+        }
+    }
+}

mpv.net/Windows/AboutWindow.xaml

@@ -0,0 +1,17 @@
+<Window x:Class="mpvnet.AboutWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        mc:Ignorable="d"
+        Title="About mpv.net" Height="230" Width="420" FontSize="16" ShowInTaskbar="False"
+        WindowStartupLocation="CenterOwner" ResizeMode="NoResize">
+    <Grid>
+        <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
+            <TextBlock FontSize="48" HorizontalAlignment="Center" Margin="0,0,0,10">mpv.net</TextBlock>
+            <TextBlock HorizontalAlignment="Center">Copyright (c) 2017-2019 Frank Skare (stax76)</TextBlock>
+            <TextBlock Name="Version" HorizontalAlignment="Center" />
+            <TextBlock HorizontalAlignment="Center" Margin="0,0,0,20">MIT License</TextBlock>
+        </StackPanel>
+    </Grid>
+</Window>

mpv.net/Windows/AboutWindow.xaml.cs

@@ -0,0 +1,18 @@
+using System.Windows;
+using System.Windows.Input;
+
+namespace mpvnet
+{
+    public partial class AboutWindow : Window
+    {
+        public AboutWindow()
+        {
+            InitializeComponent();
+            Version.Text = $"Version {System.Windows.Forms.Application.ProductVersion}";
+            Foreground = WPF.WPF.ThemeBrush;
+        }
+
+        protected override void OnPreviewKeyDown(KeyEventArgs e) => Close();
+        protected override void OnMouseDown(MouseButtonEventArgs e) => Close();
+    }
+}

mpv.net/Windows/CommandPaletteWindow.xaml

@@ -0,0 +1,35 @@
+<Window x:Class="mpvnet.CommandPaletteWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        mc:Ignorable="d"
+        Title="Command Palette" Height="295" Width="400" ResizeMode="NoResize"
+        WindowStartupLocation="CenterOwner" Loaded="Window_Loaded" FontSize="13">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition></RowDefinition>
+        </Grid.RowDefinitions>
+        <TextBox Name="FilterTextBox" PreviewKeyDown="FilterTextBox_PreviewKeyDown" TextChanged="FilterTextBox_TextChanged"></TextBox>
+        <ListView Name="ListView" Grid.Row="1" MouseUp="ListView_MouseUp">
+            <ListView.ItemContainerStyle>
+                <Style TargetType="ListBoxItem">
+                    <Setter Property="HorizontalContentAlignment" Value="Stretch"></Setter>
+                </Style>
+            </ListView.ItemContainerStyle>
+            <ListView.ItemTemplate>
+                <DataTemplate>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition />
+                            <ColumnDefinition />
+                        </Grid.ColumnDefinitions>
+                        <TextBlock Text="{Binding Path}"></TextBlock>
+                        <TextBlock Grid.Column="1" Text="{Binding Input}" HorizontalAlignment="Right"></TextBlock>
+                    </Grid>
+                </DataTemplate>
+            </ListView.ItemTemplate>
+        </ListView>        
+    </Grid>
+</Window>

mpv.net/Windows/CommandPaletteWindow.xaml.cs

@@ -0,0 +1,120 @@
+using Microsoft.Win32;
+using System;
+using System.ComponentModel;
+using System.Windows;
+using System.Windows.Data;
+using System.Windows.Input;
+using System.Windows.Interop;
+using System.Windows.Media;
+
+namespace mpvnet
+{
+    public partial class CommandPaletteWindow : Window
+    {
+        ICollectionView CollectionView;
+
+        public CommandPaletteWindow()
+        {
+            InitializeComponent();
+            CollectionViewSource collectionViewSource = new CollectionViewSource() { Source = CommandItem.Items };
+            CollectionView = collectionViewSource.View;
+            var yourCostumFilter = new Predicate<object>(item => Filter((CommandItem)item));
+            CollectionView.Filter = yourCostumFilter;
+            ListView.ItemsSource = CollectionView;
+
+            if (App.IsDarkMode)
+            {
+                ListView.Foreground = Brushes.White;
+                ListView.Background = Brushes.Black;
+                FilterTextBox.Foreground = Brushes.White;
+                FilterTextBox.Background = Brushes.Black;
+            }
+        }
+
+        bool Filter(CommandItem item)
+        {
+            if (item.Command == "" || item.Path == "")
+                return false;
+            string filter = FilterTextBox.Text.ToLower();
+            if (filter == "") return true;
+            if (item.Command.ToLower().Contains(filter) ||
+                item.Input.ToLower().Contains(filter) ||
+                item.Path.ToLower().Contains(filter))
+                return true;
+            return false;
+        }
+
+        private void Window_Loaded(object sender, RoutedEventArgs e)
+        {
+            HwndSource source = HwndSource.FromHwnd(new WindowInteropHelper(this).Handle);
+            source.AddHook(new HwndSourceHook(WndProc));
+            Keyboard.Focus(FilterTextBox);
+            SelectFirst();
+        }
+
+        void SelectFirst()
+        {
+            if (ListView.Items.Count > 0)
+                ListView.SelectedIndex = 0;
+        }
+
+        private IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
+        {
+            if (msg == 0x200 /*WM_MOUSEMOVE*/ && Mouse.LeftButton != MouseButtonState.Pressed)
+                handled = true;
+            return IntPtr.Zero;
+        }
+
+        private void FilterTextBox_PreviewKeyDown(object sender, KeyEventArgs e)
+        {
+            switch (e.Key)
+            {
+                case Key.Up:
+                    {
+                        int index = ListView.SelectedIndex;
+                        index -= 1;
+                        if (index < 0) index = 0;
+                        ListView.SelectedIndex = index;
+                        ListView.ScrollIntoView(ListView.SelectedItem);
+                    }
+                    break;
+                case Key.Down:
+                    {
+                        int index = ListView.SelectedIndex;
+                        index += 1;
+                        if (index > ListView.Items.Count - 1) index = ListView.Items.Count - 1;
+                        ListView.SelectedIndex = index;
+                        ListView.ScrollIntoView(ListView.SelectedItem);
+                    }
+                    break;
+                case Key.Escape:
+                    Close();
+                    break;
+                case Key.Enter:
+                    Execute();
+                    break;
+            }
+        }
+
+        void Execute()
+        {
+            if (ListView.SelectedItem != null)
+            {
+                CommandItem item = ListView.SelectedItem as CommandItem;
+                Close();
+                mp.command_string(item.Command);
+            }
+        }
+
+        private void ListView_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            Execute();
+        }
+
+        private void FilterTextBox_TextChanged(object sender, System.Windows.Controls.TextChangedEventArgs e)
+        {
+            CollectionView.Refresh();
+            SelectFirst();
+        }
+    }
+}

mpv.net/Windows/ConfWindow.xaml

@@ -0,0 +1,36 @@
+<Window xmlns:Controls="clr-namespace:Controls"  x:Name="ConfWindow1"  x:Class="mpvnet.ConfWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:WPF="clr-namespace:WPF"
+        mc:Ignorable="d"
+        Height="500" Width="700" Loaded="ConfWindow1_Loaded" ShowInTaskbar="False"
+        WindowStartupLocation="CenterScreen" Title="Config Editor">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="1*" />
+            <ColumnDefinition Width="6*" />
+        </Grid.ColumnDefinitions>
+        <Controls:SearchTextBoxUserControl HintText="Find a setting" x:Name="SearchControl" Width="250" Margin="0,20,0,10" Grid.ColumnSpan="2" />
+        <ScrollViewer x:Name="MainScrollViewer" VerticalScrollBarVisibility="Auto" Grid.Row="1" Grid.Column="1" Margin="0,0,0,10">
+            <StackPanel x:Name="MainStackPanel"></StackPanel>
+        </ScrollViewer>
+        <StackPanel Margin="20,0,0,0" Grid.Row="1">
+            <ListBox x:Name="FilterListBox" ItemsSource="{Binding FilterStrings}" BorderThickness="0" SelectionChanged="ListBox_SelectionChanged" Foreground="{x:Static WPF:WPF.ThemeBrush}" Background="{Binding Path=Background, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}">
+                <ListBox.ItemTemplate>
+                    <DataTemplate>
+                        <TextBlock Text="{Binding}" FontSize="16" />
+                    </DataTemplate>
+                </ListBox.ItemTemplate>
+            </ListBox>
+            <TextBlock x:Name="OpenSettingsTextBlock" Margin="0,30,0,0" Cursor="Hand" TextWrapping="WrapWithOverflow" Foreground="{x:Static WPF:WPF.ThemeBrush}" MouseUp="OpenSettingsTextBlock_MouseUp">Open config folder</TextBlock>
+            <TextBlock x:Name="ShowManualTextBlock" Margin="0,15,0,0" Cursor="Hand" TextWrapping="WrapWithOverflow" Foreground="{x:Static WPF:WPF.ThemeBrush}" MouseUp="ShowManualTextBlock_MouseUp">Show mpv manual</TextBlock>
+            <TextBlock x:Name="SupportTextBlock" Margin="0,15,0,0" Cursor="Hand" TextWrapping="WrapWithOverflow" Foreground="{x:Static WPF:WPF.ThemeBrush}" MouseUp="SupportTextBlock_MouseUp">Show support forum</TextBlock>
+        </StackPanel>
+    </Grid>
+</Window>

mpv.net/Windows/ConfWindow.xaml.cs

@@ -0,0 +1,249 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+using System.IO;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using System.Windows.Media;
+
+using DynamicGUI;
+using Sys;
+
+namespace mpvnet
+{
+    public partial class ConfWindow : Window
+    {
+        private List<SettingBase> MpvSettingsDefinitions = Settings.LoadSettings(Properties.Resources.mpvConfToml);
+        private List<SettingBase> MpvNetSettingsDefinitions = Settings.LoadSettings(Properties.Resources.mpvNetConfToml);
+        private Dictionary<string, Dictionary<string, string>> Comments = new Dictionary<string, Dictionary<string, string>>();
+
+        public ObservableCollection<string> FilterStrings { get; } = new ObservableCollection<string>();
+
+        public ConfWindow()
+        {
+            InitializeComponent();
+            DataContext = this;
+            SearchControl.SearchTextBox.TextChanged += SearchTextBox_TextChanged;
+            LoadSettings(MpvSettingsDefinitions, MpvConf);
+            LoadSettings(MpvNetSettingsDefinitions, MpvNetConf);
+            SearchControl.Text = RegistryHelp.GetString(@"HKCU\Software\mpv.net", "config editor search");
+            
+            if (App.IsDarkMode)
+            {
+                Foreground = Brushes.White;
+                Foreground2 = Brushes.Silver;
+                Background = Brushes.Black;
+            }
+        }
+
+        public Brush Foreground2 {
+            get { return (Brush)GetValue(Foreground2Property); }
+            set { SetValue(Foreground2Property, value); }
+        }
+
+        public static readonly DependencyProperty Foreground2Property =
+            DependencyProperty.Register("Foreground2", typeof(Brush), typeof(ConfWindow), new PropertyMetadata(Brushes.DarkSlateGray));
+
+        private void LoadSettings(List<SettingBase> settingsDefinitions,
+                                  Dictionary<string, string> confSettings)
+        {
+            foreach (var setting in settingsDefinitions)
+            {
+                if (!FilterStrings.Contains(setting.Filter))
+                    FilterStrings.Add(setting.Filter);
+
+                foreach (var pair in confSettings)
+                {
+                    if (setting.Name == pair.Key)
+                    {
+                        setting.Value = pair.Value;
+                        setting.StartValue = pair.Value;
+                        continue;
+                    }
+                }
+
+                switch (setting)
+                {
+                    case StringSetting s:
+                        var sc = new StringSettingControl(s);
+                        sc.TitleTextBox.Foreground = WPF.WPF.ThemeBrush;
+                        MainStackPanel.Children.Add(sc);
+                        break;
+                    case OptionSetting s:
+                        var oc = new OptionSettingControl(s);
+                        oc.TitleTextBox.Foreground = WPF.WPF.ThemeBrush;
+                        MainStackPanel.Children.Add(oc);
+                        break;
+                }
+            }
+        }
+
+        private Dictionary<string, string> _mpvConf;
+
+        public Dictionary<string, string> MpvConf {
+            get {
+                if (_mpvConf == null) _mpvConf = LoadConf(mp.MpvConfPath);
+                return _mpvConf;
+            }
+        }
+
+        private Dictionary<string, string> _mpvNetConf;
+
+        public Dictionary<string, string> MpvNetConf {
+            get {
+                if (_mpvNetConf == null) _mpvNetConf = LoadConf(mp.MpvNetConfPath);
+                return _mpvNetConf;
+            }
+        }
+
+        private Dictionary<string, string> LoadConf(string filePath)
+        {
+            Dictionary<string, string> conf = new Dictionary<string, string>();
+            Comments[filePath] = new Dictionary<string, string>();
+
+            if (File.Exists(filePath))
+            {
+                foreach (string i in File.ReadAllLines(filePath))
+                {
+                    if (i.Contains("="))
+                    {
+                        int pos = i.IndexOf("=");
+                        string left = i.Substring(0, pos).Replace(" ", "").ToLower();
+                        string right = i.Substring(pos + 1).Trim();
+
+                        if (left.StartsWith("#"))
+                        {
+                            Comments[filePath][left.TrimStart("#".ToCharArray())] = right;
+                            continue;
+                        }
+
+                        if (left == "fs") left = "fullscreen";
+                        if (left == "loop") left = "loop-file";
+                        conf[left] = right;
+                    }
+                }
+            }
+            return conf;
+        }
+
+        protected override void OnClosed(EventArgs e)
+        {
+            base.OnClosed(e);
+            WriteToDisk();
+            RegistryHelp.SetObject(@"HKCU\Software\mpv.net", "config editor search", SearchControl.Text);
+        }
+
+        void WriteToDisk()
+        {
+            bool isDirty = false;
+
+            foreach (SettingBase i in MpvSettingsDefinitions)
+                if (i.StartValue != i.Value)
+                    isDirty = true;
+
+            foreach (SettingBase i in MpvNetSettingsDefinitions)
+                if (i.StartValue != i.Value)
+                    isDirty = true;
+
+            if (!isDirty)
+                return;
+
+            WriteToDisk(mp.MpvConfPath, MpvConf, MpvSettingsDefinitions);
+            WriteToDisk(mp.MpvNetConfPath, MpvNetConf, MpvNetSettingsDefinitions);
+
+            Msg.Show("Changes will be available on next mpv.net startup.");
+        }
+
+        void WriteToDisk(string filePath,
+                         Dictionary<string, string> confSettings,
+                         List<SettingBase> settings)
+        {
+            string content = "";
+
+            foreach (var i in Comments[filePath])
+                content += $"#{i.Key} = {i.Value}\r\n";
+
+            foreach (var setting in settings)
+            {
+                if ((setting.Value ?? "") != setting.Default)
+                    confSettings[setting.Name] = setting.Value;
+
+                if (confSettings.ContainsKey(setting.Name) &&
+                    (setting.Value ?? "") == setting.Default ||
+                    (setting.Value ?? "") == "")
+                {
+                    confSettings.Remove(setting.Name);
+                }
+            }
+
+            foreach (var i in confSettings)
+                content = content + $"{i.Key} = {i.Value}\r\n";
+
+            File.WriteAllText(filePath, content);
+        }
+
+        private void SearchTextBox_TextChanged(object sender, TextChangedEventArgs e)
+        {
+            string activeFilter = "";
+
+            foreach (var i in FilterStrings)
+                if (SearchControl.Text == i + ":")
+                    activeFilter = i;
+
+            if (activeFilter == "")
+            {
+                foreach (UIElement i in MainStackPanel.Children)
+                    if ((i as ISettingControl).Contains(SearchControl.Text))
+                        i.Visibility = Visibility.Visible;
+                    else
+                        i.Visibility = Visibility.Collapsed;
+
+                FilterListBox.SelectedItem = null;
+            }
+            else
+                foreach (UIElement i in MainStackPanel.Children)
+                    if ((i as ISettingControl).SettingBase.Filter == activeFilter)
+                        i.Visibility = Visibility.Visible;
+                    else
+                        i.Visibility = Visibility.Collapsed;
+
+            MainScrollViewer.ScrollToTop();
+        }
+        
+        private void ConfWindow1_Loaded(object sender, RoutedEventArgs e)
+        {
+            SearchControl.SearchTextBox.SelectAll();
+            Keyboard.Focus(SearchControl.SearchTextBox);
+        }
+
+        private void ListBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (e.AddedItems.Count > 0)
+                SearchControl.Text = e.AddedItems[0].ToString() + ":";
+        }
+
+        private void OpenSettingsTextBlock_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            Process.Start(Path.GetDirectoryName(mp.MpvConfPath));
+        }
+
+        private void ShowManualTextBlock_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            Process.Start("https://mpv.io/manual/master/");
+        }
+
+        private void SupportTextBlock_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            Process.Start("https://github.com/stax76/mpv.net#Support");
+        }
+
+        protected override void OnKeyDown(KeyEventArgs e)
+        {
+            base.OnKeyDown(e);
+            if (e.Key == Key.Escape)
+                Close();
+        }
+    }
+}

mpv.net/Windows/InputWindow.xaml

@@ -0,0 +1,44 @@
+<Window xmlns:Controls="clr-namespace:Controls"  x:Class="mpvnet.InputWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        mc:Ignorable="d"
+        Title="Input Editor" Height="500" Width="750" FontSize="13"
+        Loaded="Window_Loaded" Closed="Window_Closed" ShowInTaskbar="False">
+    <Window.Resources>
+        <Style x:Key="DataGrid_Font_Centering" TargetType="{x:Type DataGridCell}">
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type DataGridCell}">
+                        <Grid Background="{TemplateBinding Background}">
+                            <ContentPresenter VerticalAlignment="Center" />
+                        </Grid>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+    </Window.Resources>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
+        <Controls:SearchTextBoxUserControl HintText="Type ? to get help." x:Name="SearchControl" Width="300" Margin="0,20,0,20" Grid.ColumnSpan="2" />
+        <DataGrid Grid.Row="1" x:Name="DataGrid" CommandManager.PreviewCanExecute="DataGrid_PreviewCanExecute" AutoGenerateColumns="False" CellStyle="{StaticResource DataGrid_Font_Centering}">
+            <DataGrid.Columns>
+                <DataGridTextColumn Header="Menu"  Binding="{Binding Path}"/>
+                <DataGridTemplateColumn Header="Input">
+                    <DataGridTemplateColumn.CellTemplate>
+                        <DataTemplate>
+                            <Button MinHeight="20" Click="ButtonClick">
+                                <TextBlock Text="{Binding Input}"></TextBlock>
+                            </Button>
+                        </DataTemplate>
+                    </DataGridTemplateColumn.CellTemplate>
+                </DataGridTemplateColumn>
+                <DataGridTextColumn Header="Command" Binding="{Binding Command}" MaxWidth="330" />
+            </DataGrid.Columns>
+        </DataGrid>
+    </Grid>
+</Window>

mpv.net/Windows/InputWindow.xaml.cs

@@ -0,0 +1,140 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.IO;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Input;
+using System.Windows.Media;
+using Sys;
+
+namespace mpvnet
+{
+    public partial class InputWindow : Window
+    {
+        ICollectionView CollectionView;
+        string InitialInputConfContent;
+
+        public InputWindow()
+        {
+            InitializeComponent();
+            InitialInputConfContent = GetInputConfContent();
+            SearchControl.SearchTextBox.TextChanged += SearchTextBox_TextChanged;
+            DataGrid.SelectionMode = DataGridSelectionMode.Single;
+            CollectionViewSource collectionViewSource = new CollectionViewSource() { Source = CommandItem.Items };
+            CollectionView = collectionViewSource.View;
+            var yourCostumFilter = new Predicate<object>(item => Filter((CommandItem)item));
+            CollectionView.Filter = yourCostumFilter;
+            DataGrid.ItemsSource = CollectionView;
+
+            if (App.IsDarkMode)
+            {
+                Foreground = Brushes.White;
+                Background = Brushes.Black;
+            }
+        }
+
+        private void SearchTextBox_TextChanged(object sender, TextChangedEventArgs e)
+        {
+            CollectionView.Refresh();
+
+            if (SearchControl.SearchTextBox.Text == "?")
+                Msg.Show("Filtering works by searching in the Input, Menu and Command but it's possible to reduce the filter scope to either of Input, Menu or Command by prefixing as follows:\n\ni <input search>\ni: <input search>\n\nm <menu search>\nm: <menu search>\n\nc <command search>\nc: <command search>\n\nIf only one character is entered the search will be performed only in the input.", "Filtering");
+        }
+
+        bool Filter(CommandItem item)
+        {
+            if (item.Command == "") return false;
+            string searchText = SearchControl.SearchTextBox.Text.ToLower();
+            if (searchText == "") return true;
+
+            if (searchText.StartsWith("i ") || searchText.StartsWith("i:") || searchText.Length == 1)
+            {
+                if (searchText.Length > 1)
+                    searchText = searchText.Substring(2).Trim();
+
+                if (searchText.Length < 3)
+                    return item.Input.ToLower().Replace("ctrl+", "").Replace("shift+", "").Replace("alt+", "").Contains(searchText);
+                else
+                    return item.Input.ToLower().Contains(searchText);
+            }
+            else if (searchText.StartsWith("m ") || searchText.StartsWith("m:"))
+                return item.Path.ToLower().Contains(searchText.Substring(2).Trim());
+            else if (searchText.StartsWith("c ") || searchText.StartsWith("c:"))
+                return item.Command.ToLower().Contains(searchText.Substring(2).Trim());
+            else if (item.Command.ToLower().Contains(searchText) ||
+                item.Path.ToLower().Contains(searchText) ||
+                item.Input.ToLower().Contains(searchText))
+            {
+                return true;
+            }
+            return false;
+        }
+
+        private void ButtonClick(object sender, RoutedEventArgs e)
+        {
+            CommandItem item = ((Button)e.Source).DataContext as CommandItem;
+            if (item is null) return;
+            LearnWindow w = new LearnWindow();
+            w.Owner = this;
+            w.InputItem = item;
+            w.ShowDialog();
+
+            var items = new Dictionary<string, CommandItem>();
+
+            foreach (CommandItem i in CommandItem.Items)
+                if (items.ContainsKey(i.Input) && i.Input != "")
+                    Msg.Show($"Duplicate found:\n\n{i.Input}: {i.Path}\n\n{items[i.Input].Input}: {items[i.Input].Path}\n\nPlease note that you can chain multiple commands in the same line by using a semicolon as separator.", "Duplicate Found");
+                else
+                    items[i.Input] = i;
+        }
+
+        private void Window_Loaded(object sender, RoutedEventArgs e) => Keyboard.Focus(SearchControl.SearchTextBox);
+
+        string GetInputConfContent()
+        {
+            string text = Properties.Resources.inputConfHeader + "\r\n";
+
+            foreach (CommandItem item in CommandItem.Items)
+            {
+                string input = item.Input == "" ? "_" : item.Input;
+                string line = " " + input.PadRight(10);
+
+                if (item.Command.Trim() == "")
+                    line += " ignore";
+                else
+                    line += " " + item.Command.Trim();
+
+                if (item.Path.Trim() != "")
+                    line = line.PadRight(40) + " #menu: " + item.Path;
+
+                text += line + "\r\n";
+            }
+            return text;
+        }
+
+        private void Window_Closed(object sender, EventArgs e)
+        {
+            if (InitialInputConfContent == GetInputConfContent()) return;
+            File.WriteAllText(mp.InputConfPath, GetInputConfContent());
+            Msg.Show("Changes will be available on next mpv.net startup.");
+        }
+
+        private void DataGrid_PreviewCanExecute(object sender, CanExecuteRoutedEventArgs e)
+        {
+            DataGrid grid = (DataGrid)sender;
+
+            if (e.Command == DataGrid.DeleteCommand)
+                if (Msg.ShowQuestion($"Confirm to delete: {(grid.SelectedItem as CommandItem).Input} ({(grid.SelectedItem as CommandItem).Path})") != MsgResult.OK)
+                    e.Handled = true;
+        }
+
+        protected override void OnKeyDown(KeyEventArgs e)
+        {
+            base.OnKeyDown(e);
+            if (e.Key == Key.Escape)
+                Close();
+        }
+    }
+}

mpv.net/Windows/LearnWindow.xaml

@@ -0,0 +1,24 @@
+<Window x:Class="mpvnet.LearnWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        mc:Ignorable="d"
+        Title="Learn Input" Height="200" Width="400" WindowStartupLocation="CenterOwner"
+        ResizeMode="NoResize" Loaded="Window_Loaded" Background="Black" MouseWheel="Window_MouseWheel">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="*" />
+            <RowDefinition Height="*" />
+            <RowDefinition Height="40" />
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="*" />
+        </Grid.ColumnDefinitions>
+        <Label x:Name="MenuLabel" Grid.ColumnSpan="2" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="16"></Label>
+        <Label x:Name="KeyLabel" Grid.Row="1" Grid.ColumnSpan="2" Foreground="White" VerticalAlignment="Top" HorizontalAlignment="Center" FontSize="16"></Label>
+        <Button x:Name="ConfirmButton" Grid.Row="2" Click="ConfirmButton_Click">Confirm</Button>
+        <Button x:Name="ClearButton" Grid.Row="2" Click="ClearButton_Click" Grid.Column="1">Clear</Button>
+    </Grid>
+</Window>

mpv.net/Windows/LearnWindow.xaml.cs

@@ -0,0 +1,299 @@
+using System;
+using System.Runtime.InteropServices;
+using System.Windows;
+using System.Windows.Input;
+using System.Windows.Interop;
+using WF = System.Windows.Forms;
+
+namespace mpvnet
+{
+    public partial class LearnWindow : Window
+    {
+        public CommandItem InputItem { get; set; }
+        public string NewKey { get; set; } = "";
+
+        public LearnWindow()
+        {
+            InitializeComponent();
+        }
+
+        private IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
+        {
+            WF.Message m = new WF.Message();
+            m.HWnd = hwnd;
+            m.Msg = msg;
+            m.WParam = wParam;
+            m.LParam = lParam;
+            ProcessKeyEventArgs(ref m);
+            return m.Result;
+        }
+
+        void OnKeyUp(WF.KeyEventArgs e)
+        {
+            if (e.KeyCode == WF.Keys.ControlKey || e.KeyCode == WF.Keys.ShiftKey ||
+                e.KeyCode == WF.Keys.Menu || e.KeyCode == WF.Keys.None)
+
+                return;
+
+            string text = "";
+            uint charValue = MapVirtualKey((uint)e.KeyCode, 2);
+
+            if (charValue == 0 || (charValue & 1 << 31) == 1 << 31)
+                text = e.KeyCode.ToString().Trim();
+            else
+                try {
+                    text = Convert.ToChar(charValue).ToString().ToLower().Trim();
+                }
+                catch {}
+
+            for (int i = 0; i < 13; i++)
+                if ("D" + i.ToString() == text)
+                    text = text.Substring(1);
+
+            switch (e.KeyCode)
+            {
+                case WF.Keys.NumPad0:
+                case WF.Keys.NumPad1:
+                case WF.Keys.NumPad2:
+                case WF.Keys.NumPad3:
+                case WF.Keys.NumPad4:
+                case WF.Keys.NumPad5:
+                case WF.Keys.NumPad6:
+                case WF.Keys.NumPad7:
+                case WF.Keys.NumPad8:
+                case WF.Keys.NumPad9:
+                    text = "KP" + e.KeyCode.ToString()[6].ToString(); break;
+                case WF.Keys.Space:
+                    text = "Space"; break;
+                case WF.Keys.Enter:
+                    text = "Enter"; break;
+                case WF.Keys.Tab:
+                    text = "Tab"; break;
+                case WF.Keys.Back:
+                    text = "BS"; break;
+                case WF.Keys.Delete:
+                    text = "Del"; break;
+                case WF.Keys.Insert:
+                    text = "Ins"; break;
+                case WF.Keys.Home:
+                    text = "Home"; break;
+                case WF.Keys.End:
+                    text = "End"; break;
+                case WF.Keys.PageUp:
+                    text = "PGUP"; break;
+                case WF.Keys.PageDown:
+                    text = "PGDWN"; break;
+                case WF.Keys.Escape:
+                    text = "Esc"; break;
+                case WF.Keys.PrintScreen:
+                    text = "Print"; break;
+                case WF.Keys.Play:
+                    text = "Play"; break;
+                case WF.Keys.Pause:
+                    text = "Pause"; break;
+                case WF.Keys.MediaPlayPause:
+                    text = "PlayPause"; break;
+                case WF.Keys.MediaStop:
+                    text = "Stop"; break;
+                case WF.Keys.MediaNextTrack:
+                    text = "Next"; break;
+                case WF.Keys.MediaPreviousTrack:
+                    text = "Prev"; break;
+                case WF.Keys.VolumeUp:
+                    text = "Volume_Up"; break;
+                case WF.Keys.VolumeDown:
+                    text = "Volume_Down"; break;
+                case WF.Keys.VolumeMute:
+                    text = "Mute"; break;
+                case WF.Keys.BrowserHome:
+                    text = "Homepage"; break;
+                case WF.Keys.LaunchMail:
+                    text = "Mail"; break;
+                case WF.Keys.BrowserFavorites:
+                    text = "Favorites"; break;
+                case WF.Keys.BrowserSearch:
+                    text = "Search"; break;
+                case WF.Keys.Sleep:
+                    text = "Sleep"; break;
+                case WF.Keys.Cancel:
+                    text = "Cancel"; break;
+            }
+
+            bool shiftWasHandled = false;
+
+            bool isAlt   = GetKeyState(18) < (short)0;
+            bool isShift = GetKeyState(16) < (short)0;
+            bool isCtrl  = GetKeyState(17) < (short)0;
+
+            if (text.Length == 1 && isShift && text[0] != GetModifiedKey(text[0]))
+            {
+                text = GetModifiedKey(text[0]).ToString();
+                shiftWasHandled = true;
+            }
+
+            if (text == "#") text = "Sharp";
+
+            if (isAlt) text = "Alt+" + text;
+            if (isShift && !shiftWasHandled) text = "Shift+" + text;
+            if (isCtrl) text = "Ctrl+" + text;
+
+            if (!string.IsNullOrEmpty(text))
+                SetKey(text);
+        }
+
+        void SetKey(string key)
+        {
+            NewKey = key;
+            MenuLabel.Content = InputItem.Path;
+            KeyLabel.Content = key;
+        }
+
+        [DllImport("user32.dll")]
+        static extern uint MapVirtualKey(uint uCode, uint uMapType);
+
+        public static WF.Keys ModifierKeys {
+            get {
+                WF.Keys keys = WF.Keys.None;
+                if (GetKeyState(17) < (short)0)
+                    keys |= WF.Keys.Control;
+                if (GetKeyState(16) < (short)0)
+                    keys |= WF.Keys.Shift;
+                if (GetKeyState(18) < (short)0)
+                    keys |= WF.Keys.Alt;
+                return keys;
+            }
+        }
+
+        public static char GetModifiedKey(char c)
+        {
+            short vkKeyScanResult = VkKeyScan(c);
+
+            if (vkKeyScanResult == -1)
+                return c;
+
+            uint code = (uint)vkKeyScanResult & 0xff;
+            byte[] b = new byte[256];
+            b[0x10] = 0x80;
+            uint r;
+
+            if (1 != ToAscii(code, code, b, out r, 0))
+                return c;
+
+            return (char)r;
+        }
+
+        void ProcessKeyEventArgs(ref WF.Message m)
+        {
+            int WM_KEYUP = 0x0101, WM_SYSKEYUP = 0x0105, WM_APPCOMMAND = 0x0319;
+
+            if (m.Msg == WM_KEYUP || m.Msg == WM_SYSKEYUP)
+                OnKeyUp(new WF.KeyEventArgs((WF.Keys)(unchecked((int)(long)m.WParam)) | ModifierKeys));
+            else if (m.Msg == WM_APPCOMMAND)
+            {
+                switch ((AppCommand)(m.LParam.ToInt32() >> 16))
+                {
+                    case AppCommand.MEDIA_CHANNEL_DOWN:
+                        SetKey("Channel_Down");
+                        break;
+                    case AppCommand.MEDIA_CHANNEL_UP:
+                        SetKey("Channel_Up");
+                        break;
+                    case AppCommand.MEDIA_FAST_FORWARD:
+                        SetKey("Forward");
+                        break;
+                    case AppCommand.MEDIA_REWIND:
+                        SetKey("Rewind");
+                        break;
+                    case AppCommand.MEDIA_PAUSE:
+                        SetKey("Pause");
+                        break;
+                    case AppCommand.MEDIA_PLAY:
+                        SetKey("Play");
+                        break;
+                    case AppCommand.MEDIA_PLAY_PAUSE:
+                        SetKey("PlayPause");
+                        break;
+                    case AppCommand.MEDIA_NEXTTRACK:
+                        SetKey("Next");
+                        break;
+                    case AppCommand.MEDIA_PREVIOUSTRACK:
+                        SetKey("Prev");
+                        break;
+                    case AppCommand.MEDIA_RECORD:
+                        SetKey("Record");
+                        break;
+                    case AppCommand.MEDIA_STOP:
+                        SetKey("Stop");
+                        break;
+                    case AppCommand.VolumeUp:
+                        SetKey("Volume_Up");
+                        break;
+                    case AppCommand.VolumeDown:
+                        SetKey("Volume_Down");
+                        break;
+                    case AppCommand.VolumeMute:
+                        SetKey("Mute");
+                        break;
+                }
+            }
+        }
+
+        internal enum AppCommand
+        {
+            MEDIA_CHANNEL_DOWN = 52,
+            MEDIA_CHANNEL_UP = 51,
+            MEDIA_FAST_FORWARD = 49,
+            MEDIA_NEXTTRACK = 11,
+            MEDIA_PAUSE = 47,
+            MEDIA_PLAY = 46,
+            MEDIA_PLAY_PAUSE = 14,
+            MEDIA_PREVIOUSTRACK = 12,
+            MEDIA_RECORD = 48,
+            MEDIA_REWIND = 50,
+            MEDIA_STOP = 13,
+            VolumeMute = 8,
+            VolumeDown = 9,
+            VolumeUp = 10
+        }
+
+        [DllImport("user32.dll", CharSet = CharSet.Auto)]
+        public static extern short GetKeyState(int keyCode);
+
+        [DllImport("user32.dll")]
+        static extern short VkKeyScan(char c);
+
+        [DllImport("user32.dll", SetLastError = true)]
+        static extern int ToAscii(uint     uVirtKey,
+                                  uint     uScanCode,
+                                  byte[]   lpKeyState,
+                                  out uint lpChar,
+                                  uint     flags);
+
+        private void Window_Loaded(object sender, RoutedEventArgs e)
+        {
+            HwndSource source = HwndSource.FromHwnd(new WindowInteropHelper(this).Handle);
+            source.AddHook(new HwndSourceHook(WndProc));
+            SetKey(InputItem.Input);
+        }
+
+        private void ConfirmButton_Click(object sender, RoutedEventArgs e)
+        {
+            InputItem.Input = NewKey;
+            Close();
+        }
+
+        private void ClearButton_Click(object sender, RoutedEventArgs e)
+        {
+            InputItem.Input = "_";
+            Close();
+        }
+
+        private void Window_MouseWheel(object sender, MouseWheelEventArgs e)
+        {
+            if (e.Delta > 0)
+                SetKey("WHEEL_UP");
+            else
+                SetKey("WHEEL_DOWN");
+        }
+    }
+}

mpv.net/app.manifest

@@ -25,7 +25,9 @@
   </compatibility>
   <application>
     <windowsSettings>
+      <longPathAware xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">true</longPathAware>
       <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
+      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
     </windowsSettings>
   </application>
   <dependency>

mpv.net/libmpv.cs

@@ -27,7 +27,7 @@ namespace mpvnet
         public static extern int mpv_set_option_string(IntPtr mpvHandle, byte[] name, byte[] value);
 
         [DllImport("mpv-1.dll", CallingConvention = CallingConvention.Cdecl)]
-        public static extern int mpv_get_property(IntPtr mpvHandle, byte[] name, mpv_format format, ref IntPtr data);
+        public static extern int mpv_get_property(IntPtr mpvHandle, byte[] name, mpv_format format, out IntPtr data);
 
         [DllImport("mpv-1.dll", CallingConvention = CallingConvention.Cdecl)]
         public static extern int mpv_get_property(IntPtr mpvHandle, byte[] name, mpv_format format, ref double data);

mpv.net/mp.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Drawing;
 using System.IO;
 using System.Linq;
@@ -10,9 +11,10 @@ using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
+using Sys;
+
 using static mpvnet.libmpv;
 using static mpvnet.Native;
-using static mpvnet.StaticUsing;
 
 using PyRT = IronPython.Runtime;
 
@@ -52,58 +54,108 @@ namespace mpvnet
         public static event Action QueueOverflow;             //                    MPV_EVENT_QUEUE_OVERFLOW
         public static event Action Hook;                      //                    MPV_EVENT_HOOK
 
-        public static IntPtr MpvHandle;
-        public static IntPtr MpvWindowHandle;
-        public static Addon Addon;
-        public static List<KeyValuePair<string, Action<bool>>> BoolPropChangeActions = new List<KeyValuePair<string, Action<bool>>>();
-        public static Size VideoSize = new Size(1920, 1080);
-        public static string mpvConfFolderPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\mpv\\";
-        public static string InputConfPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\mpv\\input.conf";
-        public static string mpvConfPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\mpv\\mpv.conf";
-        public static List<PythonScript> PythonScripts { get; } = new List<PythonScript>();
-        public static bool IsShutdownComplete { get; set; }
+        public static IntPtr MpvHandle { get; set; }
+        public static IntPtr MpvWindowHandle { get; set; }
+        public static Addon Addon { get; set; }
+        public static List<KeyValuePair<string, Action<bool>>> BoolPropChangeActions { get; set; } = new List<KeyValuePair<string, Action<bool>>>();
+        public static List<KeyValuePair<string, Action<int>>> IntPropChangeActions { get; set; } = new List<KeyValuePair<string, Action<int>>>();
+        public static List<KeyValuePair<string, Action<string>>> StringPropChangeActions { get; set; } = new List<KeyValuePair<string, Action<string>>>();
+        public static Size VideoSize { get; set; } = new Size(1920, 1080);
+        public static List<PythonScript> PythonScripts { get; set; } = new List<PythonScript>();
+        public static AutoResetEvent AutoResetEvent { get; set; } = new AutoResetEvent(false);
+        public static List<MediaTrack> MediaTracks { get; set; } = new List<MediaTrack>();
+        public static List<KeyValuePair<string, double>> Chapters { get; set; } = new List<KeyValuePair<string, double>>();
 
-        private static Dictionary<string, string> _mpvConv;
+        public static string InputConfPath  { get; } = MpvConfFolder + "\\input.conf";
+        public static string MpvConfPath    { get; } = MpvConfFolder + "\\mpv.conf";
+        public static string MpvNetConfPath { get; } = MpvConfFolder + "\\mpvnet.conf";
 
-        public static Dictionary<string, string> mpvConv {
+        static string _MpvConfFolder;
+
+        public static string MpvConfFolder {
             get {
-                if (_mpvConv == null)
+                if (_MpvConfFolder == null)
                 {
-                    _mpvConv = new Dictionary<string, string>();
+                    string portableFolder = Application.StartupPath + "\\portable_config\\";
+                    string appdataFolder = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\mpv\\";
 
-                    if (File.Exists(mpvConfPath))
+                    if (!Directory.Exists(appdataFolder) && !Directory.Exists(portableFolder) &&
+                        Sys.IsDirectoryWritable(Application.StartupPath))
                     {
-                        foreach (var i in File.ReadAllLines(mpvConfPath))
+                        using (TaskDialog<string> td = new TaskDialog<string>())
                         {
-                            if (i.Contains("=") && ! i.StartsWith("#"))
-                            {
-                                _mpvConv[i.Left("=").Trim()] = i.Right("=").Trim();
-                            }
+                            td.MainInstruction = "Choose a settings folder.";
+                            td.Content = "[MPV documentation about files on Windows.](https://mpv.io/manual/master/#files-on-windows)";
+                            td.AddCommandLink("appdata", appdataFolder, appdataFolder);
+                            td.AddCommandLink("portable", portableFolder, portableFolder);
+                            td.AllowCancel = false;
+                            _MpvConfFolder = td.Show();
                         }
                     }
+                    else
+                        if (Directory.Exists(portableFolder))
+                            _MpvConfFolder = portableFolder;
+                        else
+                            _MpvConfFolder = appdataFolder;
+
+                    if (string.IsNullOrEmpty(_MpvConfFolder)) _MpvConfFolder = appdataFolder;
+                    if (!Directory.Exists(_MpvConfFolder)) Directory.CreateDirectory(_MpvConfFolder);
+
+                    if (!File.Exists(_MpvConfFolder + "\\input.conf"))
+                        File.WriteAllText(_MpvConfFolder + "\\input.conf", Properties.Resources.inputConf);
+
+                    if (!File.Exists(_MpvConfFolder + "\\mpv.conf"))
+                        File.WriteAllText(_MpvConfFolder + "\\mpv.conf", Properties.Resources.mpvConf);
                 }
-                return _mpvConv;
+                return _MpvConfFolder;
+            }
+        }
+
+        static Dictionary<string, string> _mpvConf;
+
+        public static Dictionary<string, string> mpvConf {
+            get {
+                if (_mpvConf == null)
+                {
+                    _mpvConf = new Dictionary<string, string>();
+
+                    if (File.Exists(MpvConfPath))
+                        foreach (var i in File.ReadAllLines(MpvConfPath))
+                            if (i.Contains("=") && ! i.StartsWith("#"))
+                                _mpvConf[i.Substring(0, i.IndexOf("=")).Trim()] = i.Substring(i.IndexOf("=") + 1).Trim();
+                }
+                return _mpvConf;
+            }
+        }
+
+        static Dictionary<string, string> _mpvNetConf;
+
+        public static Dictionary<string, string> mpvNetConf {
+            get {
+                if (_mpvNetConf == null)
+                {
+                    _mpvNetConf = new Dictionary<string, string>();
+
+                    if (File.Exists(MpvNetConfPath))
+                        foreach (string i in File.ReadAllLines(MpvNetConfPath))
+                            if (i.Contains("=") && !i.StartsWith("#"))
+                                _mpvNetConf[i.Substring(0, i.IndexOf("=")).Trim()] = i.Substring(i.IndexOf("=") + 1).Trim();
+                }
+                return _mpvNetConf;
             }
         }
 
         public static void Init()
         {
-            if (!Directory.Exists(mp.mpvConfFolderPath))
-                Directory.CreateDirectory(mp.mpvConfFolderPath);
-
-            if (!File.Exists(mp.mpvConfPath))
-                File.WriteAllText(mp.mpvConfPath, Properties.Resources.mpv_conf);
-
-            if (!File.Exists(mp.InputConfPath))
-                File.WriteAllText(mp.InputConfPath, Properties.Resources.input_conf);
-
+            string dummy = MpvConfFolder;
             LoadLibrary("mpv-1.dll");
             MpvHandle = mpv_create();
-            SetStringProp("input-default-bindings", "yes");
-            SetStringProp("osc", "yes");
-            SetStringProp("config", "yes");
-            SetStringProp("wid", MainForm.Hwnd.ToString());
-            SetStringProp("force-window", "yes");
+            set_property_string("input-default-bindings", "yes");
+            set_property_string("osc", "yes");
+            set_property_string("config", "yes");
+            set_property_string("wid", MainForm.Hwnd.ToString());
+            set_property_string("force-window", "yes");
+            set_property_string("input-media-keys", "yes");
             mpv_initialize(MpvHandle);
             ProcessCommandLine();
             Task.Run(() => { LoadScripts(); });
@@ -118,7 +170,7 @@ namespace mpvnet
 
             foreach (var scriptPath in startupScripts)
                 if (jsLua.Contains(Path.GetExtension(scriptPath).ToLower()))
-                    mp.Command("load-script", $"{scriptPath}");
+                    mp.commandv("load-script", $"{scriptPath}");
 
             foreach (var scriptPath in startupScripts)
                 if (Path.GetExtension(scriptPath) == ".py")
@@ -128,13 +180,12 @@ namespace mpvnet
                 if (Path.GetExtension(scriptPath) == ".ps1")
                     PowerShellScript.Init(scriptPath);
 
-            foreach (var scriptPath in Directory.GetFiles(mp.mpvConfFolderPath + "Scripts"))
-            {
-                if (Path.GetExtension(scriptPath) == ".py")
-                    PythonScripts.Add(new PythonScript(File.ReadAllText(scriptPath)));
-                else if (Path.GetExtension(scriptPath) == ".ps1")
-                    PowerShellScript.Init(scriptPath);
-            }
+            if (Directory.Exists(mp.MpvConfFolder + "Scripts"))
+                foreach (var scriptPath in Directory.GetFiles(mp.MpvConfFolder + "Scripts"))
+                    if (Path.GetExtension(scriptPath) == ".py")
+                        PythonScripts.Add(new PythonScript(File.ReadAllText(scriptPath)));
+                    else if (Path.GetExtension(scriptPath) == ".ps1")
+                        PowerShellScript.Init(scriptPath);
         }
 
         public static void EventLoop()
@@ -147,142 +198,152 @@ namespace mpvnet
                 if (MpvWindowHandle == IntPtr.Zero)
                     MpvWindowHandle = FindWindowEx(MainForm.Hwnd, IntPtr.Zero, "mpv", null);
 
-                switch (evt.event_id)
+                //Debug.WriteLine(evt.event_id.ToString());
+
+                try
                 {
-                    case mpv_event_id.MPV_EVENT_SHUTDOWN:
-                        Shutdown?.Invoke();
-                        IsShutdownComplete = true;
-                        return;
-                    case mpv_event_id.MPV_EVENT_LOG_MESSAGE:
-                        LogMessage?.Invoke();
-                        break;
-                    case mpv_event_id.MPV_EVENT_GET_PROPERTY_REPLY:
-                        GetPropertyReply?.Invoke();
-                        break;
-                    case mpv_event_id.MPV_EVENT_SET_PROPERTY_REPLY:
-                        SetPropertyReply?.Invoke();
-                        break;
-                    case mpv_event_id.MPV_EVENT_COMMAND_REPLY:
-                        CommandReply?.Invoke();
-                        break;
-                    case mpv_event_id.MPV_EVENT_START_FILE:
-                        StartFile?.Invoke();
-                        break;
-                    case mpv_event_id.MPV_EVENT_END_FILE:
-                        var end_fileData = (mpv_event_end_file)Marshal.PtrToStructure(evt.data, typeof(mpv_event_end_file));
-                        EndFile?.Invoke((EndFileEventMode)end_fileData.reason);
-                        break;
-                    case mpv_event_id.MPV_EVENT_FILE_LOADED:
-                        FileLoaded?.Invoke();
-                        LoadFolder();
-                        break;
-                    case mpv_event_id.MPV_EVENT_TRACKS_CHANGED:
-                        TracksChanged?.Invoke();
-                        break;
-                    case mpv_event_id.MPV_EVENT_TRACK_SWITCHED:
-                        TrackSwitched?.Invoke();
-                        break;
-                    case mpv_event_id.MPV_EVENT_IDLE:
-                        Idle?.Invoke();
-                        break;
-                    case mpv_event_id.MPV_EVENT_PAUSE:
-                        Pause?.Invoke();
-                        break;
-                    case mpv_event_id.MPV_EVENT_UNPAUSE:
-                        Unpause?.Invoke();
-                        break;
-                    case mpv_event_id.MPV_EVENT_TICK:
-                        Tick?.Invoke();
-                        break;
-                    case mpv_event_id.MPV_EVENT_SCRIPT_INPUT_DISPATCH:
-                        ScriptInputDispatch?.Invoke();
-                        break;
-                    case mpv_event_id.MPV_EVENT_CLIENT_MESSAGE:
-                        if (ClientMessage != null)
-                        {
+                    switch (evt.event_id)
+                    {
+                        case mpv_event_id.MPV_EVENT_SHUTDOWN:
+                            Shutdown?.Invoke();
+                            WriteHistory(null);
+                            AutoResetEvent.Set();
+                            return;
+                        case mpv_event_id.MPV_EVENT_LOG_MESSAGE:
+                            LogMessage?.Invoke();
+                            break;
+                        case mpv_event_id.MPV_EVENT_GET_PROPERTY_REPLY:
+                            GetPropertyReply?.Invoke();
+                            break;
+                        case mpv_event_id.MPV_EVENT_SET_PROPERTY_REPLY:
+                            SetPropertyReply?.Invoke();
+                            break;
+                        case mpv_event_id.MPV_EVENT_COMMAND_REPLY:
+                            CommandReply?.Invoke();
+                            break;
+                        case mpv_event_id.MPV_EVENT_START_FILE:
+                            StartFile?.Invoke();
+                            break;
+                        case mpv_event_id.MPV_EVENT_END_FILE:
+                            var end_fileData = (mpv_event_end_file)Marshal.PtrToStructure(evt.data, typeof(mpv_event_end_file));
+                            EndFile?.Invoke((EndFileEventMode)end_fileData.reason);
+                            break;
+                        case mpv_event_id.MPV_EVENT_FILE_LOADED:
+                            FileLoaded?.Invoke();
+                            LoadFolder();
+                            WriteHistory(mp.get_property_string("path"));
+                            break;
+                        case mpv_event_id.MPV_EVENT_TRACKS_CHANGED:
+                            TracksChanged?.Invoke();
+                            break;
+                        case mpv_event_id.MPV_EVENT_TRACK_SWITCHED:
+                            TrackSwitched?.Invoke();
+                            break;
+                        case mpv_event_id.MPV_EVENT_IDLE:
+                            Idle?.Invoke();
+                            break;
+                        case mpv_event_id.MPV_EVENT_PAUSE:
+                            Pause?.Invoke();
+                            break;
+                        case mpv_event_id.MPV_EVENT_UNPAUSE:
+                            Unpause?.Invoke();
+                            break;
+                        case mpv_event_id.MPV_EVENT_TICK:
+                            Tick?.Invoke();
+                            break;
+                        case mpv_event_id.MPV_EVENT_SCRIPT_INPUT_DISPATCH:
+                            ScriptInputDispatch?.Invoke();
+                            break;
+                        case mpv_event_id.MPV_EVENT_CLIENT_MESSAGE:
                             var client_messageData = (mpv_event_client_message)Marshal.PtrToStructure(evt.data, typeof(mpv_event_client_message));
-                            var args = NativeUtf8StrArray2ManagedStrArray(client_messageData.args, client_messageData.num_args);
+                            string[] args = NativeUtf8StrArray2ManagedStrArray(client_messageData.args, client_messageData.num_args);
 
                             if (args != null && args.Length > 1 && args[0] == "mpv.net")
+                            {
+                                bool found = false;
+
                                 foreach (var i in mpvnet.Command.Commands)
+                                {
                                     if (args[1] == i.Name)
-                                        try
-                                        {
-                                            i.Action(args.Skip(2).ToArray());
-                                        }
-                                        catch (Exception ex)
-                                        {
-                                            MsgError(ex.GetType().Name + "\r\n\r\n" + ex.ToString());
-                                        }
+                                    {
+                                        found = true;
+                                        i.Action.Invoke(args.Skip(2).ToArray());
+                                        MainForm.Instance.BeginInvoke(new Action(() => {
+                                            Message m = new Message() { Msg = 0x0202 }; // WM_LBUTTONUP
+                                            Native.SendMessage(MainForm.Instance.Handle, m.Msg, m.WParam, m.LParam);
+                                        }));
+                                    }
+                                }
+                                if (!found)
+                                {
+                                    List<string> names = mpvnet.Command.Commands.Select((item) => item.Name).ToList();
+                                    names.Sort();
+                                    Msg.ShowError($"No command '{args[1]}' found.", $"Available commands are:\n\n{string.Join("\n", names)}\n\nHow to bind these commands can be seen in the [default input bindings and menu definition](https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/inputConf.txt).");
+                                }
+                            }
                             ClientMessage?.Invoke(args);
-                        }
-                        break;
-                    case mpv_event_id.MPV_EVENT_VIDEO_RECONFIG:
-                        VideoReconfig?.Invoke();
-                        break;
-                    case mpv_event_id.MPV_EVENT_AUDIO_RECONFIG:
-                        AudioReconfig?.Invoke();
-                        break;
-                    case mpv_event_id.MPV_EVENT_METADATA_UPDATE:
-                        MetadataUpdate?.Invoke();
-                        break;
-                    case mpv_event_id.MPV_EVENT_SEEK:
-                        Seek?.Invoke();
-                        break;
-                    case mpv_event_id.MPV_EVENT_PROPERTY_CHANGE:
-                        var event_propertyData = (mpv_event_property)Marshal.PtrToStructure(evt.data, typeof(mpv_event_property));
+                            break;
+                        case mpv_event_id.MPV_EVENT_VIDEO_RECONFIG:
+                            VideoReconfig?.Invoke();
+                            break;
+                        case mpv_event_id.MPV_EVENT_AUDIO_RECONFIG:
+                            AudioReconfig?.Invoke();
+                            break;
+                        case mpv_event_id.MPV_EVENT_METADATA_UPDATE:
+                            MetadataUpdate?.Invoke();
+                            break;
+                        case mpv_event_id.MPV_EVENT_SEEK:
+                            Seek?.Invoke();
+                            break;
+                        case mpv_event_id.MPV_EVENT_PROPERTY_CHANGE:
+                            var propData = (mpv_event_property)Marshal.PtrToStructure(evt.data, typeof(mpv_event_property));
 
-                        if (event_propertyData.format == mpv_format.MPV_FORMAT_FLAG)
-                            foreach (var i in BoolPropChangeActions)
-                                if (i.Key== event_propertyData.name)
-                                    i.Value.Invoke(Marshal.PtrToStructure<int>(event_propertyData.data) == 1);
-                        break;
-                    case mpv_event_id.MPV_EVENT_PLAYBACK_RESTART:
-                        PlaybackRestart?.Invoke();
-                        Size s = new Size(GetIntProp("dwidth", false), GetIntProp("dheight", false));
+                            if (propData.format == mpv_format.MPV_FORMAT_FLAG)
+                                foreach (var i in BoolPropChangeActions)
+                                    if (i.Key== propData.name)
+                                        i.Value.Invoke(Marshal.PtrToStructure<int>(propData.data) == 1);
 
-                        if (VideoSize != s && s != Size.Empty)
-                        {
-                            VideoSize = s;
-                            VideoSizeChanged?.Invoke();
-                        }
-                        break;
-                    case mpv_event_id.MPV_EVENT_CHAPTER_CHANGE:
-                        ChapterChange?.Invoke();
-                        break;
-                    case mpv_event_id.MPV_EVENT_QUEUE_OVERFLOW:
-                        QueueOverflow?.Invoke();
-                        break;
-                    case mpv_event_id.MPV_EVENT_HOOK:
-                        Hook?.Invoke();
-                        break;
+                            if (propData.format == mpv_format.MPV_FORMAT_STRING)
+                                foreach (var i in StringPropChangeActions)
+                                    if (i.Key == propData.name)
+                                        i.Value.Invoke(StringFromNativeUtf8(Marshal.PtrToStructure<IntPtr>(propData.data)));
+
+                            if (propData.format == mpv_format.MPV_FORMAT_INT64)
+                                foreach (var i in IntPropChangeActions)
+                                    if (i.Key == propData.name)
+                                        i.Value.Invoke(Marshal.PtrToStructure<int>(propData.data));
+                            break;
+                        case mpv_event_id.MPV_EVENT_PLAYBACK_RESTART:
+                            PlaybackRestart?.Invoke();
+                            Size vidSize = new Size(get_property_int("dwidth"), get_property_int("dheight"));
+
+                            if (VideoSize != vidSize && vidSize != Size.Empty)
+                            {
+                                VideoSize = vidSize;
+                                VideoSizeChanged?.Invoke();
+                            }                    
+
+                            Task.Run(new Action(() => ReadMetaData()));
+                            break;
+                        case mpv_event_id.MPV_EVENT_CHAPTER_CHANGE:
+                            ChapterChange?.Invoke();
+                            break;
+                        case mpv_event_id.MPV_EVENT_QUEUE_OVERFLOW:
+                            QueueOverflow?.Invoke();
+                            break;
+                        case mpv_event_id.MPV_EVENT_HOOK:
+                            Hook?.Invoke();
+                            break;
+                    }
+                }
+                catch (Exception ex)
+                {
+                    Msg.ShowException(ex);
                 }
             }
         }
 
-        public class PythonEventObject
-        {
-            public PyRT.PythonFunction PythonFunction { get; set; }
-            public EventInfo EventInfo { get; set; }
-            public Delegate Delegate { get; set; }
-
-            public void Invoke()
-            {
-                PyRT.Operations.PythonCalls.Call(PythonFunction);
-            }
-
-            public void InvokeEndFileEventMode(EndFileEventMode arg)
-            {
-                PyRT.Operations.PythonCalls.Call(PythonFunction, new[] { arg });
-            }
-
-            public void InvokeStrings(string[] arg)
-            {
-                PyRT.Operations.PythonCalls.Call(PythonFunction, new[] { arg });
-            }
-        }
-
-        private static List<PythonEventObject> PythonEventObjects = new List<PythonEventObject>();
+        static List<PythonEventObject> PythonEventObjects = new List<PythonEventObject>();
 
         public static void register_event(string name, PyRT.PythonFunction pyFunc)
         {
@@ -327,17 +388,11 @@ namespace mpvnet
         }
 
         public static void commandv(params string[] args)
-        {
-            Command(args);
-        }
-
-        public static void Command(params string[] args)
         {
             if (MpvHandle == IntPtr.Zero)
                 return;
 
-            IntPtr[] byteArrayPointers;
-            var mainPtr = AllocateUtf8IntPtrArrayWithSentinel(args, out byteArrayPointers);
+            IntPtr mainPtr = AllocateUtf8IntPtrArrayWithSentinel(args, out IntPtr[] byteArrayPointers);
             int err = mpv_command(MpvHandle, mainPtr);
 
             if (err < 0)
@@ -349,7 +404,7 @@ namespace mpvnet
             Marshal.FreeHGlobal(mainPtr);
         }
 
-        public static void CommandString(string command, bool throwException = true)
+        public static void command_string(string command, bool throwException = false)
         {
             if (MpvHandle == IntPtr.Zero)
                 return;
@@ -360,66 +415,87 @@ namespace mpvnet
                 throw new Exception($"{(mpv_error)err}\r\n\r\n" + command);
         }
 
-        public static void SetStringProp(string name, string value, bool throwException = true)
+        public static void set_property_string(string name, string value, bool throwOnException = false)
         {
-            var bytes = GetUtf8Bytes(value);
+            byte[] bytes = GetUtf8Bytes(value);
             int err = mpv_set_property(MpvHandle, GetUtf8Bytes(name), mpv_format.MPV_FORMAT_STRING, ref bytes);
 
-            if (err < 0 && throwException)
+            if (err < 0 && throwOnException)
                 throw new Exception($"{name}: {(mpv_error)err}");
         }
 
-        public static string GetStringProp(string name)
+        public static string get_property_string(string name, bool throwOnException = false)
         {
-            var lpBuffer = IntPtr.Zero;
-            int err = mpv_get_property(MpvHandle, GetUtf8Bytes(name), mpv_format.MPV_FORMAT_STRING, ref lpBuffer);
+            try
+            {
+                int err = mpv_get_property(MpvHandle, GetUtf8Bytes(name), mpv_format.MPV_FORMAT_STRING, out IntPtr lpBuffer);
 
-            if (err < 0)
-                throw new Exception($"{name}: {(mpv_error)err}");
+                if (err < 0 && throwOnException)
+                    throw new Exception($"{name}: {(mpv_error)err}");
 
-            var ret = StringFromNativeUtf8(lpBuffer);
-            mpv_free(lpBuffer);
+                string ret = StringFromNativeUtf8(lpBuffer);
+                mpv_free(lpBuffer);
 
-            return ret;
+                return ret;
+            }
+            catch (Exception ex)
+            {
+                if (throwOnException) throw ex;
+                return "";
+            }
         }
 
-        public static int GetIntProp(string name, bool throwException = true)
+        public static int get_property_int(string name, bool throwOnException = false)
         {
-            var lpBuffer = IntPtr.Zero;
-            int err = mpv_get_property(MpvHandle, GetUtf8Bytes(name), mpv_format.MPV_FORMAT_INT64, ref lpBuffer);
+            int err = mpv_get_property(MpvHandle, GetUtf8Bytes(name), mpv_format.MPV_FORMAT_INT64, out IntPtr lpBuffer);
 
-            if (err < 0 && throwException)
+            if (err < 0 && throwOnException)
                 throw new Exception($"{name}: {(mpv_error)err}");
             else
                 return lpBuffer.ToInt32();
         }
 
-        public static double get_property_number(string name)
-        {
-            return GetDoubleProp(name);
-        }
-
-        public static double GetDoubleProp(string name, bool throwException = true)
+        public static double get_property_number(string name, bool throwOnException = false)
         {
             double val = 0;
             int err = mpv_get_property(MpvHandle, GetUtf8Bytes(name), mpv_format.MPV_FORMAT_DOUBLE, ref val);
 
-            if (err < 0 && throwException)
+            if (err < 0 && throwOnException)
                 throw new Exception($"{name}: {(mpv_error)err}");
             else
                 return val;
         }
 
-        public static void SetIntProp(string name, int value)
+        public static bool get_property_bool(string name, bool throwOnException = false)
+        {
+            int err = mpv_get_property(MpvHandle, GetUtf8Bytes(name), mpv_format.MPV_FORMAT_FLAG, out IntPtr lpBuffer);
+
+            if (err < 0 && throwOnException)
+                throw new Exception($"{name}: {(mpv_error)err}");
+            else
+                return lpBuffer.ToInt32() == 1;
+        }
+
+        public static void set_property_int(string name, int value, bool throwOnException = false)
         {
             Int64 val = value;
             int err = mpv_set_property(MpvHandle, GetUtf8Bytes(name), mpv_format.MPV_FORMAT_INT64, ref val);
 
-            if (err < 0)
+            if (err < 0 && throwOnException)
                 throw new Exception($"{name}: {(mpv_error)err}");
         }
 
-        public static void ObserveBoolProp(string name, Action<bool> action)
+        public static void observe_property_int(string name, Action<int> action)
+        {
+            int err = mpv_observe_property(MpvHandle, (ulong)action.GetHashCode(), name, mpv_format.MPV_FORMAT_INT64);
+
+            if (err < 0)
+                throw new Exception($"{name}: {(mpv_error)err}");
+            else
+                IntPropChangeActions.Add(new KeyValuePair<string, Action<int>>(name, action));
+        }
+
+        public static void observe_property_bool(string name, Action<bool> action)
         {
             int err = mpv_observe_property(MpvHandle, (ulong)action.GetHashCode(), name, mpv_format.MPV_FORMAT_FLAG);
 
@@ -429,27 +505,25 @@ namespace mpvnet
                 BoolPropChangeActions.Add(new KeyValuePair<string, Action<bool>>(name, action));
         }
 
-        public static void UnobserveBoolProp(string name, Action<bool> action)
+        public static void observe_property_string(string name, Action<string> action)
         {
-            foreach (var i in BoolPropChangeActions.ToArray())
-                if (i.Value == action)
-                    BoolPropChangeActions.Remove(i);
-
-            int err = mpv_unobserve_property(MpvHandle, (ulong)action.GetHashCode());
+            int err = mpv_observe_property(MpvHandle, (ulong)action.GetHashCode(), name, mpv_format.MPV_FORMAT_STRING);
 
             if (err < 0)
                 throw new Exception($"{name}: {(mpv_error)err}");
+            else
+                StringPropChangeActions.Add(new KeyValuePair<string, Action<string>>(name, action));
         }
 
-        public static void ProcessCommandLine()
+        protected static void ProcessCommandLine()
         {
             var args = Environment.GetCommandLineArgs().Skip(1);
 
             foreach (string i in args)
                 if (!i.StartsWith("--") && File.Exists(i))
-                    mp.Command("loadfile", i, "append");
+                    mp.commandv("loadfile", i, "append");
 
-            mp.SetStringProp("playlist-pos", "0", false);
+            mp.set_property_string("playlist-pos", "0");
 
             foreach (string i in args)
             {
@@ -459,57 +533,57 @@ namespace mpvnet
                     {
                         string left = i.Substring(2, i.IndexOf("=") - 2);
                         string right = i.Substring(left.Length + 3);
-                        mp.SetStringProp(left, right);
+                        mp.set_property_string(left, right);
                     }
                     else
-                        mp.SetStringProp(i.Substring(2), "yes");
+                        mp.set_property_string(i.Substring(2), "yes");
                 }
             }
         }
 
-        public static void LoadFiles(string[] files)
+        public static void LoadFiles(params string[] files)
         {
-            int count = mp.GetIntProp("playlist-count");
+            int count = mp.get_property_int("playlist-count");
 
             foreach (string file in files)
-                mp.Command("loadfile", file, "append");
+                mp.commandv("loadfile", file, "append");
 
-            mp.SetIntProp("playlist-pos", count);
+            mp.set_property_int("playlist-pos", count);
 
             for (int i = 0; i < count; i++)
-                mp.Command("playlist-remove", "0");
+                mp.commandv("playlist-remove", "0");
 
             mp.LoadFolder();
         }
 
-        private static bool WasFolderLoaded;
+        static bool WasFolderLoaded;
 
-        public static void LoadFolder()
+        static void LoadFolder()
         {
-            if (WasFolderLoaded)
-                return;
+            if (WasFolderLoaded) return;
 
-            if (GetIntProp("playlist-count") == 1)
+            if (get_property_int("playlist-count") == 1)
             {
+                string path = get_property_string("path");
+                if (!Directory.Exists(Path.GetDirectoryName(path))) return;
                 string[] types = "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(' ');
-                string path = GetStringProp("path");
                 List<string> files = Directory.GetFiles(Path.GetDirectoryName(path)).ToList();
-                files = files.Where((file) => types.Contains(file.Ext())).ToList();
+                files = files.Where((file) => types.Contains(Path.GetExtension(file).TrimStart(".".ToCharArray()).ToLower())).ToList();
                 files.Sort(new StringLogicalComparer());
                 int index = files.IndexOf(path);
                 files.Remove(path);
 
                 foreach (string i in files)
-                    Command("loadfile", i, "append");
+                    commandv("loadfile", i, "append");
 
                 if (index > 0)
-                    Command("playlist-move", "0", (index + 1).ToString());
+                    commandv("playlist-move", "0", (index + 1).ToString());
             }
 
             WasFolderLoaded = true;
         }
 
-        public static IntPtr AllocateUtf8IntPtrArrayWithSentinel(string[] arr, out IntPtr[] byteArrayPointers)
+        static IntPtr AllocateUtf8IntPtrArrayWithSentinel(string[] arr, out IntPtr[] byteArrayPointers)
         {
             int numberOfStrings = arr.Length + 1; // add extra element for extra null pointer last (sentinel)
             byteArrayPointers = new IntPtr[numberOfStrings];
@@ -527,7 +601,7 @@ namespace mpvnet
             return rootPointer;
         }
 
-        public static string[] NativeUtf8StrArray2ManagedStrArray(IntPtr pUnmanagedStringArray, int StringCount)
+        static string[] NativeUtf8StrArray2ManagedStrArray(IntPtr pUnmanagedStringArray, int StringCount)
         {
             IntPtr[] pIntPtrArray = new IntPtr[StringCount];
             string[] ManagedStringArray = new string[StringCount];
@@ -539,7 +613,7 @@ namespace mpvnet
             return ManagedStringArray;
         }
 
-        public static string StringFromNativeUtf8(IntPtr nativeUtf8)
+        static string StringFromNativeUtf8(IntPtr nativeUtf8)
         {
             int len = 0;
             while (Marshal.ReadByte(nativeUtf8, len) != 0) ++len;
@@ -548,7 +622,124 @@ namespace mpvnet
             return Encoding.UTF8.GetString(buffer);
         }
 
-        public static byte[] GetUtf8Bytes(string s) => Encoding.UTF8.GetBytes(s + "\0");
+        static byte[] GetUtf8Bytes(string s) => Encoding.UTF8.GetBytes(s + "\0");
+
+        static string LastHistoryPath;
+        static DateTime LastHistoryStartDateTime;
+
+        static void WriteHistory(string filePath)
+        {
+            int totalMinutes = Convert.ToInt32((DateTime.Now - LastHistoryStartDateTime).TotalMinutes);
+
+            if (File.Exists(LastHistoryPath) && totalMinutes > 1)
+            {
+                string historyFilepath = mp.MpvConfFolder + "history.txt";
+
+                File.AppendAllText(historyFilepath, DateTime.Now.ToString().Substring(0, 16) +
+                    " " + totalMinutes.ToString().PadLeft(3) + " " +
+                    Path.GetFileNameWithoutExtension(LastHistoryPath) + "\r\n");
+            }
+
+            LastHistoryPath = filePath;
+            LastHistoryStartDateTime = DateTime.Now;
+        }
+
+        static void ReadMetaData()
+        {
+            lock (MediaTracks)
+            {
+                MediaTracks.Clear();
+
+                using (MediaInfo mi = new MediaInfo(mp.get_property_string("path")))
+                {
+                    int count = mi.GetCount(MediaInfoStreamKind.Video);
+
+                    for (int i = 0; i < count; i++)
+                    {
+                        MediaTrack track = new MediaTrack();
+                        Add(track, mi.GetVideo(i, "Format"));
+                        Add(track, mi.GetVideo(i, "Format_Profile"));
+                        Add(track, mi.GetVideo(i, "Width") + "x" + mi.GetVideo(i, "Height"));
+                        Add(track, mi.GetVideo(i, "FrameRate") + " FPS");
+                        Add(track, mi.GetVideo(i, "Language/String"));
+                        Add(track, mi.GetVideo(i, "Forced") == "Yes" ? "Forced" : "");
+                        Add(track, mi.GetVideo(i, "Default") == "Yes" ? "Default" : "");
+                        Add(track, mi.GetVideo(i, "Title"));
+                        track.Text = "V: " + track.Text.Trim(" ,".ToCharArray());
+                        track.Type = "v";
+                        track.ID = i + 1;
+                        MediaTracks.Add(track);
+                    }
+
+                    count = mi.GetCount(MediaInfoStreamKind.Audio);
+
+                    for (int i = 0; i < count; i++)
+                    {
+                        MediaTrack track = new MediaTrack();
+                        Add(track, mi.GetAudio(i, "Language/String"));
+                        Add(track, mi.GetAudio(i, "Format"));
+                        Add(track, mi.GetAudio(i, "Format_Profile"));
+                        Add(track, mi.GetAudio(i, "BitRate/String"));
+                        Add(track, mi.GetAudio(i, "Channel(s)/String"));
+                        Add(track, mi.GetAudio(i, "SamplingRate/String"));
+                        Add(track, mi.GetAudio(i, "Forced") == "Yes" ? "Forced" : "");
+                        Add(track, mi.GetAudio(i, "Default") == "Yes" ? "Default" : "");
+                        Add(track, mi.GetAudio(i, "Title"));
+                        track.Text = "A: " + track.Text.Trim(" ,".ToCharArray());
+                        track.Type = "a";
+                        track.ID = i + 1;
+                        MediaTracks.Add(track);
+                    }
+
+                    count = mi.GetCount(MediaInfoStreamKind.Text);
+
+                    for (int i = 0; i < count; i++)
+                    {
+                        MediaTrack track = new MediaTrack();
+                        Add(track, mi.GetText(i, "Language/String"));
+                        Add(track, mi.GetText(i, "Format"));
+                        Add(track, mi.GetText(i, "Format_Profile"));
+                        Add(track, mi.GetText(i, "Forced") == "Yes" ? "Forced" : "");
+                        Add(track, mi.GetText(i, "Default") == "Yes" ? "Default" : "");
+                        Add(track, mi.GetText(i, "Title"));
+                        track.Text = "S: " + track.Text.Trim(" ,".ToCharArray());
+                        track.Type = "s";
+                        track.ID = i + 1;
+                        MediaTracks.Add(track);
+                    }
+
+                    count = get_property_int("edition-list/count");
+
+                    for (int i = 0; i < count; i++)
+                    {
+                        MediaTrack track = new MediaTrack();
+                        track.Text = "E: " + get_property_string($"edition-list/{i}/title");
+                        track.Type = "e";
+                        track.ID = i;
+                        MediaTracks.Add(track);
+                    }
+
+                    void Add(MediaTrack track, string val)
+                    {
+                        if (!string.IsNullOrEmpty(val) && !(track.Text != null && track.Text.Contains(val)))
+                            track.Text += " " + val + ",";
+                    }
+                }
+            }
+
+            lock (Chapters)
+            {
+                Chapters.Clear();
+                int count = get_property_int("chapter-list/count");
+
+                for (int x = 0; x < count; x++)
+                {
+                    string text = get_property_string($"chapter-list/{x}/title");
+                    double time = get_property_number($"chapter-list/{x}/time");
+                    Chapters.Add(new KeyValuePair<string, double>(text, time));
+                }
+            }
+        }
     }
 
     public enum EndFileEventMode

mpv.net/mpv.net.csproj

@@ -19,66 +19,29 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
+    <OutputPath>bin\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
+    <GenerateSerializationAssemblies>On</GenerateSerializationAssemblies>
+    <LangVersion>7.3</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>bin\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup />
   <PropertyGroup />
   <PropertyGroup>
     <StartupObject>mpvnet.Program</StartupObject>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
   <PropertyGroup />
   <PropertyGroup />
   <PropertyGroup />
@@ -88,11 +51,51 @@
   <PropertyGroup />
   <PropertyGroup />
   <PropertyGroup>
-    <ApplicationIcon>mpv.ico</ApplicationIcon>
+    <ApplicationIcon>mpvnet.ico</ApplicationIcon>
   </PropertyGroup>
   <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>
@@ -117,6 +120,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>IronPython\Microsoft.Scripting.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.VisualBasic" />
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Core" />
@@ -126,23 +132,50 @@
       <HintPath>..\packages\Microsoft.PowerShell.5.ReferenceAssemblies.1.1.0\lib\net4\System.Management.Automation.dll</HintPath>
     </Reference>
     <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xaml" />
     <Reference Include="System.Xml" />
+    <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Addon.cs" />
-    <Compile Include="Extensions.cs" />
+    <Page Include="Controls\SearchTextBoxUserControl.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Windows\AboutWindow.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Windows\CommandPaletteWindow.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="WPF\Resources.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Compile Include="Controls\SearchTextBoxUserControl.xaml.cs">
+      <DependentUpon>SearchTextBoxUserControl.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="DynamicGUI\DynamicGUI.cs" />
+    <Compile Include="DynamicGUI\OptionSettingControl.xaml.cs">
+      <DependentUpon>OptionSettingControl.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="DynamicGUI\StringSettingControl.xaml.cs">
+      <DependentUpon>StringSettingControl.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="DynamicGUI\Tommy.cs" />
     <Compile Include="MediaInfo.cs" />
     <Compile Include="Menu.cs">
       <SubType>Component</SubType>
     </Compile>
+    <Compile Include="PowerShellScript.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
-    <Compile Include="PowerShellScript.cs" />
     <Compile Include="PythonScript.cs" />
-    <Compile Include="StringExtensions.cs" />
     <Compile Include="libmpv.cs" />
     <Compile Include="MainForm.cs">
       <SubType>Form</SubType>
@@ -157,7 +190,24 @@
     <Compile Include="NativeHelp.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="UI.cs" />
+    <Compile Include="Sys\TaskDialog.cs" />
+    <Compile Include="Windows\CommandPaletteWindow.xaml.cs">
+      <DependentUpon>CommandPaletteWindow.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Windows\ConfWindow.xaml.cs">
+      <DependentUpon>ConfWindow.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Windows\AboutWindow.xaml.cs">
+      <DependentUpon>AboutWindow.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Windows\LearnWindow.xaml.cs">
+      <DependentUpon>LearnWindow.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Windows\InputWindow.xaml.cs">
+      <DependentUpon>InputWindow.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="trash.cs" />
+    <Compile Include="WPF\WPF.cs" />
     <EmbeddedResource Include="MainForm.resx">
       <DependentUpon>MainForm.cs</DependentUpon>
       <SubType>Designer</SubType>
@@ -167,6 +217,9 @@
       <SubType>Designer</SubType>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
+    <None Include="..\README.md">
+      <Link>README.md</Link>
+    </None>
     <None Include="app.manifest" />
     <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
@@ -178,17 +231,45 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
-    <Content Include="Resources\mpv.conf.txt" />
+    <Content Include="..\LICENSE.txt">
+      <Link>LICENSE.txt</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="mpvnet.ico" />
+    <Content Include="Resources\mpvConf.txt" />
+    <Content Include="Resources\mpvConfToml.txt" />
+    <Content Include="Resources\mpvNetConfToml.txt" />
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="mpv.ico" />
+    <Content Include="Resources\inputConfHeader.txt" />
     <Content Include="screenshot.jpg" />
-    <Content Include="Resources\input.conf.txt" />
+    <Content Include="Resources\inputConf.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <Page Include="DynamicGUI\OptionSettingControl.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="DynamicGUI\StringSettingControl.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Windows\ConfWindow.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Windows\LearnWindow.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Windows\InputWindow.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
   </ItemGroup>
-  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

mpv.net/trash.cs

@@ -0,0 +1,22 @@
+//public static string GetAssociatedApplication(string ext)
+//{
+//    uint returnValue = 0U;
+//    // ASSOCF_VERIFY, ASSOCSTR_EXECUTABLE
+//    if (1 == Native.AssocQueryString(0x40, 2, ext, null, null, ref returnValue))
+//    {
+//        if (returnValue > 0)
+//        {
+//            StringBuilder sb = new StringBuilder(Convert.ToInt32(returnValue));
+//            // ASSOCF_VERIFY, ASSOCSTR_EXECUTABLE
+//            if (0 == Native.AssocQueryString(0x40, 2, ext, null, sb, ref returnValue))
+//            {
+//                var ret = sb.ToString();
+//                if (File.Exists(ret)) return ret;
+//            }
+//        }
+//    }
+//    return "";
+//}
+
+//[DllImport("Shlwapi.dll", SetLastError = true, CharSet = CharSet.Unicode)]
+//public static extern uint AssocQueryString(uint flags, uint str, string pszAssoc, string pszExtra, StringBuilder pszOut, ref uint pcchOut);

release.ps1

@@ -1,10 +0,0 @@
-$scriptDir = Split-Path -Path $PSCommandPath -Parent
-$exePath = $scriptDir + "\mpv.net\bin\Debug\mpvnet.exe"
-$version = [Diagnostics.FileVersionInfo]::GetVersionInfo($exePath).FileVersion
-$desktopDir = [Environment]::GetFolderPath("Desktop")
-$targetDir = $desktopDir + "\mpv.net-" + $version
-Copy-Item $scriptDir\mpv.net\bin\Debug $targetDir -recurse
-copy-item $scriptDir\README.md $targetDir\README.md
-$7zPath = "C:\Program Files\7-Zip\7z.exe"
-$args = "a -t7z -mx9 $targetDir.7z -r $targetDir\*"
-Start-Process -FilePath $7zPath -ArgumentList $args

setup.iss

@@ -0,0 +1,44 @@
+#define MyAppName "mpv.net"
+#define MyAppExeName "mpvnet.exe"
+
+#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={commonpf}\{#MyAppName}
+OutputBaseFilename=mpvnet-setup-{#arch}-{#MyAppVersion}
+OutputDir={#GetEnv('USERPROFILE')}\Desktop
+DefaultGroupName={#MyAppName}
+SetupIconFile=mpv.net\mpvnet.ico
+UninstallDisplayIcon={app}\{#MyAppExeName}
+
+[Icons]
+Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
+
+[Files]
+Source: "{#MyAppSourceDir}\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{#MyAppSourceDir}\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs; Excludes: "System.Management.Automation.xml"
+
+[Run]
+Filename: "{app}\{#MyAppExeName}"; Description: "Associate video file extensions?"; Flags: postinstall unchecked runascurrentuser runhidden nowait; Parameters: "--reg-file-assoc video"
+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 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