misc

docs/changelog.md

@@ -1,6 +1,8 @@
 
 # v7.0.0.5 Beta (2023-??-??)
 
+- Fix mpv.net option `language` not working from command line.
+- Chinese and German translation updated.
 - More libplacebo options added.
 - Support of the mpv option `title-bar`.
 - Fix video being rendered with black line at the bottom.
@@ -12,6 +14,8 @@
 - New menu item and binding: `File > Add files to playlist from clipboard` `Ctrl+Shift+v`.
 - All list operation suffixes are available on the command line.
 - Improved layout in conf editor.
+- New zhongfly libmpv build.
+
 
 # v7.0.0.4 Beta (2023-12-19)
 

docs/manual.md

@@ -606,7 +606,7 @@ visible, even when mpv.net is started from the terminal and music is played.
 For mpv.net it's currently not possible to find out where OSC menus are located,
 but there are 3 features that require this information, therefore mpv.net
 makes the assumption that near the window borders might be OSC menus. As a result
-the following three features, work only when invokes from the center of the window:
+the following three features, work only when invoked from the center of the window:
 
 1. Window dragging (moving the window with the mouse).
 2. Showing the context menu.

lang/create-mo-files.ps1

@@ -1,4 +1,6 @@
 
+$ErrorActionPreference = 'Stop'
+
 $PoFiles = Get-ChildItem $PSScriptRoot/po
 $ExeFolder = "$PSScriptRoot/../src/MpvNet.Windows/bin/Debug"
 
@@ -20,15 +22,14 @@ function CreateFolder
 foreach ($it in $PoFiles)
 {
     $folder = "$ExeFolder/Locale/$($it.BaseName)/LC_MESSAGES"
-    New-Item -ItemType Directory -Path $folder
-    $moPath = "$folder/mpvnet.mo"
-    New-Item -ItemType File -Path $moPath
-    msgfmt --output-file=$moPath $it.FullName
 
-    if ($LASTEXITCODE -ne 0)
+    if (-not (Test-Path $folder))
     {
-        throw
+        New-Item -ItemType Directory -Path $folder
     }
 
+    $moPath = "$folder/mpvnet.mo"
+    msgfmt --output-file=$moPath $it.FullName
+    if ($LastExitCode) { throw $LastExitCode }
     $moPath
 }

lang/cs-files.txt

@@ -3,6 +3,7 @@ D:\Projects\CS\mpv.net\src\MpvNet\AppInfo.cs
 D:\Projects\CS\mpv.net\src\MpvNet\Binding.cs
 D:\Projects\CS\mpv.net\src\MpvNet\Chapter.cs
 D:\Projects\CS\mpv.net\src\MpvNet\Command.cs
+D:\Projects\CS\mpv.net\src\MpvNet\CommandLine.cs
 D:\Projects\CS\mpv.net\src\MpvNet\ExtensionLoader.cs
 D:\Projects\CS\mpv.net\src\MpvNet\FileTypes.cs
 D:\Projects\CS\mpv.net\src\MpvNet\Folder.cs
@@ -14,6 +15,7 @@ D:\Projects\CS\mpv.net\src\MpvNet\MediaTrack.cs
 D:\Projects\CS\mpv.net\src\MpvNet\MpvClient.cs
 D:\Projects\CS\mpv.net\src\MpvNet\Player.cs
 D:\Projects\CS\mpv.net\src\MpvNet\Settings.cs
+D:\Projects\CS\mpv.net\src\MpvNet\StringPair.cs
 D:\Projects\CS\mpv.net\src\MpvNet\Terminal.cs
 D:\Projects\CS\mpv.net\src\MpvNet\Translator.cs
 D:\Projects\CS\mpv.net\src\MpvNet\ExtensionMethod\ObjectExtension.cs
@@ -35,9 +37,8 @@ D:\Projects\CS\mpv.net\src\MpvNet.Windows\GlobalUsings.cs
 D:\Projects\CS\mpv.net\src\MpvNet.Windows\GuiCommand.cs
 D:\Projects\CS\mpv.net\src\MpvNet.Windows\Program.cs
 D:\Projects\CS\mpv.net\src\MpvNet.Windows\Settings.cs
