From be3b31f7e6ec9396e6199632d38569baaba33102 Mon Sep 17 00:00:00 2001 From: Frank Skare Date: Thu, 9 May 2019 19:16:48 +0200 Subject: [PATCH] - --- README.md | 10 ++++++---- addons/CSScriptAddon/CSScriptAddon.vbproj | 2 +- addons/RatingAddon/RatingAddon.csproj | 2 +- addons/TestAddon/TestAddon.csproj | 10 +++++++--- mpv.net.sln | 3 --- mpv.net/Properties/AssemblyInfo.cs | 4 ++-- 6 files changed, 17 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index ad2b407..b0c9cbf 100644 --- a/README.md +++ b/README.md @@ -102,22 +102,24 @@ input.conf defines mpv's key and mouse bindings and mpv.net uses comments to def ### Settings -mpv.net shares the settings with mpv, settings can be edited in a settings dialog or in a config file called mpv.conf located in the config directory: +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 ``` -or in a portable setup at: +If a directory named portable_config next to the mpvnet.exe exists, all config will be loaded from this directory only. ```Text \portable_config\mpv.conf ``` -if it's missing mpv.net generates it with the following defaults: +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: +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. + ### Scripting [Scripting wiki page](https://github.com/stax76/mpv.net/wiki/Scripting) @@ -188,7 +190,7 @@ mpv.net bugs and requests: ### Changelog -### 3.5 (2019-??-??) +### 3.5 (2019-05-09) - when the main windows gets activated and the clipboard content starts with http mpv.net will ask to play the URL, previously this was restricted to YouTube URLs diff --git a/addons/CSScriptAddon/CSScriptAddon.vbproj b/addons/CSScriptAddon/CSScriptAddon.vbproj index fe4fe5e..0d52d2a 100644 --- a/addons/CSScriptAddon/CSScriptAddon.vbproj +++ b/addons/CSScriptAddon/CSScriptAddon.vbproj @@ -51,7 +51,7 @@ true true true - ..\mpv.net\bin\x86\Addons\CSScriptAddon\ + ..\..\mpv.net\bin\x86\Addons\CSScriptAddon\ 42105,42106,42107,42353,42354,42355 full x86 diff --git a/addons/RatingAddon/RatingAddon.csproj b/addons/RatingAddon/RatingAddon.csproj index ba7654d..1757496 100644 --- a/addons/RatingAddon/RatingAddon.csproj +++ b/addons/RatingAddon/RatingAddon.csproj @@ -32,7 +32,7 @@ true - ..\mpv.net\bin\x86\Addons\RatingAddon\ + ..\..\mpv.net\bin\x86\Addons\RatingAddon\ DEBUG;TRACE full x86 diff --git a/addons/TestAddon/TestAddon.csproj b/addons/TestAddon/TestAddon.csproj index 120d1cd..2dfee4f 100644 --- a/addons/TestAddon/TestAddon.csproj +++ b/addons/TestAddon/TestAddon.csproj @@ -31,9 +31,6 @@ 4 - - ..\..\mpv.net\bin\x64\mpvnet.exe - @@ -48,5 +45,12 @@ + + + {1751f378-8edf-4b62-be6d-304c7c287089} + mpv.net + False + + \ No newline at end of file diff --git a/mpv.net.sln b/mpv.net.sln index 05b8080..f828ad6 100644 --- a/mpv.net.sln +++ b/mpv.net.sln @@ -10,9 +10,6 @@ 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}" - ProjectSection(ProjectDependencies) = postProject - {1751F378-8EDF-4B62-BE6D-304C7C287089} = {1751F378-8EDF-4B62-BE6D-304C7C287089} - EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/mpv.net/Properties/AssemblyInfo.cs b/mpv.net/Properties/AssemblyInfo.cs index a4f85b1..209ad08 100644 --- a/mpv.net/Properties/AssemblyInfo.cs +++ b/mpv.net/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.4.0.0")] -[assembly: AssemblyFileVersion("3.4.0.0")] +[assembly: AssemblyVersion("3.5.0.0")] +[assembly: AssemblyFileVersion("3.5.0.0")]