5.4.6.0

Update Manual.md - Replace External Application Button with Open With

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,27 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: stax76
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: stax76
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

Changelog.md

@@ -1,3 +1,408 @@
+
+5.4.5.2 Beta  (not yet released)
+============
+
+
+
+
+5.4.6.0
+=======
+
+- youtube-dl update
+- auto update routine fix
+
+
+5.4.5.1 Beta
+============
+
+- extensions no longer need to end with *Extension.dll but rather
+  the file name and the directory name must be identical
+- text encoding exception fix
+- the PowerShell script host is more feature complete, easier to use
+  and more efficient, there were however many PowerShell and C# breaking
+  changes requrired to make the core more robust and efficient
+- Python 2 script host removed, Python 3 support is planned for summer
+
+
+5.4.5.0
+=======
+
+stable release, no changes since the last beta
+
+
+5.4.4.6 Beta
+============
+
+- using start-size=video the window size was not remembered
+  after fullscreen mode was left.
+- using start-size=video the window can now use the entire
+  working area using autofit-larger=100
+
+
+5.4.4.5 Beta
+============
+
+- overhaul of the [webpage](README.md) and the [manual](Manual.md).
+- change that possibly could fix a multimedia keyboard volume issue.
+
+
+5.4.4.4 Beta
+============
+
+- with `border=no` the OSC top bar window buttons min, max and close are fully supported.
+- anamorphic videos are shown without black bars, the window is resized according to the ascpect ratio.
+- PowerShell 5.1 was made optional.
+- full implementation for `window-minimized` and `window-maximized`,
+  scripts that depend on this like pause-when-minimize.lua are now fully supported.
+- fix cycling from maximized to fullscreen and back.
+
+
+5.4.4.3 Beta
+============
+
+- update MediaInfo 20.03
+- update libmpv 2020-04-12, it supports vpy playback, read manual or ask in forum
+- mpv property `window-maximized` support added, cycling it from input.conf
+  is not recommended, use native Windows shortcuts Win+Up, Win+Down
+- the mpv.net `start-size` option supports `always` to always remember the window height
+- if the window was maximized before fullscreen was entered, it's now set to
+  maximized after fullscreen was left
+- with `border=no` the OSC did not auto hide after the mouse curser left the window
+- the script that modified the seek OSD was removed, it still can be found in the mpv wiki
+- certain videos were showed with black bars
+
+
+### 5.4.4.2
+
+- update: libmpv shinchiro 0.32.0-258-g281f5c63c1
+- update: youtube-dl
+
+- new: d3d11va-zero-copy setting added to conf editor
+- new: hdr-compute-peak  setting added to conf editor
+- new: flag cli switches support now `--no-flag` in addition to `--flag=no`
+       https://mpv.io/manual/master/#usage
+- new: cli switches can also start with single `-` instead of double `--`
+       https://mpv.io/manual/master/#legacy-option-syntax
+- new: PowerShell script host was completely rewritten, events can be assigned
+       by using `Register-ObjectEvent`, the scripting wiki page was updated
+       https://github.com/stax76/mpv.net/wiki/Scripting#powershell
+- new: Context Menu > View > Show Profiles
+       https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/input.conf.txt#L147
+- new: Context Menu > View > Show Properties
+       https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/input.conf.txt#L148
+- new: Context Menu > View > Show Commands
+       https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/input.conf.txt#L149
+- new: config editor tab is now remembered
+- new: osd-duration setting added to config editor and default mpv.conf
+- new: external console replaced with internal console, in case mpv.conf is missing it's
+       generated with correct Hight DPI font size scale settings.
+       `script-opts=console-scale=<dpiscale>`
+       https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/input.conf.txt#L150
+       https://mpv.io/manual/master/#console
+- new: blue color in dark theme is now less intense
+       https://github.com/stax76/mpv.net/blob/master/Manual.md#color-theme
+- new: menu item 'View > Show Progress' (p key) to show progress bar
+       https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/input.conf.txt#L146
+- new: `script-message mpv.net playlist-first`, unlike mpv does not
+       restart if the first file is already active
+       https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/input.conf.txt#L44
+- new: if mpv.net is started from the terminal and an error happens then the error
+       is printed to the terminal instead of shown with a message box
+- fix: update routine did only work when mpv.net was located in 'Program Files'
+- fix: fatal errors were ignored and only seen in the terminal, now a message box is shown
+- fix: when start-size=video was used then enlarging or shrinking the window size was broken
+
+### 5.4.4.0
+
+- new: forecolors in the dark theme are slightly darker now
+- new: readme/website and manual were improved
+- new: source code includes now the release script to build the archives and setup files
+- new: the history feature now uses the full path
+- new: install via Scoop and Chocolatey added to readme/website (Restia666Ashdoll)
+- new: update check, it must be enabled first in the conf editor under General
+- new: update feature, requires PowerShell 5 and curl,
+       an up to date Windows 10 system has both included.
+       Main menu (input.conf) must be reset or updated manually ([defaults](https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/input.conf.txt))
+
+- update: libmpv shinchiro 2019-11-10 
+
+- fix: often the OSC was shown when fullscreen was entered
+       or on app startup, this is now suppressed
+- fix: the file association routine uses no longer 'Play with mpv.net' for the
+       default open verb caption because it doesn't support multi selection,
+       it shows now only Open, the manual explains how to get multi selection
+       in File Explorer, read about it [here](https://github.com/stax76/mpv.net/blob/master/Manual.md#open-with)
+- fix: x86 builds had an older version included because
+       of a misconfiguration in the solution file
+
+### 5.4.3.0
+
+- new: the color themes can now be customized ([manual](https://github.com/stax76/mpv.net/blob/master/Manual.md#color-theme))
+- new: three new sections were added to the [manual](https://github.com/stax76/mpv.net/blob/master/Manual.md):
+       1. [Color Theme](https://github.com/stax76/mpv.net/blob/master/Manual.md#color-theme)
+       2. [Hidden and secret features](https://github.com/stax76/mpv.net/blob/master/Manual.md#hidden-and-secret-features)
+       3. [External Tools](https://github.com/stax76/mpv.net/blob/master/Manual.md#external-tools)
+
+- fix: window restore from maximized and from minimized was broken
+- fix: it's possible to multi select files in File Explorer and press
+       enter to open the files, this did however only work when the
+	   auto load folder feature was disabled or the shift key was
+	   pressed (blocks auto load folder). Now it should also work
+	   without shift key and with auto load folder being enabled
+
+- update: libmpv shinchiro 2019-10-27
+- update: youtube-dl 2019-10-31
+
+### 5.4.2.1 Beta
+
+- pressing shift key suppresses auto-load-folder
+- switch --queue added, this will not clear the playlist but append
+  and it will suppress auto-load-folder. To get a 'Add to mpv.net playlist'
+  context menu item in explorer with multi selection support use my
+  [Open with++](https://github.com/stax76/OpenWithPlusPlus#add-to-mpvnet-playlist) shell extension, as far as I know multi selection
+  can not be done using the Registry but only via shell extension
+- window-size mpv property support added ([default bindings](https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/input.conf.txt#L137))
+- the config editor keeps profiles and comments in mpv.conf intact!
+- the options in the config editor are better organized
+
+### 5.4.2
+
+- new: the [scripting wiki page](https://github.com/stax76/mpv.net/wiki/Scripting#powershell) was improved
+- new: Toggle Shuffle has been added to the menu defaults
+- new: for URLs the media title is shown in the title bar and in the info command
+       instead of displaying the URL, mpv.conf defaults were changed to use
+       [protocol.https] osd-playing-msg = '${media-title}'
+
+- fix: on the very first start volume was set to 0 and mute was set to yes
+- fix: there was a sound when closed from taskbar
+- fix: the log feature was not working
+- fix: clipboard monitoring removed because it was causing to many issues
+- fix: restore resulted in collapsed window when maximized = yes was used
+
+- update: libmpv shinchiro 2019-10-06
+- update: youtube-dl 2019-10-01
+
+### 5.4.1.1
+
+- a issue with the taskbar-progress feature was fixed
+- improved PowerShell scrip host
+
+### 5.4.1
+
+- fix ArgumentOutOfRangeException
+
+### 5.4
+
+- added taskbar-progress implementation
+- added new setting to start with maximized window
+- long file paths work now even if not enabled by the OS
+- fixed history being written even when history file wasn't created prior
+- libmpv updated to shinchiro 2019-08-31
+
+### 5.3
+
+- added new feature: Open > Open DVD/Blu-ray Drive/Folder...
+- the default of remember-volume has been set to yes
+- scale, cscale, dscale defaults have been set to spline36,
+  profile=gpu-hq is not used in the defaults because it starts very slow
+- new menu items have been added to navigate to the first and
+  last playlist position, key bindings: Home, End
+- new config setting recent-count added, amount of menu items
+  shown under 'Open > Recent'
+- in the config dialog the description for keep-open was corrected
+  because unlike mpv, mpv.net will never terminate automatically
+- there was a rare occasion where the mpv.net logo wasn't shown
+- fix excessive memory usage using `osd-scale-by-window = no`
+- mpv setting osd-scale-by-window added to config dialog
+
+### 5.2.1
+
+- fixed race condition causing various features to fail
+
+### 5.2
+
+- bug fix for single-instance not working with unicode filenames
+- bug fix for logo not shown on start
+- osd-visibility.js script was removed because the OSC uses too much memory
+- youtube-dl was updated
+- libmpv was updated to shinchiro 2019-08-04
+- in case mpv.net was started from a terminal it sets now the mpv property input-terminal to yes,
+  this means mpv.net will now receive and handle input keys from the terminal
+- certain command line properties didn't work (input-terminal, terminal, input-file,
+  config, config-dir, input-conf, load-scripts, script, scripts, player-operation-mode)
+- the about dialog shows now the mpv version and build date
+- the dialog that asks for a config folder has now a cancel option
+
+### 5.1
+
+- many [wiki pages](https://github.com/stax76/mpv.net/wiki) were improved
+- the logo/icon had a very small cosmetic change
+- the help in the context menu was improved,
+  for quick access consider the command palette (F1 key)
+- config options specific to mpv.net are now available from the command line
+- the input editor no longer has known limitations, 'alt gr' and ctrl+alt are working now
+- the help in the input editor was simplified and the filter logic was improved
+- fixed issue in file associations causing mpv.net not to appear in OS default apps
+- 'Tools > Manage File Associations' was replaced by 'Tools > OS Setup',
+  it has now a feature to add and remove mpv.net to and from the Path
+  environment variable and the OS default apps settings can be opened (Win 10 only)
+- startup folder and config folder being identical was causing a critical issue
+  as mpv.net was loading extensions twice and scripts four times, now identical
+  folders are no longer permitted
+- error messages are shown when unknown scripts and extensions are found in the startup folder
+  because user scripts and extensions are supposed to be located in the config folder instead
+- changing from maximized to fullscreen did not work
+- the search field in the config editor was not always remembered
+- new setting remember-volume added, saves volume and mute on exit
+  and restores it on start.
+- it's now enforced that mpv properties on the command line and in
+  the mpv.conf config file are lowercase, if not a error is shown
+- gpu-api vulkan was not working if media files were opened via
+  command line (that included Explorer)
+- new setting minimum-aspect-ratio added, minimum aspect ratio for the window,
+  this was previously hard coded to 1.3
+- new setting auto-load-folder added, for single files automatically load
+  the entire directory into the playlist, previously this was forced,
+  now it can be disabled
+- new setting themed-menu added, follow theme color in context menu,
+  default: no. UI related settings have now a separate UI tab in the config editor
+
+### 5.0
+
+- [changed icon design](https://github.com/stax76/mpv.net/blob/master/img/mpvnet.png)
+- libmpv was updated to shinchiro 2019-07-14
+- new or improved config editor settings: screenshot-directory,
+  screenshot-format, screenshot-tag-colorspace, screenshot-high-bit-depth,
+  screenshot-jpeg-source-chroma, screenshot-template, screenshot-jpeg-quality,
+  screenshot-png-compression, screenshot-png-filter
+- mpv.conf preview feature added to config editor, it previews the mpv.conf content
+- in the entire project the term addon was replaced with the term extension,
+  unfortunately this will break user extensions. The reason for this drastic
+  change is that there exist too many different terms, addons, addins,
+  extensions, modules, packages etc.. mpv.net follows Google Chrome as the worlds
+  most popular extendable app, Chrome uses the term Extension.
+- a thread synchronization bug was fixed, the shutdown thread was aborted
+  if it was running more than 3 seconds, this caused the rating extension
+  to fail if it was waiting for a drive to wake up
+- a new JavaScript was included to show the playlist with a smaller font size,
+  the script is located at startup/scripts
+- terminal support added using mpvnet.com !
+- script engine performance and error handling was improved
+- the [scripting wiki page](https://github.com/stax76/mpv.net/wiki/Scripting) was improved
+- the C# scripting host extension was converted from VB to C# because it's not
+  only used for hosting but I also use it now to code and debug script code
+- there was a copy paste bug in the file association feature resulting in keys
+  from mpv being overwritten instead of using mpv.net keys. Thanks to floppyD!
+- there was a exception fixed that happened opening rar files
+- instead of using the OS theme color there are now default colors
+  for dark-color and light-color
+
+### 4.7.7
+
+- on Win 7 the theme color was hardcoded to DarkSlateGrey because
+  WPF was returning a bad color on Win 7, this was fixed by reading
+  the theme color from the Registry on Win 7. If the theme color
+  is identical to the background color it's corrected
+- dark-color setting was added to overwrite the OS theme color used in dark mode,
+  find the setting on the General tab
+- light-color setting was added to overwrite the OS theme color used in non dark mode,
+  find the setting on the General tab
+- various changes regarding input handling, multi media keys and
+  mouse forward/backward were successfully tested
+- it's now possible to use a custom folder as config folder,
+  A TaskDialog shows five options: 1. appdata mpv.net, 2. appdata mpv (shared with mpv),
+  3. portable_config, 4. startup, 5. custom
+- slightly increased startup performance, start-threshold setting added.
+  Threshold in milliseconds to wait for libmpv returning the video resolution
+  before the window is shown, otherwise default dimensions are used as defined
+  by autofit and start-size. Default: 1500
+- autofit-smaller setting added. Minimum window height in percent. Default: 40%
+- autofit-larger setting added. Maximum window height in percent. Default: 75%
+
+### 4.7.3
+
+- fix cursor showing load activity on startup
+- added file size and type to info command using audio files
+- added image format support to the info command, to file
+  association management, to folder loading, to Everything
+- readme/github have a updated features and architecture section
+
+### 4.7.1
+
+- few layout problems were fixed, autosize for instance did not work
+
+### 4.7
+
+- remember-height was replaced with start-size, when start-size is set
+  to video the main video starts directly with the native video size,
+  before it was starting with the autofit size first and was only
+  afterwards resized to the native video size
+- on exit the window location can be saved with remember-position
+- in the learn window of the input editor underscores were stripped
+  because they have a special meaning in WPF labels 
+- fix for keys/input not working for MBTN_LEFT_DBL, MBTN_BACK, MBTN_FORWARD
+- in the learn window of the input editor support was added for
+  mouse left, mouse left double, mouse mid, mouse forward, mouse back
+- libmpv was updated to shinchiro 2019-07-07
+- when border is none it wasn't possible to minimize the window from
+  the task bar because this is the WinForms default behavier. This
+  was fixed by calling Spy++ to the rescue and adding WS_MINIMIZEBOX
+  in CreateParams
+
+### 4.6
+
+- fix for middle mouse button not working
+- fix of logo overlay using a huge amount of memory (thx for the [ghacks article](https://www.ghacks.net/2019/07/05/a-look-at-mpv-net-a-mpv-frontend-with-everything-integration/))
+- fix config dialog showing a message about app restart without reason
+- when multiple files are selected in File Explorer and enter is
+  pressed, the files are opened as selected, the order is random though
+  because Explorer starts multiple mpv.net processes concurrently
+- libmpv was updated to shinchiro 2019-06-30
+- the [mpv.conf defaults](https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/mpv.conf.txt) were changed to show a larger OSC
+- in case a file is opened that has a aspect ratio smaller then 1.2 then
+  the window size will use a aspect ratio of 1.8
+- new JavaScript script osc-visibility.js included in the distribution
+  under startup\scripts. It sets the OSC to be always on for audio files
+  and auto for non audio files
+
+### 4.5
+
+- opening a URL manually no longer uses a input box but uses the clipboard directly
+- the manifest was missing the company attribute which caused
+  mpv.net not appearing in the 'Open with' menu of the File Explorer,
+  thanks to 44vince44 for pointing this out!!!
+- new Python and C# script examples were added to the wiki and the scripting and
+  extension documentation was improved
+- invalid command line arguments were ignored, now an error message is shown
+- a description on how to start mpv.net from Google Chrome was added to the
+  manual, it's useful to play videos from sites like YouTube, find the
+  description [here](https://github.com/stax76/mpv.net/blob/master/Manual.md#chrome-extension)
+- new config setting remember-height added to remember the window height,
+  otherwise the video's native resolution is used
+- support for protocols other then http added
+
+### 4.4
+
+- clipboard-monitoring was replaced by url-whitelist:
+  Keyword whitelist to monitor the clipboard for URLs to play.
+  Default: tube vimeo ard zdf 
+- some settings like colors didn't work because enclosing quotes were missing
+- when single process queue is used the folder is no longer loaded
+- the playlist is never cleared whenever the control key is down but
+  files and URLs are appended instead
+- powershell script hosting bugs were fixed and a new powershell example script
+  was added to the [scripting wiki page](https://github.com/stax76/mpv.net/wiki/Scripting#powershell)
+- the menu entry for the command palette was renamed to 'Show All Commands' and
+  the default key binding was changed to F1 which is also the default in VS Code
+- the default key binding of the Everything media search was changed to F3
+- support for the mpv property 'border' was added to the config editor
+  to show/hide the window decoration (titlebar, border). A toggle menu item and
+  key binding (b) was added as well ([Default Binding](https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/input.conf.txt#L135))
+
+### 4.3.1
+
+- there was a old bug setting the screen property
+
 ### 4.3
 
 - there was new bug in file association feature
@@ -7,7 +412,7 @@
 - the help and layout in the config editor was improved
 - clipboard monitoring for URLs can be disabled in the settings
 - the context menu has a new feature: Open > Add files to playlist,
-  it appends files to the playlist [(Default binding)](https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/inputConf.txt#L33)
+  it appends files to the playlist [(Default binding)](https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/input.conf.txt#L33)
 - a setting was added to force using a single mpv.net process instance
 
 ### 4.1
@@ -49,7 +454,7 @@
 - there was a bug that caused underscores beeing removed from input like MBTN_LEFT_DBL
 - the search clear button in the input editor had a render issue in dark mode
 - new search feature added to search and play media files, requires
-  [Everything](https://www.voidtools.com) to be installed. [Default Binding](https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/inputConf.txt#L29)
+  [Everything](https://www.voidtools.com) to be installed. [Default Binding](https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/input.conf.txt#L29)
 
 ### 3.5
 
@@ -62,6 +467,6 @@
 
 ### 3.4
 
-- 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 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/input.conf.txt#L149)
 - new zip download option added
 - new x86 download option added

LICENSE.txt

@@ -1,21 +1,24 @@
+
 MIT License
 
-Copyright (c) 2017-2019 Frank Skare (stax76)
+Copyright (C) 2017-2020 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:
+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 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.
+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,225 +1,148 @@
+
 ![](https://raw.githubusercontent.com/stax76/mpv.net/master/img/mpvnet.png)
 
-# 🎞 mpv.net
+![GitHub closed pull requests](https://img.shields.io/github/issues-pr-closed/stax76/mpv.net) ![GitHub closed issues](https://img.shields.io/github/issues-closed/stax76/mpv.net) ![GitHub All Releases](https://img.shields.io/github/downloads/stax76/mpv.net/total) ![GitHub tag (latest by date)](https://img.shields.io/github/tag-date/stax76/mpv.net) ![GitHub stars](https://img.shields.io/github/stars/stax76/mpv.net)
 
-mpv.net is a modern media player for Windows that works just like [mpv](https://mpv.io).
+🎞 mpv.net
+==========
 
-#### Based on libmpv
+mpv.net is a modern media player for Windows based on the popular [mpv](https://mpv.io) player.
+
+
+#### Graphical User Interface
+
+Modern GUI with customizable color themes.
 
-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. mpv is like vlc not based on DirectShow or Media Foundation. 
 
 #### Command Line Interface
 
-mpv.net has the [CLI of mpv](https://mpv.io/manual/master/#options).
+mpv.net supports mpvs property based command line switches.
+
 
 #### High quality video output
 
-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.
+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
 
-The OSC of libmpv offers play controls with a modern flat design. ([Screenshot](#main-window-screenshot))
+Play controls with a modern flat design.
+
 
 #### GPU video decoding
 
-libmpv leverages the FFmpeg hwaccel APIs to support DXVA2 video decoding acceleration.
+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)!
+mpv.net is under active development.
+
+
+#### Based on libmpv
+
+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. mpv is like VLC not based on DirectShow or Media Foundation. 
+
 
 Table of contents
 -----------------
 
 - [Features](#features)
-- [Screenshots](#screenshots)
-- [Manual](#manual)
-- [Context Menu](#context-menu)
-- [Settings](#settings)
-- [Scripting](#scripting)
-- [Add-ons](#add-ons)
-- [Architecture](#architecture)
 - [Support](#support)
-- [Links](#links)
-- [Changelog](#changelog)
 - [Download](#download)
+- [Manual](#manual)
+- [Screenshots](#screenshots)
 
-### Features
 
-- Customizable context menu defined in the same file as the key bindings ([Screenshot](#context-menu-screenshot), [Defaults](https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/inputConf.txt))
-- Searchable config dialog ([Screenshot](#config-editor-screenshot), [Defaults](https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/mpvConf.txt))
-- Searchable input (key/mouse) binding editor ([Screenshot](#input-editor-screenshot), [Defaults](https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/inputConf.txt))
-- Searchable command palette to quickly launch commands and look for keys ([Screenshot](#command-palette-screenshot))
-- Modern UI with dark mode ([Screenshot](#config-editor-screenshot))
-- 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
-- [Command Line Interface](https://mpv.io/manual/master/#options)
+Features
+--------
+
+- High degree of mpv compatibility, almost all mpv features are available
+- Customizable context menu defined in the same file as the key bindings
+- Config dialog
+- Shorcut key editor
+- Many features like the config editor and shortcut key editor are fully searchable
+- Configuration files that are easy to read and edit
+- Command palette to quickly find commands and keys
+- Modern graphical user interface with customizable color themes
+- Extension API for .NET languages (C#, VB.NET and F#)
+- Scripting API for C#, Lua, JavaScript and PowerShell
+- JSON IPC to control the player with a external programs
+- On Screen Controler (OSC, play control buttons) with modern flat design
+- Command Line Interface
+- Started from a terminal status and debug output is printed on the terminal
 - 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
-- Search feature powered by [Everything](https://www.voidtools.com) to find and play media ([Screenshot](#media-search-screenshot))
+- 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
+- File search feature powered by the popular search and index tool Everything
+- Browser extensions to start mpv.net from the browser
+- Fast seek performance
+- Fast startup performance
+- Usable as video player, audio player and image viewer with a wide range of supported formats
+- Built-in decoders, no external codecs have to be installed
+- Setup as x64, x86, installer, portable, Chocolatey and Scoop
+- Build-in media streaming via youtube-dl
+- File associations can be created by the setup and from the player
+- External audio and subtitle files can be loaded manually or automatically
+- Screenshot feature
+- File history feature to log time and filename
+- Watch later feature to save the position
+- Files can be enqueued from File Explorer
+- Update check and update routine
 
-### Screenshots
 
-#### Main Window Screenshot
+## [Support](Manual.md#support)
+
+[Support section of the manual.](Manual.md#support)
+
+
+## [Download](Manual.md#download)
+
+[Download section of the manual.](Manual.md#download)
+
+
+## [Manual](Manual.md)
+
+[The mpv.net documentation.](Manual.md)
+
+
+Screenshots
+-----------
+
+#### Main Window
 
 ![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
+
+Context menu using dark mode.
 
 ![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.
+#### Config Editor
+
+Searchable config editor as alternative to edit the conf file manually.
 
 ![](https://raw.githubusercontent.com/stax76/mpv.net/master/img/ConfEditor.png)
 
-#### Input Editor Screenshot
 
-A searchable key and mouse binding editor.
+#### Terminal
+
+OSD console and status printed on the terminal.
+
+![](https://raw.githubusercontent.com/stax76/mpv.net/master/img/Terminal.png)
+
+
+#### Input Editor
+
+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
+
+Command Palette to find commands and shortcut keys easily.
 
 ![Command Palette](https://raw.githubusercontent.com/stax76/mpv.net/master/img/CommandPalette.png)
-
-#### Media Search Screenshot
-
-Media search feature powered by [Everything](https://www.voidtools.com) to find and play media.
-
-![Media Search](https://raw.githubusercontent.com/stax76/mpv.net/master/img/MediaSearch.png)
-
-### Manual
-
-[Manual](Manual.md)
-
-### Context Menu
-
-The context menu can be customized via input.conf file located in the config directory:
-
-```Text
-C:\Users\%username%\AppData\Roaming\mpv\input.conf
-```
-
-if it's missing mpv.net generates it with the following defaults:
-
-<https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/inputConf.txt>
-
-input.conf defines mpv's key and mouse bindings and mpv.net uses comments to define the context menu.
-
-### Settings
-
-mpv.net is able to share the settings with mpv and mpv.net uses the same logic to decide from where the settings are loaded. The default location is:
-
-```Text
-C:\Users\%username%\AppData\Roaming\mpv\mpv.conf
-```
-
-If a directory named portable_config next to the mpvnet.exe exists, all config will be loaded from this directory only.
-
-```Text
-<startup>\portable_config\mpv.conf
-```
-
-In case there isn't any config folder mpv.net asks where to create it. If no mpv.conf file exists mpv.net generates it with the following defaults:
-
-<https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/mpvConf.txt>
-
-Config files located in the same directory as mpvnet.exe are loaded with lower priority. Some config files are loaded only once, which means that e.g. of 2 input.conf files located in two config directories, only the one from the directory with higher priority will be loaded.
-
-The key bindings and the context menu definitions are stored in the input.conf file,
-if it's missing mpv.net generates it with the following defaults:
-
-<https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/inputConf.txt>
-
-mpv.net supports almost all mpv settings and features, [limitations are listed in the wiki](https://github.com/stax76/mpv.net/wiki/Limitations).
-
-### Scripting
-
-[Scripting wiki page](https://github.com/stax76/mpv.net/wiki/Scripting)
-
-### Add-ons
-
-[Add-on wiki page](https://github.com/stax76/mpv.net/wiki/Addons)
-
-### Architecture
-
-mpv.net is written in C# 7.0 and runs on the .NET framework 4.7 or higher.
-
-The Add-on implementation is based on the [Managed Extensibility Framework](https://docs.microsoft.com/en-us/dotnet/framework/mef/).
-
-There are no specific extension or scripting interfaces but instead everyting
-is accessible for .NET compatible languages (C#, VB.NET, F#, Python, PowerShell),
-this decision was made to keep the code simple and lightweight.
-
-Python scripting is implemented with IronPython which uses Python 2.7.
-
-The main/video window is WinForms based, all other windows are WPF based.
-
-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 6000 lines of code and markup.
-
-IDE, Editor: Visual Studio, Visual Studio Code.
-
-Due to mpv.net being my first WPF app and mpv.net never meant to be a large
-application best practices and design pattern are not always applied.
-
-Third party components:
-
-- [libmpv, the heard and soul of mpv.net](https://mpv.io/)
-- [MediaInfo, no media related project could do without](https://mediaarea.net/en/MediaInfo)
-- [Tommy, a single file TOML parser](https://github.com/dezhidki/Tommy)
-- [IronPython, bringing Python to dotnet](https://ironpython.net/)
-- [CS-Script, scripting with C#](http://www.csscript.net/)
-- [Everything, a blazing fast file search service](https://www.voidtools.com)
-
-### 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)
-
-[frank.skare.de@gmail.com](mailto:frank.skare.de@gmail.com?Subject=mpv.net%20support)
-
-### 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>
-
-### Changelog
-
-[Changelog](Changelog.md)
-
-### Download
-
-<https://github.com/stax76/mpv.net/releases>

Release.ps1

@@ -0,0 +1,113 @@
+
+$ErrorActionPreference = 'Stop'
+
+$include = @(
+    '*.cs',
+    '*.csproj',
+    '*.iss',
+    '*.js',
+    '*.lua',
+    '*.ps1',
+    '*.resx',
+    '*.sln',
+    '*.txt',
+    '*.xaml'
+)
+
+$files = Get-ChildItem -Path $PSScriptRoot -Recurse -File -Include $include
+
+foreach ($file in $files)
+{
+    $lines = Get-Content $file
+
+    foreach ($line in $lines)
+    {
+        foreach ($char in $line.ToCharArray())
+        {
+            $codePoint = [int]$char
+
+            if ($codePoint -gt 127)
+            {
+                throw "Non ASCII char $char in file '$($file.FullName)' in line: $line"
+            }
+        }
+    }
+}
+
+$desktopDir  = [Environment]::GetFolderPath('Desktop')
+$exePath     = $PSScriptRoot + '\mpv.net\bin\x64\mpvnet.exe'
+$versionInfo = [Diagnostics.FileVersionInfo]::GetVersionInfo($exePath)
+$vsDir       = 'C:\Program Files (x86)\Microsoft Visual Studio\2019'
+$msBuild     = $vsDir + '\Community\MSBuild\Current\Bin\MSBuild.exe'
+$inno        = 'C:\Program Files (x86)\Inno Setup 6\ISCC.exe'
+$7z          = 'C:\Program Files\7-Zip\7z.exe'
+
+if ($versionInfo.FilePrivatePart -eq 0)
+{
+    & $msBuild mpv.net.sln -t:Rebuild -p:Configuration=Debug -p:Platform=x64
+    if ($LastExitCode) { throw $LastExitCode }
+
+    & $msBuild mpv.net.sln -t:Rebuild -p:Configuration=Debug -p:Platform=x86
+    if ($LastExitCode) { throw $LastExitCode }
+
+    & $inno /Darch=x64 setup.iss
+    if ($LastExitCode) { throw $LastExitCode }
+
+    & $inno /Darch=x86 setup.iss
+    if ($LastExitCode) { throw $LastExitCode }
+
+    $targetDir = $desktopDir + "\mpv.net-portable-x64-$($versionInfo.FileVersion)"
+    Copy-Item .\mpv.net\bin\x64 $targetDir -Recurse -Exclude System.Management.Automation.xml
+
+    & $7z a -t7z -mx9 "$targetDir.7z" -r "$targetDir\*"
+    if ($LastExitCode) { throw $LastExitCode }
+
+    & $7z a -tzip -mx9 "$targetDir.zip" -r "$targetDir\*"
+    if ($LastExitCode) { throw $LastExitCode }
+
+    $targetDir = $desktopDir + "\mpv.net-portable-x86-$($versionInfo.FileVersion)"
+    Copy-Item .\mpv.net\bin\x86 $targetDir -Recurse -Exclude System.Management.Automation.xml
+
+    & $7z a -t7z -mx9 "$targetDir.7z" -r "$targetDir\*"
+    if ($LastExitCode) { throw $LastExitCode }
+
+    & $7z a -tzip -mx9 "$targetDir.zip" -r "$targetDir\*"
+    if ($LastExitCode) { throw $LastExitCode }
+}
+else
+{
+    & $msBuild mpv.net.sln -t:Rebuild -p:Configuration=Debug -p:Platform=x64
+    if ($LastExitCode) { throw $LastExitCode }
+
+    $targetDir = "$desktopDir\mpv.net-portable-x64-$($versionInfo.FileVersion)-beta"
+    Copy-Item .\mpv.net\bin\x64 $targetDir -Recurse -Exclude System.Management.Automation.xml
+    & $7z a -t7z -mx9 "$targetDir.7z" -r "$targetDir\*"
+    if ($LastExitCode) { throw $LastExitCode }
+
+    $cloudDirectories = 'C:\Users\frank\OneDrive\Public\mpv.net\',
+                        'C:\Users\frank\Dropbox\Public\mpv.net\'
+
+    foreach ($cloudDirectory in $cloudDirectories)
+    {
+        if (-not (Test-Path $cloudDirectory))
+        {
+            throw $cloudDirectory
+        }
+
+        $targetFile = $cloudDirectory + (Split-Path $targetDir -Leaf) + '.7z'
+
+        if (Test-Path $targetFile)
+        {
+            throw $targetFile
+        }
+
+        Copy-Item ($targetDir + '.7z') $targetFile
+        Invoke-Item $cloudDirectory
+    }
+}
+
+Set-Clipboard ($versionInfo.FileVersion + "`n`n" +
+    'https://github.com/stax76/mpv.net/blob/master/Changelog.md' + "`n`n" +
+    'https://github.com/stax76/mpv.net#download')
+
+Write-Host 'successfully finished' -ForegroundColor Green

addons/CSScriptAddon/CSScriptAddon.vb

@@ -1,35 +0,0 @@
-Imports System.ComponentModel.Composition
-Imports System.IO
-Imports System.Windows.Forms
-
-Imports mpvnet
-
-Imports CSScriptLibrary
-
-<Export(GetType(IAddon))>
-Public Class CSScriptAddon
-    Implements IAddon
-
-    Sub New()
-        Dim scriptFiles As New List(Of String)
-
-        If Directory.Exists(mp.ConfFolder + "scripts") Then
-            scriptFiles.AddRange(Directory.GetFiles(mp.ConfFolder + "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 scriptFiles
-            Try
-                CSScriptLibrary.CSScript.Evaluator.LoadCode(File.ReadAllText(i))
-            Catch ex As Exception
-                Msg.ShowException(ex)
-            End Try
-        Next
-    End Sub
-End Class

addons/CSScriptAddon/CSScriptAddon.vbproj

@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{71808A87-8B1C-4DF8-957C-D79C3B164CCA}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <RootNamespace>CSScriptAddon</RootNamespace>
-    <AssemblyName>CSScriptAddon</AssemblyName>
-    <FileAlignment>512</FileAlignment>
-    <MyType>Windows</MyType>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <DefineDebug>true</DefineDebug>
-    <DefineTrace>true</DefineTrace>
-    <OutputPath>..\mpv.net\bin\Addons\CSScriptAddon\</OutputPath>
-    <DocumentationFile>
-    </DocumentationFile>
-    <NoWarn>42105,42106,42107,42353,42354,42355</NoWarn>
-    <WarningsAsErrors>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</WarningsAsErrors>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <DefineDebug>false</DefineDebug>
-    <DefineTrace>true</DefineTrace>
-    <Optimize>true</Optimize>
-    <OutputPath>..\mpv.net\bin\Addons\CSScriptAddon\</OutputPath>
-    <DocumentationFile>
-    </DocumentationFile>
-    <NoWarn>42105,42106,42107,42353,42354,42355</NoWarn>
-    <WarningsAsErrors>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</WarningsAsErrors>
-  </PropertyGroup>
-  <PropertyGroup>
-    <OptionExplicit>On</OptionExplicit>
-  </PropertyGroup>
-  <PropertyGroup>
-    <OptionCompare>Binary</OptionCompare>
-  </PropertyGroup>
-  <PropertyGroup>
-    <OptionStrict>On</OptionStrict>
-  </PropertyGroup>
-  <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>
-      <HintPath>.\CSScriptLibrary.dll</HintPath>
-    </Reference>
-    <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" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Net.Http" />
-  </ItemGroup>
-  <ItemGroup>
-    <Import Include="Microsoft.VisualBasic" />
-    <Import Include="System" />
-    <Import Include="System.Collections" />
-    <Import Include="System.Collections.Generic" />
-    <Import Include="System.Data" />
-    <Import Include="System.Diagnostics" />
-    <Import Include="System.Linq" />
-    <Import Include="System.Xml.Linq" />
-    <Import Include="System.Threading.Tasks" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="CSScriptAddon.vb" />
-    <Compile Include="My Project\AssemblyInfo.vb" />
-    <Compile Include="My Project\Application.Designer.vb">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Application.myapp</DependentUpon>
-    </Compile>
-    <Compile Include="My Project\Resources.Designer.vb">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="My Project\Settings.Designer.vb">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="My Project\Resources.resx">
-      <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.vb</LastGenOutput>
-      <CustomToolNamespace>My.Resources</CustomToolNamespace>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="My Project\Application.myapp">
-      <Generator>MyApplicationCodeGenerator</Generator>
-      <LastGenOutput>Application.Designer.vb</LastGenOutput>
-    </None>
-    <None Include="My Project\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <CustomToolNamespace>My</CustomToolNamespace>
-      <LastGenOutput>Settings.Designer.vb</LastGenOutput>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="CSScriptLibrary.dll" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\mpv.net\mpv.net.csproj">
-      <Project>{1751f378-8edf-4b62-be6d-304c7c287089}</Project>
-      <Name>mpv.net</Name>
-      <Private>False</Private>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
-</Project>

addons/CSScriptAddon/My Project/Application.Designer.vb

@@ -1,13 +0,0 @@
-'------------------------------------------------------------------------------
-' <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>
-'------------------------------------------------------------------------------
-
-Option Strict On
-Option Explicit On
-

addons/CSScriptAddon/My Project/Application.myapp

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<MyApplicationData xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <MySubMain>false</MySubMain>
-  <SingleInstance>false</SingleInstance>
-  <ShutdownMode>0</ShutdownMode>
-  <EnableVisualStyles>true</EnableVisualStyles>
-  <AuthenticationMode>0</AuthenticationMode>
-  <ApplicationType>1</ApplicationType>
-  <SaveMySettingsOnExit>true</SaveMySettingsOnExit>
-</MyApplicationData>

addons/CSScriptAddon/My Project/AssemblyInfo.vb

@@ -1,35 +0,0 @@
-Imports System
-Imports System.Reflection
-Imports System.Runtime.InteropServices
-
-' General Information about an assembly is controlled through the following
-' set of attributes. Change these attribute values to modify the information
-' associated with an assembly.
-
-' Review the values of the assembly attributes
-
-<Assembly: AssemblyTitle("CSScriptAddon")>
-<Assembly: AssemblyDescription("")>
-<Assembly: AssemblyCompany("")>
-<Assembly: AssemblyProduct("CSScriptAddon")>
-<Assembly: AssemblyCopyright("Copyright ©  2019")>
-<Assembly: AssemblyTrademark("")>
-
-<Assembly: ComVisible(False)>
-
-'The following GUID is for the ID of the typelib if this project is exposed to COM
-<Assembly: Guid("4a748201-3948-497d-b156-7d172a332bd6")>
-
-' Version information for an assembly consists of the following four values:
-'
-'      Major Version
-'      Minor Version
-'      Build Number
-'      Revision
-'
-' 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.0.0.0")>
-<Assembly: AssemblyFileVersion("1.0.0.0")>

addons/CSScriptAddon/My Project/Resources.Designer.vb

@@ -1,63 +0,0 @@
-'------------------------------------------------------------------------------
-' <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>
-'------------------------------------------------------------------------------
-
-Option Strict On
-Option Explicit On
-
-Imports System
-
-Namespace My.Resources
-    
-    '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.
-    '''<summary>
-    '''  A strongly-typed resource class, for looking up localized strings, etc.
-    '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0"),  _
-     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.Microsoft.VisualBasic.HideModuleNameAttribute()>  _
-    Friend Module Resources
-        
-        Private resourceMan As Global.System.Resources.ResourceManager
-        
-        Private resourceCulture As Global.System.Globalization.CultureInfo
-        
-        '''<summary>
-        '''  Returns the cached ResourceManager instance used by this class.
-        '''</summary>
-        <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
-        Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
-            Get
-                If Object.ReferenceEquals(resourceMan, Nothing) Then
-                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("CSScriptAddon.Resources", GetType(Resources).Assembly)
-                    resourceMan = temp
-                End If
-                Return resourceMan
-            End Get
-        End Property
-        
-        '''<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)>  _
-        Friend Property Culture() As Global.System.Globalization.CultureInfo
-            Get
-                Return resourceCulture
-            End Get
-            Set
-                resourceCulture = value
-            End Set
-        End Property
-    End Module
-End Namespace

addons/CSScriptAddon/My Project/Resources.resx

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

addons/CSScriptAddon/My Project/Settings.Designer.vb

@@ -1,73 +0,0 @@
-'------------------------------------------------------------------------------
-' <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>
-'------------------------------------------------------------------------------
-
-Option Strict On
-Option Explicit On
-
-
-Namespace My
-    
-    <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0"),  _
-     Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
-    Partial Friend NotInheritable Class MySettings
-        Inherits Global.System.Configuration.ApplicationSettingsBase
-        
-        Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings)
-        
-#Region "My.Settings Auto-Save Functionality"
-#If _MyType = "WindowsForms" Then
-    Private Shared addedHandler As Boolean
-
-    Private Shared addedHandlerLockObject As New Object
-
-    <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
-    Private Shared Sub AutoSaveSettings(sender As Global.System.Object, e As Global.System.EventArgs)
-        If My.Application.SaveMySettingsOnExit Then
-            My.Settings.Save()
-        End If
-    End Sub
-#End If
-#End Region
-        
-        Public Shared ReadOnly Property [Default]() As MySettings
-            Get
-                
-#If _MyType = "WindowsForms" Then
-               If Not addedHandler Then
-                    SyncLock addedHandlerLockObject
-                        If Not addedHandler Then
-                            AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings
-                            addedHandler = True
-                        End If
-                    End SyncLock
-                End If
-#End If
-                Return defaultInstance
-            End Get
-        End Property
-    End Class
-End Namespace
-
-Namespace My
-    
-    <Global.Microsoft.VisualBasic.HideModuleNameAttribute(),  _
-     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()>  _
-    Friend Module MySettingsProperty
-        
-        <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>  _
-        Friend ReadOnly Property Settings() As Global.CSScriptAddon.My.MySettings
-            Get
-                Return Global.CSScriptAddon.My.MySettings.Default
-            End Get
-        End Property
-    End Module
-End Namespace

addons/CSScriptAddon/My Project/Settings.settings

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

addons/RatingAddon/RatingAddon.cs

@@ -1,58 +0,0 @@
-using System;
-using System.ComponentModel.Composition;
-using System.Collections.Generic;
-using System.IO;
-
-using mpvnet;
-
-namespace RatingAddon
-{
-    [Export(typeof(IAddon))]
-    public class RatingAddon : IAddon
-    {
-        Dictionary<string, int> Dic = new Dictionary<string, int>();
-
-        public RatingAddon()
-        {
-            mp.ClientMessage += mpv_ClientMessage;
-            mp.Shutdown += mpv_Shutdown;
-        }
-
-        void mpv_Shutdown()
-        {
-            foreach (var i in Dic)
-            {
-                string filepath = i.Key;
-                int rating = i.Value;
-
-                if (String.IsNullOrEmpty(filepath) || ! File.Exists(filepath))
-                    return;
-
-                string basename = Path.GetFileNameWithoutExtension(filepath);
-
-                for (int x = 0; x < 6; x++)
-                    if (basename.Contains(" (" + x.ToString() + "stars)"))
-                        basename = basename.Replace(" (" + x.ToString() + "stars)", "");
-
-                basename += $" ({rating}stars)";
-                string newPath = Path.Combine(Path.GetDirectoryName(filepath), basename + Path.GetExtension(filepath));
-
-                if (filepath.ToLower() != newPath.ToLower())
-                    File.Move(filepath, newPath);
-
-                File.SetLastWriteTime(newPath, DateTime.Now);
-            }            
-        }
-
-        void mpv_ClientMessage(string[] args)
-        {
-            int rating;
-
-            if (args?.Length != 2 || args[0] != "rate-file" || ! int.TryParse(args[1], out rating))
-                return;
-
-            Dic[mp.get_property_string("path")] = rating;
-            mp.commandv("show-text", $"Rating: {rating}");
-        }
-    }
-}

addons/TestAddon/TestAddon.cs

@@ -1,27 +0,0 @@
-using System.ComponentModel.Composition;
-
-using mpvnet;
-
-namespace TestAddon
-{
-    [Export(typeof(IAddon))]
-    public class TestAddon : IAddon
-    {
-        // do some init work in constructor
-        public TestAddon()
-        {
-            // Observe changes of the fullscreen property.
-            // You can find a list of available mpv properties
-            // in mpv.net's wiki on github or use mpv --list-properties.
-            // You can test properties in mpv.net in the menu at:
-            // Tools > Execute mpv command
-            // where you can enter: show-text ${fullscreen}
-            mp.observe_property_bool("fullscreen", OnFullscreenChange);
-        }
-
-        void OnFullscreenChange(bool val)
-        {
-            mp.commandv("show-text", "fullscreen: " + val.ToString());
-        }
-    }
-}

extensions/RatingExtension/Properties/AssemblyInfo.cs

@@ -5,12 +5,12 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("RatingAddon")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyTitle("RatingExtension")]
+[assembly: AssemblyDescription("RatingExtension")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("RatingAddon")]
-[assembly: AssemblyCopyright("Copyright ©  2017")]
+[assembly: AssemblyCompany("Frank Skare (stax76)")]
+[assembly: AssemblyProduct("RatingExtension")]
+[assembly: AssemblyCopyright("Copyright (C) 2017-2020 Frank Skare (stax76)")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

extensions/RatingExtension/RatingExtension.cs

@@ -0,0 +1,66 @@
+// This extension writes a rating to the filename of rated videos when mpv.net shuts down.
+
+// The input.conf defaults contain key bindings for this extension to set ratings.
+
+using System;
+using System.ComponentModel.Composition;
+using System.Collections.Generic;
+using System.IO;
+
+using mpvnet;
+using static mpvnet.Core;
+
+namespace RatingExtension // the assembly name must end with 'Extension'
+{
+    [Export(typeof(IExtension))]
+    public class RatingExtension : IExtension
+    {
+        // dictionory to store the filename and the rating
+        Dictionary<string, int> Dic = new Dictionary<string, int>();
+
+        public RatingExtension() // plugin initialization
+        {
+            core.ClientMessage += ClientMessage; //handles keys defined in input.conf
+            core.Shutdown += Shutdown; // handles MPV_EVENT_SHUTDOWN
+        }
+
+        // handles MPV_EVENT_SHUTDOWN
+        void Shutdown()
+        {
+            foreach (var i in Dic)
+            {
+                string filepath = i.Key;
+                int rating = i.Value;
+                if (String.IsNullOrEmpty(filepath) || !File.Exists(filepath))
+                    return;
+                string basename = Path.GetFileNameWithoutExtension(filepath);
+
+                for (int x = 0; x < 6; x++)
+                    if (basename.Contains(" (" + x + "stars)"))
+                        basename = basename.Replace(" (" + x + "stars)", "");
+
+                basename += $" ({rating}stars)";
+                string newPath = Path.Combine(Path.GetDirectoryName(filepath), basename + Path.GetExtension(filepath));
+                if (filepath.ToLower() != newPath.ToLower())
+                    File.Move(filepath, newPath);
+                File.SetLastWriteTime(newPath, DateTime.Now);
+            }            
+        }
+
+        //handles keys defined in input.conf
+        void ClientMessage(string[] args)
+        {
+            if (args[0] != "rate-file") return;
+
+            if (int.TryParse(args[1], out int rating))
+            {
+                string path = core.get_property_string("path");
+                if (!File.Exists(path)) return;
+                Dic[path] = rating;
+                core.commandv("show-text", $"Rating: {rating}");
+            }
+            else if (args[1] == "about")
+                Msg.Show("Rating Extension", "This extension writes a rating to the filename of rated videos when mpv.net shuts down.\n\nThe input.conf defaults contain key bindings for this extension to set ratings.");
+        }
+    }
+}

extensions/RatingExtension/RatingExtension.csproj

@@ -4,53 +4,18 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{06F854B0-00F9-4B53-94D9-0BE65A7C55D8}</ProjectGuid>
+    <ProjectGuid>{55C88710-539D-4402-84C8-31694841C731}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>TestAddon</RootNamespace>
-    <AssemblyName>TestAddon</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <RootNamespace>RatingExtension</RootNamespace>
+    <AssemblyName>RatingExtension</AssemblyName>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <Deterministic>true</Deterministic>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </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>
-  </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>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\Debug\</OutputPath>
+    <OutputPath>..\..\mpv.net\bin\x86\Extensions\RatingExtension\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x86</PlatformTarget>
@@ -58,7 +23,7 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>bin\x86\Release\</OutputPath>
+    <OutputPath>..\..\mpv.net\bin\x86\Extensions\RatingExtension\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -66,6 +31,24 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>..\..\mpv.net\bin\x64\Extensions\RatingExtension\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>..\..\mpv.net\bin\x64\Extensions\RatingExtension\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.Composition" />
@@ -78,7 +61,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="TestAddon.cs" />
+    <Compile Include="RatingExtension.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>

extensions/ScriptingExtension/Properties/AssemblyInfo.cs

@@ -5,12 +5,12 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("TestAddon")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyTitle("RatingExtension")]
+[assembly: AssemblyDescription("RatingExtension")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("TestAddon")]
-[assembly: AssemblyCopyright("Copyright ©  2019")]
+[assembly: AssemblyCompany("Frank Skare (stax76)")]
+[assembly: AssemblyProduct("RatingExtension")]
+[assembly: AssemblyCopyright("Copyright (C) 2017-2020 Frank Skare (stax76)")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -20,7 +20,7 @@ using System.Runtime.InteropServices;
 [assembly: ComVisible(false)]
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("06f854b0-00f9-4b53-94d9-0be65a7c55d8")]
+[assembly: Guid("55c88710-539d-4402-84c8-31694841c731")]
 
 // Version information for an assembly consists of the following four values:
 //

extensions/ScriptingExtension/ScriptingExtension.cs

@@ -0,0 +1,56 @@
+
+// This extension implements the C# scripting feature of mpv.net which
+// is based on CS-Script (https://www.cs-script.net).
+
+// I also use this extension to code scripts in order to have full
+// code completion and debugger support, once the script code is
+// finished I move it from the extension to a standalone script.
+
+using System;
+using System.ComponentModel.Composition;
+using System.Collections.Generic;
+using System.IO;
+
+using mpvnet;
+using CSScriptLibrary;
+using static mpvnet.Core;
+
+// the file name of extensions must end with 'Extension'
+namespace ScriptingExtension
+{
+    [Export(typeof(IExtension))]
+    public class ScriptingExtension : IExtension
+    {
+        //Script Script;
+
+        public ScriptingExtension()
+        {
+            //Script = new Script();
+            List<string> files = new List<string>();
+
+            if (Directory.Exists(core.ConfigFolder + "scripts-cs"))
+                files.AddRange(Directory.GetFiles(core.ConfigFolder + "scripts-cs", "*.cs"));
+
+            if (Directory.Exists(Folder.Startup + "scripts"))
+                foreach (string path in Directory.GetFiles(Folder.Startup + "scripts", "*.cs"))
+                    files.AddRange(Directory.GetFiles(Folder.Startup + "scripts", "*.cs"));
+
+            if (files.Count == 0)
+                return;
+
+            CSScriptLibrary.CSScript.EvaluatorConfig.Engine = EvaluatorEngine.CodeDom;
+
+            foreach (string file in files)
+            {
+                try
+                {
+                    CSScriptLibrary.CSScript.Evaluator.LoadCode(File.ReadAllText(file));
+                }
+                catch (Exception e)
+                {
+                    App.ShowException(e);
+                }
+            }
+        }
+    }
+}

extensions/ScriptingExtension/ScriptingExtension.csproj

@@ -4,35 +4,18 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{55C88710-539D-4402-84C8-31694841C731}</ProjectGuid>
+    <ProjectGuid>{94255EF2-C823-4D82-9017-0E993CC0F5A1}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>RatingAddon</RootNamespace>
-    <AssemblyName>RatingAddon</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <RootNamespace>ScriptingExtension</RootNamespace>
+    <AssemblyName>ScriptingExtension</AssemblyName>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\mpv.net\bin\Addons\RatingAddon\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <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\Addons\RatingAddon\</OutputPath>
+    <OutputPath>..\..\mpv.net\bin\x86\Extensions\ScriptingExtension\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x86</PlatformTarget>
@@ -40,7 +23,7 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>..\mpv.net\bin\x86\Addons\RatingAddon\</OutputPath>
+    <OutputPath>..\..\mpv.net\bin\x86\Extensions\ScriptingExtension\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -50,7 +33,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..\..\mpv.net\bin\x64\Addons\RatingAddon\</OutputPath>
+    <OutputPath>..\..\mpv.net\bin\x64\Extensions\ScriptingExtension\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x64</PlatformTarget>
@@ -58,7 +41,7 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>..\mpv.net\bin\x64\Addons\RatingAddon\</OutputPath>
+    <OutputPath>..\..\mpv.net\bin\x64\Extensions\ScriptingExtension\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -67,9 +50,13 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="CSScriptLibrary">
+      <HintPath>.\CSScriptLibrary.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -78,8 +65,9 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="RatingAddon.cs" />
+    <Compile Include="ScriptingExtension.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="script.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\mpv.net\mpv.net.csproj">

extensions/ScriptingExtension/ScriptingExtension.sln

@@ -0,0 +1,31 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29123.88
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ScriptingExtension", "ScriptingExtension.csproj", "{55C88710-539D-4402-84C8-31694841C731}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{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|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
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {C8A53BF6-B00A-4215-B9D7-801ADB9C8F60}
+	EndGlobalSection
+EndGlobal

extensions/ScriptingExtension/script.cs

@@ -0,0 +1,19 @@
+
+using System.IO;
+
+using mpvnet;
+using static mpvnet.Core;
+
+class Script
+{
+    public Script()
+    {
+        core.Shutdown += Shutdown;
+    }
+
+    void Shutdown()
+    {
+        foreach (string file in Directory.GetFiles(@"C:\Users\frank\Desktop\aaa"))
+            File.Delete(file);
+    }
+}

mpv.net.sln

@@ -5,70 +5,42 @@ 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
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "CSScriptAddon", "addons\CSScriptAddon\CSScriptAddon.vbproj", "{71808A87-8B1C-4DF8-957C-D79C3B164CCA}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RatingExtension", "extensions\RatingExtension\RatingExtension.csproj", "{55C88710-539D-4402-84C8-31694841C731}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RatingAddon", "addons\RatingAddon\RatingAddon.csproj", "{55C88710-539D-4402-84C8-31694841C731}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestAddon", "addons\TestAddon\TestAddon.csproj", "{06F854B0-00F9-4B53-94D9-0BE65A7C55D8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ScriptingExtension", "extensions\ScriptingExtension\ScriptingExtension.csproj", "{94255EF2-C823-4D82-9017-0E993CC0F5A1}"
 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
-		{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|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|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|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
-		{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
-		{06F854B0-00F9-4B53-94D9-0BE65A7C55D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{06F854B0-00F9-4B53-94D9-0BE65A7C55D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{06F854B0-00F9-4B53-94D9-0BE65A7C55D8}.Debug|x64.ActiveCfg = Debug|x64
-		{06F854B0-00F9-4B53-94D9-0BE65A7C55D8}.Debug|x64.Build.0 = Debug|x64
-		{06F854B0-00F9-4B53-94D9-0BE65A7C55D8}.Debug|x86.ActiveCfg = Debug|x86
-		{06F854B0-00F9-4B53-94D9-0BE65A7C55D8}.Debug|x86.Build.0 = Debug|x86
-		{06F854B0-00F9-4B53-94D9-0BE65A7C55D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{06F854B0-00F9-4B53-94D9-0BE65A7C55D8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{06F854B0-00F9-4B53-94D9-0BE65A7C55D8}.Release|x64.ActiveCfg = Release|Any CPU
-		{06F854B0-00F9-4B53-94D9-0BE65A7C55D8}.Release|x64.Build.0 = Release|Any CPU
-		{06F854B0-00F9-4B53-94D9-0BE65A7C55D8}.Release|x86.ActiveCfg = Release|Any CPU
-		{06F854B0-00F9-4B53-94D9-0BE65A7C55D8}.Release|x86.Build.0 = Release|Any CPU
+		{94255EF2-C823-4D82-9017-0E993CC0F5A1}.Debug|x64.ActiveCfg = Debug|x64
+		{94255EF2-C823-4D82-9017-0E993CC0F5A1}.Debug|x64.Build.0 = Debug|x64
+		{94255EF2-C823-4D82-9017-0E993CC0F5A1}.Debug|x86.ActiveCfg = Debug|x86
+		{94255EF2-C823-4D82-9017-0E993CC0F5A1}.Debug|x86.Build.0 = Debug|x86
+		{94255EF2-C823-4D82-9017-0E993CC0F5A1}.Release|x64.ActiveCfg = Release|x64
+		{94255EF2-C823-4D82-9017-0E993CC0F5A1}.Release|x64.Build.0 = Release|x64
+		{94255EF2-C823-4D82-9017-0E993CC0F5A1}.Release|x86.ActiveCfg = Release|x86
+		{94255EF2-C823-4D82-9017-0E993CC0F5A1}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

mpv.net/App.config

@@ -3,6 +3,6 @@
     <configSections>
     </configSections>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
     </startup>
 </configuration>

mpv.net/Controls/SearchTextBoxUserControl.xaml

@@ -1,13 +0,0 @@
-<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/DynamicGUI/DynamicGUI.cs

@@ -1,4 +1,5 @@
-using System;
+
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
@@ -15,8 +16,10 @@ namespace DynamicGUI
         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"])
@@ -29,34 +32,37 @@ namespace DynamicGUI
                     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)
+                else
                 {
                     StringSetting stringSetting = new StringSetting();
                     baseSetting = stringSetting;
-                    stringSetting.Default = setting["default"];
+                    stringSetting.Default = setting.HasKey("default") ? setting["default"].ToString() : "";
                 }
 
                 baseSetting.Name = setting["name"];
+                baseSetting.File = setting["file"];
                 baseSetting.Filter = setting["filter"];
 
                 if (setting.HasKey("help")) baseSetting.Help = setting["help"];
-                if (setting.HasKey("helpurl")) baseSetting.HelpURL = setting["helpurl"];
+                if (setting.HasKey("url")) baseSetting.URL = setting["url"];
                 if (setting.HasKey("width")) baseSetting.Width = setting["width"];
                 if (setting.HasKey("type")) baseSetting.Type = setting["type"];
 
@@ -66,17 +72,30 @@ namespace DynamicGUI
         }
     }
 
+    public class ConfItem
+    {
+        public string Name { get; set; } = "";
+        public string Value { get; set; } = "";
+        public string Comment { get; set; } = "";
+        public string LineComment { get; set; } = "";
+        public string Section { get; set; } = "";
+        public string File { get; set; } = "";
+        public bool IsSectionItem { get; set; }
+        public SettingBase SettingBase { get; set; }
+    }
+
     public abstract class SettingBase
     {
         public string Name { get; set; }
+        public string File { 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 URL { get; set; }
         public string Filter { get; set; }
         public string Type { get; set; }
         public int Width { get; set; }
+        public ConfItem ConfItem { get; set; }
     }
 
     public class StringSetting : SettingBase
@@ -95,7 +114,7 @@ namespace DynamicGUI
 
         public OptionSetting OptionSetting { get; set; }
 
-        private string _Text;
+        string _Text;
 
         public string Text
         {
@@ -106,7 +125,10 @@ namespace DynamicGUI
         public bool Checked
         {
             get => OptionSetting.Value == Name ;
-            set { if (value) OptionSetting.Value = Name; }
+            set {
+                if (value)
+                    OptionSetting.Value = Name;
+            }
         }
 
         public Visibility Visibility
@@ -123,7 +145,7 @@ namespace DynamicGUI
 
     public class HyperlinkEx : Hyperlink
     {
-        private void HyperLinkEx_RequestNavigate(object sender, RequestNavigateEventArgs e)
+        void HyperLinkEx_RequestNavigate(object sender, RequestNavigateEventArgs e)
         {
             Process.Start(e.Uri.AbsoluteUri);
         }

mpv.net/DynamicGUI/OptionSettingControl.xaml

@@ -4,22 +4,58 @@
              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">
+             xmlns:UI="clr-namespace:UI"
+             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>
+            <TextBox x:Name="TitleTextBox"
+                     FontSize="24"
+                     Margin="0,10"
+                     BorderThickness="0"
+                     IsReadOnly="True"
+                     Foreground="{x:Static UI:Theme.Heading}"
+                     Background="{x:Static UI:Theme.Background}" />
+
             <ItemsControl x:Name="ItemsControl">
                 <ItemsControl.ItemTemplate>
                     <DataTemplate>
                         <WrapPanel Orientation="Vertical">
-                            <RadioButton x:Name="RadioButton" VerticalContentAlignment="Center" IsChecked="{Binding Checked}" 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}" Visibility="{Binding Visibility}" 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>
+                            <RadioButton x:Name="RadioButton"
+                                         VerticalContentAlignment="Center"
+                                         IsChecked="{Binding Checked}"
+                                         GroupName="{Binding OptionSetting.Name}"
+                                         Content="{Binding Text}"
+                                         FontSize="16"
+                                         FontWeight="Normal"
+                                         VerticalAlignment="Top"
+                                         Foreground="{x:Static UI:Theme.Foreground}"/>
+
+                            <TextBox x:Name="ItemHelpTextBox"
+                                     TextWrapping="WrapWithOverflow"
+                                     Text="{Binding Help}"
+                                     Visibility="{Binding Visibility}"
+                                     Margin="10,0,0,0" BorderThickness="0"
+                                     IsReadOnly="True" Padding="7,0,0,0"
+                                     MinHeight="0"
+                                     Foreground="{x:Static UI:Theme.Foreground2}"
+                                     Background="{x:Static UI:Theme.Background}"/>
+
                         </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>
+
+            <TextBox x:Name="HelpTextBox"
+                     TextWrapping="WrapWithOverflow"
+                     BorderThickness="0"
+                     IsReadOnly="True"
+                     Margin="0,10,0,0"
+                     Foreground="{x:Static UI:Theme.Foreground}"
+                     Background="{x:Static UI:Theme.Background}"/>
             <TextBlock x:Name="LinkTextBlock" Margin="0,10">
                 <local:HyperlinkEx x:Name="Link"></local:HyperlinkEx>
             </TextBlock>

mpv.net/DynamicGUI/OptionSettingControl.xaml.cs

@@ -1,35 +1,42 @@
-using System.Windows;
+
+using System.Windows;
 using System.Windows.Controls;
 
 namespace DynamicGUI
 {
     public partial class OptionSettingControl : UserControl, ISettingControl
     {
-        private OptionSetting OptionSetting;
+        OptionSetting OptionSetting;
 
         public OptionSettingControl(OptionSetting optionSetting)
         {
             OptionSetting = optionSetting;
             InitializeComponent();
             TitleTextBox.Text = optionSetting.Name;
+
             if (string.IsNullOrEmpty(optionSetting.Help))
                 HelpTextBox.Visibility = Visibility.Collapsed;
+
             HelpTextBox.Text = optionSetting.Help;
             ItemsControl.ItemsSource = optionSetting.Options;
-            if (string.IsNullOrEmpty(optionSetting.HelpURL))
+
+            if (string.IsNullOrEmpty(optionSetting.URL))
                 LinkTextBlock.Visibility = Visibility.Collapsed;
-            Link.SetURL(optionSetting.HelpURL);
+
+            Link.SetURL(optionSetting.URL);
         }
 
-        private string _SearchableText;
+        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;
@@ -39,4 +46,4 @@ namespace DynamicGUI
         public SettingBase SettingBase => OptionSetting;
         public bool Contains(string searchString) => SearchableText.Contains(searchString.ToLower());
     }
-}
+}

mpv.net/DynamicGUI/StringSettingControl.xaml

@@ -4,21 +4,52 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:DynamicGUI"
+             xmlns:UI="clr-namespace:UI"
              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>
+            <TextBox x:Name="TitleTextBox"
+                     FontSize="24"
+                     Margin="0,10"
+                     BorderThickness="0"
+                     IsReadOnly="True"
+                     Foreground="{x:Static UI:Theme.Heading}"
+                     Background="{x:Static UI:Theme.Background}"/>
+            
             <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}}" TextChanged="ValueTextBox_TextChanged"/>
-                <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>
+                <TextBox x:Name="ValueTextBox"
+                         Text="{Binding Path=Text, ElementName=StringSettingControl1, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                         Width="150"
+                         Height="20"
+                         HorizontalAlignment="Left"
+                         Foreground="{x:Static UI:Theme.Foreground}"
+                         Background="{x:Static UI:Theme.Background}"
+                         CaretBrush="{x:Static UI:Theme.Foreground}"
+                         TextChanged="ValueTextBox_TextChanged"/>
+               
+                <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" 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>
+
+            <TextBox x:Name="HelpTextBox"
+                     TextWrapping="WrapWithOverflow"
+                     BorderThickness="0"
+                     IsReadOnly="True"
+                     Foreground="{x:Static UI:Theme.Foreground}"
+                     Background="{x:Static UI:Theme.Background}"/>
+
             <TextBlock x:Name="LinkTextBlock" Margin="0,10">
                 <local:HyperlinkEx x:Name="Link"></local:HyperlinkEx>
             </TextBlock>

mpv.net/DynamicGUI/StringSettingControl.xaml.cs

@@ -1,4 +1,5 @@
-using System;
+
+using System;
 using System.Globalization;
 using System.Windows;
 using System.Windows.Controls;
@@ -9,7 +10,7 @@ namespace DynamicGUI
 {
     public partial class StringSettingControl : UserControl, ISettingControl
     {
-        private StringSetting StringSetting;
+        StringSetting StringSetting;
         
         public StringSettingControl(StringSetting stringSetting)
         {
@@ -18,21 +19,26 @@ namespace DynamicGUI
             TitleTextBox.Text = stringSetting.Name;
             HelpTextBox.Text = stringSetting.Help;
             ValueTextBox.Text = StringSetting.Value;
+
             if (StringSetting.Width > 0)
                 ValueTextBox.Width = StringSetting.Width;
+
             if (StringSetting.Type != "folder" && StringSetting.Type != "color")
                 Button.Visibility = Visibility.Hidden;
-            Link.SetURL(StringSetting.HelpURL);
-            if (string.IsNullOrEmpty(stringSetting.HelpURL))
+
+            Link.SetURL(StringSetting.URL);
+
+            if (string.IsNullOrEmpty(stringSetting.URL))
                 LinkTextBlock.Visibility = Visibility.Collapsed;
         }
 
-        private string _SearchableText;
+        string _SearchableText;
 
         public string SearchableText {
             get {
                 if (_SearchableText is null)
                     _SearchableText = (TitleTextBox.Text + HelpTextBox.Text +ValueTextBox.Text).ToLower();
+
                 return _SearchableText;
             }
         }
@@ -46,7 +52,7 @@ namespace DynamicGUI
             set => StringSetting.Value = value;
         }
 
-        private void Button_Click(object sender, RoutedEventArgs e)
+        void Button_Click(object sender, RoutedEventArgs e)
         {
             switch (StringSetting.Type)
             {
@@ -55,49 +61,62 @@ namespace DynamicGUI
                     {
                         d.Description = "Choose a folder.";
                         d.SelectedPath = ValueTextBox.Text;
-                        if (d.ShowDialog() == System.Windows.Forms.DialogResult.OK)
+
+                        if (d.ShowDialog() == WinForms.DialogResult.OK)
                             ValueTextBox.Text = d.SelectedPath;
                     }
                     break;
                 case "color":
-                    using (var d = new WinForms.ColorDialog())
+                    using (var dialog = new WinForms.ColorDialog())
                     {
-                        d.FullOpen = true;
-                        try {
-                            d.Color = System.Drawing.ColorTranslator.FromHtml(ValueTextBox.Text);
-                        } catch { }
-                        if (d.ShowDialog() == WinForms.DialogResult.OK)
-                            ValueTextBox.Text = System.Drawing.ColorTranslator.ToHtml(d.Color);
+                        dialog.FullOpen = true;
+
+                        try
+                        {
+                            if (!string.IsNullOrEmpty(ValueTextBox.Text))
+                            {
+                                Color col = GetColor(ValueTextBox.Text);
+                                dialog.Color = System.Drawing.Color.FromArgb(col.A, col.R, col.G, col.B); 
+                            }
+                        } catch {}
+
+                        if (dialog.ShowDialog() == WinForms.DialogResult.OK)
+                            ValueTextBox.Text = "#" + dialog.Color.ToArgb().ToString("X8");
                     }
                     break;
             }
         }
 
-        private void ValueTextBox_TextChanged(object sender, TextChangedEventArgs e) => Update();
+        void ValueTextBox_TextChanged(object sender, TextChangedEventArgs e) => Update();
+
+        Color GetColor(string value)
+        {
+            if (value.Contains("/"))
+            {
+                string[] a = value.Split('/');
+
+                if (a.Length == 3)
+                    return Color.FromRgb(ToByte(a[0]), ToByte(a[1]), ToByte(a[2]));
+                else if (a.Length == 4)
+                    return Color.FromArgb(ToByte(a[3]), ToByte(a[0]), ToByte(a[1]), ToByte(a[2]));
+            }
+
+            return (Color)ColorConverter.ConvertFromString(value);
+
+            Byte ToByte(string val) => Convert.ToByte(Convert.ToSingle(val, CultureInfo.InvariantCulture) * 255);
+        }
 
         public void Update()
         {
             if (StringSetting.Type == "color")
             {
                 Color c = Colors.Transparent;
+
                 if (ValueTextBox.Text != "")
-                {
-                    try {
-                        if (ValueTextBox.Text.Contains("/"))
-                        {
-                            string[] a = ValueTextBox.Text.Split('/');
-                            if (a.Length == 3)
-                                c = Color.FromRgb(ToByte(a[0]), ToByte(a[1]), ToByte(a[2]));
-                            else if (a.Length == 4)
-                                c = Color.FromArgb(ToByte(a[3]), ToByte(a[0]), ToByte(a[1]), ToByte(a[2]));
-                        }
-                        else
-                            c = (Color)ColorConverter.ConvertFromString(ValueTextBox.Text);
-                    } catch {}
-                }
+                    try { c = GetColor(ValueTextBox.Text); } catch {}
+
                 ValueTextBox.Background = new SolidColorBrush(c);
             }
-            Byte ToByte(string val) => Convert.ToByte(Convert.ToSingle(val, CultureInfo.InvariantCulture) * 255);
         }
     }
-}
+}

mpv.net/DynamicGUI/Tommy.cs

@@ -1752,7 +1752,6 @@ namespace Tommy
                         }
                         else
                             stringBuilder.Append(c);
-
                         break;
                 }
             }

mpv.net/Misc/Addon.cs

@@ -1,51 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.Composition;
-using System.ComponentModel.Composition.Hosting;
-using System.IO;
-using System.Windows.Forms;
-
-namespace mpvnet
-{
-    public class Addon
-    {
-        [ImportMany]
-        public IEnumerable<IAddon> Addons = null;
-
-        readonly CompositionContainer CompositionContainer;
-
-        public Addon()
-        {
-            try
-            {
-                AggregateCatalog catalog = new AggregateCatalog();
-
-                string dir = Application.StartupPath + "\\Addons";
-
-                if (Directory.Exists(dir))
-                    foreach (string i in Directory.GetDirectories(dir))
-                        catalog.Catalogs.Add(new DirectoryCatalog(i, "*Addon.dll"));
-
-                dir = mp.ConfFolder + "\\Addons";
-
-                if (Directory.Exists(dir))
-                    foreach (string i in Directory.GetDirectories(dir))
-                        catalog.Catalogs.Add(new DirectoryCatalog(i, "*Addon.dll"));
-
-                if (catalog.Catalogs.Count > 0)
-                {
-                    CompositionContainer = new CompositionContainer(catalog);
-                    CompositionContainer.ComposeParts(this);
-                }
-            }
-            catch (Exception ex)
-            {
-                Msg.ShowException(ex);
-            }
-        }
-    }
-
-    public interface IAddon
-    {
-    }
-}

mpv.net/Misc/App.cs

@@ -0,0 +1,205 @@
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Windows.Forms;
+
+using UI;
+
+using static libmpv;
+using static mpvnet.Core;
+
+using System.Threading.Tasks;
+
+namespace mpvnet
+{
+    public static class App
+    {
+        public static string[] VideoTypes { get; } = "264 265 asf avc avi avs flv h264 h265 hevc m2ts m2v m4v mkv mov mp4 mpeg mpg mpv mts ts vob vpy webm wmv y4m".Split(' ');
+        public static string[] AudioTypes { get; } = "mp3 mp2 ac3 ogg opus flac wav w64 m4a dts dtsma dtshr dtshd eac3 thd thd+ac3 mka aac mpa".Split(' ');
+        public static string[] ImageTypes { get; } = {"jpg", "bmp", "gif", "png"};
+        public static string[] SubtitleTypes { get; } = { "srt", "ass", "idx", "sup", "ttxt", "ssa", "smi" };
+
+        public static string RegPath { get; } = @"HKCU\Software\" + Application.ProductName;
+        public static string ConfPath { get => core.ConfigFolder + "mpvnet.conf"; }
+        public static string ProcessInstance { get; set; } = "single";
+        public static string DarkMode { get; set; } = "always";
+        public static string DarkTheme { get; set; } = "dark";
+        public static string LightTheme { get; set; } = "light";
+        public static string StartSize { get; set; } = "previous";
+
+        public static bool RememberPosition { get; set; }
+        public static bool DebugMode { get; set; }
+        public static bool IsStartedFromTerminal { get; } = Environment.GetEnvironmentVariable("_started_from_console") == "yes";
+        public static bool RememberVolume { get; set; } = true;
+        public static bool AutoLoadFolder { get; set; } = true;
+        public static bool Queue { get; set; }
+        public static bool UpdateCheck { get; set; }
+
+        public static int StartThreshold { get; set; } = 1500;
+        public static int RecentCount { get; set; } = 15;
+
+        public static float MinimumAspectRatio { get; set; } = 1.2f;
+
+        public static Extension Extension { get; set; }
+
+        public static bool IsDarkMode {
+            get => (DarkMode == "system" && Sys.IsDarkTheme) || DarkMode == "always";
+        }
+
+        public static void Init()
+        {
+            string dummy = core.ConfigFolder;
+            var dummy2 = core.Conf;
+
+            foreach (var i in Conf)
+                ProcessProperty(i.Key, i.Value, true);
+
+            if (App.DebugMode)
+            {
+                try
+                {
+                    string filePath = core.ConfigFolder + "mpvnet-debug.log";
+
+                    if (File.Exists(filePath))
+                        File.Delete(filePath);
+
+                    Trace.Listeners.Add(new TextWriterTraceListener(filePath));
+                    Trace.AutoFlush = true;
+
+                    //if (App.DebugMode)
+                    //    Trace.WriteLine("");
+                }
+                catch (Exception e)
+                {
+                    Msg.ShowException(e);
+                }
+            }
+
+            string themeContent = null;
+
+            if (File.Exists(core.ConfigFolder + "theme.conf"))
+                themeContent = File.ReadAllText(core.ConfigFolder + "theme.conf");
+
+            Theme.Init(
+                themeContent,
+                Properties.Resources.theme,
+                IsDarkMode ? DarkTheme : LightTheme);
+
+            core.Shutdown += Shutdown;
+            core.Initialized += Initialized;
+            core.LogMessage += ShowFatalError;
+        }
+
+        static void ShowFatalError(mpv_log_level level, string msg)
+        {
+            if (!App.IsStartedFromTerminal && level == mpv_log_level.MPV_LOG_LEVEL_FATAL)
+                Msg.ShowError(msg);
+        }
+
+        public static void RunAction(Action action)
+        {
+            Task.Run(() => {
+                try
+                {
+                    action.Invoke();
+                    Debug.WriteLine(Environment.TickCount);
+                }
+                catch (Exception e)
+                {
+                    ShowException(e);
+                }
+            });
+        }
+
+        public static void ShowException(object obj)
+        {
+            if (obj is Exception e)
+            {
+                if (App.IsStartedFromTerminal)
+                    ConsoleHelp.WriteError(e.ToString());
+                else
+                    Msg.ShowException(e);
+            }
+            else
+            {
+                if (App.IsStartedFromTerminal)
+                    ConsoleHelp.WriteError(obj.ToString());
+                else
+                    Msg.ShowError(obj.ToString());
+            }
+        }
+
+        public static void ShowError(string title, string msg)
+        {
+            if (App.IsStartedFromTerminal)
+            {
+                ConsoleHelp.WriteError(title);
+                ConsoleHelp.WriteError(msg);
+            }
+            else
+                Msg.ShowError(title, msg);
+        }
+
+        static void Initialized()
+        {
+            if (RememberVolume)
+            {
+                core.set_property_int("volume", RegistryHelp.GetInt(App.RegPath, "Volume", 70));
+                core.set_property_string("mute", RegistryHelp.GetString(App.RegPath, "Mute", "no"));
+            }
+        }
+
+        static void Shutdown()
+        {
+            if (RememberVolume)
+            {
+                RegistryHelp.SetValue(App.RegPath, "Volume", core.get_property_int("volume"));
+                RegistryHelp.SetValue(App.RegPath, "Mute", core.get_property_string("mute"));
+            }
+        }
+
+        static Dictionary<string, string> _Conf;
+
+        public static Dictionary<string, string> Conf {
+            get {
+                if (_Conf == null)
+                {
+                    _Conf = new Dictionary<string, string>();
+
+                    if (File.Exists(ConfPath))
+                        foreach (string i in File.ReadAllLines(ConfPath))
+                            if (i.Contains("=") && !i.StartsWith("#"))
+                                _Conf[i.Substring(0, i.IndexOf("=")).Trim()] = i.Substring(i.IndexOf("=") + 1).Trim();
+                }
+                return _Conf;
+            }
+        }
+
+        public static bool ProcessProperty(string name, string value, bool writeError = false)
+        {
+            switch (name)
+            {
+                case "remember-position": RememberPosition = value == "yes"; return true;
+                case "debug-mode": DebugMode = value == "yes"; return true;
+                case "remember-volume": RememberVolume = value == "yes"; return true;
+                case "queue": Queue = value == "yes"; return true;
+                case "auto-load-folder": AutoLoadFolder = value == "yes"; return true;
+                case "update-check": UpdateCheck = value == "yes"; return true;
+                case "start-size": StartSize = value; return true;
+                case "process-instance": ProcessInstance = value; return true;
+                case "dark-mode": DarkMode = value; return true;
+                case "start-threshold": StartThreshold = value.Int(); return true;
+                case "recent-count": RecentCount = value.Int(); return true;
+                case "minimum-aspect-ratio": MinimumAspectRatio = value.Float(); return true;
+                case "dark-theme": DarkTheme = value.Trim('\'', '"'); return true;
+                case "light-theme": LightTheme = value.Trim('\'', '"'); return true;
+                default:
+                    if (writeError)
+                        ConsoleHelp.WriteError($"unknown mpvnet.conf property: {name}");
+                    return false;
+            }
+        }
+    }
+}

mpv.net/Misc/Command.cs

@@ -1,288 +0,0 @@
-using System;
-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 VB = Microsoft.VisualBasic;
-
-namespace mpvnet
-{
-    public class Command
-    {
-        public string Name { get; set; }
-        public Action<string[]> Action { get; set; }
-
-        static List<Command> commands;
-
-        public static List<Command> Commands
-        {
-            get
-            {
-                if (commands == null)
-                {
-                    commands = new List<Command>();
-                    Type type = typeof(Command);
-                    MethodInfo[] methods = type.GetMethods(System.Reflection.BindingFlags.Static | System.Reflection.BindingFlags.Public);
-
-                    foreach (MethodInfo i in methods)
-                    {
-                        ParameterInfo[] parameters = i.GetParameters();
-
-                        if (parameters == null || parameters.Length != 1 || parameters[0].ParameterType != typeof(string[]))
-                            continue;
-
-                        Command cmd = new Command() { Name = i.Name.Replace("_","-"), Action = (Action<string[]>)i.CreateDelegate(typeof(Action<string[]>)) };
-                        commands.Add(cmd);
-                    }
-                }
-                return commands;
-            }
-        }
-
-        public static void open_files(string[] args)
-        {
-            MainForm.Instance.Invoke(new Action(() => {
-                using (var d = new OpenFileDialog() { Multiselect = true })
-                    if (d.ShowDialog() == DialogResult.OK)
-                        mp.Load(d.FileNames);
-            }));
-        }
-
-        public static void open_conf_folder(string[] args)
-        {
-            Process.Start(mp.ConfFolder);
-        }
-
-        public static void show_input_editor(string[] args)
-        {
-            MainForm.Instance.Invoke(new Action(() => {
-                InputWindow w = new InputWindow();
-                new WindowInteropHelper(w).Owner = MainForm.Instance.Handle;
-                w.ShowDialog();
-            }));
-        }
-
-        public static void show_conf_editor(string[] args)
-        {
-            MainForm.Instance.Invoke(new Action(() => {
-                ConfWindow w = new ConfWindow();
-                new WindowInteropHelper(w).Owner = MainForm.Instance.Handle;
-                w.ShowDialog();
-            }));
-        }
-
-        public static void show_about(string[] args)
-        {
-            MainForm.Instance.Invoke(new Action(() => {
-                AboutWindow w = new AboutWindow();
-                new WindowInteropHelper(w).Owner = MainForm.Instance.Handle;
-                w.ShowDialog();
-            }));
-        }
-
-        public static void show_command_palette(string[] args)
-        {
-            MainForm.Instance.Invoke(new Action(() => {
-                var w = new CommandPaletteWindow();
-                new WindowInteropHelper(w).Owner = MainForm.Instance.Handle;
-                w.ShowDialog();
-            }));
-        }
-
-        public static void show_media_search(string[] args)
-        {
-            MainForm.Instance.Invoke(new Action(() => {
-                var w = new EverythingWindow();
-                new WindowInteropHelper(w).Owner = MainForm.Instance.Handle;
-                w.ShowDialog();
-            }));
-        }
-
-        public static void show_history(string[] args)
-        {
-            var fp = mp.ConfFolder + "history.txt";
-
-            if (File.Exists(fp))
-                Process.Start(fp);
-            else
-                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 show_info(string[] args)
-        {
-            try
-            {
-                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 (File.Exists(path))
-                {
-                    fileSize = new FileInfo(path).Length;
-
-                    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 (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";
-
-                            mp.commandv("show-text", text, "5000");
-                            return;
-                        }
-                    }
-                }
-
-                TimeSpan position = TimeSpan.FromSeconds(mp.get_property_number("time-pos"));
-                TimeSpan duration2 = TimeSpan.FromSeconds(mp.get_property_number("duration"));
-                string videoFormat = mp.get_property_string("video-format").ToUpper();
-                string audioCodec = mp.get_property_string("audio-codec-name").ToUpper();
-
-                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 += $"{videoFormat}\n{audioCodec}";
-
-                mp.commandv("show-text", text, "5000");
-                string FormatTime(double value) => ((int)value).ToString("00");
-            }
-            catch (Exception e)
-            {
-                Msg.ShowException(e);
-            }
-        }
-
-        public static void execute_mpv_command(string[] args)
-        {
-            MainForm.Instance.Invoke(new Action(() => {
-                string command = VB.Interaction.InputBox("Enter a mpv command to be executed.", "Execute Command", RegistryHelp.GetString(App.RegPath, "RecentExecutedCommand"));
-                if (string.IsNullOrEmpty(command)) return;
-                RegistryHelp.SetObject(App.RegPath, "RecentExecutedCommand", command);
-                mp.command_string(command, false);
-            }));
-        }
-        
-        public static void open_url(string[] args)
-        {
-            MainForm.Instance.Invoke(new Action(() => {
-                string command = VB.Interaction.InputBox("Enter URL to be opened.");
-                if (string.IsNullOrEmpty(command)) return;
-                mp.Load(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 add_files_to_playlist(string[] args)
-        {
-            MainForm.Instance.Invoke(new Action(() => {
-                using (var d = new OpenFileDialog() { Multiselect = true })
-                    if (d.ShowDialog() == DialogResult.OK)
-                        foreach(string file in d.FileNames)
-                            mp.commandv("loadfile", file, "append");
-            }));
-        }
-
-        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/Misc/Commands.cs

@@ -0,0 +1,366 @@
+
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Windows;
+using System.Windows.Forms;
+using System.Windows.Interop;
+
+using VB = Microsoft.VisualBasic;
+
+using static NewLine;
+using static mpvnet.Core;
+
+namespace mpvnet
+{
+    public class Commands
+    {
+        public static void Execute(string id, string[] args)
+        {
+            switch (id)
+            {
+                case "open-files": OpenFiles(args); break;
+                case "update-check": UpdateCheck.CheckOnline(true); break;
+                case "open-url": OpenURL(); break;
+                case "open-optical-media": Open_DVD_Or_BD_Folder(); break;
+                case "manage-file-associations": // deprecated 2019
+                case "show-setup-dialog": ShowDialog(typeof(SetupWindow)); break;
+                case "cycle-audio": CycleAudio(); break;
+                case "load-audio": LoadAudio(); break;
+                case "load-sub": LoadSubtitle(); break;
+                case "execute-mpv-command": ExecuteMpvCommand(); break;
+                case "show-history": ShowHistory(); break;
+                case "show-media-search": ShowDialog(typeof(EverythingWindow)); break;
+                case "show-command-palette": ShowDialog(typeof(CommandPaletteWindow)); break;
+                case "show-about": ShowDialog(typeof(AboutWindow)); break;
+                case "show-conf-editor": ShowDialog(typeof(ConfWindow)); break;
+                case "show-input-editor": ShowDialog(typeof(InputWindow)); break;
+                case "open-conf-folder": Process.Start(core.ConfigFolder); break;
+                case "shell-execute": Process.Start(args[0]); break;
+                case "show-info": ShowInfo(); break;
+                case "playlist-first": PlaylistFirst(); break;
+                case "playlist-last": PlaylistLast(); break;
+                case "show-profiles": ShowProfiles(); break;
+                case "show-properties": ShowProperties(); break;
+                case "show-commands": ShowCommands(); break;
+                case "add-files-to-playlist": OpenFiles("append"); break; // deprecated 2019
+                default: Msg.ShowError($"No command '{id}' found."); break;
+            }
+        }
+
+        public static void InvokeOnMainThread(Action action) => MainForm.Instance.BeginInvoke(action);
+
+        public static void ShowDialog(Type winType)
+        {
+            InvokeOnMainThread(new Action(() => {
+                Window win = Activator.CreateInstance(winType) as Window;
+                new WindowInteropHelper(win).Owner = MainForm.Instance.Handle;
+                win.ShowDialog();
+            }));
+        }
+
+        public static void OpenFiles(params string[] args)
+        {
+            bool append = Control.ModifierKeys.HasFlag(Keys.Control);
+            bool loadFolder = true;
+
+            foreach (string arg in args)
+            {
+                if (arg == "append") append = true;
+                if (arg == "no-folder") loadFolder = false;
+            }
+
+            InvokeOnMainThread(new Action(() => {
+                using (var d = new OpenFileDialog() { Multiselect = true })
+                    if (d.ShowDialog() == DialogResult.OK)
+                        core.LoadFiles(d.FileNames, loadFolder, append);
+            }));
+        }
+
+        public static void Open_DVD_Or_BD_Folder()
+        {
+            InvokeOnMainThread(new Action(() => {
+                using (var d = new FolderBrowserDialog())
+                {
+                    d.Description = "Select a DVD or Blu-ray folder.";
+                    d.ShowNewFolderButton = false;
+
+                    if (d.ShowDialog() == DialogResult.OK)
+                    {
+                        if (Directory.Exists(d.SelectedPath + "\\BDMV"))
+                        {
+                            core.set_property_string("bluray-device", d.SelectedPath);
+                            core.LoadFiles(new[] { @"bd://" }, false, false);
+                        }
+                        else
+                        {
+                            core.set_property_string("dvd-device", d.SelectedPath);
+                            core.LoadFiles(new[] { @"dvd://" }, false, false);
+                        }
+                    }
+                }
+            }));
+        }
+
+        public static void PlaylistFirst()
+        {
+            int pos = core.get_property_int("playlist-pos");
+
+            if (pos != 0)
+                core.set_property_int("playlist-pos", 0);
+        }
+
+        public static void PlaylistLast()
+        {
+            int pos = core.get_property_int("playlist-pos");
+            int count = core.get_property_int("playlist-count");
+
+            if (pos < count - 1)
+                core.set_property_int("playlist-pos", count - 1);
+        }
+
+        public static void ShowHistory()
+        {
+            if (File.Exists(core.ConfigFolder + "history.txt"))
+                Process.Start(core.ConfigFolder + "history.txt");
+            else
+            {
+                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(core.ConfigFolder + "history.txt", "");
+            }
+        }
+
+        public static void ShowInfo()
+        {
+            try
+            {
+                string performer, title, album, genre, date, duration, text = "";
+                long fileSize = 0;
+                string path = core.get_property_string("path");
+
+                if (path.Contains("://"))
+                    path = core.get_property_string("media-title");
+
+                int width = core.get_property_int("video-params/w");
+                int height = core.get_property_int("video-params/h");
+
+                if (File.Exists(path))
+                {
+                    fileSize = new FileInfo(path).Length;
+
+                    if (App.AudioTypes.Contains(path.ShortExt()))
+                    {
+                        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 (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";
+                            text += "Size: " + mediaInfo.GetInfo(MediaInfoStreamKind.General, "FileSize/String") + "\n";
+                            text += "Type: " + path.ShortExt().ToUpper();
+
+                            core.commandv("show-text", text, "5000");
+                            return;
+                        }
+                    }
+                    else if (App.ImageTypes.Contains(path.ShortExt()))
+                    {
+                        using (MediaInfo mediaInfo = new MediaInfo(path))
+                        {
+                            text =
+                                "Width: " + mediaInfo.GetInfo(MediaInfoStreamKind.Image, "Width") + "\n" +
+                                "Height: " + mediaInfo.GetInfo(MediaInfoStreamKind.Image, "Height") + "\n" +
+                                "Size: " + mediaInfo.GetInfo(MediaInfoStreamKind.General, "FileSize/String") + "\n" +
+                                "Type: " + path.ShortExt().ToUpper();
+
+                            core.commandv("show-text", text, "5000");
+                            return;
+                        }
+                    }
+                }
+
+                TimeSpan position = TimeSpan.FromSeconds(core.get_property_number("time-pos"));
+                TimeSpan duration2 = TimeSpan.FromSeconds(core.get_property_number("duration"));
+                string videoFormat = core.get_property_string("video-format").ToUpper();
+                string audioCodec = core.get_property_string("audio-codec-name").ToUpper();
+
+                text = path.FileName() + "\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) + " MB\n";
+
+                text += $"{videoFormat}\n{audioCodec}";
+
+                core.commandv("show-text", text, "5000");
+                string FormatTime(double value) => ((int)value).ToString("00");
+            }
+            catch (Exception e)
+            {
+                App.ShowException(e);
+            }
+        }
+
+        public static void ExecuteMpvCommand() // deprecated 2019
+        {
+            InvokeOnMainThread(new Action(() => {
+                string command = VB.Interaction.InputBox("Enter a mpv command to be executed.", "Execute Command", RegistryHelp.GetString(App.RegPath, "RecentExecutedCommand"));
+             
+                if (string.IsNullOrEmpty(command))
+                    return;
+
+                RegistryHelp.SetValue(App.RegPath, "RecentExecutedCommand", command);
+                core.command(command, false);
+            }));
+        }
+        
+        public static void OpenURL()
+        {
+            InvokeOnMainThread(new Action(() => {
+                string clipboard = System.Windows.Forms.Clipboard.GetText();
+
+                if (string.IsNullOrEmpty(clipboard) || (!clipboard.Contains("://") && !File.Exists(clipboard)) || clipboard.Contains("\n"))
+                {
+                    App.ShowError("No URL found", "The clipboard does not contain a valid URL or file.");
+                    return;
+                }
+
+                core.LoadFiles(new [] { clipboard }, false, Control.ModifierKeys.HasFlag(Keys.Control));
+            }));
+        }
+
+        public static void LoadSubtitle()
+        {
+            InvokeOnMainThread(new Action(() => {
+                using (var d = new OpenFileDialog())
+                {
+                    string path = core.get_property_string("path");
+
+                    if (File.Exists(path))
+                        d.InitialDirectory = Path.GetDirectoryName(path);
+
+                    d.Multiselect = true;
+
+                    if (d.ShowDialog() == DialogResult.OK)
+                        foreach (string filename in d.FileNames)
+                            core.commandv("sub-add", filename);
+                }
+            }));
+        }
+
+        public static void LoadAudio()
+        {
+            InvokeOnMainThread(new Action(() => {
+                using (var d = new OpenFileDialog())
+                {
+                    string path = core.get_property_string("path");
+                    if (File.Exists(path))
+                        d.InitialDirectory = Path.GetDirectoryName(path);
+                    d.Multiselect = true;
+
+                    if (d.ShowDialog() == DialogResult.OK)
+                        foreach (string i in d.FileNames)
+                            core.commandv("audio-add", i);
+                }
+            }));
+        }
+
+        public static void CycleAudio()
+        {
+            string path = core.get_property_string("path");
+
+            if (!File.Exists(path))
+                return;
+
+            using (MediaInfo mi = new MediaInfo(path))
+            {
+                MediaTrack[] audTracks = core.MediaTracks.Where(track => track.Type == "a").ToArray();
+
+                if (audTracks.Length < 2)
+                    return;
+
+                int aid = core.get_property_int("aid");
+                aid += 1;
+
+                if (aid > audTracks.Length)
+                    aid = 1;
+
+                core.commandv("set", "aid", aid.ToString());
+                core.commandv("show-text", audTracks[aid - 1].Text.Substring(3), "5000");
+            }
+        }
+
+        static void ShowProfiles()
+        {
+            string code = @"
+                foreach ($item in ($json | ConvertFrom-Json | foreach { $_ } | sort name))
+                {
+                    $item.name
+                    ''
+
+                    foreach ($option in $item.options)
+                    {
+                        '   ' + $option.key + ' = ' + $option.value
+                    }
+
+                    ''
+                }";
+
+            string json = core.get_property_string("profile-list");
+            string file = Path.GetTempPath() + @"\mpv profile-list.txt";
+            File.WriteAllText(file, BR + PowerShell.InvokeAndReturnString(code, "json", json));
+            Process.Start(file);
+        }
+
+        static void ShowCommands()
+        {
+            string code = @"
+                foreach ($item in ($json | ConvertFrom-Json | foreach { $_ } | sort name))
+                {
+                    ''
+                    $item.name
+
+                    foreach ($arg in $item.args)
+                    {
+                        $value = $arg.name + ' <' + $arg.type.ToLower() + '>'
+
+                        if ($arg.optional -eq $true)
+                        {
+                            $value = '[' + $value + ']'
+                        }
+
+                        '    ' + $value
+                    }
+                }";
+
+            string json = core.get_property_string("command-list");
+            string file = Path.GetTempPath() + @"\mpv command-list.txt";
+            File.WriteAllText(file, PowerShell.InvokeAndReturnString(code, "json", json) + BR);
+            Process.Start(file);
+        }
+
+        static void ShowProperties()
+        {
+            string file = Path.GetTempPath() + @"\mpv property-list.txt";
+            var props = core.get_property_string("property-list").Split(',').OrderBy(prop => prop);
+            File.WriteAllText(file, BR + string.Join(BR, props) + BR);
+            Process.Start(file);
+        }
+    }
+}

mpv.net/Misc/Extension.cs

@@ -0,0 +1,65 @@
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.Composition;
+using System.ComponentModel.Composition.Hosting;
+using System.IO;
+using System.Linq;
+
+using static mpvnet.Core;
+
+namespace mpvnet
+{
+    public class Extension
+    {
+        [ImportMany]
+        public IEnumerable<IExtension> Extensions = null;
+
+        readonly CompositionContainer CompositionContainer;
+
+        public Extension()
+        {
+            try
+            {
+                AggregateCatalog catalog = new AggregateCatalog();
+                string dir = Folder.Startup + "Extensions";
+
+                if (Directory.Exists(dir))
+                {
+                    string[] knownExtensions = { "RatingExtension", "ScriptingExtension" };
+
+                    foreach (string extDir in Directory.GetDirectories(dir))
+                    {
+                        if (knownExtensions.Contains(Path.GetFileName(extDir)))
+                            catalog.Catalogs.Add(new DirectoryCatalog(extDir, Path.GetFileName(extDir) + ".dll"));
+                        else
+                            ConsoleHelp.WriteError("Failed to load extension:\n\n" +  extDir +
+                                "\n\nOnly extensions that ship with mpv.net are allowed in <startup>\\extensions" +
+                                "\n\nUser extensions have to use <config folder>\\extensions" +
+                                "\n\nNever copy or install a new mpv.net version over a old mpv.net version.");
+                    }
+                }
+
+                dir = core.ConfigFolder + "extensions";
+
+                if (Directory.Exists(dir))
+                    foreach (string extDir in Directory.GetDirectories(dir))
+                        catalog.Catalogs.Add(new DirectoryCatalog(extDir, Path.GetFileName(extDir) + ".dll"));
+
+                if (catalog.Catalogs.Count > 0)
+                {
+                    CompositionContainer = new CompositionContainer(catalog);
+                    CompositionContainer.ComposeParts(this);
+                }
+            }
+            catch (Exception ex)
+            {
+                App.ShowException(ex);
+            }
+        }
+    }
+
+    public interface IExtension
+    {
+    }
+}

mpv.net/Misc/ExtensionMethods.cs

@@ -0,0 +1,32 @@
+using System.Globalization;
+using System.IO;
+
+public static class Extensions
+{
+    public static string FileName(this string path)
+    {
+        if (string.IsNullOrEmpty(path)) return "";
+        int index = path.LastIndexOf('\\');
+        if (index > -1) return path.Substring(index + 1);
+        index = path.LastIndexOf('/');
+        if (index > -1) return path.Substring(index + 1);
+        return path;
+    }
+
+    public static string ShortExt(this string path)
+    {
+        return Path.GetExtension(path).ToLower().TrimStart('.');
+    }
+
+    public static int Int(this string value)
+    {
+        int.TryParse(value, out int result);
+        return result;
+    }
+
+    public static float Float(this string value)
+    {
+        float.TryParse(value.Replace(",", "."), NumberStyles.Float, CultureInfo.InvariantCulture, out float result);
+        return result;
+    }
+}

mpv.net/Misc/Help.cs

@@ -0,0 +1,48 @@
+
+using System;
+using System.Diagnostics;
+
+public static class ConsoleHelp
+{
+    public static int Padding { get; set; }
+
+    public static void WriteError(object obj, string module = "mpv.net")
+    {
+        Write(obj, module, ConsoleColor.Red, false);    
+    }
+
+    public static void Write(object obj, string module = "mpv.net")
+    {
+        Write(obj, module, ConsoleColor.Black, true);
+    }
+
+    public static void Write(object obj, string module, ConsoleColor color)
+    {
+        Write(obj, module, color, false);
+    }
+
+    public static void Write(object obj, string module, ConsoleColor color, bool useDefaultColor)
+    {
+        if (obj == null)
+            return;
+
+        string value = obj.ToString();               
+
+        if (!string.IsNullOrEmpty(module))
+            module = "[" + module + "] ";
+
+        if (useDefaultColor)
+            Console.ResetColor();
+        else
+            Console.ForegroundColor = color;
+
+        value = module + value;
+
+        if (Padding > 0 && value.Length < Padding)
+            value = value.PadRight(Padding);
+
+        Console.WriteLine(value);
+        Console.ResetColor();
+        Trace.WriteLine(obj);
+    }
+}

mpv.net/Misc/Misc.cs

@@ -1,4 +1,5 @@
-using System;
+
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -13,113 +14,22 @@ using System.Windows.Forms;
 
 using Microsoft.Win32;
 
+using static mpvnet.Core;
+
 namespace mpvnet
 {
-    public class App
-    {
-        public static string ConfFilePath { get; } = mp.ConfFolder + "\\mpvnet.conf";
-        public static string RegPath { get; } = "HKCU\\Software\\" + Application.ProductName;
-        public static string ClipboardMonitoring { get; set; } = "yes";
-
-        public static string[] VideoTypes    { get; } = "mkv mp4 mpg avi mov webm vob wmv flv avs 264 h264 asf webm mpeg mpv y4m avc hevc 265 h265 m2v m2ts vpy mts m4v".Split(' ');
-        public static string[] AudioTypes    { get; } = "mp3 mp2 ac3 ogg opus flac wav w64 m4a dts dtsma dtshr dtshd eac3 thd thd+ac3 mka aac mpa".Split(' ');
-        public static string[] SubtitleTypes { get; } = "srt ass idx sup ttxt ssa smi".Split(' ');
-
-        public static string DarkMode { get; set; } = "always";
-        public static string ProcessInstance { get; set; } = "single";
-
-        public static bool IsDarkMode { 
-            get => (DarkMode == "system" && Sys.IsDarkTheme) || DarkMode == "always";
-        }
-
-        public static void Init()
-        {
-            foreach (var i in Conf)
-                ProcessProperty(i.Key, i.Value);
-        }
-
-        static Dictionary<string, string> _Conf;
-
-        public static Dictionary<string, string> Conf {
-            get {
-                if (_Conf == null)
-                {
-                    _Conf = new Dictionary<string, string>();
-
-                    if (File.Exists(ConfFilePath))
-                        foreach (string i in File.ReadAllLines(ConfFilePath))
-                            if (i.Contains("=") && !i.StartsWith("#"))
-                                _Conf[i.Substring(0, i.IndexOf("=")).Trim()] = i.Substring(i.IndexOf("=") + 1).Trim();
-                }
-                return _Conf;
-            }
-        }
-
-        public static void ProcessProperty(string name, string value)
-        {
-            switch (name)
-            {
-                case "clipboard-monitoring": ClipboardMonitoring = value; break;
-                case "process-instance": ProcessInstance = value; break;
-                case "dark-mode": DarkMode = value; break;
-            }
-        }
-
-        public static 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);
-                        mp.ProcessProperty(left, right);
-                        ProcessProperty(left, right);
-                    }
-                    else
-                    {
-                        string switchName = i.Substring(2);
-
-                        switch (switchName)
-                        {
-                            case "fs":
-                            case "fullscreen":
-                                mp.Fullscreen = true;
-                                break;
-                        }
-                    }
-                }
-            }
-        }
-    }
-
     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;
+            
+                if (value is null)
+                    value = 1;
+
                 return (int)value == 0;
             }
         }
-
-        public static bool IsDirectoryWritable(string dirPath)
-        {
-            try
-            {
-                using (FileStream fs = File.Create(Path.Combine(dirPath,
-                    Path.GetRandomFileName()), 1, FileOptions.DeleteOnClose))
-                { }
-                return true;
-            }
-            catch
-            { }
-            return false;
-        }
     }
 
     public class StringLogicalComparer : IComparer, IComparer<string>
@@ -144,96 +54,51 @@ namespace mpvnet
         {
             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, "");
+            RegistryHelp.SetValue(@"HKCU\Software\Microsoft\Windows\CurrentVersion\App Paths\" + ExeFilename, null, ExePath);
+            RegistryHelp.SetValue(@"HKCR\Applications\" + ExeFilename, "FriendlyAppName", "mpv.net media player");
+            RegistryHelp.SetValue($@"HKCR\Applications\{ExeFilename}\shell\open\command", null, $"\"{ExePath}\" \"%1\"");
+            RegistryHelp.SetValue(@"HKLM\SOFTWARE\Clients\Media\mpv.net\Capabilities", "ApplicationDescription", "mpv.net media player");
+            RegistryHelp.SetValue(@"HKLM\SOFTWARE\Clients\Media\mpv.net\Capabilities", "ApplicationName", "mpv.net");
+            RegistryHelp.SetValue(@"HKCR\SystemFileAssociations\video\OpenWithList\" + ExeFilename, null, "");
+            RegistryHelp.SetValue(@"HKCR\SystemFileAssociations\audio\OpenWithList\" + ExeFilename, null, "");
+            RegistryHelp.SetValue(@"HKLM\SOFTWARE\RegisteredApplications", "mpv.net", @"SOFTWARE\Clients\Media\mpv.net\Capabilities");
 
             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, "");
+                RegistryHelp.SetValue($@"HKCR\Applications\{ExeFilename}\SupportedTypes", "." + ext, "");
+                RegistryHelp.SetValue($@"HKCR\" + "." + ext, null, ExeFilenameNoExt + "." + ext);
+                RegistryHelp.SetValue($@"HKCR\" + "." + ext + @"\OpenWithProgIDs", ExeFilenameNoExt + "." + ext, "");
+
                 if (App.VideoTypes.Contains(ext))
-                    RegistryHelp.SetObject($"HKCR\\" + "." + ext, "PerceivedType", "video");
+                    RegistryHelp.SetValue(@"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);
+                    RegistryHelp.SetValue(@"HKCR\" + "." + ext, "PerceivedType", "audio");
+
+                if (App.ImageTypes.Contains(ext))
+                    RegistryHelp.SetValue(@"HKCR\" + "." + ext, "PerceivedType", "image");
+
+                RegistryHelp.SetValue($@"HKCR\" + ExeFilenameNoExt + "." + ext + @"\shell\open\command", null, $"\"{ExePath}\" \"%1\"");
+                RegistryHelp.SetValue(@"HKLM\SOFTWARE\Clients\Media\mpv.net\Capabilities\FileAssociations", "." + ext, ExeFilenameNoExt + "." + ext);
             }
         }
 
         public static void Unregister()
         {
-            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}");
+            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);
+            RegistryHelp.RemoveValue(@"HKLM\SOFTWARE\RegisteredApplications", "mpv.net");
 
             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 string GetString(string path, string name)
-        {
-            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)
-        {
-            try {
-                GetRootKey(path).DeleteSubKeyTree(path.Substring(5), false);
-            } catch { }
-        }
-
-        public static void RemoveValue(string path, string name)
-        {
-            try {
-                using (RegistryKey rk = GetRootKey(path).OpenSubKey(path.Substring(5), true))
-                    if (!(rk is null))
-                        rk.DeleteValue(name, false);
-            } catch {}
-        }
-
-        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();
+                RegistryHelp.RemoveValue($@"HKCR\Software\Classes\{id}\OpenWithProgIDs", ExeFilenameNoExt + id);
+                RegistryHelp.RemoveValue($@"HKLM\Software\Classes\{id}\OpenWithProgIDs", ExeFilenameNoExt + id);
             }
         }
     }
@@ -256,12 +121,12 @@ namespace mpvnet
 
         public CommandItem(SerializationInfo info, StreamingContext context) { }
 
-        private void NotifyPropertyChanged([CallerMemberName] string propertyName = "")
+        void NotifyPropertyChanged([CallerMemberName] string propertyName = "")
         {
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
 
-        private string _Input = "";
+        string _Input = "";
 
         public string Input {
             get => _Input;
@@ -280,59 +145,52 @@ namespace mpvnet
                 foreach (string line in content.Split('\r', '\n'))
                 {
                     string val = line.Trim();
-                    if (val.StartsWith("#")) continue;
-                    if (!val.Contains(" ")) continue;
+
+                    if (val.StartsWith("#"))
+                        continue;
+
+                    if (!val.Contains(" "))
+                        continue;
+
                     CommandItem item = new CommandItem();
                     item.Input = val.Substring(0, val.IndexOf(" "));
-                    if (item.Input == "_") item.Input = "";
+
+                    if (item.Input == "_")
+                        item.Input = "";
+
                     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 = "";
-                    MigrateCommands(item);
+
                     items.Add(item);
                 }
             }
             return items;
         }
 
-        private static ObservableCollection<CommandItem> _Items;
+        static ObservableCollection<CommandItem> _Items;
 
         public static ObservableCollection<CommandItem> Items {
             get {
                 if (_Items is null)
-                    _Items = GetItems(File.ReadAllText(mp.InputConfPath));
-                return _Items;
-            }
-        }
+                    _Items = GetItems(File.ReadAllText(core.InputConfPath));
 
-        public static void MigrateCommands(CommandItem item)
-        {
-            switch (item.Command)
-            {
-                case "script-message mpv.net show-prefs":
-                    item.Command = "script-message mpv.net show-conf-editor";
-                    break;
-                case "script-message mpv.net show-keys":
-                    item.Command = "script-message mpv.net show-input-editor";
-                    break;
-                case "script-message mpv.net history":
-                    item.Command = "script-message mpv.net show-history";
-                    break;
-                case "script-message mpv.net open-config-folder":
-                    item.Command = "script-message open-conf-folder";
-                    break;
+                return _Items;
             }
         }
     }
@@ -367,14 +225,8 @@ namespace mpvnet
         }
     }
 
-    public class SingleProcess
+    public class Folder
     {
-        public static int Message { get; } = RegisterWindowMessage("mpvnet_IPC");
-
-        [DllImport("user32.dll", CharSet = CharSet.Unicode)]
-        static extern int RegisterWindowMessage(string id);
-
-        [DllImport("user32.dll")]
-        public static extern bool AllowSetForegroundWindow(int dwProcessId);
+        public static string Startup { get; } = Application.StartupPath + @"\";
     }
-}
+}

mpv.net/Misc/NewLine.cs

@@ -0,0 +1,8 @@
+
+using System;
+
+public static class NewLine
+{
+    public static string BR = Environment.NewLine;
+    public static string BR2 = Environment.NewLine + Environment.NewLine;
+}

mpv.net/Misc/PowerShell.cs

@@ -0,0 +1,244 @@
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Management.Automation;
+using System.Management.Automation.Runspaces;
+using System.Threading;
+using System.Threading.Tasks;
+
+using static mpvnet.Core;
+using static NewLine;
+
+namespace mpvnet
+{
+    public class PowerShell
+    {
+        public Runspace Runspace { get; set; }
+        public Pipeline Pipeline { get; set; }
+        public string Module { get; set; }
+        public bool Print { get; set; }
+        public List<string> Scripts { get; } = new List<string>();
+        public List<KeyValuePair<string, object>> Variables = new List<KeyValuePair<string, object>>();
+        public string[] Parameters { get; }
+        public event Action<string, object[]> Event;
+        public event Action<string, object> PropertyChanged;
+        public List<KeyValuePair<string, ScriptBlock>> EventHandlers = new List<KeyValuePair<string, ScriptBlock>>();
+        public List<KeyValuePair<string, ScriptBlock>> PropChangedHandlers = new List<KeyValuePair<string, ScriptBlock>>();
+
+        public static List<PowerShell> Instances { get; } = new List<PowerShell>();
+
+        public object Invoke() => Invoke(null, null);
+
+        public object Invoke(string variable, object obj)
+        {
+            try
+            {
+                Runspace = RunspaceFactory.CreateRunspace();
+                Runspace.ApartmentState = ApartmentState.STA;
+                Runspace.Open();
+                Pipeline = Runspace.CreatePipeline();
+
+                foreach (string script in Scripts)
+                    Pipeline.Commands.AddScript(script);
+
+                if (Parameters != null)
+                    foreach (string param in Parameters)
+                        foreach (Command command in Pipeline.Commands)
+                            command.Parameters.Add(null, param);
+
+                Runspace.SessionStateProxy.SetVariable("mp", this);
+
+                foreach (var i in Variables)
+                    Runspace.SessionStateProxy.SetVariable(i.Key, i.Value);
+
+                if (!string.IsNullOrEmpty(variable))
+                    Runspace.SessionStateProxy.SetVariable(variable, obj);
+
+                if (Print)
+                {
+                    Pipeline.Output.DataReady += Output_DataReady;
+                    Pipeline.Error.DataReady += Error_DataReady;
+                }
+            
+                return Pipeline.Invoke();
+            }
+            catch (RuntimeException e)
+            {
+                string message = e.Message + BR + BR + e.ErrorRecord.ScriptStackTrace.Replace(
+                    " <ScriptBlock>, <No file>", "") + BR + BR + Module + BR;
+
+                throw new PowerShellException(message);
+            }
+            catch (Exception e)
+            {
+                throw e;
+            }        
+        }
+
+        public static string InvokeAndReturnString(string code, string varName, object varValue)
+        {
+            PowerShell ps = new PowerShell() { Print = false };
+            ps.Scripts.Add(code);
+            string ret = string.Join(Environment.NewLine, (ps.Invoke(varName, varValue)
+                as IEnumerable<object>).Select(item => item.ToString())).ToString();
+            ps.Runspace.Dispose();
+            return ret;
+        }
+
+        public void Output_DataReady(object sender, EventArgs e)
+        {
+            var output = sender as PipelineReader<PSObject>;
+
+            while (output.Count > 0)
+                ConsoleHelp.Write(output.Read(), Module);
+        }
+
+        public void Error_DataReady(object sender, EventArgs e)
+        {
+            var output = sender as PipelineReader<Object>;
+
+            while (output.Count > 0)
+                ConsoleHelp.WriteError(output.Read(), Module);
+        }
+
+        public void RedirectStreams(PSEventJob job)
+        {
+            if (Print)
+            {
+                job.Output.DataAdded += Output_DataAdded;
+                job.Error.DataAdded += Error_DataAdded;
+            }
+        }
+
+        public void commandv(params string[] args) => core.commandv(args);
+
+        public void command(string command) => core.command(command);
+
+        public bool get_property_bool(string name) => core.get_property_bool(name);
+
+        public void set_property_bool(string name, bool value) => core.set_property_bool(name, value);
+
+        public int get_property_int(string name) => core.get_property_int(name);
+
+        public void set_property_int(string name, int value) => core.set_property_int(name, value);
+
+        public double get_property_number(string name) => core.get_property_number(name);
+
+        public void set_property_number(string name, double value) => core.set_property_number(name, value);
+
+        public string get_property_string(string name) => core.get_property_string(name);
+
+        public void set_property_string(string name, string value) => core.set_property_string(name, value);
+
+        public void observe_property(string name, string type, ScriptBlock sb)
+        {
+            PropChangedHandlers.Add(new KeyValuePair<string, ScriptBlock>(name, sb));
+
+            switch (type)
+            {
+                case "bool": case "boolean":
+                    core.observe_property_bool(name, (value) => Task.Run(() => PropertyChanged.Invoke(name, value)));
+                    break;
+                case "string":
+                    core.observe_property_string(name, (value) => Task.Run(() => PropertyChanged.Invoke(name, value)));
+                    break;
+                case "int": case "integer":
+                    core.observe_property_int(name, (value) => Task.Run(() => PropertyChanged.Invoke(name, value)));
+                    break;
+                case "float": case "double":
+                    core.observe_property_double(name, (value) => Task.Run(() => PropertyChanged.Invoke(name, value)));
+                    break;
+                case "nil": case "none": case "native":
+                    core.observe_property(name, () => Task.Run(() => PropertyChanged.Invoke(name, null)));
+                    break;
+                default:
+                    App.ShowError("Invalid Type", "Valid types are: bool or boolean, string, int or integer, float or double, nil or none or native");
+                    break;
+            }
+        }
+
+        public void register_event(string name, ScriptBlock sb)
+        {
+            EventHandlers.Add(new KeyValuePair<string, ScriptBlock>(name, sb));
+
+            switch (name)
+            {
+                case "log-message":
+                    core.LogMessageAsync += (level, msg) => Event.Invoke("log-message", new object[] { level, msg });
+                    break;
+
+                case "end-file":
+                    core.EndFileAsync += (reason) => Event.Invoke("end-file", new object[] { reason });
+                    break;
+
+                case "client-message":
+                    core.ClientMessageAsync += (args) => Event.Invoke("client-message", args);
+                    break;
+
+                case "shutdown":
+                    core.Shutdown += () => Event.Invoke("shutdown", null);
+                    break;
+
+                case "get-property-reply":
+                    core.GetPropertyReplyAsync += () => Event.Invoke("get-property-reply", null);
+                    break;
+
+                case "set-property-reply":
+                    core.SetPropertyReplyAsync += () => Event.Invoke("set-property-reply", null);
+                    break;
+
+                case "command-reply":
+                    core.CommandReplyAsync += () => Event.Invoke("command-reply", null);
+                    break;
+
+                case "start-file":
+                    core.StartFileAsync += () => Event.Invoke("start-file", null);
+                    break;
+
+                case "file-loaded":
+                    core.FileLoadedAsync += () => Event.Invoke("file-loaded", null);
+                    break;
+
+                case "idle":
+                    core.IdleAsync += () => Event.Invoke("idle", null);
+                    break;
+
+                case "video-reconfig":
+                    core.VideoReconfigAsync += () => Event.Invoke("video-reconfig", null);
+                    break;
+
+                case "audio-reconfig":
+                    core.AudioReconfigAsync += () => Event.Invoke("audio-reconfig", null);
+                    break;
+
+                case "seek":
+                    core.SeekAsync += () => Event.Invoke("seek", null);
+                    break;
+
+                case "playback-restart":
+                    core.PlaybackRestartAsync += () => Event.Invoke("playback-restart", null);
+                    break;
+            }
+        }
+
+        void Output_DataAdded(object sender, DataAddedEventArgs e)
+        {
+            var output = sender as PSDataCollection<PSObject>;
+            ConsoleHelp.Write(output[e.Index], Module);
+        }
+
+        void Error_DataAdded(object sender, DataAddedEventArgs e)
+        {
+            var error = sender as PSDataCollection<ErrorRecord>;
+            ConsoleHelp.WriteError(error[e.Index], Module);
+        }
+    }
+
+    public class PowerShellException : Exception
+    {
+        public PowerShellException(string message) : base(message)
+        {
+        }
+    }
+}

mpv.net/Misc/Program.cs

@@ -1,11 +1,13 @@
-using System;
+
+using System;
 using System.Windows.Forms;
 using System.Linq;
 using System.Collections.Generic;
-using System.IO;
 using System.Threading;
 using System.Diagnostics;
 
+using static mpvnet.Core;
+
 namespace mpvnet
 {
     static class Program
@@ -15,46 +17,78 @@ namespace mpvnet
         {
             try
             {
+                Application.EnableVisualStyles();
+                Application.SetCompatibleTextRenderingDefault(false);
+
+                if (App.IsStartedFromTerminal)
+                    WinAPI.AttachConsole(-1 /*ATTACH_PARENT_PROCESS*/);
+
+                if (core.ConfigFolder == "")
+                    return;
+
                 string[] args = Environment.GetCommandLineArgs().Skip(1).ToArray();
 
                 if (args.Length == 2 && args[0] == "--reg-file-assoc")
                 {
                     if (args[1] == "audio") FileAssociation.Register(App.AudioTypes);
                     if (args[1] == "video") FileAssociation.Register(App.VideoTypes);
+                    if (args[1] == "image") FileAssociation.Register(App.ImageTypes);
                     if (args[1] == "unreg") FileAssociation.Unregister();
                     return;
                 }
 
-                Mutex mutex = new Mutex(true, "mpvnetProcessInstance", out bool isFirst);
                 App.Init();
+                Mutex mutex = new Mutex(true, "mpvnetProcessInstance", out bool isFirst);
 
                 if ((App.ProcessInstance == "single" || App.ProcessInstance == "queue") && !isFirst)
                 {
                     List<string> files = new List<string>();
+                    files.Add(App.ProcessInstance);
 
                     foreach (string arg in args)
-                        if (!arg.StartsWith("--") && (File.Exists(arg) || arg == "-" || arg.StartsWith("http")))
-                            files.Add(arg);
-
-                    if (files.Count > 0)
-                        RegistryHelp.SetObject(App.RegPath, "ShellFiles", files.ToArray());
-
-                    RegistryHelp.SetObject(App.RegPath, "ProcessInstanceMode", App.ProcessInstance);
-
-                    foreach(Process process in Process.GetProcessesByName("mpvnet"))
                     {
-                        try {
-                            SingleProcess.AllowSetForegroundWindow(process.Id);
-                            Native.SendMessage(process.MainWindowHandle, SingleProcess.Message, IntPtr.Zero, IntPtr.Zero);
-                        } catch {}
+                        if (!arg.StartsWith("--") && (arg == "-" || arg.Contains("://") ||
+                            arg.Contains(":\\") || arg.StartsWith("\\\\")))
+
+                            files.Add(arg);
+                        else if (arg == "--queue")
+                            files[0] = "queue";
                     }
 
+                    Process[] procs = Process.GetProcessesByName("mpvnet");
+
+                    for (int i = 0; i < 20; i++)
+                    {
+                        foreach (Process proc in procs)
+                        {
+                            if (proc.MainWindowHandle != IntPtr.Zero)
+                            {
+                                WinAPI.AllowSetForegroundWindow(proc.Id);
+                                var data = new WinAPI.COPYDATASTRUCT();
+                                data.lpData = string.Join("\n", files.ToArray());
+                                data.cbData = data.lpData.Length * 2 + 1;
+                                WinAPI.SendMessage(proc.MainWindowHandle, 0x004A /*WM_COPYDATA*/, IntPtr.Zero, ref data);
+                                mutex.Dispose();
+
+                                if (App.IsStartedFromTerminal)
+                                    WinAPI.FreeConsole();
+
+                                return;
+                            }
+                        }
+
+                        Thread.Sleep(50);
+                    }
+
+                    mutex.Dispose();
                     return;
                 }
 
-                Application.EnableVisualStyles();
-                Application.SetCompatibleTextRenderingDefault(false);
                 Application.Run(new MainForm());
+
+                if (App.IsStartedFromTerminal)
+                    WinAPI.FreeConsole();
+
                 mutex.Dispose();
             }
             catch (Exception ex)
@@ -63,4 +97,4 @@ namespace mpvnet
             }
         }
     }
-}
+}

mpv.net/Misc/RegistryHelp.cs

@@ -0,0 +1,70 @@
+
+using System;
+using Microsoft.Win32;
+using System.Windows.Forms;
+
+public class RegistryHelp
+{
+    public static string ApplicationKey { get; } = @"HKCU\Software\" + Application.ProductName;
+
+    public static void SetValue(string path, string name, object value)
+    {
+        using (RegistryKey regKey = GetRootKey(path).CreateSubKey(path.Substring(5), RegistryKeyPermissionCheck.ReadWriteSubTree))
+            regKey.SetValue(name, value);
+    }
+
+    public static string GetString(string path, string name, string defaultValue = "")
+    {
+        object value = GetValue(path, name, defaultValue);
+        return !(value is string) ? defaultValue : value.ToString();
+    }
+
+    public static int GetInt(string path, string name, int defaultValue = 0)
+    {
+        object value = GetValue(path, name, defaultValue);
+        return !(value is int) ? defaultValue : (int)value;
+    }
+
+    public static bool GetBool(string path, string name, bool defaultValue = false)
+    {
+        object val = GetValue(path, name, defaultValue);
+        return val is bool ? (bool)val : defaultValue;
+    }
+
+    public static object GetValue(string path, string name, object defaultValue = null)
+    {
+        using (RegistryKey regKey = GetRootKey(path).OpenSubKey(path.Substring(5)))
+            return regKey == null ? null : regKey.GetValue(name, defaultValue);
+    }
+
+    public static void RemoveKey(string path)
+    {
+        try
+        {
+            GetRootKey(path).DeleteSubKeyTree(path.Substring(5), false);
+        }
+        catch { }
+    }
+
+    public static void RemoveValue(string path, string name)
+    {
+        try
+        {
+            using (RegistryKey regKey = GetRootKey(path).OpenSubKey(path.Substring(5), true))
+                if (regKey != null)
+                    regKey.DeleteValue(name, false);
+        }
+        catch { }
+    }
+
+    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();
+        }
+    }
+}

mpv.net/Misc/Theme.cs

@@ -0,0 +1,96 @@
+
+using System.Collections.Generic;
+using System.Windows.Media;
+
+namespace UI
+{
+    public class Theme
+    {
+        public string Name { get; set; }
+        public Dictionary<string, string> Dictionary { get; } = new Dictionary<string, string>();
+
+        public static List<Theme> DefaultThemes { get; set; }
+        public static List<Theme> CustomThemes { get; set; }
+
+        public static Theme Current { get; set; }
+
+        public static Brush Foreground { get; set; }
+        public static Brush Foreground2 { get; set; }
+        public static Brush Background { get; set; }
+        public static Brush Heading { get; set; }
+
+        public System.Drawing.Color GetWinFormsColor(string key)
+        {
+            return System.Drawing.ColorTranslator.FromHtml(Dictionary[key]);
+        }
+
+        public Brush GetBrush(string key)
+        {
+            return new SolidColorBrush((Color)ColorConverter.ConvertFromString(Dictionary[key]));
+        }
+
+        public static void Init(string customContent, string defaultContent, string activeTheme)
+        {
+            DefaultThemes = Load(defaultContent);
+            CustomThemes = Load(customContent);
+
+            foreach (Theme theme in CustomThemes)
+            {
+                if (theme.Name == activeTheme)
+                {
+                    bool isKeyMissing = false;
+
+                    foreach (string key in DefaultThemes[0].Dictionary.Keys)
+                    {
+                        if (!theme.Dictionary.ContainsKey(key))
+                        {
+                            isKeyMissing = true;
+                            ConsoleHelp.WriteError($"Theme '{activeTheme}' misses '{key}'");
+                            break;
+                        }
+                    }
+
+                    if (!isKeyMissing)
+                        Current = theme;                     
+
+                    break;
+                }
+            }
+
+            if (Current == null)
+                foreach (Theme theme in DefaultThemes)
+                    if (theme.Name == activeTheme)
+                        Current = theme;
+
+            if (Current == null)
+                Current = DefaultThemes[0];
+
+            Foreground = Current.GetBrush("foreground");
+            Foreground2 = Current.GetBrush("foreground2");
+            Background = Current.GetBrush("background");
+            Heading = Current.GetBrush("heading");
+        }
+
+        static List<Theme> Load(string content)
+        {
+            List<Theme> list = new List<Theme>();
+            Theme theme = null;
+
+            foreach (string currentLine in (content ?? "").Split(new [] { '\r', '\n' }))
+            {
+                string line = currentLine.Trim();
+
+                if (line.StartsWith("[") && line.EndsWith("]"))
+                    list.Add(theme = new Theme() { Name = line.Substring(1, line.Length - 2).Trim() });
+
+                if (line.Contains("=") && theme != null)
+                {
+                    string left = line.Substring(0, line.IndexOf("=")).Trim();
+                    theme.Dictionary[left] = line.Substring(line.IndexOf("=") + 1).Trim();
+                }
+            }
+
+            return list;
+        }
+    }
+}

mpv.net/Misc/UpdateCheck.cs

@@ -0,0 +1,79 @@
+
+using System;
+using System.Diagnostics;
+using System.Net.Http;
+using System.Reflection;
+using System.Text.RegularExpressions;
+using System.Windows.Forms;
+
+using static mpvnet.Core;
+
+namespace mpvnet
+{
+    class UpdateCheck
+    {
+        public static void DailyCheck()
+        {
+            if (App.UpdateCheck && RegistryHelp.GetInt(RegistryHelp.ApplicationKey, "UpdateCheckLast")
+                != DateTime.Now.DayOfYear)
+
+                CheckOnline();
+        }
+
+        public static async void CheckOnline(bool showUpToDateMessage = false)
+        {
+            try
+            {
+                using (HttpClient client = new HttpClient())
+                {
+                    RegistryHelp.SetValue(RegistryHelp.ApplicationKey, "UpdateCheckLast", DateTime.Now.DayOfYear);
+                    client.DefaultRequestHeaders.Add("User-Agent", "mpv.net");
+                    var response = await client.GetAsync("https://api.github.com/repos/stax76/mpv.net/releases/latest");
+                    response.EnsureSuccessStatusCode();
+                    string content = await response.Content.ReadAsStringAsync();
+                    Match match = Regex.Match(content, @"""mpv\.net-portable-x64-([\d\.]+)\.7z""");
+                    Version onlineVersion = Version.Parse(match.Groups[1].Value);
+                    Version currentVersion = Assembly.GetEntryAssembly().GetName().Version;
+
+                    if (onlineVersion <= currentVersion)
+                    {
+                        if (showUpToDateMessage)
+                            Msg.Show($"{Application.ProductName} is up to date.");
+
+                        return;
+                    }
+
+                    if ((RegistryHelp.GetString(RegistryHelp.ApplicationKey, "UpdateCheckVersion")
+                        != onlineVersion.ToString() || showUpToDateMessage) && Msg.ShowQuestion(
+                            $"New version {onlineVersion} is available, update now?") == MsgResult.OK)
+                    {
+                        string arch = IntPtr.Size == 8 ? "64" : "86";
+                        string url = $"https://github.com/stax76/mpv.net/releases/download/{onlineVersion}/mpv.net-portable-x{arch}-{onlineVersion}.7z";
+
+                        using (Process proc = new Process())
+                        {
+                            proc.StartInfo.UseShellExecute = true;
+                            proc.StartInfo.WorkingDirectory = Environment.GetFolderPath(Environment.SpecialFolder.Desktop);
+                            proc.StartInfo.FileName = "PowerShell";
+                            proc.StartInfo.Arguments = $"-NoLogo -NoExit -File \"{Folder.Startup + "Update.ps1"}\" \"{url}\" \"{Application.StartupPath.TrimEnd('\\')}\"";
+
+                            if (Folder.Startup.Contains("Program Files"))
+                                proc.StartInfo.Verb = "runas";
+
+                            proc.Start();
+                        }
+
+                        core.command("quit");
+                    }
+
+                    RegistryHelp.SetValue(RegistryHelp.ApplicationKey, "UpdateCheckVersion", onlineVersion.ToString());
+                }
+            }
+            catch (Exception ex)
+            {
+                if (showUpToDateMessage)
+                    Msg.ShowException(ex);
+            }
+        }
+    }
+}

mpv.net/Native/MediaInfo.cs

@@ -1,45 +1,44 @@
-using System;
+
+using System;
 using System.Runtime.InteropServices;
 
 public class MediaInfo : IDisposable
 {
     IntPtr Handle;
-    static bool Loaded;
 
-    public MediaInfo(string sourcepath)
+    public MediaInfo(string file)
     {
-        if (!Loaded)
-        {
-            if (LoadLibrary("MediaInfo.dll") == IntPtr.Zero)
-                throw new Exception("Failed to load MediaInfo.dll.");
+        if ((Handle = MediaInfo_New()) == IntPtr.Zero)
+            throw new Exception("Failed to call MediaInfo_New");
 
-            Loaded = true;
-        }
-
-        Handle = MediaInfo_New();
-        MediaInfo_Open(Handle, sourcepath);
+        if (MediaInfo_Open(Handle, file) == 0)
+            throw new Exception("Error MediaInfo_Open");
     }
 
-    public string GetInfo(MediaInfoStreamKind streamKind, string parameter)
+    public string GetInfo(MediaInfoStreamKind kind, string parameter)
     {
-        return Marshal.PtrToStringUni(MediaInfo_Get(Handle, streamKind, 0, parameter, MediaInfoInfoKind.Text, MediaInfoInfoKind.Name));
+        return Marshal.PtrToStringUni(MediaInfo_Get(Handle, kind, 0,
+            parameter, MediaInfoKind.Text, MediaInfoKind.Name));
     }
 
-    public int GetCount(MediaInfoStreamKind streamKind) => MediaInfo_Count_Get(Handle, streamKind, -1);
+    public int GetCount(MediaInfoStreamKind kind) => MediaInfo_Count_Get(Handle, kind, -1);
 
-    public string GetVideo(int streamNumber, string parameter)
+    public string GetVideo(int stream, string parameter)
     {
-        return Marshal.PtrToStringUni(MediaInfo_Get(Handle, MediaInfoStreamKind.Video, streamNumber, parameter, MediaInfoInfoKind.Text, MediaInfoInfoKind.Name));
+        return Marshal.PtrToStringUni(MediaInfo_Get(Handle, MediaInfoStreamKind.Video,
+            stream, parameter, MediaInfoKind.Text, MediaInfoKind.Name));
     }
 
-    public string GetAudio(int streamNumber, string parameter)
+    public string GetAudio(int stream, string parameter)
     {
-        return Marshal.PtrToStringUni(MediaInfo_Get(Handle, MediaInfoStreamKind.Audio, streamNumber, parameter, MediaInfoInfoKind.Text, MediaInfoInfoKind.Name));
+        return Marshal.PtrToStringUni(MediaInfo_Get(Handle, MediaInfoStreamKind.Audio,
+            stream, parameter, MediaInfoKind.Text, MediaInfoKind.Name));
     }
 
-    public string GetText(int streamNumber, string parameter)
+    public string GetText(int stream, string parameter)
     {
-        return Marshal.PtrToStringUni(MediaInfo_Get(Handle, MediaInfoStreamKind.Text, streamNumber, parameter, MediaInfoInfoKind.Text, MediaInfoInfoKind.Name));
+        return Marshal.PtrToStringUni(MediaInfo_Get(Handle, MediaInfoStreamKind.Text,
+            stream, parameter, MediaInfoKind.Text, MediaInfoKind.Name));
     }
 
     bool Disposed;
@@ -48,41 +47,45 @@ public class MediaInfo : IDisposable
     {
         if (!Disposed)
         {
+            if (Handle != IntPtr.Zero)
+            {
+                MediaInfo_Close(Handle);
+                MediaInfo_Delete(Handle);
+            }
+
             Disposed = true;
-            MediaInfo_Close(Handle);
-            MediaInfo_Delete(Handle);
         }
     }
 
-    ~MediaInfo() { Dispose(); }
-
-    [DllImport("kernel32.dll", CharSet = CharSet.Unicode)]
-    static extern IntPtr LoadLibrary(string path);
+    ~MediaInfo()
+    {
+        Dispose();
+    }
 
     [DllImport("MediaInfo.dll")]
     static extern IntPtr MediaInfo_New();
 
+    [DllImport("MediaInfo.dll", CharSet = CharSet.Unicode)]
+    static extern int MediaInfo_Open(IntPtr handle, string path);
+
+    [DllImport("MediaInfo.dll", CharSet = CharSet.Unicode)]
+    static extern IntPtr MediaInfo_Option(IntPtr handle, string option, string value);
+
+    [DllImport("MediaInfo.dll")]
+    static extern IntPtr MediaInfo_Inform(IntPtr handle, int reserved);
+
+    [DllImport("MediaInfo.dll")]
+    static extern int MediaInfo_Close(IntPtr handle);
+
     [DllImport("MediaInfo.dll")]
     static extern void MediaInfo_Delete(IntPtr handle);
 
     [DllImport("MediaInfo.dll", CharSet = CharSet.Unicode)]
-    static extern int MediaInfo_Open(IntPtr handle, string fileName);
-
-    [DllImport("MediaInfo.dll")]
-    static extern int MediaInfo_Close(IntPtr handle);
+    static extern IntPtr MediaInfo_Get(IntPtr handle, MediaInfoStreamKind kind,
+        int stream, string parameter, MediaInfoKind infoKind, MediaInfoKind searchKind);
 
     [DllImport("MediaInfo.dll", CharSet = CharSet.Unicode)]
-    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);
+    static extern int MediaInfo_Count_Get(IntPtr handle, MediaInfoStreamKind streamKind, int stream);
 }
 
 public enum MediaInfoStreamKind
@@ -97,7 +100,7 @@ public enum MediaInfoStreamKind
     Max,
 }
 
-public enum MediaInfoInfoKind
+public enum MediaInfoKind
 {
     Name,
     Text,
@@ -107,4 +110,4 @@ public enum MediaInfoInfoKind
     MeasureText,
     Info,
     HowTo
-}
+}

mpv.net/Native/Native.cs

@@ -1,77 +1,99 @@
-using System;
+
+using System;
 using System.Drawing;
 using System.Runtime.InteropServices;
 
-namespace mpvnet
+public class WinAPI
 {
-    public class Native
+    [DllImport("kernel32.dll")]
+    public static extern bool AttachConsole(int dwProcessId);
+
+    [DllImport("kernel32.dll")]
+    public static extern bool FreeConsole();
+
+    [DllImport("kernel32.dll")]
+    public static extern IntPtr LoadLibrary(string path);
+
+    [DllImport("user32.dll", CharSet = CharSet.Unicode)]
+    public static extern IntPtr FindWindowEx(IntPtr parentHandle, IntPtr childAfter, string lclassName, string windowTitle);
+
+    [DllImport("user32.dll", CharSet = CharSet.Unicode)]
+    public static extern IntPtr 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, ref COPYDATASTRUCT lParam);
+
+    [DllImport("user32.dll", CharSet = CharSet.Unicode)]
+    public static extern IntPtr PostMessage(IntPtr hWnd, int Msg, IntPtr wParam, IntPtr lParam);
+
+    [DllImport("user32.dll", CharSet = CharSet.Unicode)]
+    public static extern int RegisterWindowMessage(string id);
+
+    [DllImport("user32.dll")]
+    public static extern bool AllowSetForegroundWindow(int dwProcessId);
+
+    [DllImport("user32.dll")]
+    public static extern void ReleaseCapture();
+
+    [DllImport("user32.dll")]
+    public static extern bool AdjustWindowRect(ref RECT lpRect, uint dwStyle, bool bMenu);
+
+    [DllImport("user32.dll")]
+    public static extern bool SetWindowPos(IntPtr hWnd, IntPtr hWndInsertAfter, int x, int y, int cx, int cy, uint uFlags);
+
+    [DllImport("user32.dll", EntryPoint = "GetWindowLong")]
+    static extern IntPtr GetWindowLong32(IntPtr hWnd, int nIndex);
+
+    [DllImport("user32.dll", EntryPoint = "GetWindowLongPtr")]
+    static extern IntPtr GetWindowLong64(IntPtr hWnd, int nIndex);
+
+    public static IntPtr GetWindowLong(IntPtr hWnd, int nIndex)
     {
-        [DllImport("kernel32.dll")]
-        public static extern IntPtr LoadLibrary(string dllToLoad);
-
-        [DllImport("user32.dll", CharSet = CharSet.Unicode)]
-        public static extern IntPtr FindWindowEx(IntPtr parentHandle, IntPtr childAfter, string lclassName, string windowTitle);
-
-        [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.Unicode)]
-        public static extern IntPtr PostMessage(IntPtr hWnd, int Msg, IntPtr wParam, IntPtr lParam);
-
-        [DllImport("user32.dll")]
-        public static extern void ReleaseCapture();
-
-        [DllImport("user32.dll")]
-        public static extern bool AdjustWindowRect(ref RECT lpRect, uint dwStyle, bool bMenu);
-
-        [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")]
-        public static extern bool EnableWindow(IntPtr hWnd, bool bEnable);
-
-        [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
-        {
-            public int Left;
-            public int Top;
-            public int Right;
-            public int Bottom;
-
-            public RECT(Rectangle r)
-            {
-                Left = r.Left;
-                Top = r.Top;
-                Right = r.Right;
-                Bottom = r.Bottom;
-            }
-
-            public RECT(int left, int top, int right, int bottom)
-            {
-                Left = left;
-                Top = top;
-                Right = right;
-                Bottom = bottom;
-            }
-
-            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;
-        }
+        if (IntPtr.Size == 8)
+            return GetWindowLong64(hWnd, nIndex);
+        else
+            return GetWindowLong32(hWnd, nIndex);
     }
-}
+
+    [DllImport("gdi32.dll")]
+    public static extern int GetDeviceCaps(IntPtr hdc, int nIndex);
+
+    [StructLayout(LayoutKind.Sequential)]
+    public struct RECT
+    {
+        public int Left;
+        public int Top;
+        public int Right;
+        public int Bottom;
+
+        public RECT(Rectangle r)
+        {
+            Left = r.Left;
+            Top = r.Top;
+            Right = r.Right;
+            Bottom = r.Bottom;
+        }
+
+        public RECT(int left, int top, int right, int bottom)
+        {
+            Left = left;
+            Top = top;
+            Right = right;
+            Bottom = bottom;
+        }
+
+        public Rectangle ToRectangle() => 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;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    public struct COPYDATASTRUCT
+    {
+        public IntPtr dwData;
+        public int cbData;
+        [MarshalAs(UnmanagedType.LPTStr)]
+        public string lpData;
+    }
+}

mpv.net/Native/NativeHelp.cs

@@ -20,9 +20,9 @@ namespace mpvnet
             }
         }
 
-        public static void SubtractWindowBorders(IntPtr hwnd, ref Native.RECT rc)
+        public static void SubtractWindowBorders(IntPtr hwnd, ref WinAPI.RECT rc)
         {
-            var b = new Native.RECT(0, 0, 0, 0);
+            var b = new WinAPI.RECT(0, 0, 0, 0);
             AddWindowBorders(hwnd, ref b);
             rc.Left -= b.Left;
             rc.Top -= b.Top;
@@ -30,9 +30,9 @@ namespace mpvnet
             rc.Bottom -= b.Bottom;
         }
 
-        public static void AddWindowBorders(IntPtr hwnd, ref Native.RECT rc)
+        public static void AddWindowBorders(IntPtr hwnd, ref WinAPI.RECT rc)
         {
-            Native.AdjustWindowRect(ref rc, (uint)Native.GetWindowLongPtr(hwnd, -16 /* GWL_STYLE */), false);
+            WinAPI.AdjustWindowRect(ref rc, (uint)WinAPI.GetWindowLong(hwnd, -16 /* GWL_STYLE */), false);
         }
     }
 }

mpv.net/Native/TaskDialog.cs

@@ -1,4 +1,5 @@
-using System;
+
+using System;
 using System.Runtime.InteropServices;
 using System.Text;
 using System.Collections.Generic;
@@ -11,7 +12,7 @@ using System.Windows.Forms;
 
 public class Msg
 {
-    private static string ShownMessages;
+    static string ShownMessages;
 
     public static string SupportURL { get; set; }
 
@@ -50,23 +51,23 @@ public class Msg
                 td.Show();
             }
         }
-        catch (Exception ex)
+        catch (Exception e)
         {
-            MessageBox.Show(ex.GetType().Name + "\n\n" + ex.Message + "\n\n" + ex.ToString(),
+            MessageBox.Show(e.GetType().Name + "\n\n" + e.Message + "\n\n" + e,
                 Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Error);
         }
     }
 
-    public static void ShowException(Exception e)
+    public static void ShowException(Exception exception)
     {
         try
         {
             using (TaskDialog<string> td = new TaskDialog<string>())
             {
-                td.MainInstruction = e.GetType().Name;
-                td.Content = e.Message;
+                td.MainInstruction = exception.GetType().Name;
+                td.Content = exception.Message;
                 td.MainIcon = MsgIcon.Error;
-                td.ExpandedInformation = e.ToString();
+                td.ExpandedInformation = exception.StackTrace;
                 td.Footer = "[Copy Message](copymsg)";
 
                 if (!string.IsNullOrEmpty(Msg.SupportURL))
@@ -75,10 +76,9 @@ public class Msg
                 td.Show();
             }
         }
-        catch (Exception ex)
+        catch (Exception e)
         {
-            MessageBox.Show(ex.GetType().Name + "\n\n" + ex.Message + "\n\n" + ex.ToString(),
-                Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Error);
+            MessageBox.Show(e.ToString(), Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Error);
         }
     }
 
@@ -95,24 +95,24 @@ public class Msg
         Msg.ShownMessages += mainInstruction + content;
     }
 
-    public static MsgResult ShowQuestion(string mainInstruction,
-                                         MsgButtons buttons = MsgButtons.OkCancel)
+    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)
+    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)
+    public static MsgResult Show(
+        string mainInstruction,
+        string content,
+        MsgIcon icon,
+        MsgButtons buttons,
+        MsgResult defaultButton = MsgResult.None)
     {
         try
         {
@@ -144,9 +144,9 @@ public class Msg
                 return td.Show();
             }
         }
-        catch (Exception ex)
+        catch (Exception e)
         {
-            return (MsgResult)MessageBox.Show(ex.GetType().Name + "\n\n" + ex.Message + "\n\n" + ex.ToString(),
+            return (MsgResult)MessageBox.Show(e.GetType().Name + "\n\n" + e.Message + "\n\n" + e,
                 Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Error);
         }
     }
@@ -154,14 +154,20 @@ public class Msg
 
 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;
+    Dictionary<int, T>      IdValueDic;
+    Dictionary<int, string> IdTextDic;
+    List<int> CommandLinkShieldList;
+    IntPtr ButtonArray;
+    IntPtr RadioButtonArray;
+    T      SelectedValueValue;
+    string SelectedTextValue;
+    int    TimeoutValue;
+    int    ExitTickCount;
+    bool   Disposed;
+    List<TaskDialogNative.TASKDIALOG_BUTTON> Buttons;
+    List<TaskDialogNative.TASKDIALOG_BUTTON> RadioButtons;
+    TaskDialogNative.TASKDIALOGCONFIG        Config;
+
     const int TDE_CONTENT = 0;
     const int TDE_EXPANDED_INFORMATION = 1;
     const int TDE_FOOTER = 2;
@@ -192,11 +198,6 @@ public class TaskDialog<T> : TaskDialogNative, IDisposable
     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()
     {
@@ -235,6 +236,7 @@ public class TaskDialog<T> : TaskDialogNative, IDisposable
 
         if (Path.GetFileName(lpszFileName.ToString().Replace(".vshost", "")) ==
             Path.GetFileName(Assembly.GetEntryAssembly().Location))
+
             return foregroundWindow;
 
         return IntPtr.Zero;
@@ -283,13 +285,14 @@ public class TaskDialog<T> : TaskDialogNative, IDisposable
         set => Config.MainIcon = new TaskDialogNative.TASKDIALOGCONFIG_ICON_UNION((int)value);
     }
 
-    private int _SelectedID;
+    int _SelectedID;
 
     public int SelectedID {
         get => _SelectedID;
         set {
             foreach (var i in IdValueDic)
-                if (i.Key == value) _SelectedID = value;
+                if (i.Key == value)
+                    _SelectedID = value;
         }
     }
 
@@ -297,6 +300,7 @@ public class TaskDialog<T> : TaskDialogNative, IDisposable
         get {
             if (IdValueDic.ContainsKey(SelectedID))
                 return IdValueDic[SelectedID];
+
             return SelectedValueValue;
         }
         set => SelectedValueValue = value;
@@ -306,13 +310,15 @@ public class TaskDialog<T> : TaskDialogNative, IDisposable
         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;
+        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;
@@ -353,24 +359,30 @@ public class TaskDialog<T> : TaskDialogNative, IDisposable
                 value = regex.Replace(value, "<a href=\"$2\">$1</a>");
             }
         }
+
         return value;
     }
 
-    public void AddCommandLink(string text, T value)
+    public void AddCommand(string text, T value)
     {
         int n = 1000 + IdValueDic.Count + 1;
-        IdValueDic[n] = value == null ? (T)(object)text : value;
+        IdValueDic[n] = 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)
+    public void AddCommand(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;
+
+        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;
     }
@@ -386,10 +398,17 @@ public class TaskDialog<T> : TaskDialogNative, IDisposable
     {
         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);
+        int hr = TaskDialogNative.TaskDialogIndirect(
+            config, out int dummy1, out int dummy2, out bool isChecked);
+
+        if (hr < 0)
+            Marshal.ThrowExceptionForHR(hr);
+
         CheckBoxChecked = isChecked;
-        if (SelectedValue is MsgResult) SelectedValue = (T)(object)SelectedID;
+
+        if (SelectedValue is MsgResult)
+            SelectedValue = (T)(object)SelectedID;
+
         return SelectedValue;
     }
 
@@ -410,8 +429,10 @@ public class TaskDialog<T> : TaskDialogNative, IDisposable
                 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)(() => {
@@ -473,8 +494,10 @@ public class TaskDialog<T> : TaskDialogNative, IDisposable
 
     protected void Dispose(bool disposing)
     {
-        if (disposed) return;
-        disposed = true;
+        if (Disposed)
+            return;
+
+        Disposed = true;
 
         if (ButtonArray != IntPtr.Zero)
         {
@@ -491,36 +514,27 @@ public class TaskDialog<T> : TaskDialogNative, IDisposable
 }
 
 public delegate int PFTASKDIALOGCALLBACK(
-    IntPtr hwnd,
-    uint msg,
-    IntPtr wParam,
-    IntPtr lParam,
-    IntPtr lpRefData);
+    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,
+        TaskDialogNative.TASKDIALOGCONFIG pTaskConfig,
         out int pnButton,
         out int pnRadioButton,
-        [MarshalAs(UnmanagedType.Bool)] out bool pVerificationFlagChecked);
+        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);
+        IntPtr hwnd, StringBuilder lpszFileName, uint cchFileNameMax);
 
     [DllImport("user32.dll")]
     public static extern IntPtr SendMessage(
-        IntPtr handle,
-        int message,
-        IntPtr wParam,
-        IntPtr lParam);
+        IntPtr handle, int message, IntPtr wParam, IntPtr lParam);
 
     [StructLayout(LayoutKind.Sequential, Pack = 4, CharSet = CharSet.Unicode)]
     public class TASKDIALOGCONFIG
@@ -530,12 +544,9 @@ public class TaskDialogNative
         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;
@@ -543,16 +554,11 @@ public class TaskDialogNative
         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;
@@ -653,4 +659,4 @@ public enum MsgIcon
     Info = 65533,
     Error = 65534,
     Warning = 65535,
-}
+}

mpv.net/Native/Taskbar.cs

@@ -0,0 +1,55 @@
+
+using System;
+using System.Runtime.InteropServices;
+
+public class Taskbar
+{
+    public IntPtr Handle { get; set; }
+
+    public Taskbar(IntPtr handle) => Handle = handle;
+ 
+    ITaskbarList3 Instance = (ITaskbarList3)new TaskBarCommunication();
+
+    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+    [Guid("EA1AFB91-9E28-4B86-90E9-9E9F8A5EEFAF")]
+    interface ITaskbarList3
+    {
+        // ITaskbarList
+        [PreserveSig] void HrInit();
+        [PreserveSig] void AddTab(IntPtr hwnd);
+        [PreserveSig] void DeleteTab(IntPtr hwnd);
+        [PreserveSig] void ActivateTab(IntPtr hwnd);
+        [PreserveSig] void SetActiveAlt(IntPtr hwnd);
+        // ITaskbarList2
+        [PreserveSig] void MarkFullscreenWindow(IntPtr hwnd, [MarshalAs(UnmanagedType.Bool)] bool fFullscreen);
+        // ITaskbarList3
+        [PreserveSig] void SetProgressValue(IntPtr hwnd, UInt64 ullCompleted, UInt64 ullTotal);
+        [PreserveSig] void SetProgressState(IntPtr hwnd, TaskbarStates state);
+    }
+
+    [ComImport]
+    [ClassInterface(ClassInterfaceType.None)]
+    [Guid("56FDF344-FD6D-11d0-958A-006097C9A090")]
+    class TaskBarCommunication
+    {
+    }
+
+    public void SetState(TaskbarStates taskbarState)
+    {
+        Instance.SetProgressState(Handle, taskbarState);
+    }
+
+    public void SetValue(double progressValue, double progressMax)
+    {
+        Instance.SetProgressValue(Handle, (UInt64)progressValue, (UInt64)progressMax);
+    }
+}
+
+public enum TaskbarStates
+{
+    NoProgress = 0,
+    Indeterminate = 0x1,
+    Normal = 0x2,
+    Error = 0x4,
+    Paused = 0x8
+}

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("A modern media player")]
+[assembly: AssemblyDescription("mpv based media player")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
+[assembly: AssemblyCompany("Frank Skare (stax76)")]
 [assembly: AssemblyProduct("mpv.net")]
-[assembly: AssemblyCopyright("Copyright © 2017-2019 Frank Skare (stax76)")]
+[assembly: AssemblyCopyright("Copyright (C) 2017-2020 Frank Skare (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("4.3.0.0")]
-[assembly: AssemblyFileVersion("4.3.0.0")]
+[assembly: AssemblyVersion("5.4.6.0")]
+[assembly: AssemblyFileVersion("5.4.6.0")]

mpv.net/Properties/Resources.Designer.cs

@@ -62,84 +62,63 @@ namespace mpvnet.Properties {
         
         /// <summary>
         ///   Looks up a localized string similar to 
-        /// # 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&apos;s context menu at:
-        ///
-        /// # Settings &gt; Show Config Editor
-        /// # Settings &gt; 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
-        ///
-        /// # th [rest of string was truncated]&quot;;.
-        /// </summary>
-        internal static string inputConf {
-            get {
-                return ResourceManager.GetString("inputConf", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to 
-        /// # 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&apos;s context menu at:
-        ///
-        /// # Settings &gt; Show Config Editor
-        /// # Settings &gt; 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
-        ///
-        /// # t [rest of string was truncated]&quot;;.
-        /// </summary>
-        internal static string inputConfHeader {
-            get {
-                return ResourceManager.GetString("inputConfHeader", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to 
-        ///# 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
-        ///.
-        /// </summary>
-        internal static string mpvConf {
-            get {
-                return ResourceManager.GetString("mpvConf", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to [[settings]]
+        ///[[settings]]
         ///name = &quot;hwdec&quot;
+        ///file = &quot;mpv&quot;
         ///default = &quot;no&quot;
         ///filter = &quot;Video&quot;
-        ///helpurl = &quot;https://mpv.io/manual/master/#options-hwdec&quot;
+        ///url = &quot;https://mpv.io/manual/master/#options-hwdec&quot;
         ///help = &quot;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:&quot;
         ///options = [{ name = &quot;no&quot;,           help = &quot;always use software decoding&quot; },
-        ///           { name = &quot;auto&quot;,         help = &quot;enabl [rest of string was truncated]&quot;;.
+        ///           { name = &quot;auto&quot;,         h [rest of string was truncated]&quot;;.
         /// </summary>
-        internal static string mpvConfToml {
+        internal static string editor_toml {
             get {
-                return ResourceManager.GetString("mpvConfToml", resourceCulture);
+                return ResourceManager.GetString("editor_toml", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to 
+        /// # This file defines the key and mouse bindings and the context menu
+        /// # of mpv.net. A input and config editor can be found in mpv.nets
+        /// # context menu under &apos;Settings&apos;. 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&apos;s defaults of mpv.conf contain: &apos;input-default-bindings = no&apos;
+        /// # which disables mpv&apos;s i [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-default-bindings = no
+        ///input-ar-delay = 500
+        ///input-ar-rate = 20
+        ///keep-open = yes
+        ///keep-open-pause = no
+        ///osd-duration = 2000
+        ///osd-playing-msg = &apos;${filename}&apos;
+        ///script-opts = osc-scalewindowed=1.5,osc-hidetimeout=2000,console-scale=1
+        ///screenshot-directory = &apos;~~desktop/&apos;
+        ///hwdec = yes
+        ///
+        ///[protocol.https]
+        ///osd-playing-msg = &apos;${media-title}&apos;
+        ///.
+        /// </summary>
+        internal static string mpv_conf {
+            get {
+                return ResourceManager.GetString("mpv_conf", resourceCulture);
             }
         }
         
@@ -154,26 +133,38 @@ namespace mpvnet.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to [[settings]]
-        ///name = &quot;dark-mode&quot;
-        ///default = &quot;always&quot;
-        ///filter = &quot;mpv.net&quot;
-        ///help = &quot;Enables a dark theme.&quot;
-        ///options = [{ name = &quot;always&quot; },
-        ///           { name = &quot;system&quot; , help = &quot;Available on Windows 10 or higher&quot; },
-        ///		   { name = &quot;never&quot; }]
+        ///   Looks up a localized string similar to 
+        ///[dark]
         ///
-        ///[[settings]]
-        ///name = &quot;clipboard-monitoring&quot;
-        ///default = &quot;yes&quot;
-        ///filter = &quot;mpv.net&quot;
-        ///help = &quot;Monitors the clipboard for URLs to play.&quot;
-        ///options = [{ name = &quot;yes&quot; },
-        ///           { name = &quot;no&quot; }].
+        ///heading     = #3C8CC8
+        ///foreground  = #DDDDDD
+        ///foreground2 = #AAAAAA
+        ///background  = #323232
+        ///
+        ///menu-foreground = #DDDDDD
+        ///menu-background = #323232
+        ///menu-highlight  = #505050
+        ///menu-border     = #FFFFFF
+        ///menu-checked    = #5A5A5A
+        ///
+        ///
+        ///[light]
+        ///
+        ///heading     = #0068B2
+        ///foreground  = #000000
+        ///foreground2 = #4C4C4C
+        ///background  = #F7F7F7
+        ///
+        ///menu-foreground = #000000
+        ///menu-background = #DFDFDF
+        ///menu-highlight  = #BFBFBF
+        ///menu-border     = #6A6A6A
+        ///menu-checked    = #AAAAAA
+        ///.
         /// </summary>
-        internal static string mpvNetConfToml {
+        internal static string theme {
             get {
-                return ResourceManager.GetString("mpvNetConfToml", resourceCulture);
+                return ResourceManager.GetString("theme", resourceCulture);
             }
         }
     }

mpv.net/Properties/Resources.resx

@@ -118,22 +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="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 name="editor_toml" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\editor.toml.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
   </data>
-  <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 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>
   <data name="mpvnet" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\mpvnet.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</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 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>
+  <data name="theme" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\theme.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", "16.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.3.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/Resources/editor.toml.txt

@@ -1,8 +1,10 @@
-[[settings]]
+
+[[settings]]
 name = "hwdec"
+file = "mpv"
 default = "no"
 filter = "Video"
-helpurl = "https://mpv.io/manual/master/#options-hwdec"
+url = "https://mpv.io/manual/master/#options-hwdec"
 help = "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" },
            { name = "auto",         help = "enable best hw decoder (see below)" },
@@ -21,16 +23,18 @@ options = [{ name = "no",           help = "always use software decoding" },
 
 [[settings]]
 name = "gpu-api"
+file = "mpv"
 default = "auto"
 filter = "Video"
-help = "Controls which type of graphics APIs will be accepted."
+help = "Controls which type of graphics APIs will be accepted. Auto uses d3d11, it should only be changed in case of problems, Vulkan is not recommended."
 options = [{ name = "auto",   help = "Use any available API" },
            { 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 = "vulkan", help = "Allow only Vulkan (not recommended). " },
            { name = "d3d11",  help = "Allow only gpu-context=d3d11" }]
 
 [[settings]]
 name = "gpu-context"
+file = "mpv"
 default = "auto"
 filter = "Video"
 options = [{ name = "auto",      help = "auto-select" },
@@ -42,19 +46,21 @@ options = [{ name = "auto",      help = "auto-select" },
 
 [[settings]]
 name = "vo"
+file = "mpv"
 default = "gpu"
 filter = "Video"
 help = "Video output drivers to be used.\n\nFor more information visit:"
-helpurl = "https://mpv.io/manual/master/#video-output-drivers-vo"
+url = "https://mpv.io/manual/master/#video-output-drivers-vo"
 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." },
            { name = "direct3d", help = "Video output driver that uses the Direct3D interface" }]
 
 [[settings]]
 name = "video-sync"
+file = "mpv"
 default = "audio"
 filter = "Video"
 help = "How the player synchronizes audio and video.\n\nFor more information visit:"
-helpurl = "https://mpv.io/manual/master/#options-video-sync"
+url = "https://mpv.io/manual/master/#options-video-sync"
 options = [{ name = "audio" },
            { name = "display-resample" },
            { name = "display-resample-vdrop" },
@@ -66,6 +72,7 @@ options = [{ name = "audio" },
 
 [[settings]]
 name = "scale"
+file = "mpv"
 default = "bilinear"
 filter = "Video"
 help = "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"
@@ -80,6 +87,7 @@ options = [{ name = "bilinear",         help = "Bilinear hardware texture filter
 
 [[settings]]
 name = "cscale"
+file = "mpv"
 default = "bilinear"
 filter = "Video"
 help = "As scale, but for interpolating chroma information. If the image is not subsampled, this option is ignored entirely."
@@ -94,6 +102,7 @@ options = [{ name = "bilinear",         help = "Bilinear hardware texture filter
 
 [[settings]]
 name = "dscale"
+file = "mpv"
 default = "bilinear"
 filter = "Video"
 help = "Like scale, but apply these filters on downscaling instead. If this option is unset, the filter implied by scale will be applied."
@@ -108,6 +117,7 @@ options = [{ name = "bilinear",         help = "Bilinear hardware texture filter
 
 [[settings]]
 name = "dither-depth"
+file = "mpv"
 default = "no"
 filter = "Video"
 help = "Set dither target depth to N. 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."
@@ -117,6 +127,7 @@ options = [{ name = "no",   help = "Disable any dithering done by mpv." },
 
 [[settings]]
 name = "correct-downscaling"
+file = "mpv"
 default = "no"
 filter = "Video"
 help = "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."
@@ -125,6 +136,7 @@ options = [{ name = "yes" },
 
 [[settings]]
 name = "sigmoid-upscaling"
+file = "mpv"
 default = "no"
 filter = "Video"
 help = "When upscaling, use a sigmoidal color transform to avoid emphasizing ringing artifacts. This also implies linear-scaling."
@@ -133,26 +145,57 @@ options = [{ name = "yes" },
 
 [[settings]]
 name = "deband"
+file = "mpv"
 default = "no"
 filter = "Video"
 help = "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 = "d3d11va-zero-copy"
+file = "mpv"
+default = "no"
+filter = "Video"
+help = "By default, when using hardware decoding with --gpu-api=d3d11, the video image will be copied (GPU-to-GPU) from the decoder surface to a shader resource. Set this option to avoid that copy by sampling directly from the decoder image. This may increase performance and reduce power usage, but can cause the image to be sampled incorrectly on the bottom and right edges due to padding, and may invoke driver bugs, since Direct3D 11 technically does not allow sampling from a decoder surface (though most drivers support it.)"
+options = [{ name = "yes" },
+           { name = "no" }]
+
+[[settings]]
+name = "hdr-compute-peak"
+file = "mpv"
+default = "auto"
+filter = "Video"
+help = "Compute the HDR peak and frame average brightness per-frame instead of relying on tagged metadata. These values are averaged over local regions as well as over several frames to prevent the value from jittering around too much. This option basically gives you dynamic, per-scene tone mapping. Requires compute shaders, which is a fairly recent OpenGL feature, and will probably also perform horribly on some drivers, so enable at your own risk. The special value auto (default) will enable HDR peak computation automatically if compute shaders and SSBOs are supported."
+options = [{ name = "auto" },
+           { name = "yes" },
+           { name = "no" }]
+
 [[settings]]
 name = "volume"
-default = "100"
+file = "mpv"
 filter = "Audio"
 help = "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 = ""
+name = "remember-volume"
+file = "mpvnet"
+default = "yes"
 filter = "Audio"
+help = "Save volume and mute on exit and restore it on start. (mpv.net specific setting)"
+options = [{ name = "yes" },
+           { name = "no" }]
+
+[[settings]]
+name = "alang"
+file = "mpv"
+filter = "Audio"
+type = "string"
 help = "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"
+file = "mpv"
 default = "no"
 filter = "Audio"
 help = "Load additional audio files matching the video filename. The parameter specifies how external audio files are matched."
@@ -163,12 +206,14 @@ options = [{ name = "no",    help = "Don't automatically load external audio fil
 
 [[settings]]
 name = "slang"
-default = ""
+file = "mpv"
 filter = "Subtitle"
+type = "string"
 help = "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"
+file = "mpv"
 default = "exact"
 filter = "Subtitle"
 help = "Load additional subtitle files matching the video filename. The parameter specifies how external subtitle files are matched. exact is enabled by default."
@@ -179,59 +224,41 @@ options = [{ name = "no",    help = "Don't automatically load external subtitle
 
 [[settings]]
 name = "sub-font"
-default = ""
+file = "mpv"
 filter = "Subtitle"
+type = "string"
 help = "Specify font to use for subtitles that do not themselves specify a particular font. The default is  sans-serif."
 
 [[settings]]
 name = "sub-font-size"
-default = ""
+file = "mpv"
 filter = "Subtitle"
 help = "Specify the sub font size. The unit is the size in scaled pixels at a window height of 720. The actual pixel size is scaled with the window height: if the window height is larger or smaller than 720, the actual size of the text increases or decreases as well. Default: 55"
 
 [[settings]]
 name = "sub-color"
-default = ""
+file = "mpv"
 type = "color"
 filter = "Subtitle"
 help = "Specify the color used for unstyled text subtitles.\n\nThe color is specified in the form r/g/b, where each color component is specified as number in the range 0.0 to 1.0. It's also possible to specify the transparency by using r/g/b/a, where the alpha value 0 means fully transparent, and 1.0 means opaque. If the alpha component is not given, the color is 100% opaque.\n\nPassing a single number to the option sets the sub to gray, and the form gray/a lets you specify alpha additionally.\n\nExamples\n\n1.0/0.0/0.0 set sub to opaque red\n1.0/0.0/0.0/0.75 set sub to opaque red with 75% alpha\n0.5/0.75 set sub to 50% gray with 75% alpha\n\nAlternatively, the color can be specified as a RGB hex triplet in the form #RRGGBB, where each 2-digit group expresses a color value in the range 0 (00) to 255 (FF). For example, #FF0000 is red. This is similar to web colors. Alpha is given with #AARRGGBB.\n\nExamples\n\n#FF0000 set sub to opaque red\n#C0808080 set sub to 50% gray with 75% alpha"
 
 [[settings]]
 name = "sub-border-color"
-default = ""
+file = "mpv"
 type = "color"
 filter = "Subtitle"
 help = "See sub-color. Color used for the sub font border. Ignored when sub-back-color is specified (or more exactly: when that option is not set to completely transparent)."
 
 [[settings]]
 name = "sub-back-color"
-default = ""
+file = "mpv"
 type = "color"
 filter = "Subtitle"
 help = "See sub-color. Color used for sub text background. You can use sub-shadow-offset to change its size relative to the text."
 
-[[settings]]
-name = "screen"
-default = ""
-filter = "Screen"
-help = "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."
-
-[[settings]]
-name = "osd-playing-msg"
-default = ""
-width = 300
-filter = "Screen"
-help = "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 = "osd-font-size"
-default = "55"
-filter = "Screen"
-help = "Specify the OSD font size. See sub-font-size for details. Default: 55"
-
 [[settings]]
 name = "fullscreen"
+file = "mpv"
 default = "no"
 filter = "Screen"
 help = "Start the player in fullscreen mode."
@@ -239,21 +266,190 @@ options = [{ name = "yes" },
            { name = "no" }]
 
 [[settings]]
-name = "screenshot-directory"
-default = ""
-width = 500
-type = "folder"
+name = "border"
+file = "mpv"
+default = "yes"
 filter = "Screen"
-help = "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."
+help = "Show window with decoration (titlebar, border)."
+options = [{ name = "yes" },
+           { name = "no" }]
+
+[[settings]]
+name = "screen"
+file = "mpv"
+filter = "Screen"
+help = "<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."
+
+[[settings]]
+name = "osd-playing-msg"
+file = "mpv"
+width = 300
+filter = "Screen"
+type = "string"
+help = "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:"
+url = "https://mpv.io/manual/master/#property-expansion"
+
+[[settings]]
+name = "osd-font-size"
+file = "mpv"
+filter = "Screen"
+help = "Specify the OSD font size. See sub-font-size for details. Default: 55"
+
+[[settings]]
+name = "osd-duration"
+file = "mpv"
+filter = "Screen"
+help = "Set the duration of the OSD messages in ms. Default: 1000"
+
+[[settings]]
+name = "osd-scale-by-window"
+file = "mpv"
+default = "yes"
+filter = "Screen"
+help = "Whether to scale the OSD with the window size. If this is disabled, osd-font-size and other OSD options that use scaled pixels are always in actual pixels. The effect is that changing the window size won't change the OSD font size."
+options = [{ name = "yes" },
+           { name = "no" }]
 
 [[settings]]
 name = "autofit"
-default = "50%"
+file = "mpv"
 filter = "Screen"
-help = "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%"
+help = "<int> Initial window height in percent. Default: 50"
+
+[[settings]]
+name = "autofit-smaller"
+file = "mpv"
+filter = "Screen"
+help = "<int> Minimum window height in percent. Default: 30"
+
+[[settings]]
+name = "autofit-larger"
+file = "mpv"
+filter = "Screen"
+help = "<int> Maximum window height in percent. Default: 80"
+
+[[settings]]
+name = "start-size"
+file = "mpvnet"
+default = "previous"
+filter = "Screen"
+help = "Setting to remember the window height. (mpv.net specific setting)"
+options = [{ name = "video",    help = "Window size is set to video resolution" },
+           { name = "previous", help = "Window size is remembered but only in the current session" },
+           { name = "always",   help = "Window size is always remembered"}]
+
+[[settings]]
+name = "start-threshold"
+file = "mpvnet"
+filter = "Screen"
+help = "Threshold in milliseconds to wait for libmpv returning the video resolution before the window is shown, otherwise default dimensions are used as defined by autofit and start-size. Default: 1500 (mpv.net specific setting)"
+
+[[settings]]
+name = "minimum-aspect-ratio"
+file = "mpvnet"
+filter = "Screen"
+help = "<float> Minimum aspect ratio for the window. Default: 1.2 (mpv.net specific setting)"
+
+[[settings]]
+name = "remember-position"
+file = "mpvnet"
+default = "no"
+filter = "Screen"
+help = "Save the window position on exit. (mpv.net specific setting)"
+options = [{ name = "yes" },
+           { name = "no" }]
+
+[[settings]]
+name = "window-maximized"
+file = "mpv"
+default = "no"
+filter = "Screen"
+help = "Start with a maximized window."
+options = [{ name = "yes" },
+           { name = "no" }]
+
+[[settings]]
+name = "screenshot-directory"
+file = "mpv"
+width = 500
+type = "folder"
+filter = "Screen"
+help = "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."
+
+[[settings]]
+name = "screenshot-format"
+file = "mpv"
+default = "jpg"
+filter = "Screen"
+help = "Set the image file type used for saving screenshots."
+options = [{ name = "jpg" },
+           { name = "png" }]
+
+[[settings]]
+name = "screenshot-tag-colorspace"
+file = "mpv"
+default = "no"
+filter = "Screen"
+help = "Tag screenshots with the appropriate colorspace. Note that not all formats are supported."
+options = [{ name = "yes" },
+           { name = "no" }]
+
+[[settings]]
+name = "screenshot-high-bit-depth"
+file = "mpv"
+default = "yes"
+filter = "Screen"
+help = "If possible, write screenshots with a bit depth similar to the source video. This is interesting in particular for PNG, as this sometimes triggers writing 16 bit PNGs with huge file sizes. This will also include an unused alpha channel in the resulting files if 16 bit is used."
+options = [{ name = "yes" },
+           { name = "no" }]
+
+[[settings]]
+name = "screenshot-jpeg-source-chroma"
+file = "mpv"
+default = "yes"
+filter = "Screen"
+help = "Write JPEG files with the same chroma subsampling as the video. If disabled, the libjpeg default is used."
+options = [{ name = "yes" },
+           { name = "no" }]
+
+[[settings]]
+name = "screenshot-template"
+file = "mpv"
+filter = "Screen"
+type = "string"
+help = "Specify the filename template used to save screenshots. The template specifies the filename without file extension, and can contain format specifiers, which will be substituted when taking a screenshot. By default, the template is mpv-shot%n, which results in filenames like  mpv-shot0012.png for example.\n\nFind the full documentation here:"
+url = "https://mpv.io/manual/master/#options-screenshot-template"
+
+[[settings]]
+name = "screenshot-jpeg-quality"
+file = "mpv"
+filter = "Screen"
+help = "<0-100> Set the JPEG quality level. Higher means better quality. The default is 90."
+
+[[settings]]
+name = "screenshot-png-compression"
+file = "mpv"
+filter = "Screen"
+help = "<0-9> Set the PNG compression level. Higher means better compression. This will affect the file size of the written screenshot file and the time it takes to write a screenshot. Too high compression might occupy enough CPU time to interrupt playback. The default is 7."
+
+[[settings]]
+name = "screenshot-png-filter"
+file = "mpv"
+filter = "Screen"
+help = "<0-5> Set the filter applied prior to PNG compression. 0 is none, 1 is 'sub', 2 is 'up', 3 is 'average', 4 is 'Paeth', and 5 is 'mixed'. This affects the level of compression that can be achieved. For most images, 'mixed' achieves the best compression ratio, hence it is the default."
+
+[[settings]]
+name = "taskbar-progress"
+file = "mpv"
+default = "yes"
+filter = "Playback"
+help = "Show progress in taskbar."
+options = [{ name = "yes" },
+           { name = "no" }]
 
 [[settings]]
 name = "keep-open-pause"
+file = "mpv"
 default = "yes"
 filter = "Playback"
 help = "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."
@@ -262,41 +458,32 @@ options = [{ name = "yes" },
 
 [[settings]]
 name = "keep-open"
+file = "mpv"
 default = "no"
 filter = "Playback"
-help = "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." },
-           { 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."}]
+help = "Using no, mpv would terminate after the last file but mpv.net never terminates automatically."
+options = [{ name = "yes",    help = "If the current file ends, go to the next file, keep the last file open."},
+           { name = "no",     help = "If the current file ends, go to the next file." },
+           { name = "always", help = "Playback will never automatically advance to the next file."}]
 
 [[settings]]
 name = "loop-file"
-default = ""
+file = "mpv"
 filter = "Playback"
-help = "Loop a single file N times. inf means forever, no means normal playback.\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. loop is an alias for this option."
+help = "<N|inf|no> Loop a single file N times. inf means forever, no means normal playback.\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. loop is an alias for this option."
 
 [[settings]]
 name = "save-position-on-quit"
+file = "mpv"
 default = "no"
 filter = "Playback"
 help = "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 = "Delay in milliseconds before we start to autorepeat a key (0 to disable)."
-
-[[settings]]
-name = "input-ar-rate"
-default = ""
-filter = "Input"
-help = "Number of key presses to generate per second on autorepeat."
-
 [[settings]]
 name = "hr-seek"
+file = "mpv"
 default = "absolute"
 filter = "Playback"
 help = "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."
@@ -307,6 +494,7 @@ options = [{ name = "yes",      help = "Use precise seeks whenever possible." },
 
 [[settings]]
 name = "track-auto-selection"
+file = "mpv"
 default = "yes"
 filter = "Playback"
 help = "Enable the default track auto-selection. 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."
@@ -315,6 +503,85 @@ options = [{ name = "yes" },
 
 [[settings]]
 name = "loop-playlist"
-default = ""
+file = "mpv"
 filter = "Playback"
-help = "<N|inf|force|no> 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. The 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."
+help = "<N|inf|force|no> 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. The 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."
+
+[[settings]]
+name = "auto-load-folder"
+file = "mpvnet"
+default = "yes"
+filter = "Playback"
+help = "For single files automatically load the entire directory into the playlist. Can be suppressed via shift key. (mpv.net specific setting)"
+options = [{ name = "yes" },
+           { name = "no" }]
+
+[[settings]]
+name = "input-ar-delay"
+file = "mpv"
+filter = "Input"
+help = "Delay in milliseconds before we start to autorepeat a key (0 to disable)."
+
+[[settings]]
+name = "input-ar-rate"
+file = "mpv"
+filter = "Input"
+help = "Number of key presses to generate per second on autorepeat."
+
+[[settings]]
+name = "update-check"
+file = "mpvnet"
+default = "no"
+filter = "General"
+help = "Daily check for new version. (requires PowerShell 5 and curl. mpv.net specific setting)"
+options = [{ name = "yes" },
+           { name = "no" }]
+
+[[settings]]
+name = "process-instance"
+file = "mpvnet"
+default = "single"
+filter = "General"
+help = "Defines if more then one mpv.net process is allowed. (mpv.net specific setting)\n\nTip: Whenever the control key is pressed when files or URLs are opened, the playlist is not cleared but the files or URLs are appended to the playlist. This not only works on process startup but in all mpv.net features that open files and URLs."
+options = [{ name = "multi",  help = "Create a new process everytime the shell starts mpv.net" },
+           { name = "single", help = "Force a single process everytime the shell starts mpv.net" },
+		   { name = "queue",  help = "Force a single process and add files to playlist" }]
+
+[[settings]]
+name = "recent-count"
+file = "mpvnet"
+filter = "General"
+help = "<int> Amount of recent files to be remembered. Default: 15 (mpv.net specific setting)"
+
+[[settings]]
+name = "debug-mode"
+file = "mpvnet"
+default = "no"
+filter = "General"
+help = "Enable this only when a developer asks for it. (mpv.net specific setting)"
+options = [{ name = "yes" },
+           { name = "no" }]
+
+[[settings]]
+name = "dark-mode"
+file = "mpvnet"
+default = "always"
+filter = "UI"
+help = "Enables a dark theme. (mpv.net specific setting)"
+options = [{ name = "always" },
+           { name = "system" , help = "Available on Windows 10 or higher" },
+		   { name = "never" }]
+
+[[settings]]
+name = "dark-theme"
+file = "mpvnet"
+filter = "UI"
+url = "https://github.com/stax76/mpv.net/blob/master/Manual.md#color-theme"
+help = "Color theme used in dark mode. Default: dark"
+
+[[settings]]
+name = "light-theme"
+file = "mpvnet"
+filter = "UI"
+url = "https://github.com/stax76/mpv.net/blob/master/Manual.md#color-theme"
+help = "Color theme used in light mode. Default: light"

mpv.net/Resources/input.conf.txt

@@ -1,39 +1,34 @@
 
- # 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:
+ # This file defines the key and mouse bindings and the context menu
+ # of mpv.net. A input and config editor can be found in mpv.nets
+ # context menu under 'Settings'. The defaults of this file can be found at:
 
- # Settings > Show Config Editor
- # Settings > Show Input Editor
+ # https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/input.conf.txt
 
- # 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:
+ # 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 '.
+ # if 'o' has already a binding you can do a text search on ' o '.
 
- # mpv input commands: https://github.com/stax76/mpv.net/wiki/mpv-input-commands
+ # mpv input commands: https://mpv.io/manual/master/#list-of-input-commands
 
- # mpv input keys:     https://github.com/stax76/mpv.net/wiki/mpv-input-keys
+ # run mpv.net in input test mode with: mpvnet --input-test
 
- 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 > -
- _           script-message mpv.net add-files-to-playlist #menu: Open > Add files to playlist...
- Ctrl+S      script-message mpv.net show-media-search #menu: Open > Show media search...
- _           ignore                            #menu: Open > -
- _           ignore                            #menu: Open > Recent
+ o           script-message mpv.net open-files         #menu: Open > Open Files...
+ u           script-message mpv.net open-url           #menu: Open > Open URL or file path from clipboard
+ _           script-message mpv.net open-optical-media #menu: Open > Open DVD/Blu-ray Drive/Folder...
+ _           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 > -
+ _           script-message mpv.net open-files append  #menu: Open > Add files to playlist...
+ F3          script-message mpv.net show-media-search  #menu: Open > Show media search...
+ _           ignore                                    #menu: Open > -
+ _           ignore                                    #menu: Open > Recent
 
  _           ignore                 #menu: -
  Space       cycle pause            #menu: Play/Pause
@@ -44,20 +39,23 @@
  F11         playlist-prev          #menu: Navigate > Previous File
  F12         playlist-next          #menu: Navigate > Next File
  _           ignore                 #menu: Navigate > -
+ Home        script-message mpv.net playlist-first #menu: Navigate > First File
+ End         script-message mpv.net playlist-last  #menu: Navigate > Last 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
+ Right       seek  7                #menu: Navigate > Jump 7 sec forward
+ Left        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
+ Up          seek  40               #menu: Navigate > Jump 40 sec forward
+ Down        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
+ Ctrl+Right  seek  300              #menu: Navigate > Jump 5 min forward
+ Ctrl+Left   seek -300              #menu: Navigate > Jump 5 min backward
  _           ignore                 #menu: Navigate > -
  _           ignore                 #menu: Navigate > Chapters
 
@@ -129,55 +127,74 @@
  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
+ _   ignore                         #menu: Extensions > Rating > -
+ _   script-message rate-file about #menu: Extensions > Rating > About
 
- 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+t  set ontop yes                               #menu: View > On Top > Enable
+ Ctrl+T  set ontop no                                #menu: View > On Top > Disable
+ Alt++   no-osd set window-scale 1.2                 #menu: View > Window Size > Enlarge
+ Alt+-   no-osd set window-scale 0.8                 #menu: View > Window Size > Shrink
+ b       cycle border                                #menu: View > Toggle Border
+ i       script-message mpv.net show-info            #menu: View > File/Stream 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      script-binding show-playlist                #menu: View > Show Playlist
+ F9      show-text ${track-list} 5000                #menu: View > Show Audio/Video/Subtitle List
+ p       show-progress                               #menu: View > Show Progress
+ Ctrl+p  script-message mpv.net show-profiles        #menu: View > Show Profiles
+ Shift+p script-message mpv.net show-properties      #menu: View > Show Properties
+ Shift+c script-message mpv.net show-commands        #menu: View > Show Commands
+ `       script-binding console/enable               #menu: View > Show Console
 
- 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
+ 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...
+ F1      script-message mpv.net show-command-palette #menu: Tools > Show All Commands
+ 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
+ _       cycle shuffle                               #menu: Tools > Toggle Shuffle
+ Ctrl+h  cycle-values hwdec "auto" "no"              #menu: Tools > Toggle Hardware Decoding
+ _ script-message mpv.net show-setup-dialog          #menu: Tools > Setup...
 
- _ 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
- _ script-message mpv.net shell-execute https://github.com/stax76/mpv.net/blob/master/Manual.md #menu: Help > Show mpv.net manual
- _ ignore                                         #menu: Help > -
- _ script-message mpv.net show-about              #menu: Help > About mpv.net
+ _ script-message mpv.net shell-execute https://mpv.io                    #menu: Help > Website mpv
+ _ script-message mpv.net shell-execute https://github.com/stax76/mpv.net #menu: Help > Website mpv.net
+ _ ignore                                                                 #menu: Help > -
+ _ script-message mpv.net shell-execute https://mpv.io/manual/stable/     #menu: Help > Manual mpv
+ _ script-message mpv.net shell-execute https://github.com/stax76/mpv.net/blob/master/Manual.md #menu: Help > Manual mpv.net
+ _ ignore                                                                 #menu: Help > -
+ _ script-message mpv.net update-check                                    #menu: Help > Check for Updates
+ _ 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
-
- MBTN_LEFT_DBL cycle fullscreen
+ Power        quit
+ Play         cycle pause
+ Pause        cycle pause
+ PlayPause    cycle pause
+ MBTN_Mid     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
+ Wheel_Left   add volume -10
+ Wheel_Right  add volume  10
+ Prev         playlist-prev
+ Next         playlist-next
+ MBTN_Forward playlist-next
+ MBTN_Back    playlist-prev
+ >            playlist-next
+ <            playlist-prev
+ Ctrl+Wheel_Up   no-osd seek  7
+ Ctrl+Wheel_Down no-osd seek -7
+ MBTN_Left_DBL   cycle fullscreen
+ KP_Enter        cycle fullscreen
+ 

mpv.net/Resources/inputConfHeader.txt

@@ -1,25 +0,0 @@
-
- # 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

@@ -0,0 +1,14 @@
+
+input-default-bindings = no
+input-ar-delay = 500
+input-ar-rate = 20
+keep-open = yes
+keep-open-pause = no
+osd-duration = 2000
+osd-playing-msg = '${filename}'
+script-opts = osc-scalewindowed=1.5,osc-hidetimeout=2000,console-scale=1
+screenshot-directory = '~~desktop/'
+hwdec = yes
+
+[protocol.https]
+osd-playing-msg = '${media-title}'

mpv.net/Resources/mpvConf.txt

@@ -1,14 +0,0 @@
-
-# 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/mpvNetConfToml.txt

@@ -1,25 +0,0 @@
-[[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" }]
-
-[[settings]]
-name = "clipboard-monitoring"
-default = "yes"
-filter = "mpv.net"
-help = "Monitors the clipboard for URLs to play."
-options = [{ name = "yes" },
-           { name = "no" }]
-
-[[settings]]
-name = "process-instance"
-default = "single"
-filter = "mpv.net"
-help = "Defines if more then one mpv.net process is allowed."
-options = [{ name = "multi",  help = "Create a new process everytime the shell starts mpv.net" },
-           { name = "single", help = "Force a single process everytime the shell starts mpv.net" },
-		   { name = "queue",  help = "Force a single process and add files to playlist" }]

mpv.net/Resources/theme.txt

@@ -0,0 +1,27 @@
+
+[dark]
+
+heading     = #3C8CC8
+foreground  = #DDDDDD
+foreground2 = #AAAAAA
+background  = #323232
+
+menu-foreground = #DDDDDD
+menu-background = #323232
+menu-highlight  = #505050
+menu-border     = #FFFFFF
+menu-checked    = #5A5A5A
+
+
+[light]
+
+heading     = #0068B2
+foreground  = #000000
+foreground2 = #4C4C4C
+background  = #F7F7F7
+
+menu-foreground = #000000
+menu-background = #DFDFDF
+menu-highlight  = #BFBFBF
+menu-border     = #6A6A6A
+menu-checked    = #AAAAAA

mpv.net/Scripting/PowerShellScript.cs

@@ -1,127 +0,0 @@
-using System;
-using System.IO;
-using System.Threading;
-using System.Management.Automation.Runspaces;
-using System.Reflection;
-using System.Threading.Tasks;
-
-namespace mpvnet
-{
-    public class PowerShellScript
-    {
-        public static object Execute(string code, string[] parameters)
-        {
-            using (Runspace runspace = RunspaceFactory.CreateRunspace())
-            {
-                runspace.ApartmentState = ApartmentState.STA;
-                runspace.ThreadOptions = PSThreadOptions.UseCurrentThread;
-                runspace.Open();
-
-                using (Pipeline pipeline = runspace.CreatePipeline())
-                {
-                    pipeline.Commands.AddScript(
-@"Using namespace mpvnet;
-Using namespace System;
-[System.Reflection.Assembly]::LoadWithPartialName(""mpvnet"")");
-
-                    pipeline.Commands.AddScript(code);
-
-                    try
-                    {
-                        var ret = pipeline.Invoke(parameters);
-
-                        if (ret.Count > 0)
-                            return ret[0];
-                    }
-                    catch (Exception ex)
-                    {
-                        try
-                        {
-                            using (Pipeline pipeline2 = runspace.CreatePipeline())
-                            {
-                                pipeline2.Commands.AddScript("$PSVersionTable.PSVersion.Major * 10 +" +
-                                    "$PSVersionTable.PSVersion.Minor");
-
-                                if (Convert.ToInt32(pipeline2.Invoke()[0].ToString()) < 51)
-                                    throw new Exception();
-                            }
-                        }
-                        catch (Exception ex2)
-                        {
-                            Msg.ShowError("PowerShell Setup Problem\n\nEnsure you have at least PowerShell 5.1 installed.", ex2.ToString());
-                            return null;
-                        }
-                        Msg.ShowException(ex);
-                    }
-                }
-            }
-            return null;
-        }
-
-        public static void Init(string filePath)
-        {
-            foreach (var eventInfo in typeof(mp).GetEvents())
-            {
-                if (eventInfo.Name.ToLower() ==
-                    Path.GetFileNameWithoutExtension(filePath).ToLower().Replace("-", ""))
-                {
-                    PowerShellEventObject eventObject = new PowerShellEventObject();
-                    MethodInfo mi;
-                    eventObject.FilePath = filePath;
-
-                    if (eventInfo.EventHandlerType == typeof(Action))
-                    {
-                        mi = eventObject.GetType().GetMethod(nameof(PowerShellEventObject.Invoke));
-                    }
-                    else if (eventInfo.EventHandlerType == typeof(Action<EndFileEventMode>))
-                    {
-                        mi = eventObject.GetType().GetMethod(nameof(PowerShellEventObject.InvokeEndFileEventMode));
-                    }
-                    else if (eventInfo.EventHandlerType == typeof(Action<string[]>))
-                    {
-                        mi = eventObject.GetType().GetMethod(nameof(PowerShellEventObject.InvokeStrings));
-                    }
-                    else
-                        throw new Exception();
-
-                    eventObject.EventInfo = eventInfo;
-                    Delegate handler = Delegate.CreateDelegate(eventInfo.EventHandlerType, eventObject, mi);
-                    eventObject.Delegate = handler;
-                    eventInfo.AddEventHandler(eventObject, handler);
-                    return;
-                }
-            }
-            Task.Run(() =>
-            {
-                PowerShellScript.Execute(File.ReadAllText(filePath), new string[] {});
-            });
-        }
-    }
-
-    public class PowerShellEventObject
-    {
-        public EventInfo EventInfo { get; set; }
-        public Delegate Delegate { get; set; }
-        public string FilePath { get; set; }
-
-        public void Invoke()
-        {
-            Task.Run(() => { PowerShellScript.Execute(File.ReadAllText(FilePath), new string[] { }); });
-        }
-
-        public void InvokeEndFileEventMode(EndFileEventMode arg)
-        {
-            Task.Run(() =>
-            {
-                PowerShellScript.Execute(File.ReadAllText(FilePath), new string[] { arg.ToString() });
-            });
-        }
-
-        public void InvokeStrings(string[] args)
-        {
-            Task.Run(() => {
-                PowerShellScript.Execute(File.ReadAllText(FilePath), args);
-            });
-        }
-    }
-}

mpv.net/Scripting/PythonScript.cs

@@ -1,59 +0,0 @@
-using System;
-using System.Reflection;
-
-using Microsoft.Scripting;
-using Microsoft.Scripting.Hosting;
-
-using IronPython.Hosting;
-using IronPython.Runtime;
-using IronPython.Runtime.Operations;
-
-namespace mpvnet
-{
-    public class PythonScript
-    {
-        ScriptEngine engine;
-        ScriptScope scope;
-
-        public PythonScript(string code)
-        {
-            try
-            {
-                engine = Python.CreateEngine();
-                scope = engine.CreateScope();
-                scope.ImportModule("clr");
-                engine.Execute("import clr", scope);
-                engine.Execute("clr.AddReference(\"mpvnet\")", scope);
-                engine.Execute("import mpvnet", scope);
-                engine.Execute("from mpvnet import *", scope);
-                engine.Execute(code, scope);
-            }
-            catch (Exception ex)
-            {
-                if (ex is SyntaxErrorException e)
-                    Msg.ShowError($"{e.Line}, {e.Column}: " + ex.Message);
-                else
-                    Msg.ShowException(ex);
-            }
-        }
-    }
-
-    public class PythonEventObject
-    {
-        public PythonFunction PythonFunction { get; set; }
-        public EventInfo EventInfo { get; set; }
-        public Delegate Delegate { get; set; }
-
-        public void Invoke() => PythonCalls.Call(PythonFunction);
-
-        public void InvokeEndFileEventMode(EndFileEventMode arg)
-        {
-            PythonCalls.Call(PythonFunction, new[] { arg });
-        }
-
-        public void InvokeStrings(string[] arg)
-        {
-            PythonCalls.Call(PythonFunction, new[] { arg });
-        }
-    }
-}

mpv.net/Update.ps1

@@ -0,0 +1,67 @@
+
+$ErrorActionPreference = 'Stop'
+
+if ($args.Length -ne 2) {
+    Write-Host 'Invalid arguments' -ForegroundColor Red
+    exit
+}
+
+if (-not (Get-Command curl.exe)) {
+    Write-Host 'Error using curl.exe' -ForegroundColor Red
+    exit
+}
+
+if ($PSVersionTable.PSVersion.Major -lt 5) {
+    Write-Host 'PowerShell 5.1 not found' -ForegroundColor Red
+    exit
+}
+
+Add-Type -AssemblyName Microsoft.VisualBasic
+
+# Delete directory using recycle bin
+function Remove-Directory($directory) {
+    if (Test-Path $directory) {
+        [Microsoft.VisualBasic.FileIO.FileSystem]::
+            DeleteDirectory($directory, 'OnlyErrorDialogs', 'SendToRecycleBin')
+    }
+}
+
+$currentDir = $args[1];
+
+$targetDir = (Split-Path $currentDir) + "\new version"
+Remove-Directory $targetDir
+$targetFile = $targetDir + '.7z'
+Remove-Item $targetFile -Force -ErrorAction Ignore
+
+Write-Host 'Download new version' -ForegroundColor Green
+curl.exe $args[0] --location --output $targetFile
+if ($LastExitCode) { throw $LastExitCode }
+
+Write-Host 'Unpack new version' -ForegroundColor Green
+& ($currentDir + '\7z\7za.exe') x -y $targetFile -o"$targetDir"
+if ($LastExitCode) { throw $LastExitCode }
+
+Write-Host 'Delete downloaded file' -ForegroundColor Green
+Remove-Item $targetFile -Force -Recurse
+
+$portableConfigDir = $currentDir + '\portable_config'
+$portableConfigTempDir = (Split-Path $currentDir) + '\portable config dir temp'
+Remove-Item $portableConfigTempDir -Force -ErrorAction Ignore
+
+if (Test-Path $portableConfigDir) {
+    Write-Host 'Backup portable config' -ForegroundColor Green
+    Copy-Item $portableConfigDir $portableConfigTempDir -Recurse -Force
+}
+
+Write-Host 'Delete current version' -ForegroundColor Green
+Remove-Directory $currentDir
+
+Write-Host 'Rename directory' -ForegroundColor Green
+Rename-Item $targetDir (Split-Path $currentDir -Leaf)
+
+if (Test-Path $portableConfigTempDir) {
+    Write-Host 'Restore portable config' -ForegroundColor Green
+    Move-Item $portableConfigTempDir $portableConfigDir -Force
+}
+
+Write-Host 'Update is complete' -ForegroundColor Green

mpv.net/WPF/AboutWindow.xaml

@@ -3,14 +3,25 @@
         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:UI="clr-namespace:UI"
         mc:Ignorable="d"
-        Title="About mpv.net" Height="230" Width="420" FontSize="16" ShowInTaskbar="False"
-        WindowStartupLocation="CenterOwner" ResizeMode="NoResize">
+        
+        Title="About mpv.net"
+        Height="230"
+        Width="400"
+        FontSize="16"
+        ShowInTaskbar="False"
+        WindowStartupLocation="CenterOwner"
+        ResizeMode="NoResize"
+        Foreground="{x:Static UI:Theme.Foreground}"
+        Background="{x:Static UI:Theme.Background}">
+    
     <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 HorizontalAlignment="Center">Copyright (C) 2017-2020 Frank Skare (stax76)</TextBlock>
             <TextBlock Name="Version" HorizontalAlignment="Center" />
+            <TextBlock Name="mpvVersion" HorizontalAlignment="Center" />
             <TextBlock HorizontalAlignment="Center" Margin="0,0,0,20">MIT License</TextBlock>
         </StackPanel>
     </Grid>

mpv.net/WPF/AboutWindow.xaml.cs

@@ -1,6 +1,10 @@
-using System.Windows;
+
+using System.IO;
+using System.Windows;
 using System.Windows.Input;
 
+using static mpvnet.Core;
+
 namespace mpvnet
 {
     public partial class AboutWindow : Window
@@ -8,8 +12,8 @@ namespace mpvnet
         public AboutWindow()
         {
             InitializeComponent();
-            Version.Text = $"Version {System.Windows.Forms.Application.ProductVersion}";
-            Foreground = WPF.WPF.ThemeBrush;
+            Version.Text = $"mpv.net Version {System.Windows.Forms.Application.ProductVersion} ({File.GetLastWriteTime(System.Windows.Forms.Application.ExecutablePath).ToShortDateString()})";
+            mpvVersion.Text = $"{core.get_property_string("mpv-version")} ({File.GetLastWriteTime(Folder.Startup + "mpv-1.dll").ToShortDateString()})";
         }
 
         protected override void OnPreviewKeyDown(KeyEventArgs e) => Close();

mpv.net/WPF/CommandPaletteWindow.xaml

@@ -3,21 +3,41 @@
         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:UI="clr-namespace:UI"
         mc:Ignorable="d"
-        Title="Command Palette" Height="295" Width="400" ResizeMode="NoResize"
-        WindowStartupLocation="CenterOwner" Loaded="Window_Loaded" FontSize="13">
+        
+        Title="Command Palette"
+        Height="295"
+        Width="400"
+        FontSize="13"
+        ResizeMode="NoResize"
+        WindowStartupLocation="CenterOwner"
+        Loaded="Window_Loaded">
+    
     <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">
+
+        <TextBox Name="FilterTextBox"
+                 Foreground="{x:Static UI:Theme.Foreground}"
+                 Background="{x:Static UI:Theme.Background}"
+                 PreviewKeyDown="FilterTextBox_PreviewKeyDown"
+                 TextChanged="FilterTextBox_TextChanged"/>
+        
+        <ListView Name="ListView"
+                  Grid.Row="1"
+                  Foreground="{x:Static UI:Theme.Foreground}"
+                  Background="{x:Static UI:Theme.Background}"
+                  MouseUp="ListView_MouseUp">
+            
             <ListView.ItemContainerStyle>
                 <Style TargetType="ListBoxItem">
                     <Setter Property="HorizontalContentAlignment" Value="Stretch"></Setter>
                 </Style>
             </ListView.ItemContainerStyle>
+            
             <ListView.ItemTemplate>
                 <DataTemplate>
                     <Grid>
@@ -25,8 +45,12 @@
                             <ColumnDefinition />
                             <ColumnDefinition />
                         </Grid.ColumnDefinitions>
+                        
                         <TextBlock Text="{Binding Path}"></TextBlock>
-                        <TextBlock Grid.Column="1" Text="{Binding Input}" HorizontalAlignment="Right"></TextBlock>
+                        
+                        <TextBlock Grid.Column="1"
+                                   Text="{Binding Input}"
+                                   HorizontalAlignment="Right"></TextBlock>
                     </Grid>
                 </DataTemplate>
             </ListView.ItemTemplate>

mpv.net/WPF/CommandPaletteWindow.xaml.cs

@@ -1,13 +1,12 @@
-using Microsoft.Win32;
+
 using System;
 using System.ComponentModel;
-using System.Runtime.InteropServices;
-using System.Text;
 using System.Windows;
 using System.Windows.Data;
 using System.Windows.Input;
 using System.Windows.Interop;
-using System.Windows.Media;
+
+using static mpvnet.Core;
 
 namespace mpvnet
 {
@@ -23,30 +22,28 @@ namespace mpvnet
             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 (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)
+        void Window_Loaded(object sender, RoutedEventArgs e)
         {
             HwndSource source = HwndSource.FromHwnd(new WindowInteropHelper(this).Handle);
             source.AddHook(new HwndSourceHook(WndProc));
@@ -60,14 +57,15 @@ namespace mpvnet
                 ListView.SelectedIndex = 0;
         }
 
-        private IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
+        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)
+        void FilterTextBox_PreviewKeyDown(object sender, KeyEventArgs e)
         {
             switch (e.Key)
             {
@@ -75,7 +73,10 @@ namespace mpvnet
                     {
                         int index = ListView.SelectedIndex;
                         index -= 1;
-                        if (index < 0) index = 0;
+
+                        if (index < 0)
+                            index = 0;
+
                         ListView.SelectedIndex = index;
                         ListView.ScrollIntoView(ListView.SelectedItem);
                     }
@@ -84,7 +85,10 @@ namespace mpvnet
                     {
                         int index = ListView.SelectedIndex;
                         index += 1;
-                        if (index > ListView.Items.Count - 1) index = ListView.Items.Count - 1;
+
+                        if (index > ListView.Items.Count - 1)
+                            index = ListView.Items.Count - 1;
+
                         ListView.SelectedIndex = index;
                         ListView.ScrollIntoView(ListView.SelectedItem);
                     }
@@ -104,16 +108,16 @@ namespace mpvnet
             {
                 CommandItem item = ListView.SelectedItem as CommandItem;
                 Close();
-                mp.command_string(item.Command);
+                core.command(item.Command);
             }
         }
 
-        private void ListView_MouseUp(object sender, MouseButtonEventArgs e)
+        void ListView_MouseUp(object sender, MouseButtonEventArgs e)
         {
             Execute();
         }
 
-        private void FilterTextBox_TextChanged(object sender, System.Windows.Controls.TextChangedEventArgs e)
+        void FilterTextBox_TextChanged(object sender, System.Windows.Controls.TextChangedEventArgs e)
         {
             CollectionView.Refresh();
             SelectFirst();

mpv.net/WPF/ConfWindow.xaml

@@ -3,34 +3,64 @@
         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"
+        xmlns:UI="clr-namespace:UI"
         mc:Ignorable="d"
-        Height="500" Width="700" Loaded="ConfWindow1_Loaded" ShowInTaskbar="False"
-        WindowStartupLocation="CenterScreen" Title="Config Editor">
+        
+        Title="Config Editor"
+        Height="530"
+        Width="700"
+        Foreground="{x:Static UI:Theme.Foreground}"
+        Background="{x:Static UI:Theme.Background}"
+        ShowInTaskbar="False"
+        WindowStartupLocation="CenterScreen"
+        Loaded="ConfWindow1_Loaded">
+    
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
+        
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="100" />
             <ColumnDefinition Width="*" />
         </Grid.ColumnDefinitions>
-        <Controls:SearchTextBoxUserControl HintText="Find a setting" x:Name="SearchControl" Width="250" Margin="0,20,0,0" Grid.ColumnSpan="2"/>
-        <ScrollViewer x:Name="MainScrollViewer" VerticalScrollBarVisibility="Auto" Grid.Row="1" Grid.Column="2" Margin="0,0,0,10">
+        
+        <Controls:SearchTextBoxUserControl
+            x:Name="SearchControl"
+            HintText="Find a setting"
+            Width="250"
+            Margin="0,20,0,0"
+            Grid.ColumnSpan="2"/>
+        
+        <ScrollViewer Name="MainScrollViewer"
+                      VerticalScrollBarVisibility="Auto"
+                      Grid.Row="1"
+                      Grid.Column="2" 
+                      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 Name="FilterListBox"
+                     ItemsSource="{Binding FilterStrings}"
+                     BorderThickness="0"
+                     SelectionChanged="FilterListBox_SelectionChanged"
+                     Foreground="{x:Static UI:Theme.Heading}"
+                     Background="{x:Static UI:Theme.Background}">
+                
                 <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>
+
+            <TextBlock Name="OpenSettingsTextBlock" Margin="0,30,0,0" Cursor="Hand" TextWrapping="WrapWithOverflow" Foreground="{x:Static UI:Theme.Heading}" MouseUp="OpenSettingsTextBlock_MouseUp">Open config folder</TextBlock>
+            <TextBlock Name="PreviewTextBlock"      Margin="0,15,0,0" Cursor="Hand" TextWrapping="WrapWithOverflow" Foreground="{x:Static UI:Theme.Heading}" MouseUp="PreviewTextBlock_MouseUp">Preview mpv.conf</TextBlock>
+            <TextBlock Name="ShowManualTextBlock"   Margin="0,15,0,0" Cursor="Hand" TextWrapping="WrapWithOverflow" Foreground="{x:Static UI:Theme.Heading}" MouseUp="ShowManualTextBlock_MouseUp">Show mpv manual</TextBlock>
+            <TextBlock Name="SupportTextBlock"      Margin="0,15,0,0" Cursor="Hand" TextWrapping="WrapWithOverflow" Foreground="{x:Static UI:Theme.Heading}" MouseUp="SupportTextBlock_MouseUp">Show support forum</TextBlock>
         </StackPanel>
     </Grid>
 </Window>

mpv.net/WPF/ConfWindow.xaml.cs

@@ -1,65 +1,54 @@
-using System;
+
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Diagnostics;
 using System.IO;
+using System.Linq;
+using System.Text;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
-using System.Windows.Media;
-using System.Linq;
 
 using DynamicGUI;
+using static mpvnet.Core;
 
 namespace mpvnet
 {
     public partial class ConfWindow : Window
     {
-        private List<SettingBase> SettingsDefinitions = Settings.LoadSettings(Properties.Resources.mpvConfToml);
-        private List<SettingBase> NetSettingsDefinitions = Settings.LoadSettings(Properties.Resources.mpvNetConfToml);
-        private Dictionary<string, Dictionary<string, string>> Comments = new Dictionary<string, Dictionary<string, string>>();
-
+        List<SettingBase> SettingsDefinitions = Settings.LoadSettings(Properties.Resources.editor_toml);
+        List<ConfItem> ConfItems = new List<ConfItem>();
         public ObservableCollection<string> FilterStrings { get; } = new ObservableCollection<string>();
+        string InitialContent;
 
         public ConfWindow()
         {
             InitializeComponent();
             DataContext = this;
             SearchControl.SearchTextBox.TextChanged += SearchTextBox_TextChanged;
-            LoadSettings(SettingsDefinitions, Conf);
-            LoadSettings(NetSettingsDefinitions, NetConf);
-            SearchControl.Text = RegistryHelp.GetString(@"HKCU\Software\mpv.net", "config editor search");
-
-            if (App.IsDarkMode)
-            {
-                Foreground = Brushes.White;
-                Foreground2 = Brushes.Silver;
-                Background = Brushes.Black;
-            }
+            LoadConf(core.ConfPath);
+            LoadConf(App.ConfPath);
+            LoadSettings();
+            InitialContent = GetCompareString();
+            SearchControl.Text = RegistryHelp.GetString(App.RegPath, "ConfigEditorSearch");
+            FilterListBox.SelectedItem = SearchControl.Text.TrimEnd(':');
         }
 
-        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)
+        void LoadSettings()
         {
-            foreach (var setting in settingsDefinitions)
+            foreach (SettingBase setting in SettingsDefinitions)
             {
                 if (!FilterStrings.Contains(setting.Filter))
                     FilterStrings.Add(setting.Filter);
 
-                foreach (var pair in confSettings)
+                foreach (ConfItem confItem in ConfItems)
                 {
-                    if (setting.Name == pair.Key)
+                    if (setting.Name == confItem.Name && confItem.Section == "" && !confItem.IsSectionItem)
                     {
-                        setting.Value = pair.Value;
-                        setting.StartValue = pair.Value;
+                        setting.Value = confItem.Value.Trim('\'', '"');
+                        setting.ConfItem = confItem;
+                        confItem.SettingBase = setting;
                         continue;
                     }
                 }
@@ -68,123 +57,199 @@ namespace mpvnet
                 {
                     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> _Conf;
-
-        public Dictionary<string, string> Conf {
-            get {
-                if (_Conf == null) _Conf = LoadConf(mp.ConfPath);
-                return _Conf;
-            }
-        }
-
-        private Dictionary<string, string> _NetConf;
-
-        public Dictionary<string, string> NetConf {
-            get {
-                if (_NetConf == null) _NetConf = LoadConf(App.ConfFilePath);
-                return _NetConf;
-            }
-        }
-
-        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('#')] = 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);
+            RegistryHelp.SetValue(App.RegPath, "ConfigEditorSearch", SearchControl.Text);
+            
+            if (InitialContent == GetCompareString())
+                return;
+            
+            File.WriteAllText(core.ConfPath, GetContent("mpv"));
+            File.WriteAllText(App.ConfPath, GetContent("mpvnet"));
+            Msg.Show("Changes will be available on next mpv.net startup.");            
         }
 
-        void WriteToDisk()
+        string GetCompareString()
         {
-            bool isDirty = false;
+            return string.Join("", SettingsDefinitions.Select(item => item.Name + item.Value).ToArray());
+        }
 
-            foreach (SettingBase i in SettingsDefinitions)
-                if (i.StartValue != i.Value)
-                    isDirty = true;
-
-            foreach (SettingBase i in NetSettingsDefinitions)
-                if (i.StartValue != i.Value)
-                    isDirty = true;
-
-            if (!isDirty)
+        void LoadConf(string file)
+        {
+            if (!File.Exists(file))
                 return;
 
-            WriteToDisk(mp.ConfPath, Conf, SettingsDefinitions);
-            WriteToDisk(App.ConfFilePath, NetConf, NetSettingsDefinitions);
+            string comment = "";
+            string section = "";
+            bool isSectionItem = false;
 
-            Msg.Show("Changes will be available on next mpv.net startup.");
+            foreach (string currentLine in File.ReadAllLines(file))
+            {
+                string line = currentLine.Trim();
+
+                if (line == "")
+                {
+                    comment += "\r\n";
+                }
+                else if (line.StartsWith("#"))
+                {
+                    comment += line.Trim() + "\r\n";
+                }
+                else if (line.StartsWith("[") && line.Contains("]"))
+                {
+                    if (!isSectionItem && comment != "" && comment != "\r\n")
+                        ConfItems.Add(new ConfItem() {
+                            Comment = comment, File = Path.GetFileNameWithoutExtension(file)});
+
+                    section = line.Substring(0, line.IndexOf("]") + 1);
+                    comment = "";
+                    isSectionItem = true;
+                }
+                else if (line.Contains("="))
+                {
+                    ConfItem item = new ConfItem();
+                    item.File = Path.GetFileNameWithoutExtension(file);
+                    item.IsSectionItem = isSectionItem;
+                    item.Comment = comment;
+                    comment = "";
+                    item.Section = section;
+                    section = "";
+
+                    if (line.Contains("#") && !line.Contains("'") && !line.Contains("\""))
+                    {
+                        item.LineComment = line.Substring(line.IndexOf("#")).Trim();
+                        line = line.Substring(0, line.IndexOf("#")).Trim();
+                    }
+
+                    int pos = line.IndexOf("=");
+                    string left = line.Substring(0, pos).Trim().ToLower();
+                    string right = line.Substring(pos + 1).Trim();
+
+                    if (left == "fs")
+                        left = "fullscreen";
+
+                    if (left == "loop")
+                        left = "loop-file";
+
+                    item.Name = left;
+                    item.Value = right;
+                    ConfItems.Add(item);
+                }
+            }
         }
 
-        void WriteToDisk(string filePath,
-                         Dictionary<string, string> confSettings,
-                         List<SettingBase> settings)
+        string GetContent(string filename)
         {
-            string content = "";
+            StringBuilder sb = new StringBuilder();
+            List<string> namesWritten = new List<string>();
 
-            foreach (var i in Comments[filePath])
-                content += $"#{i.Key} = {i.Value}\r\n";
-
-            foreach (var setting in settings)
+            foreach (ConfItem item in ConfItems)
             {
-                if ((setting.Value ?? "") != setting.Default)
-                    confSettings[setting.Name] = setting.Value;
+                if (filename != item.File || item.Section != "" || item.IsSectionItem)
+                    continue;
 
-                if (confSettings.ContainsKey(setting.Name) &&
-                    (setting.Value ?? "") == setting.Default ||
-                    (setting.Value ?? "") == "")
+                if (item.Comment != "")
+                    sb.Append(item.Comment);
+
+                if (item.SettingBase == null)
                 {
-                    confSettings.Remove(setting.Name);
+                    if (item.Name != "")
+                    {
+                        sb.Append(item.Name + " = " + item.Value);
+
+                        if (item.LineComment != "")
+                            sb.Append(" " + item.LineComment);
+
+                        sb.AppendLine();
+                        namesWritten.Add(item.Name);
+                    }
+                }
+                else if ((item.SettingBase.Value ?? "") != item.SettingBase.Default)
+                {
+                    string value = "";
+
+                    if (item.SettingBase.Type == "string" ||
+                        item.SettingBase.Type == "folder" ||
+                        item.SettingBase.Type == "color")
+
+                        value = "'" + item.SettingBase.Value + "'";
+                    else
+                        value = item.SettingBase.Value;
+
+                    sb.Append(item.Name + " = " + value);
+
+                    if (item.LineComment != "")
+                        sb.Append(" " + item.LineComment);
+
+                    sb.AppendLine();
+                    namesWritten.Add(item.Name);
                 }
             }
 
-            foreach (var i in confSettings)
-                content = content + $"{i.Key} = {i.Value}\r\n";
+            if (!sb.ToString().Contains("# Editor"))
+                sb.AppendLine("# Editor");
 
-            File.WriteAllText(filePath, content);
+            foreach (SettingBase setting in SettingsDefinitions)
+            {
+                if (filename != setting.File || namesWritten.Contains(setting.Name))
+                    continue;
+
+                if ((setting.Value ?? "") != setting.Default)
+                {
+                    string value = "";
+
+                    if (setting.Type == "string" ||
+                        setting.Type == "folder" ||
+                        setting.Type == "color")
+
+                        value = "'" + setting.Value + "'";
+                    else
+                        value = setting.Value;
+
+                    sb.AppendLine(setting.Name + " = " + value);
+                }
+            }
+
+            foreach (ConfItem item in ConfItems)
+            {
+                if (filename != item.File || (item.Section == "" && !item.IsSectionItem))
+                    continue;
+
+                if (item.Section != "")
+                {
+                    if (!sb.ToString().EndsWith("\r\n\r\n"))
+                        sb.AppendLine();
+
+                    sb.AppendLine(item.Section);
+                }
+
+                if (item.Comment != "")
+                    sb.Append(item.Comment);
+
+                sb.Append(item.Name + " = " + item.Value);
+
+                if (item.LineComment != "")
+                    sb.Append(" " + item.LineComment);
+
+                sb.AppendLine();
+                namesWritten.Add(item.Name);
+            }
+
+            return "\r\n" + sb.ToString().Trim() + "\r\n";
         }
 
-        private void SearchTextBox_TextChanged(object sender, TextChangedEventArgs e)
+        void SearchTextBox_TextChanged(object sender, TextChangedEventArgs e)
         {
             string activeFilter = "";
 
@@ -212,31 +277,37 @@ namespace mpvnet
             MainScrollViewer.ScrollToTop();
         }
         
-        private void ConfWindow1_Loaded(object sender, RoutedEventArgs e)
+        void ConfWindow1_Loaded(object sender, RoutedEventArgs e)
         {
             SearchControl.SearchTextBox.SelectAll();
             Keyboard.Focus(SearchControl.SearchTextBox);
+
             foreach (var i in MainStackPanel.Children.OfType<StringSettingControl>())
                 i.Update();
         }
 
-        private void ListBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        void FilterListBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
             if (e.AddedItems.Count > 0)
-                SearchControl.Text = e.AddedItems[0].ToString() + ":";
+                SearchControl.Text = e.AddedItems[0] + ":";
         }
 
-        private void OpenSettingsTextBlock_MouseUp(object sender, MouseButtonEventArgs e)
+        void OpenSettingsTextBlock_MouseUp(object sender, MouseButtonEventArgs e)
         {
-            Process.Start(Path.GetDirectoryName(mp.ConfPath));
+            Process.Start(Path.GetDirectoryName(core.ConfPath));
         }
 
-        private void ShowManualTextBlock_MouseUp(object sender, MouseButtonEventArgs e)
+        void PreviewTextBlock_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            Msg.Show("mpv.conf Preview", GetContent("mpv"));
+        }
+
+        void ShowManualTextBlock_MouseUp(object sender, MouseButtonEventArgs e)
         {
             Process.Start("https://mpv.io/manual/master/");
         }
 
-        private void SupportTextBlock_MouseUp(object sender, MouseButtonEventArgs e)
+        void SupportTextBlock_MouseUp(object sender, MouseButtonEventArgs e)
         {
             Process.Start("https://github.com/stax76/mpv.net#Support");
         }
@@ -244,8 +315,9 @@ namespace mpvnet
         protected override void OnKeyDown(KeyEventArgs e)
         {
             base.OnKeyDown(e);
+
             if (e.Key == Key.Escape)
                 Close();
         }
     }
-}
+}

mpv.net/WPF/EverythingWindow.xaml

@@ -3,21 +3,42 @@
         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:UI="clr-namespace:UI"
         mc:Ignorable="d"
-        Title="Media File Search" Height="300" Width="600" ResizeMode="NoResize"
-        WindowStartupLocation="CenterOwner" Loaded="Window_Loaded" FontSize="13">
+        
+        Title="Media File Search"
+        FontSize="13"
+        Height="300"
+        Width="600"
+        ResizeMode="NoResize"
+        WindowStartupLocation="CenterOwner"
+        Loaded="Window_Loaded">
+    
     <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" PreviewKeyDown="ListView_PreviewKeyDown">
+
+        <TextBox Name="FilterTextBox"
+                 Foreground="{x:Static UI:Theme.Foreground}"
+                 Background="{x:Static UI:Theme.Background}"
+                 PreviewKeyDown="FilterTextBox_PreviewKeyDown"
+                 TextChanged="FilterTextBox_TextChanged"/>
+
+        <ListView Name="ListView"
+                  Foreground="{x:Static UI:Theme.Foreground}"
+                  Background="{x:Static UI:Theme.Background}"
+                  Grid.Row="1"
+                  MouseUp="ListView_MouseUp"
+                  PreviewKeyDown="ListView_PreviewKeyDown">
+            
             <ListView.ItemContainerStyle>
                 <Style TargetType="ListBoxItem">
                     <Setter Property="HorizontalContentAlignment" Value="Stretch"></Setter>
                 </Style>
             </ListView.ItemContainerStyle>
+            
         </ListView>        
     </Grid>
 </Window>

mpv.net/WPF/EverythingWindow.xaml.cs

@@ -1,6 +1,6 @@
-using System;
+
+using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Text;
@@ -9,7 +9,8 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Interop;
-using System.Windows.Media;
+
+using static mpvnet.Core;
 
 namespace mpvnet
 {
@@ -18,19 +19,10 @@ namespace mpvnet
         public EverythingWindow()
         {
             InitializeComponent();
-
-            if (App.IsDarkMode)
-            {
-                ListView.Foreground = Brushes.White;
-                ListView.Background = Brushes.Black;
-                FilterTextBox.Foreground = Brushes.White;
-                FilterTextBox.Background = Brushes.Black;
-            }
         }
 
         const int EVERYTHING_REQUEST_FILE_NAME = 0x00000001;
         const int EVERYTHING_REQUEST_PATH = 0x00000002;
-        const int EVERYTHING_SORT_SIZE_DESCENDING = 6;
 
         [DllImport("Everything.dll", CharSet = CharSet.Unicode)]
         public static extern int Everything_SetSearch(string lpSearchString);
@@ -53,7 +45,7 @@ namespace mpvnet
         [DllImport("Everything.dll")]
         public static extern UInt32 Everything_GetNumResults();
 
-        private void Window_Loaded(object sender, RoutedEventArgs e)
+        void Window_Loaded(object sender, RoutedEventArgs e)
         {
             HwndSource source = HwndSource.FromHwnd(new WindowInteropHelper(this).Handle);
             source.AddHook(new HwndSourceHook(WndProc));
@@ -66,14 +58,15 @@ namespace mpvnet
                 ListView.SelectedIndex = 0;
         }
 
-        private IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
+        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)
+        void FilterTextBox_PreviewKeyDown(object sender, KeyEventArgs e)
         {
             switch (e.Key)
             {
@@ -95,34 +88,31 @@ namespace mpvnet
                         ListView.ScrollIntoView(ListView.SelectedItem);
                     }
                     break;
-                case Key.Escape:
-                    Close();
-                    break;
-                case Key.Enter:
-                    Execute();
-                    break;
+                case Key.Escape: Close(); break;
+                case Key.Enter:  Execute(); break;
             }
         }
 
-        private void ListView_PreviewKeyDown(object sender, KeyEventArgs e)
+        void ListView_PreviewKeyDown(object sender, KeyEventArgs e)
         {
-            if (e.Key == Key.Escape) Close();
-            if (e.Key == Key.Enter) Execute();
+            if (e.Key == Key.Escape)
+                Close();
+
+            if (e.Key == Key.Enter)
+                Execute();
         }
 
         void Execute()
         {
             if (ListView.SelectedItem != null)
-                mp.Load(ListView.SelectedItem as string);
+                core.LoadFiles(new[] { ListView.SelectedItem as string }, true, Keyboard.Modifiers == ModifierKeys.Control);
+
             Keyboard.Focus(FilterTextBox);
         }
 
-        private void ListView_MouseUp(object sender, MouseButtonEventArgs e)
-        {
-            Execute();
-        }
+        void ListView_MouseUp(object sender, MouseButtonEventArgs e) => Execute();
 
-        private void FilterTextBox_TextChanged(object sender, TextChangedEventArgs e)
+        void FilterTextBox_TextChanged(object sender, TextChangedEventArgs e)
         {
             string searchtext = FilterTextBox.Text;
             Task.Run(() => Search(searchtext));
@@ -142,16 +132,22 @@ namespace mpvnet
                     StringBuilder buf = new StringBuilder(bufsize);
                     Everything_SetSearch(searchtext);
                     Everything_SetRequestFlags(EVERYTHING_REQUEST_FILE_NAME | EVERYTHING_REQUEST_PATH);
-                    Everything_SetSort(EVERYTHING_SORT_SIZE_DESCENDING);
                     Everything_Query(true);
+
                     for (i = 0; i < Everything_GetNumResults(); i++)
                     {
                         Everything_GetResultFullPathName(i, buf, bufsize);
-                        string ext = Path.GetExtension(buf.ToString()).TrimStart('.').ToLower();
-                        if (App.AudioTypes.Contains(ext) || App.VideoTypes.Contains(ext))
+                        string ext = buf.ToString().ShortExt();
+
+                        if (App.AudioTypes.Contains(ext) || App.VideoTypes.Contains(ext)
+                            || App.ImageTypes.Contains(ext))
+
                             items.Add(buf.ToString());
-                        if (items.Count > 100) break;
+
+                        if (items.Count > 100)
+                            break;
                     }
+
                     Application.Current.Dispatcher.Invoke(() => {
                         ListView.ItemsSource = items;
                         SelectFirst();

mpv.net/WPF/InputWindow.xaml

@@ -3,9 +3,19 @@
         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:UI="clr-namespace:UI"
         mc:Ignorable="d"
-        Title="Input Editor" Height="500" Width="750" FontSize="13"
-        Loaded="Window_Loaded" Closed="Window_Closed" ShowInTaskbar="False">
+        
+        Title="Input Editor"
+        Height="500"
+        Width="750"
+        FontSize="13"
+        ShowInTaskbar="False"
+        Foreground="{x:Static UI:Theme.Foreground}"
+        Background="{x:Static UI:Theme.Background}"
+        Loaded="Window_Loaded"
+        Closed="Window_Closed">
+    
     <Window.Resources>
         <Style x:Key="DataGrid_Font_Centering" TargetType="{x:Type DataGridCell}">
             <Setter Property="Template">
@@ -19,15 +29,29 @@
             </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}">
+        
+        <Controls:SearchTextBoxUserControl
+            HintText="Type ? to get help."
+            x:Name="SearchControl"
+            Width="300"
+            Margin="0,20,0,20"
+            Grid.ColumnSpan="2" />
+
+        <DataGrid x:Name="DataGrid"
+                  Grid.Row="1"
+                  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>
@@ -37,7 +61,9 @@
                         </DataTemplate>
                     </DataGridTemplateColumn.CellTemplate>
                 </DataGridTemplateColumn>
+                
                 <DataGridTextColumn Header="Command" Binding="{Binding Command}" MaxWidth="330" />
+                
             </DataGrid.Columns>
         </DataGrid>
     </Grid>

mpv.net/WPF/InputWindow.xaml.cs

@@ -1,4 +1,5 @@
-using System;
+
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.IO;
@@ -6,7 +7,8 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Data;
 using System.Windows.Input;
-using System.Windows.Media;
+
+using static mpvnet.Core;
 
 namespace mpvnet
 {
@@ -26,38 +28,28 @@ namespace mpvnet
             var yourCostumFilter = new Predicate<object>(item => Filter((CommandItem)item));
             CollectionView.Filter = yourCostumFilter;
             DataGrid.ItemsSource = CollectionView;
-
-            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(InputWindow), new PropertyMetadata(Brushes.DarkSlateGray));
-
-        private void SearchTextBox_TextChanged(object sender, TextChangedEventArgs e)
+        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");
+            {
+                SearchControl.SearchTextBox.Text = "";
+                Msg.Show("Filtering", "Reduce the filter scope with:\n\ni input\n\nm menu\n\nc command\n\nIf only one character is entered input search is performed.");
+            }
         }
 
         bool Filter(CommandItem item)
         {
             if (item.Command == "") return false;
             string searchText = SearchControl.SearchTextBox.Text.ToLower();
-            if (searchText == "") return true;
+            if (searchText == "" || searchText == "?") return true;
 
-            if (searchText.StartsWith("i ") || searchText.StartsWith("i:") || searchText.Length == 1)
+            if (searchText.Length == 1)
+                return item.Input.ToLower().Replace("ctrl+", "").Replace("shift+", "").Replace("alt+", "") == searchText.ToLower();
+            else if (searchText.StartsWith("i ") || searchText.StartsWith("i:") || searchText.Length == 1)
             {
                 if (searchText.Length > 1)
                     searchText = searchText.Substring(2).Trim();
@@ -80,7 +72,7 @@ namespace mpvnet
             return false;
         }
 
-        private void ButtonClick(object sender, RoutedEventArgs e)
+        void ButtonClick(object sender, RoutedEventArgs e)
         {
             CommandItem item = ((Button)e.Source).DataContext as CommandItem;
             if (item is null) return;
@@ -98,11 +90,19 @@ namespace mpvnet
                     items[i.Input] = i;
         }
 
-        private void Window_Loaded(object sender, RoutedEventArgs e) => Keyboard.Focus(SearchControl.SearchTextBox);
+        void Window_Loaded(object sender, RoutedEventArgs e) => Keyboard.Focus(SearchControl.SearchTextBox);
 
         string GetInputConfContent()
         {
-            string text = Properties.Resources.inputConfHeader + "\r\n";
+            string text = null;
+
+            foreach (string line in Properties.Resources.input_conf.Split(new[] { "\r\n" }, StringSplitOptions.None))
+            {
+                string test = line.Trim();
+                if (test == "" || test.StartsWith("#")) text += test + "\r\n";
+            }
+
+            text = "\r\n" + text.Trim() + "\r\n\r\n";
 
             foreach (CommandItem item in CommandItem.Items)
             {
@@ -122,14 +122,14 @@ namespace mpvnet
             return text;
         }
 
-        private void Window_Closed(object sender, EventArgs e)
+        void Window_Closed(object sender, EventArgs e)
         {
             if (InitialInputConfContent == GetInputConfContent()) return;
-            File.WriteAllText(mp.InputConfPath, GetInputConfContent());
+            File.WriteAllText(core.InputConfPath, GetInputConfContent());
             Msg.Show("Changes will be available on next mpv.net startup.");
         }
 
-        private void DataGrid_PreviewCanExecute(object sender, CanExecuteRoutedEventArgs e)
+        void DataGrid_PreviewCanExecute(object sender, CanExecuteRoutedEventArgs e)
         {
             DataGrid grid = (DataGrid)sender;
 

mpv.net/WPF/LearnWindow.xaml

@@ -3,21 +3,47 @@
         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:UI="clr-namespace:UI"
         mc:Ignorable="d"
-        Title="Learn Input" Height="200" Width="400" WindowStartupLocation="CenterOwner"
-        ResizeMode="NoResize" Loaded="Window_Loaded" Background="Black" MouseWheel="Window_MouseWheel">
+        
+        Title="Learn Input"
+        Height="200"
+        Width="400"
+        WindowStartupLocation="CenterOwner"
+        ResizeMode="NoResize"
+        Loaded="Window_Loaded"
+        Foreground="{x:Static UI:Theme.Foreground}"
+        Background="{x:Static UI:Theme.Background}"
+        MouseWheel="Window_MouseWheel"
+        MouseUp="Window_MouseUp"
+        MouseDoubleClick="Window_MouseDoubleClick"
+        TextInput="Window_TextInput">
+    
     <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>
+        
+        <TextBlock x:Name="MenuTextBlock"
+                   Grid.ColumnSpan="2"
+                   VerticalAlignment="Center"
+                   HorizontalAlignment="Center"
+                   FontSize="16"></TextBlock>
+
+        <TextBlock x:Name="KeyTextBlock"
+                   Grid.Row="1"
+                   Grid.ColumnSpan="2"
+                   VerticalAlignment="Top"
+                   HorizontalAlignment="Center"
+                   FontSize="16" />
+        
         <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>

mpv.net/WPF/LearnWindow.xaml.cs

@@ -1,25 +1,26 @@
-using System;
+
+using System;
 using System.Runtime.InteropServices;
 using System.Windows;
 using System.Windows.Input;
 using System.Windows.Interop;
-using WF = System.Windows.Forms;
+
+using WinForms = System.Windows.Forms;
+using static mpvnet.Core;
 
 namespace mpvnet
 {
     public partial class LearnWindow : Window
     {
         public CommandItem InputItem { get; set; }
-        public string NewKey { get; set; } = "";
+        string NewKey = "";
+        string KeyChar = "";
 
-        public LearnWindow()
-        {
-            InitializeComponent();
-        }
+        public LearnWindow() => InitializeComponent();
 
-        private IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
+        IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
         {
-            WF.Message m = new WF.Message();
+            WinForms.Message m = new WinForms.Message();
             m.HWnd = hwnd;
             m.Msg = msg;
             m.WParam = wParam;
@@ -28,10 +29,10 @@ namespace mpvnet
             return m.Result;
         }
 
-        void OnKeyUp(WF.KeyEventArgs e)
+        void OnKeyUp(WinForms.KeyEventArgs e)
         {
-            if (e.KeyCode == WF.Keys.ControlKey || e.KeyCode == WF.Keys.ShiftKey ||
-                e.KeyCode == WF.Keys.Menu || e.KeyCode == WF.Keys.None)
+            if (e.KeyCode == WinForms.Keys.ControlKey || e.KeyCode == WinForms.Keys.ShiftKey ||
+                e.KeyCode == WinForms.Keys.Menu || e.KeyCode == WinForms.Keys.None)
 
                 return;
 
@@ -43,196 +44,209 @@ namespace mpvnet
             else
                 try {
                     text = Convert.ToChar(charValue).ToString().ToLower().Trim();
-                }
-                catch {}
+                } catch {}
 
             for (int i = 0; i < 13; i++)
-                if ("D" + i.ToString() == text)
+                if ("D" + i == 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:
+                case WinForms.Keys.NumPad0:
+                case WinForms.Keys.NumPad1:
+                case WinForms.Keys.NumPad2:
+                case WinForms.Keys.NumPad3:
+                case WinForms.Keys.NumPad4:
+                case WinForms.Keys.NumPad5:
+                case WinForms.Keys.NumPad6:
+                case WinForms.Keys.NumPad7:
+                case WinForms.Keys.NumPad8:
+                case WinForms.Keys.NumPad9:
+                    text = "KP" + e.KeyCode.ToString()[6]; break;
+                case WinForms.Keys.Space:
                     text = "Space"; break;
-                case WF.Keys.Enter:
+                case WinForms.Keys.Enter:
                     text = "Enter"; break;
-                case WF.Keys.Tab:
-                    text = "Tab"; break;
-                case WF.Keys.Back:
+                case WinForms.Keys.Tab:
+                    text = "TAB"; break;
+                case WinForms.Keys.Back:
                     text = "BS"; break;
-                case WF.Keys.Delete:
-                    text = "Del"; break;
-                case WF.Keys.Insert:
-                    text = "Ins"; break;
-                case WF.Keys.Home:
+                case WinForms.Keys.Delete:
+                    text = "DEL"; break;
+                case WinForms.Keys.Insert:
+                    text = "INS"; break;
+                case WinForms.Keys.Home:
                     text = "Home"; break;
-                case WF.Keys.End:
-                    text = "End"; break;
-                case WF.Keys.PageUp:
+                case WinForms.Keys.End:
+                    text = "END"; break;
+                case WinForms.Keys.PageUp:
                     text = "PGUP"; break;
-                case WF.Keys.PageDown:
+                case WinForms.Keys.PageDown:
                     text = "PGDWN"; break;
-                case WF.Keys.Escape:
-                    text = "Esc"; break;
-                case WF.Keys.PrintScreen:
+                case WinForms.Keys.Escape:
+                    text = "ESC"; break;
+                case WinForms.Keys.PrintScreen:
                     text = "Print"; break;
-                case WF.Keys.Play:
+                case WinForms.Keys.Play:
                     text = "Play"; break;
-                case WF.Keys.Pause:
+                case WinForms.Keys.Pause:
                     text = "Pause"; break;
-                case WF.Keys.MediaPlayPause:
+                case WinForms.Keys.MediaPlayPause:
                     text = "PlayPause"; break;
-                case WF.Keys.MediaStop:
+                case WinForms.Keys.MediaStop:
                     text = "Stop"; break;
-                case WF.Keys.MediaNextTrack:
+                case WinForms.Keys.MediaNextTrack:
                     text = "Next"; break;
-                case WF.Keys.MediaPreviousTrack:
+                case WinForms.Keys.MediaPreviousTrack:
                     text = "Prev"; break;
-                case WF.Keys.VolumeUp:
+                case WinForms.Keys.VolumeUp:
                     text = "Volume_Up"; break;
-                case WF.Keys.VolumeDown:
+                case WinForms.Keys.VolumeDown:
                     text = "Volume_Down"; break;
-                case WF.Keys.VolumeMute:
+                case WinForms.Keys.VolumeMute:
                     text = "Mute"; break;
-                case WF.Keys.BrowserHome:
+                case WinForms.Keys.BrowserHome:
                     text = "Homepage"; break;
-                case WF.Keys.LaunchMail:
+                case WinForms.Keys.LaunchMail:
                     text = "Mail"; break;
-                case WF.Keys.BrowserFavorites:
+                case WinForms.Keys.BrowserFavorites:
                     text = "Favorites"; break;
-                case WF.Keys.BrowserSearch:
+                case WinForms.Keys.BrowserSearch:
                     text = "Search"; break;
-                case WF.Keys.Sleep:
+                case WinForms.Keys.Sleep:
                     text = "Sleep"; break;
-                case WF.Keys.Cancel:
+                case WinForms.Keys.Cancel:
                     text = "Cancel"; break;
             }
 
-            bool shiftWasHandled = false;
+            bool wasModified = 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]))
+            if (text.Length == 1 && KeyChar != text)
             {
-                text = GetModifiedKey(text[0]).ToString();
-                shiftWasHandled = true;
+                text = KeyChar;
+                wasModified = true;
             }
 
-            if (text == "#") text = "Sharp";
+            if (text == "#") text = "SHARP";
 
-            if (isAlt) text = "Alt+" + text;
-            if (isShift && !shiftWasHandled) text = "Shift+" + text;
-            if (isCtrl) text = "Ctrl+" + text;
+            if (isAlt   && !wasModified)
+                text = "ALT+" + text;
+
+            if (isShift && !wasModified)
+                text = "SHIFT+" + text;
+
+            if (isCtrl  && !wasModified)
+                text = "CTRL+" + text;
 
             if (!string.IsNullOrEmpty(text))
                 SetKey(text);
         }
 
+        DateTime LastKeyUp;
+
         void SetKey(string key)
         {
             NewKey = key;
-            MenuLabel.Content = InputItem.Path;
-            KeyLabel.Content = key;
+            MenuTextBlock.Text = InputItem.Path;
+            KeyTextBlock.Text = key;
+            LastKeyUp = DateTime.Now;
         }
 
         [DllImport("user32.dll")]
         static extern uint MapVirtualKey(uint uCode, uint uMapType);
 
-        public static WF.Keys ModifierKeys {
+        public static WinForms.Keys ModifierKeys {
             get {
-                WF.Keys keys = WF.Keys.None;
+                WinForms.Keys keys = WinForms.Keys.None;
+
                 if (GetKeyState(17) < (short)0)
-                    keys |= WF.Keys.Control;
+                    keys |= WinForms.Keys.Control;
+
                 if (GetKeyState(16) < (short)0)
-                    keys |= WF.Keys.Shift;
+                    keys |= WinForms.Keys.Shift;
+
                 if (GetKeyState(18) < (short)0)
-                    keys |= WF.Keys.Alt;
+                    keys |= WinForms.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)
+        void ProcessKeyEventArgs(ref WinForms.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));
+                OnKeyUp(new WinForms.KeyEventArgs((WinForms.Keys)(unchecked((int)(long)m.WParam)) | ModifierKeys));
             else if (m.Msg == WM_APPCOMMAND)
             {
-                switch ((AppCommand)(m.LParam.ToInt32() >> 16))
+                if (!core.get_property_bool("input-media-keys"))
+                    return;
+
+                var value = (AppCommand)(m.LParam.ToInt64() >> 16 & ~0xf000);
+
+                switch (value)
                 {
-                    case AppCommand.MEDIA_CHANNEL_DOWN:
-                        SetKey("Channel_Down");
+                    case AppCommand.APPCOMMAND_MEDIA_CHANNEL_DOWN:
+                        SetKey("CHANNEL_DOWN");
                         break;
-                    case AppCommand.MEDIA_CHANNEL_UP:
-                        SetKey("Channel_Up");
+                    case AppCommand.APPCOMMAND_MEDIA_CHANNEL_UP:
+                        SetKey("CHANNEL_UP");
                         break;
-                    case AppCommand.MEDIA_FAST_FORWARD:
-                        SetKey("Forward");
+                    case AppCommand.APPCOMMAND_MEDIA_FAST_FORWARD:
+                        SetKey("FORWARD");
                         break;
-                    case AppCommand.MEDIA_REWIND:
-                        SetKey("Rewind");
+                    case AppCommand.APPCOMMAND_MEDIA_REWIND:
+                        SetKey("REWIND");
                         break;
-                    case AppCommand.MEDIA_PAUSE:
-                        SetKey("Pause");
+                    case AppCommand.APPCOMMAND_MEDIA_PAUSE:
+                        SetKey("PAUSE");
                         break;
-                    case AppCommand.MEDIA_PLAY:
-                        SetKey("Play");
+                    case AppCommand.APPCOMMAND_MEDIA_PLAY:
+                        SetKey("PLAY");
                         break;
-                    case AppCommand.MEDIA_PLAY_PAUSE:
-                        SetKey("PlayPause");
+                    case AppCommand.APPCOMMAND_MEDIA_PLAY_PAUSE:
+                        SetKey("PLAYPAUSE");
                         break;
-                    case AppCommand.MEDIA_NEXTTRACK:
-                        SetKey("Next");
+                    case AppCommand.APPCOMMAND_MEDIA_NEXTTRACK:
+                        SetKey("NEXT");
                         break;
-                    case AppCommand.MEDIA_PREVIOUSTRACK:
-                        SetKey("Prev");
+                    case AppCommand.APPCOMMAND_MEDIA_PREVIOUSTRACK:
+                        SetKey("PREV");
                         break;
-                    case AppCommand.MEDIA_RECORD:
-                        SetKey("Record");
+                    case AppCommand.APPCOMMAND_MEDIA_RECORD:
+                        SetKey("RECORD");
                         break;
-                    case AppCommand.MEDIA_STOP:
-                        SetKey("Stop");
+                    case AppCommand.APPCOMMAND_MEDIA_STOP:
+                        SetKey("STOP");
                         break;
-                    case AppCommand.VolumeUp:
-                        SetKey("Volume_Up");
+                    case AppCommand.APPCOMMAND_VOLUME_UP:
+                        SetKey("VOLUME_UP");
                         break;
-                    case AppCommand.VolumeDown:
-                        SetKey("Volume_Down");
+                    case AppCommand.APPCOMMAND_VOLUME_DOWN:
+                        SetKey("VOLUME_DOWN");
                         break;
-                    case AppCommand.VolumeMute:
-                        SetKey("Mute");
+                    case AppCommand.APPCOMMAND_VOLUME_MUTE:
+                        SetKey("MUTE");
+                        break;
+                    case AppCommand.APPCOMMAND_BROWSER_HOME:
+                        SetKey("HOMEPAGE");
+                        break;
+                    case AppCommand.APPCOMMAND_LAUNCH_MAIL:
+                        SetKey("MAIL");
+                        break;
+                    case AppCommand.APPCOMMAND_BROWSER_FAVORITES:
+                        SetKey("FAVORITES");
+                        break;
+                    case AppCommand.APPCOMMAND_BROWSER_SEARCH:
+                        SetKey("SEARCH");
+                        break;
+                    case AppCommand.APPCOMMAND_PRINT:
+                        SetKey("PRINT");
                         break;
                 }
             }
@@ -240,20 +254,58 @@ namespace mpvnet
 
         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
+            APPCOMMAND_BASS_BOOST = 20,
+            APPCOMMAND_BASS_DOWN = 19,
+            APPCOMMAND_BASS_UP = 21,
+            APPCOMMAND_BROWSER_BACKWARD = 1,
+            APPCOMMAND_BROWSER_FAVORITES = 6,
+            APPCOMMAND_BROWSER_FORWARD = 2,
+            APPCOMMAND_BROWSER_HOME = 7,
+            APPCOMMAND_BROWSER_REFRESH = 3,
+            APPCOMMAND_BROWSER_SEARCH = 5,
+            APPCOMMAND_BROWSER_STOP = 4,
+            APPCOMMAND_CLOSE = 31,
+            APPCOMMAND_COPY = 36,
+            APPCOMMAND_CORRECTION_LIST = 45,
+            APPCOMMAND_CUT = 37,
+            APPCOMMAND_DICTATE_OR_COMMAND_CONTROL_TOGGLE = 43,
+            APPCOMMAND_FIND = 28,
+            APPCOMMAND_FORWARD_MAIL = 40,
+            APPCOMMAND_HELP = 27,
+            APPCOMMAND_LAUNCH_APP1 = 17,
+            APPCOMMAND_LAUNCH_APP2 = 18,
+            APPCOMMAND_LAUNCH_MAIL = 15,
+            APPCOMMAND_LAUNCH_MEDIA_SELECT = 16,
+            APPCOMMAND_MEDIA_CHANNEL_DOWN = 52,
+            APPCOMMAND_MEDIA_CHANNEL_UP = 51,
+            APPCOMMAND_MEDIA_FAST_FORWARD = 49,
+            APPCOMMAND_MEDIA_NEXTTRACK = 11,
+            APPCOMMAND_MEDIA_PAUSE = 47,
+            APPCOMMAND_MEDIA_PLAY = 46,
+            APPCOMMAND_MEDIA_PLAY_PAUSE = 14,
+            APPCOMMAND_MEDIA_PREVIOUSTRACK = 12,
+            APPCOMMAND_MEDIA_RECORD = 48,
+            APPCOMMAND_MEDIA_REWIND = 50,
+            APPCOMMAND_MEDIA_STOP = 13,
+            APPCOMMAND_MIC_ON_OFF_TOGGLE = 44,
+            APPCOMMAND_MICROPHONE_VOLUME_DOWN = 25,
+            APPCOMMAND_MICROPHONE_VOLUME_MUTE = 24,
+            APPCOMMAND_MICROPHONE_VOLUME_UP = 26,
+            APPCOMMAND_NEW = 29,
+            APPCOMMAND_OPEN = 30,
+            APPCOMMAND_PASTE = 38,
+            APPCOMMAND_PRINT = 33,
+            APPCOMMAND_REDO = 35,
+            APPCOMMAND_REPLY_TO_MAIL = 39,
+            APPCOMMAND_SAVE = 32,
+            APPCOMMAND_SEND_MAIL = 41,
+            APPCOMMAND_SPELL_CHECK = 42,
+            APPCOMMAND_TREBLE_DOWN = 22,
+            APPCOMMAND_TREBLE_UP = 23,
+            APPCOMMAND_UNDO = 34,
+            APPCOMMAND_VOLUME_DOWN = 9,
+            APPCOMMAND_VOLUME_MUTE = 8,
+            APPCOMMAND_VOLUME_UP = 10
         }
 
         [DllImport("user32.dll", CharSet = CharSet.Auto)]
@@ -269,31 +321,69 @@ namespace mpvnet
                                   out uint lpChar,
                                   uint     flags);
 
-        private void Window_Loaded(object sender, RoutedEventArgs e)
+        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)
+        void ConfirmButton_Click(object sender, RoutedEventArgs e)
         {
             InputItem.Input = NewKey;
             Close();
         }
 
-        private void ClearButton_Click(object sender, RoutedEventArgs e)
+        void ClearButton_Click(object sender, RoutedEventArgs e)
         {
             InputItem.Input = "_";
             Close();
         }
 
-        private void Window_MouseWheel(object sender, MouseWheelEventArgs e)
+        void Window_MouseWheel(object sender, MouseWheelEventArgs e)
         {
             if (e.Delta > 0)
                 SetKey("WHEEL_UP");
             else
                 SetKey("WHEEL_DOWN");
         }
+
+        void Window_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            switch (e.ChangedButton)
+            {
+                case MouseButton.Left:
+                    if (BlockMBTN_LEFT)
+                        BlockMBTN_LEFT = false;
+                    else
+                        SetKey("MBTN_LEFT");
+                    break;
+                case MouseButton.Middle:
+                    SetKey("MBTN_MID");
+                    break;
+                case MouseButton.XButton1:
+                    SetKey("MBTN_BACK");
+                    break;
+                case MouseButton.XButton2:
+                    SetKey("MBTN_FORWARD");
+                    break;
+            }
+        }
+
+        bool BlockMBTN_LEFT;
+
+        void Window_MouseDoubleClick(object sender, MouseButtonEventArgs e)
+        {
+            if (e.ChangedButton == MouseButton.Left)
+            {
+                SetKey("MBTN_LEFT_DBL");
+                BlockMBTN_LEFT = true;
+            }
+        }
+
+        void Window_TextInput(object sender, TextCompositionEventArgs e)
+        {
+            KeyChar = e.Text;
+        }
     }
 }

mpv.net/WPF/Resources.xaml

@@ -1,14 +1,23 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:WPF="clr-namespace:WPF">
+                    xmlns:UI="clr-namespace:UI">
     
     <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 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"/>
@@ -17,7 +26,7 @@
                             <Setter Property="BorderBrush" TargetName="border" Value="#FF7EB4EA"/>
                         </Trigger>
                         <Trigger Property="IsFocused" Value="true">
-                            <Setter Property="BorderBrush" TargetName="border" Value="{x:Static WPF:WPF.ThemeBrush}"/>
+                            <Setter Property="BorderBrush" TargetName="border" Value="{x:Static UI:Theme.Heading}"/>
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -34,13 +43,14 @@
                             <ColumnDefinition x:Name="LeftCol" Width="18" />
                             <ColumnDefinition x:Name="RightCol" Width="*" />
                         </Grid.ColumnDefinitions>
+                        
                         <Grid x:Name="PART_CHECKBOX">
                             <Ellipse
                                 x:Name="normal"
                                 Width="18"
                                 Height="18"
-                                Fill="{Binding Path=Background, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}"
-                                Stroke="{x:Static WPF:WPF.ThemeBrush}"
+                                Fill="{x:Static UI:Theme.Background}"
+                                Stroke="{x:Static UI:Theme.Heading}"
                                 StrokeThickness="2" />
                             <Ellipse
                                 x:Name="Checked1"
@@ -56,6 +66,7 @@
                                 Opacity="0"
                                 StrokeThickness="{TemplateBinding BorderThickness}" />
                         </Grid>
+                        
                         <ContentPresenter
                             x:Name="contentPresenter"
                             Grid.Column="1"
@@ -67,6 +78,7 @@
                             ContentTemplate="{TemplateBinding ContentTemplate}"
                             ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
                             RecognizesAccessKey="True" />
+                        
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CommonStates">
                                 <VisualState x:Name="Normal" />

mpv.net/WPF/SearchTextBoxUserControl.xaml

@@ -0,0 +1,68 @@
+<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"
+             xmlns:UI="clr-namespace:UI"
+             mc:Ignorable="d" 
+             d:DesignHeight="450"
+             d:DesignWidth="800">
+    
+    <Grid Name="SearchTextBoxUserControl1"
+          Background="{x:Static UI:Theme.Background}">
+        
+        <TextBlock Name="HintTextBlock"
+                   Margin="5,2"
+                   Text="Find a setting"
+                   VerticalAlignment="Center"
+                   Foreground="{x:Static UI:Theme.Foreground2}"
+                   Background="{x:Static UI:Theme.Background}" />
+        
+        <TextBox Name="SearchTextBox"
+                 Height="25"
+                 Padding="1,2,0,0"
+                 BorderThickness="2"
+                 Background="Transparent"
+                 TextChanged="SearchTextBox_TextChanged"
+                 Foreground="{x:Static UI:Theme.Foreground}"
+                 CaretBrush="{x:Static UI:Theme.Foreground}" />
+        
+        <Button Name="SearchClearButton"
+                Background="Transparent"
+                HorizontalAlignment="Right"
+                FontFamily="Marlett"
+                FontSize="10"
+                Width="17"
+                Height="17"
+                Margin="2,0,4,0"
+                Visibility="Hidden"
+                Click="SearchClearButton_Click" >r
+
+            <Button.Style>
+                <Style TargetType="Button">
+                    <Setter Property="Background" Value="{x:Static UI:Theme.Background}"/>
+                    <Setter Property="Foreground" Value="{x:Static UI:Theme.Foreground2}"/>
+                    <Setter Property="Template">
+                        <Setter.Value>
+                            <ControlTemplate TargetType="Button">
+                                <Border BorderThickness="1"
+                                        BorderBrush="{TemplateBinding Foreground}"
+                                        SnapsToDevicePixels="True">
+                                    
+                                    <ContentPresenter HorizontalAlignment="Center"
+                                                      VerticalAlignment="Center" />
+                                </Border>
+                            </ControlTemplate>
+                        </Setter.Value>
+                    </Setter>
+                    
+                    <Style.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="Foreground" Value="{x:Static UI:Theme.Heading}"/>
+                        </Trigger>
+                    </Style.Triggers>
+                </Style>
+            </Button.Style>
+        </Button>
+    </Grid>
+</UserControl>

mpv.net/WPF/SearchTextBoxUserControl.xaml.cs

@@ -1,4 +1,5 @@
-using System.Windows;
+
+using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 
@@ -13,7 +14,7 @@ namespace Controls
 
         public string Text { get => SearchTextBox.Text; set => SearchTextBox.Text = value; }
 
-        private string _HintText;
+        string _HintText;
 
         public string HintText {
             get => _HintText;
@@ -23,13 +24,13 @@ namespace Controls
             }
         }
 
-        private void SearchClearButton_Click(object sender, RoutedEventArgs e)
+        void SearchClearButton_Click(object sender, RoutedEventArgs e)
         {
             SearchTextBox.Text = "";
             Keyboard.Focus(SearchTextBox);
         }
 
-        private void SearchTextBox_TextChanged(object sender, TextChangedEventArgs e)
+        void SearchTextBox_TextChanged(object sender, TextChangedEventArgs e)
         {
             UpdateControls();
         }

mpv.net/WPF/SetupWindow.xaml

@@ -0,0 +1,33 @@
+<Window x:Class="mpvnet.SetupWindow"
+        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:UI="clr-namespace:UI"
+        mc:Ignorable="d"
+        
+        Title="mpv.net Setup"
+        FontSize="13"
+        Foreground="{x:Static UI:Theme.Foreground}"
+        Background="{x:Static UI:Theme.Background}"
+        SizeToContent="WidthAndHeight"
+        WindowStartupLocation="CenterOwner" >
+
+    <Window.Resources>
+        <Style TargetType="Button">
+            <Setter Property="Padding" Value="10"></Setter>
+            <Setter Property="Margin" Value="5"></Setter>
+        </Style>
+    </Window.Resources>
+    
+    <Grid>
+        <StackPanel Margin="10">
+            <Button Name="RegisterVideo" Click="RegisterVideo_Click">Register video file extensions (requires admin rights)</Button>
+            <Button Name="RegisterAudio" Click="RegisterAudio_Click">Register audio file extensions (requires admin rights)</Button>
+            <Button Name="RegisterImage" Click="RegisterImage_Click">Register image file extensions (requires admin rights)</Button>
+            <Button Name="UnregisterFileAssociations" Click="UnregisterFileAssociations_Click">Unregister file extensions (requires admin rights)</Button>
+            <Button Name="AddToPathEnvVar" Click="AddToPathEnvVar_Click">Add mpv.net to Path environment variable</Button>
+            <Button Name="RemoveFromPathEnvVar" Click="RemoveFromPathEnvVar_Click">Remove mpv.net from Path environment variable</Button>
+        </StackPanel>
+    </Grid>
+</Window>