-D:\Projects\CS\mpv.net\src\MpvNet.Windows\StringPair.cs
 D:\Projects\CS\mpv.net\src\MpvNet.Windows\Help\RegistryHelp.cs
-D:\Projects\CS\mpv.net\src\MpvNet.Windows\Help\WinMpvHelp.cs
+D:\Projects\CS\mpv.net\src\MpvNet.Windows\Help\WinApiHelp.cs
 D:\Projects\CS\mpv.net\src\MpvNet.Windows\Native\StockIcon.cs
 D:\Projects\CS\mpv.net\src\MpvNet.Windows\Native\Taskbar.cs
 D:\Projects\CS\mpv.net\src\MpvNet.Windows\Native\WinApi.cs
@@ -51,6 +52,7 @@ D:\Projects\CS\mpv.net\src\MpvNet.Windows\WinForms\MainForm.cs
 D:\Projects\CS\mpv.net\src\MpvNet.Windows\WinForms\MainForm.Designer.cs
 D:\Projects\CS\mpv.net\src\MpvNet.Windows\WinForms\SnapManager.cs
 D:\Projects\CS\mpv.net\src\MpvNet.Windows\WPF\BindingProxy.cs
+D:\Projects\CS\mpv.net\src\MpvNet.Windows\WPF\ComboBoxTemplateSelector.cs
 D:\Projects\CS\mpv.net\src\MpvNet.Windows\WPF\ConfWindow.xaml.cs
 D:\Projects\CS\mpv.net\src\MpvNet.Windows\WPF\InputWindow.xaml.cs
 D:\Projects\CS\mpv.net\src\MpvNet.Windows\WPF\ISettingControl.cs
@@ -59,6 +61,7 @@ D:\Projects\CS\mpv.net\src\MpvNet.Windows\WPF\MenuHelp.cs
 D:\Projects\CS\mpv.net\src\MpvNet.Windows\WPF\Msg.cs
 D:\Projects\CS\mpv.net\src\MpvNet.Windows\WPF\WpfApplication.cs
 D:\Projects\CS\mpv.net\src\MpvNet.Windows\WPF\WpfTranslator.cs
+D:\Projects\CS\mpv.net\src\MpvNet.Windows\WPF\Controls\ComboBoxSettingControl.xaml.cs
 D:\Projects\CS\mpv.net\src\MpvNet.Windows\WPF\Controls\CommandPaletteControl.xaml.cs
 D:\Projects\CS\mpv.net\src\MpvNet.Windows\WPF\Controls\HyperlinkEx.cs
 D:\Projects\CS\mpv.net\src\MpvNet.Windows\WPF\Controls\OptionSettingControl.xaml.cs

lang/update-po-and-pot-files.ps1

@@ -1,4 +1,6 @@
 
+$ErrorActionPreference = 'Stop'
+
 # Write list of .cs files into cs-files.txt file
 Get-ChildItem $PSScriptRoot/.. -Recurse -File -Filter '*.cs' |
     Where-Object { $_ -notmatch '[/\\]obj[/\\]' } |
@@ -7,6 +9,7 @@ Get-ChildItem $PSScriptRoot/.. -Recurse -File -Filter '*.cs' |
 
 # Create .pot file
 xgettext --force-po --from-code=UTF-8 '--language=c#' -o $PSScriptRoot/source.pot --files-from=$PSScriptRoot/cs-files.txt --keyword=_
+if ($LastExitCode) { throw $LastExitCode }
 
 # Backup .po files
 $BackupTargetFolder = $env:TEMP + '/mpv.net po backup ' + (Get-Date -Format 'yyyy-MM-dd HH_mm_ss')
@@ -16,3 +19,5 @@ Copy-Item $PSScriptRoot/po $BackupTargetFolder -Force -Recurse
 # Update .po files
 (Get-ChildItem $PSScriptRoot/PO -Filter '*.po').FullName |
     ForEach-Object { msgmerge --sort-output --backup=none --update $_ $PSScriptRoot/source.pot }
