This commit is contained in:
stax76
2022-06-02 20:16:13 +02:00
parent d465b13a03
commit e9df0f9f99
3 changed files with 99 additions and 144 deletions

View File

@@ -303,11 +303,18 @@ namespace mpvnet
public static void CycleAudio()
{
if (!App.MediaInfo)
Core.UpdateTrackData();
var tracks = Core.MediaTracks.Where(track => track.Type == "a").ToArray();
var externalTracks = Core.GetExternalTracks().Where(track => track.Type == "a");
if (App.MediaInfo)
{
var externalTracks = Core.GetExternalTracks().Where(track => track.Type == "a");
if (externalTracks.Count() > 0)
tracks = tracks.Concat(externalTracks).ToArray();
if (externalTracks.Count() > 0)
tracks = tracks.Concat(externalTracks).ToArray();
}
int len = tracks.Length;
@@ -425,11 +432,18 @@ namespace mpvnet
public static void ShowAudioTracks() => App.InvokeOnMainThread(() =>
{
var tracks = Core.MediaTracks.Where(track => track.Type == "a").ToArray();
var externalTracks = Core.GetExternalTracks().Where(track => track.Type == "a");
if (!App.MediaInfo)
Core.UpdateTrackData();
if (externalTracks.Count() > 0)
tracks = tracks.Concat(externalTracks).ToArray();
var tracks = Core.MediaTracks.Where(track => track.Type == "a").ToArray();
if (App.MediaInfo)
{
var externalTracks = Core.GetExternalTracks().Where(track => track.Type == "a");
if (externalTracks.Count() > 0)
tracks = tracks.Concat(externalTracks).ToArray();
}
if (tracks.Length < 1)
{
@@ -463,11 +477,18 @@ namespace mpvnet
public static void ShowSubtitleTracks() => App.InvokeOnMainThread(() =>
{
var tracks = Core.MediaTracks.Where(track => track.Type == "s").ToArray();
var externalTracks = Core.GetExternalTracks().Where(track => track.Type == "s");
if (!App.MediaInfo)
Core.UpdateTrackData();
if (externalTracks.Count() > 0)
tracks = tracks.Concat(externalTracks).ToArray();
var tracks = Core.MediaTracks.Where(track => track.Type == "s").ToArray();
if (App.MediaInfo)
{
var externalTracks = Core.GetExternalTracks().Where(track => track.Type == "s");
if (externalTracks.Count() > 0)
tracks = tracks.Concat(externalTracks).ToArray();
}
if (tracks.Length < 1)
{