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

BluRay folder path auto detection

Browse Source
This commit is contained in:
Frank Skare
2020-07-26 03:19:35 +02:00
parent b4632a0b6e
commit 5f4eca21e5
3 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Changelog.md
View File

@@ -3,7 +3,9 @@
============ ============
- BluRays with dozens of titles showed all titles in the menu - BluRays with dozens of titles showed all titles in the menu
which was difficult to choose and also extremely slow. which was difficult to choose and extremely slow.
- BluRay folder paths are auto detected when received
from drag & drop and command line.
5.4.8.3 Beta 5.4.8.3 Beta

18
mpv.net/Misc/Commands.cs
View File

@@ -11,6 +11,7 @@ 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
{ {
@@ -82,21 +83,24 @@ namespace mpvnet
public static void Open_DVD_Or_BD_Folder() public static void Open_DVD_Or_BD_Folder()
{ {
InvokeOnMainThread(new Action(() => { InvokeOnMainThread(new Action(() => {
using (var d = new FolderBrowserDialog()) using (var dialog = new FolderBrowserDialog())
{ {
d.Description = "Select a DVD or Blu-ray folder."; dialog.Description = "Select a DVD or Blu-ray folder.";
d.ShowNewFolderButton = false; dialog.ShowNewFolderButton = false;
if (d.ShowDialog() == DialogResult.OK) if (dialog.ShowDialog() == DialogResult.OK)
{ {
if (Directory.Exists(d.SelectedPath + "\\BDMV")) core.command("stop");
Thread.Sleep(500);
if (Directory.Exists(dialog.SelectedPath + "\\BDMV"))
{ {
core.set_property_string("bluray-device", d.SelectedPath); core.set_property_string("bluray-device", dialog.SelectedPath);
core.LoadFiles(new[] { @"bd://" }, false, false); core.LoadFiles(new[] { @"bd://" }, false, false);
} }
else else
{ {
core.set_property_string("dvd-device", d.SelectedPath); core.set_property_string("dvd-device", dialog.SelectedPath);
core.LoadFiles(new[] { @"dvd://" }, false, false); core.LoadFiles(new[] { @"dvd://" }, false, false);
} }
} }

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

@@ -1020,6 +1020,13 @@ namespace mpvnet
LoadISO(file); LoadISO(file);
else if(App.SubtitleTypes.Contains(file.Ext())) else if(App.SubtitleTypes.Contains(file.Ext()))
commandv("sub-add", file); commandv("sub-add", file);
else if (file.Ext().Length != 3 && File.Exists(Path.Combine(file, "BDMV\\index.bdmv")))
{
core.command("stop");
Thread.Sleep(500);
set_property_string("bluray-device", file);
commandv("loadfile", @"bd://");
}
else else
if (i == 0 && !append) if (i == 0 && !append)
commandv("loadfile", file); commandv("loadfile", file);
@@ -1141,7 +1148,7 @@ namespace mpvnet
string GetLanguage(string id) string GetLanguage(string id)
{ {
foreach (var ci in CultureInfo.GetCultures(CultureTypes.NeutralCultures)) foreach (CultureInfo ci in CultureInfo.GetCultures(CultureTypes.NeutralCultures))
if (ci.ThreeLetterISOLanguageName == id) if (ci.ThreeLetterISOLanguageName == id)
return ci.EnglishName; return ci.EnglishName;