+
+if ($LastExitCode) { throw $LastExitCode }

src/MpvNet.Windows/GuiCommand.cs

@@ -330,7 +330,7 @@ public class GuiCommand
 
         if (path.ToLower().Contains(Folder.Startup.TrimEnd(Path.DirectorySeparatorChar).ToLower()))
         {
-            Msg.ShowWarning("mpv.net is already in Path.");
+            Msg.ShowWarning(_("mpv.net is already in Path."));
             return;
         }
 
@@ -338,7 +338,7 @@ public class GuiCommand
             Folder.Startup.TrimEnd(Path.DirectorySeparatorChar) + ";" + path,
             EnvironmentVariableTarget.User);
 
-        Msg.ShowInfo("mpv.net successfully was added to Path.");
+        Msg.ShowInfo(_("mpv.net was successfully added to Path."));
     }
 
     public void ShowPlaylist()
@@ -397,4 +397,4 @@ public class GuiCommand
 //        MainForm.Instance.ShowCommandPalette();
 //        CommandPalette.Instance.SelectFirst();
 //    });
-//}
+//}

src/MpvNet.Windows/Program.cs

@@ -41,7 +41,7 @@ static class Program
             Theme.Init();
             Mutex mutex = new Mutex(true, StringHelp.GetMD5Hash(App.ConfPath), out bool isFirst);
 
-            if (Control.ModifierKeys.HasFlag(Keys.Shift) ||
+            if (Control.ModifierKeys == Keys.Shift ||
                 App.CommandLine.Contains("--process-instance=multi") ||
                 App.CommandLine.Contains("--o="))
             {

src/MpvNet.Windows/Resources/editor_conf.txt

@@ -824,8 +824,9 @@ name = audio-device
 file = mpv
 directory = Audio
 type = string
+width = 400
 url = https://mpv.io/manual/master/#options-audio-device
-help = <name> Use the given audio device. This consists of the audio output name, e.g. alsa, followed by /, followed by the audio output specific device name. The default value for this option is auto, which tries every audio output in preference order with the default device.
+help = <name> Use the given audio device. This consists of the audio output name, e.g. alsa, followed by /, followed by the audio output specific device name. The default value for this option is auto, which tries every audio output in preference order with the default device. To list audio devices in mpv.net use the context menu:\nView > More > Show Audio Devices.
 
 name = slang
 file = mpv

src/MpvNet.Windows/WPF/WpfTranslator.cs

@@ -7,6 +7,8 @@ namespace MpvNet.Windows.WPF;
 
 public class WpfTranslator : ITranslator
 {
+    string _localizerLangauge = "";
+
     static Language[] Languages { get; } = new Language[] {
         new("english", "en", "en"),
         new("chinese-china", "zh-CN", "zh"),  // Chinese (Simplified)
@@ -21,8 +23,11 @@ public class WpfTranslator : ITranslator
 
     void InitNGettextWpf()
     {
-        if (Translation.Localizer == null)
+        if (Translation.Localizer == null || _localizerLangauge != App.Language)
+        {
             CompositionRoot.Compose("mpvnet", GetCulture(App.Language), Folder.Startup + "Locale");
+            _localizerLangauge = App.Language;
+        }
     }
 
     string GetSystemLanguage()

src/MpvNet/InputHelp.cs

@@ -17,7 +17,7 @@ public static class InputHelp
                 new (_("File"), _("Add external subtitle files..."), "script-message-to mpvnet load-sub", "Alt+s"),
                 new (_("File"), "-"),
                 new (_("File"), _("Add files to playlist..."), "script-message-to mpvnet open-files append"),
-                new (_("File"), _("Add files to playlist from clipboard"), "script-message-to mpvnet open-clipboard append", "Ctrl+Shift+v"),
+                new (_("File"), _("Add files/URLs to playlist from clipboard"), "script-message-to mpvnet open-clipboard append", "Ctrl+Shift+v"),
                 new (_("File"), "-"),
                 new (_("File"), _("Recent Files")),
                 new (_("File"), _("Exit"), "quit", "Esc"),