linus/mpv.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

5.4.7.1 Beta

Browse Source
This commit is contained in:
Frank Skare
2020-05-07 11:47:09 +02:00
parent 407b49b3ad
commit 9d46064dca
4 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Changelog.md
View File

@@ -1,10 +1,18 @@
5.4.7.1 Beta (not yet released) 5.4.7.2 Beta (not yet released)
============ ============
5.4.7.1 Beta
============
- log error fix, mpv.net does now ignore all log messages because libmpv already
prints the log messages to the the terminal
- the release script now also outputs x86 beta versions so x86 users can test betas
5.4.7.0 5.4.7.0
======= =======

23
Release.ps1
View File

@@ -58,21 +58,21 @@ if ($versionInfo.FilePrivatePart -eq 0)
$targetDir = $desktopDir + "\mpv.net-portable-x64-$($versionInfo.FileVersion)" $targetDir = $desktopDir + "\mpv.net-portable-x64-$($versionInfo.FileVersion)"
Copy-Item .\mpv.net\bin\x64 $targetDir -Recurse -Exclude System.Management.Automation.xml Copy-Item .\mpv.net\bin\x64 $targetDir -Recurse -Exclude System.Management.Automation.xml
& $7z a -t7z -mx9 "$targetDir.7z" -r "$targetDir\*" & $7z a -t7z -mx9 "$targetDir.7z" -r "$targetDir\*"
if ($LastExitCode) { throw $LastExitCode } if ($LastExitCode) { throw $LastExitCode }
& $7z a -tzip -mx9 "$targetDir.zip" -r "$targetDir\*" & $7z a -tzip -mx9 "$targetDir.zip" -r "$targetDir\*"
if ($LastExitCode) { throw $LastExitCode } if ($LastExitCode) { throw $LastExitCode }
$targetDir = $desktopDir + "\mpv.net-portable-x86-$($versionInfo.FileVersion)" $targetDir = $desktopDir + "\mpv.net-portable-x86-$($versionInfo.FileVersion)"
Copy-Item .\mpv.net\bin\x86 $targetDir -Recurse -Exclude System.Management.Automation.xml Copy-Item .\mpv.net\bin\x86 $targetDir -Recurse -Exclude System.Management.Automation.xml
& $7z a -t7z -mx9 "$targetDir.7z" -r "$targetDir\*" & $7z a -t7z -mx9 "$targetDir.7z" -r "$targetDir\*"
if ($LastExitCode) { throw $LastExitCode } if ($LastExitCode) { throw $LastExitCode }
& $7z a -tzip -mx9 "$targetDir.zip" -r "$targetDir\*" & $7z a -tzip -mx9 "$targetDir.zip" -r "$targetDir\*"
if ($LastExitCode) { throw $LastExitCode } if ($LastExitCode) { throw $LastExitCode }
Set-Clipboard ($versionInfo.FileVersion + "`n`nChangelog:`n`n" +
'https://github.com/stax76/mpv.net/blob/master/Changelog.md' + "`n`nDownload:`n`n" +
'https://github.com/stax76/mpv.net/blob/master/Manual.md#stable')
} }
else else
{ {
@@ -84,6 +84,11 @@ else
& $7z a -t7z -mx9 "$targetDir.7z" -r "$targetDir\*" & $7z a -t7z -mx9 "$targetDir.7z" -r "$targetDir\*"
if ($LastExitCode) { throw $LastExitCode } 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 }
$cloudDirectories = 'C:\Users\frank\OneDrive\Public\mpv.net\', $cloudDirectories = 'C:\Users\frank\OneDrive\Public\mpv.net\',
'C:\Users\frank\Dropbox\Public\mpv.net\' 'C:\Users\frank\Dropbox\Public\mpv.net\'
@@ -103,11 +108,11 @@ else
Copy-Item ($targetDir + '.7z') $targetFile Copy-Item ($targetDir + '.7z') $targetFile
Invoke-Item $cloudDirectory Invoke-Item $cloudDirectory
}
}
Set-Clipboard ($versionInfo.FileVersion + "`n`n" + Set-Clipboard ($versionInfo.FileVersion + " Beta`n`nChangelog:`n`n" +
'https://github.com/stax76/mpv.net/blob/master/Changelog.md' + "`n`n" + 'https://github.com/stax76/mpv.net/blob/master/Changelog.md' + "`n`nDownload:`n`n" +
'https://github.com/stax76/mpv.net#download') 'https://github.com/stax76/mpv.net/blob/master/Manual.md#beta')
}
}
Write-Host 'successfully finished' -ForegroundColor Green Write-Host 'successfully finished' -ForegroundColor Green

4
mpv.net/Properties/AssemblyInfo.cs
View File

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("5.4.7.0")] [assembly: AssemblyVersion("5.4.7.1")]
[assembly: AssemblyFileVersion("5.4.7.0")] [assembly: AssemblyFileVersion("5.4.7.1")]

9
mpv.net/mpv/Core.cs
View File

@@ -117,7 +117,7 @@ namespace mpvnet
if (Handle == IntPtr.Zero) if (Handle == IntPtr.Zero)
throw new Exception("error mpv_create"); throw new Exception("error mpv_create");
mpv_request_log_messages(Handle, "info"); mpv_request_log_messages(Handle, "terminal-default");
Task.Run(() => EventLoop()); Task.Run(() => EventLoop());
@@ -397,14 +397,9 @@ namespace mpvnet
{ {
var data = (mpv_event_log_message)Marshal.PtrToStructure(evt.data, typeof(mpv_event_log_message)); var data = (mpv_event_log_message)Marshal.PtrToStructure(evt.data, typeof(mpv_event_log_message));
if (LogMessage != null || LogMessageAsync != null || if (LogMessage != null || LogMessageAsync != null)
data.log_level == mpv_log_level.MPV_LOG_LEVEL_FATAL)
{ {
string msg = $"[{ConvertFromUtf8(data.prefix)}] {ConvertFromUtf8(data.text)}"; string msg = $"[{ConvertFromUtf8(data.prefix)}] {ConvertFromUtf8(data.text)}";
if (data.log_level == mpv_log_level.MPV_LOG_LEVEL_FATAL)
App.RunAction(() => App.ShowError("Fatal Error", msg));
InvokeAsync<mpv_log_level, string>(LogMessageAsync, data.log_level, msg); InvokeAsync<mpv_log_level, string>(LogMessageAsync, data.log_level, msg);
LogMessage?.Invoke(data.log_level, msg); LogMessage?.Invoke(data.log_level, msg);
} }