From 9198d610adf75d855a74539bf8ffe189384ab10c Mon Sep 17 00:00:00 2001 From: Frank Skare Date: Sat, 4 May 2019 14:03:59 +0200 Subject: [PATCH] - --- README.md | 5 ++ .../CSScriptAddon}/CSScriptAddon.vb | 0 .../CSScriptAddon}/CSScriptAddon.vbproj | 2 +- .../CSScriptAddon}/CSScriptLibrary.dll | Bin .../My Project/Application.Designer.vb | 0 .../My Project/Application.myapp | 0 .../CSScriptAddon}/My Project/AssemblyInfo.vb | 0 .../My Project/Resources.Designer.vb | 0 .../CSScriptAddon}/My Project/Resources.resx | 0 .../My Project/Settings.Designer.vb | 0 .../My Project/Settings.settings | 0 .../RatingAddon}/Properties/AssemblyInfo.cs | 0 .../RatingAddon}/RatingAddon.cs | 0 .../RatingAddon}/RatingAddon.csproj | 2 +- addons/TestAddon/Properties/AssemblyInfo.cs | 36 ++++++++++++ addons/TestAddon/TestAddon.cs | 27 +++++++++ addons/TestAddon/TestAddon.csproj | 52 ++++++++++++++++++ mpv.net.sln | 51 +++++++++++++---- mpv.net/MainForm.cs | 12 ++-- setup.iss | 2 +- setup.ps1 | 3 +- 21 files changed, 171 insertions(+), 21 deletions(-) rename {CSScriptAddon => addons/CSScriptAddon}/CSScriptAddon.vb (100%) rename {CSScriptAddon => addons/CSScriptAddon}/CSScriptAddon.vbproj (99%) rename {CSScriptAddon => addons/CSScriptAddon}/CSScriptLibrary.dll (100%) rename {CSScriptAddon => addons/CSScriptAddon}/My Project/Application.Designer.vb (100%) rename {CSScriptAddon => addons/CSScriptAddon}/My Project/Application.myapp (100%) rename {CSScriptAddon => addons/CSScriptAddon}/My Project/AssemblyInfo.vb (100%) rename {CSScriptAddon => addons/CSScriptAddon}/My Project/Resources.Designer.vb (100%) rename {CSScriptAddon => addons/CSScriptAddon}/My Project/Resources.resx (100%) rename {CSScriptAddon => addons/CSScriptAddon}/My Project/Settings.Designer.vb (100%) rename {CSScriptAddon => addons/CSScriptAddon}/My Project/Settings.settings (100%) rename {RatingAddon => addons/RatingAddon}/Properties/AssemblyInfo.cs (100%) rename {RatingAddon => addons/RatingAddon}/RatingAddon.cs (100%) rename {RatingAddon => addons/RatingAddon}/RatingAddon.csproj (98%) create mode 100644 addons/TestAddon/Properties/AssemblyInfo.cs create mode 100644 addons/TestAddon/TestAddon.cs create mode 100644 addons/TestAddon/TestAddon.csproj diff --git a/README.md b/README.md index 1c2958b..687c2a0 100644 --- a/README.md +++ b/README.md @@ -201,6 +201,11 @@ mpv.net bugs and requests: ### Changelog +### 3.5 (2019-??-??) + +- 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 + ### 3.4 (2019-05-03) - new feature added to manage file associations from within the app. It can be found in the menu at: Tools > Manage... [Default Binding](https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/inputConf.txt#L149) diff --git a/CSScriptAddon/CSScriptAddon.vb b/addons/CSScriptAddon/CSScriptAddon.vb similarity index 100% rename from CSScriptAddon/CSScriptAddon.vb rename to addons/CSScriptAddon/CSScriptAddon.vb diff --git a/CSScriptAddon/CSScriptAddon.vbproj b/addons/CSScriptAddon/CSScriptAddon.vbproj similarity index 99% rename from CSScriptAddon/CSScriptAddon.vbproj rename to addons/CSScriptAddon/CSScriptAddon.vbproj index e903af0..9597a8d 100644 --- a/CSScriptAddon/CSScriptAddon.vbproj +++ b/addons/CSScriptAddon/CSScriptAddon.vbproj @@ -156,7 +156,7 @@ - + {1751f378-8edf-4b62-be6d-304c7c287089} mpv.net False diff --git a/CSScriptAddon/CSScriptLibrary.dll b/addons/CSScriptAddon/CSScriptLibrary.dll similarity index 100% rename from CSScriptAddon/CSScriptLibrary.dll rename to addons/CSScriptAddon/CSScriptLibrary.dll diff --git a/CSScriptAddon/My Project/Application.Designer.vb b/addons/CSScriptAddon/My Project/Application.Designer.vb similarity index 100% rename from CSScriptAddon/My Project/Application.Designer.vb rename to addons/CSScriptAddon/My Project/Application.Designer.vb diff --git a/CSScriptAddon/My Project/Application.myapp b/addons/CSScriptAddon/My Project/Application.myapp similarity index 100% rename from CSScriptAddon/My Project/Application.myapp rename to addons/CSScriptAddon/My Project/Application.myapp diff --git a/CSScriptAddon/My Project/AssemblyInfo.vb b/addons/CSScriptAddon/My Project/AssemblyInfo.vb similarity index 100% rename from CSScriptAddon/My Project/AssemblyInfo.vb rename to addons/CSScriptAddon/My Project/AssemblyInfo.vb diff --git a/CSScriptAddon/My Project/Resources.Designer.vb b/addons/CSScriptAddon/My Project/Resources.Designer.vb similarity index 100% rename from CSScriptAddon/My Project/Resources.Designer.vb rename to addons/CSScriptAddon/My Project/Resources.Designer.vb diff --git a/CSScriptAddon/My Project/Resources.resx b/addons/CSScriptAddon/My Project/Resources.resx similarity index 100% rename from CSScriptAddon/My Project/Resources.resx rename to addons/CSScriptAddon/My Project/Resources.resx diff --git a/CSScriptAddon/My Project/Settings.Designer.vb b/addons/CSScriptAddon/My Project/Settings.Designer.vb similarity index 100% rename from CSScriptAddon/My Project/Settings.Designer.vb rename to addons/CSScriptAddon/My Project/Settings.Designer.vb diff --git a/CSScriptAddon/My Project/Settings.settings b/addons/CSScriptAddon/My Project/Settings.settings similarity index 100% rename from CSScriptAddon/My Project/Settings.settings rename to addons/CSScriptAddon/My Project/Settings.settings diff --git a/RatingAddon/Properties/AssemblyInfo.cs b/addons/RatingAddon/Properties/AssemblyInfo.cs similarity index 100% rename from RatingAddon/Properties/AssemblyInfo.cs rename to addons/RatingAddon/Properties/AssemblyInfo.cs diff --git a/RatingAddon/RatingAddon.cs b/addons/RatingAddon/RatingAddon.cs similarity index 100% rename from RatingAddon/RatingAddon.cs rename to addons/RatingAddon/RatingAddon.cs diff --git a/RatingAddon/RatingAddon.csproj b/addons/RatingAddon/RatingAddon.csproj similarity index 98% rename from RatingAddon/RatingAddon.csproj rename to addons/RatingAddon/RatingAddon.csproj index 667204d..afa67cd 100644 --- a/RatingAddon/RatingAddon.csproj +++ b/addons/RatingAddon/RatingAddon.csproj @@ -82,7 +82,7 @@ - + {1751f378-8edf-4b62-be6d-304c7c287089} mpv.net False diff --git a/addons/TestAddon/Properties/AssemblyInfo.cs b/addons/TestAddon/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..edeaa25 --- /dev/null +++ b/addons/TestAddon/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +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: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("TestAddon")] +[assembly: AssemblyCopyright("Copyright © 2019")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[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")] + +// 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")] diff --git a/addons/TestAddon/TestAddon.cs b/addons/TestAddon/TestAddon.cs new file mode 100644 index 0000000..c4f2163 --- /dev/null +++ b/addons/TestAddon/TestAddon.cs @@ -0,0 +1,27 @@ +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()); + } + } +} \ No newline at end of file diff --git a/addons/TestAddon/TestAddon.csproj b/addons/TestAddon/TestAddon.csproj new file mode 100644 index 0000000..120d1cd --- /dev/null +++ b/addons/TestAddon/TestAddon.csproj @@ -0,0 +1,52 @@ + + + + + Debug + AnyCPU + {06F854B0-00F9-4B53-94D9-0BE65A7C55D8} + Library + Properties + TestAddon + TestAddon + v4.7.2 + 512 + true + + + true + full + false + bin\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\ + TRACE + prompt + 4 + + + + ..\..\mpv.net\bin\x64\mpvnet.exe + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mpv.net.sln b/mpv.net.sln index 71cbf9e..05b8080 100644 --- a/mpv.net.sln +++ b/mpv.net.sln @@ -5,42 +5,73 @@ 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("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RatingAddon", "RatingAddon\RatingAddon.csproj", "{55C88710-539D-4402-84C8-31694841C731}" +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "CSScriptAddon", "addons\CSScriptAddon\CSScriptAddon.vbproj", "{71808A87-8B1C-4DF8-957C-D79C3B164CCA}" EndProject -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "CSScriptAddon", "CSScriptAddon\CSScriptAddon.vbproj", "{71808A87-8B1C-4DF8-957C-D79C3B164CCA}" +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 + Debug|Any CPU = Debug|Any CPU Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU Release|x64 = Release|x64 Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {1751F378-8EDF-4B62-BE6D-304C7C287089}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1751F378-8EDF-4B62-BE6D-304C7C287089}.Debug|Any CPU.Build.0 = Debug|Any CPU {1751F378-8EDF-4B62-BE6D-304C7C287089}.Debug|x64.ActiveCfg = Debug|x64 {1751F378-8EDF-4B62-BE6D-304C7C287089}.Debug|x64.Build.0 = Debug|x64 {1751F378-8EDF-4B62-BE6D-304C7C287089}.Debug|x86.ActiveCfg = Debug|x86 {1751F378-8EDF-4B62-BE6D-304C7C287089}.Debug|x86.Build.0 = Debug|x86 + {1751F378-8EDF-4B62-BE6D-304C7C287089}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1751F378-8EDF-4B62-BE6D-304C7C287089}.Release|Any CPU.Build.0 = Release|Any CPU {1751F378-8EDF-4B62-BE6D-304C7C287089}.Release|x64.ActiveCfg = Release|x64 {1751F378-8EDF-4B62-BE6D-304C7C287089}.Release|x64.Build.0 = Release|x64 {1751F378-8EDF-4B62-BE6D-304C7C287089}.Release|x86.ActiveCfg = Release|x86 {1751F378-8EDF-4B62-BE6D-304C7C287089}.Release|x86.Build.0 = Release|x86 - {55C88710-539D-4402-84C8-31694841C731}.Debug|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 + {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|Any CPU + {06F854B0-00F9-4B53-94D9-0BE65A7C55D8}.Debug|x64.Build.0 = Debug|Any CPU + {06F854B0-00F9-4B53-94D9-0BE65A7C55D8}.Debug|x86.ActiveCfg = Debug|Any CPU + {06F854B0-00F9-4B53-94D9-0BE65A7C55D8}.Debug|x86.Build.0 = Debug|Any CPU + {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 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/mpv.net/MainForm.cs b/mpv.net/MainForm.cs index e2f1de9..404f936 100644 --- a/mpv.net/MainForm.cs +++ b/mpv.net/MainForm.cs @@ -568,7 +568,7 @@ namespace mpvnet BuildMenu(); ContextMenuStrip = ContextMenu; IgnoreDpiChanged = false; - CheckYouTube(); + CheckURL(); } protected override void OnFormClosed(FormClosedEventArgs e) @@ -588,18 +588,18 @@ namespace mpvnet protected override void OnActivated(EventArgs e) { base.OnActivated(e); - CheckYouTube(); + CheckURL(); } - void CheckYouTube() + void CheckURL() { string clipboard = Clipboard.GetText(); - if (clipboard.StartsWith("https://www.youtube.com/watch?") && RegistryHelp.GetString("HKCU\\Software\\" + Application.ProductName, "LastYouTubeURL") != clipboard && Visible) + if (clipboard.StartsWith("http") && RegistryHelp.GetString("HKCU\\Software\\" + Application.ProductName, "LastURL") != clipboard && Visible) { - RegistryHelp.SetObject("HKCU\\Software\\" + Application.ProductName, "LastYouTubeURL", clipboard); + RegistryHelp.SetObject("HKCU\\Software\\" + Application.ProductName, "LastURL", clipboard); - if (Msg.ShowQuestion("Play YouTube URL?", clipboard) == MsgResult.OK) + if (Msg.ShowQuestion("Play URL?", clipboard) == MsgResult.OK) mp.LoadFiles(clipboard); } } diff --git a/setup.iss b/setup.iss index 01c4032..c0c4ef7 100644 --- a/setup.iss +++ b/setup.iss @@ -23,7 +23,7 @@ AppPublisher=Frank Skare (stax76) #endif Compression=lzma2 DefaultDirName={commonpf}\{#MyAppName} -OutputBaseFilename=mpvnet-setup-{#arch}-{#MyAppVersion} +OutputBaseFilename=mpv.net-setup-{#arch}-{#MyAppVersion} OutputDir={#GetEnv('USERPROFILE')}\Desktop DefaultGroupName={#MyAppName} SetupIconFile=mpv.net\mpvnet.ico diff --git a/setup.ps1 b/setup.ps1 index 1e7d998..8d7beab 100644 --- a/setup.ps1 +++ b/setup.ps1 @@ -1,6 +1,5 @@ function CheckExitCode { - if ($LastExitCode -gt 0) - { + if ($LastExitCode -gt 0) { Write-Host "`nExit code $LastExitCode was returned.`n" -ForegroundColor Red exit }