message asking if image is BD or DVD

This commit is contained in:
Frank Skare
2020-07-26 04:03:56 +02:00
parent 8f4ad52469
commit 09944583dd
5 changed files with 42 additions and 12 deletions

View File

@@ -1,12 +1,16 @@
5.4.8.4 Beta (not yet released) 5.4.8.5 Beta (not yet released)
============ ============
- BluRays with dozens of titles showed all titles in the menu 5.4.8.4 Beta
============
- Blu-rays with dozens of titles showed all titles in the menu
which was difficult to choose and extremely slow. which was difficult to choose and extremely slow.
- BluRay folder paths are auto detected when received - Blu-ray folder paths are auto detected when received
from drag & drop and command line. from drag & drop and command line.
- Cycle audio was not working for BluRay. - Cycle audio was not working for Blu-ray.
- Message asking if image is BD or DVD in case image is < 10 GB.
5.4.8.3 Beta 5.4.8.3 Beta

View File

@@ -3,15 +3,15 @@ using System;
using System.Diagnostics; using System.Diagnostics;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Windows; using System.Threading;
using System.Windows.Forms; using System.Windows.Forms;
using System.Windows.Interop; using System.Windows.Interop;
using System.Windows;
using VB = Microsoft.VisualBasic; using VB = Microsoft.VisualBasic;
using static NewLine; using static NewLine;
using static mpvnet.Core; using static mpvnet.Core;
using System.Threading;
namespace mpvnet namespace mpvnet
{ {

View File

@@ -363,6 +363,12 @@ public class TaskDialog<T> : TaskDialogNative, IDisposable
return value; return value;
} }
public void AddCommand(string text)
{
object obj = text;
AddCommand(text, (T)obj);
}
public void AddCommand(string text, T value) public void AddCommand(string text, T value)
{ {
int n = 1000 + IdValueDic.Count + 1; int n = 1000 + IdValueDic.Count + 1;

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.8.3")] [assembly: AssemblyVersion("5.4.8.4")]
[assembly: AssemblyFileVersion("5.4.8.3")] [assembly: AssemblyFileVersion("5.4.8.4")]

View File

@@ -1043,17 +1043,37 @@ namespace mpvnet
public void LoadISO(string path) public void LoadISO(string path)
{ {
core.command("stop");
Thread.Sleep(500);
long gb = new FileInfo(path).Length / 1024 / 1024 / 1024; long gb = new FileInfo(path).Length / 1024 / 1024 / 1024;
if (gb < 10) if (gb < 10)
{ {
core.set_property_string("dvd-device", path); using (TaskDialog<string> td = new TaskDialog<string>())
core.LoadFiles(new[] { @"dvd://" }, false, false); {
td.MainInstruction = "Blu-ray or DVD?";
td.AddCommand("Blu-ray");
td.AddCommand("DVD");
switch (td.Show())
{
case "Blu-ray":
core.command("stop");
Thread.Sleep(500);
core.set_property_string("bluray-device", path);
core.LoadFiles(new[] { @"bd://" }, false, false);
break;
case "DVD":
core.command("stop");
Thread.Sleep(500);
core.set_property_string("dvd-device", path);
core.LoadFiles(new[] { @"dvd://" }, false, false);
break;
}
}
} }
else else
{ {
core.command("stop");
Thread.Sleep(500);
core.set_property_string("bluray-device", path); core.set_property_string("bluray-device", path);
core.LoadFiles(new[] { @"bd://" }, false, false); core.LoadFiles(new[] { @"bd://" }, false, false);
} }