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

external audio and subtitle tracks

Browse Source
This commit is contained in:
Frank Skare
2021-05-31 10:17:55 +02:00
parent 650c41eb8a
commit 8420abd915
4 changed files with 56 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/Changelog.md
View File

@@ -4,6 +4,7 @@
- New media info command: Ctrl+m script-message mpv.net show-media-info #menu: View > Show Media Info - New media info command: Ctrl+m script-message mpv.net show-media-info #menu: View > Show Media Info
- Context menu font render quality fix. - Context menu font render quality fix.
- Context menu and cycle-audio command support external audio and subtitle tracks.
5.4.9.0 (2021-05-29) 5.4.9.0 (2021-05-29)

1
src/Misc/Commands.cs
View File

@@ -57,7 +57,6 @@ namespace mpvnet
} }
} }
public static void ShowDialog(Type winType) public static void ShowDialog(Type winType)
{ {
App.InvokeOnMainThread(new Action(() => { App.InvokeOnMainThread(new Action(() => {

62
src/Misc/CorePlayer.cs
View File

@@ -92,12 +92,13 @@ namespace mpvnet
public AutoResetEvent ShutdownAutoResetEvent { get; } = new AutoResetEvent(false); public AutoResetEvent ShutdownAutoResetEvent { get; } = new AutoResetEvent(false);
public AutoResetEvent VideoSizeAutoResetEvent { get; } = new AutoResetEvent(false); public AutoResetEvent VideoSizeAutoResetEvent { get; } = new AutoResetEvent(false);
public string Aid { get; set; } = "";
public string ConfPath { get => ConfigFolder + "mpv.conf"; } public string ConfPath { get => ConfigFolder + "mpv.conf"; }
public string GPUAPI { get; set; } = "auto"; public string GPUAPI { get; set; } = "auto";
public string InputConfPath { get => ConfigFolder + "input.conf"; } public string InputConfPath { get => ConfigFolder + "input.conf"; }
public string Sid { get; set; } = "";
public string Vid { get; set; } = ""; public string VID { get; set; } = "";
public string AID { get; set; } = "";
public string SID { get; set; } = "";
public bool Border { get; set; } = true; public bool Border { get; set; } = true;
public bool Fullscreen { get; set; } public bool Fullscreen { get; set; }
@@ -1293,12 +1294,11 @@ namespace mpvnet
lock (MediaTracks) lock (MediaTracks)
{ {
MediaTracks.Clear(); MediaTracks.Clear();
int trackListCount = Core.get_property_int("track-list/count");
if (path.ToLowerEx().Contains("://")) if (path.ToLowerEx().Contains("://"))
{ {
int count = Core.get_property_int("track-list/count"); for (int i = 0; i < trackListCount; i++)
for (int i = 0; i < count; i++)
{ {
string type = Core.get_property_string($"track-list/{i}/type"); string type = Core.get_property_string($"track-list/{i}/type");
@@ -1328,9 +1328,9 @@ namespace mpvnet
{ {
using (MediaInfo mi = new MediaInfo(path)) using (MediaInfo mi = new MediaInfo(path))
{ {
int count = mi.GetCount(MediaInfoStreamKind.Video); int videoCount = mi.GetCount(MediaInfoStreamKind.Video);
for (int i = 0; i < count; i++) for (int i = 0; i < videoCount; i++)
{ {
MediaTrack track = new MediaTrack(); MediaTrack track = new MediaTrack();
Add(track, mi.GetVideo(i, "Format")); Add(track, mi.GetVideo(i, "Format"));
@@ -1347,9 +1347,9 @@ namespace mpvnet
MediaTracks.Add(track); MediaTracks.Add(track);
} }
count = mi.GetCount(MediaInfoStreamKind.Audio); int audioCount = mi.GetCount(MediaInfoStreamKind.Audio);
for (int i = 0; i < count; i++) for (int i = 0; i < audioCount; i++)
{ {
MediaTrack track = new MediaTrack(); MediaTrack track = new MediaTrack();
Add(track, mi.GetAudio(i, "Language/String")); Add(track, mi.GetAudio(i, "Language/String"));
@@ -1367,9 +1367,27 @@ namespace mpvnet
MediaTracks.Add(track); MediaTracks.Add(track);
} }
count = mi.GetCount(MediaInfoStreamKind.Text); for (int i = 0; i < trackListCount; i++)
{
string type = Core.get_property_string($"track-list/{i}/type");
string external = Core.get_property_string($"track-list/{i}/external");
for (int i = 0; i < count; i++) if (type == "audio" && external == "yes")
{
MediaTrack track = new MediaTrack();
Add(track, GetLanguage(Core.get_property_string($"track-list/{i}/lang")));
Add(track, Core.get_property_string($"track-list/{i}/codec").ToUpperEx());
Add(track, Core.get_property_int($"track-list/{i}/audio-channels") + " channels");
track.Text = "A: " + (track.Text.Trim(' ', ',') + ", External").Trim(' ', ',');
track.Type = "a";
track.ID = Core.get_property_int($"track-list/{i}/id");
MediaTracks.Add(track);
}
}
int subCount = mi.GetCount(MediaInfoStreamKind.Text);
for (int i = 0; i < subCount; i++)
{ {
MediaTrack track = new MediaTrack(); MediaTrack track = new MediaTrack();
Add(track, mi.GetText(i, "Language/String")); Add(track, mi.GetText(i, "Language/String"));
@@ -1384,9 +1402,25 @@ namespace mpvnet
MediaTracks.Add(track); MediaTracks.Add(track);
} }
count = get_property_int("edition-list/count"); for (int i = 0; i < trackListCount; i++)
{
string type = Core.get_property_string($"track-list/{i}/type");
string external = Core.get_property_string($"track-list/{i}/external");
for (int i = 0; i < count; i++) if (type == "sub" && external == "yes")
{
MediaTrack track = new MediaTrack();
Add(track, GetLanguage(Core.get_property_string($"track-list/{i}/lang")));
track.Text = "S: " + (track.Text.Trim(' ', ',') + ", External").Trim(' ', ',');
track.Type = "s";
track.ID = Core.get_property_int($"track-list/{i}/id");
MediaTracks.Add(track);
}
}
int editionCount = get_property_int("edition-list/count");
for (int i = 0; i < editionCount; i++)
{ {
MediaTrack track = new MediaTrack(); MediaTrack track = new MediaTrack();
track.Text = "E: " + get_property_string($"edition-list/{i}/title"); track.Text = "E: " + get_property_string($"edition-list/{i}/title");

14
src/WinForms/MainForm.cs
View File

@@ -196,7 +196,7 @@ namespace mpvnet
{ {
MenuItem mi = new MenuItem(track.Text); MenuItem mi = new MenuItem(track.Text);
mi.Action = () => Core.commandv("set", "vid", track.ID.ToString()); mi.Action = () => Core.commandv("set", "vid", track.ID.ToString());
mi.Checked = Core.Vid == track.ID.ToString(); mi.Checked = Core.VID == track.ID.ToString();
trackMenuItem.DropDownItems.Add(mi); trackMenuItem.DropDownItems.Add(mi);
} }
@@ -207,7 +207,7 @@ namespace mpvnet
{ {
MenuItem mi = new MenuItem(track.Text); MenuItem mi = new MenuItem(track.Text);
mi.Action = () => Core.commandv("set", "aid", track.ID.ToString()); mi.Action = () => Core.commandv("set", "aid", track.ID.ToString());
mi.Checked = Core.Aid == track.ID.ToString(); mi.Checked = Core.AID == track.ID.ToString();
trackMenuItem.DropDownItems.Add(mi); trackMenuItem.DropDownItems.Add(mi);
} }
@@ -218,7 +218,7 @@ namespace mpvnet
{ {
MenuItem mi = new MenuItem(track.Text); MenuItem mi = new MenuItem(track.Text);
mi.Action = () => Core.commandv("set", "sid", track.ID.ToString()); mi.Action = () => Core.commandv("set", "sid", track.ID.ToString());
mi.Checked = Core.Sid == track.ID.ToString(); mi.Checked = Core.SID == track.ID.ToString();
trackMenuItem.DropDownItems.Add(mi); trackMenuItem.DropDownItems.Add(mi);
} }
@@ -226,7 +226,7 @@ namespace mpvnet
{ {
MenuItem mi = new MenuItem("S: No subtitles"); MenuItem mi = new MenuItem("S: No subtitles");
mi.Action = () => Core.commandv("set", "sid", "no"); mi.Action = () => Core.commandv("set", "sid", "no");
mi.Checked = Core.Sid == "no"; mi.Checked = Core.SID == "no";
trackMenuItem.DropDownItems.Add(mi); trackMenuItem.DropDownItems.Add(mi);
} }
@@ -831,11 +831,11 @@ namespace mpvnet
void PropChangeOnTop(bool value) => BeginInvoke(new Action(() => TopMost = value)); void PropChangeOnTop(bool value) => BeginInvoke(new Action(() => TopMost = value));
void PropChangeAid(string value) => Core.Aid = value; void PropChangeAid(string value) => Core.AID = value;
void PropChangeSid(string value) => Core.Sid = value; void PropChangeSid(string value) => Core.SID = value;
void PropChangeVid(string value) => Core.Vid = value; void PropChangeVid(string value) => Core.VID = value;
void PropChangeTitle(string value) { Title = value; SetTitle(); } void PropChangeTitle(string value) { Title = value; SetTitle(); }