[bestsource] Add title/language in the track selection menu

src/audio_provider_bestsource.cpp

@@ -67,7 +67,7 @@ BSAudioProvider::BSAudioProvider(agi::fs::path const& filename, agi::BackgroundR
 		ps->SetTitle(from_wx(_("Indexing")));
 		ps->SetMessage(from_wx(_("Indexing file... This will take a while!")));
 		try {
-			bs = agi::make_unique<BestAudioSource>(filename.string(), static_cast<int>(track), -1, false, 0, 1, provider_bs::GetCacheFile(filename), &bsopts, 0, [=](int Track, int64_t Current, int64_t Total) {
+			bs = agi::make_unique<BestAudioSource>(filename.string(), static_cast<int>(track), -1, 0, 1, provider_bs::GetCacheFile(filename), &bsopts, 0, [=](int Track, int64_t Current, int64_t Total) {
 				ps->SetProgress(Current, Total);
 				return !ps->IsCancelled();
 			});

src/bestsource_common.cpp

@@ -56,7 +56,18 @@ std::pair<TrackSelection, bool> SelectTrack(agi::fs::path const& filename, bool
 
 		if (info.MediaType == type) {
 			TrackNumbers.push_back(i);
-			Choices.Add(agi::wxformat(_("Track %02d: %s"), i, info.CodecString));
+			std::map<std::string, std::string> metadata = tracklist.GetTrackMetadata(i);
+			wxString description = agi::wxformat(_("Track %02d: %s"), i, info.CodecString);
+
+			if (metadata.count("language") > 0) {
+				description += agi::wxformat(_(" - [%s]"), metadata["language"]);
+			}
+
+			if (metadata.count("title") > 0) {
+				description += agi::wxformat(_(" - %s"), metadata["title"]);
+			}
+
+			Choices.Add(description);
 		}
 	}
 

src/video_provider_bestsource.cpp

@@ -116,7 +116,7 @@ BSVideoProvider::BSVideoProvider(agi::fs::path const& filename, std::string cons
 		ps->SetTitle(from_wx(_("Indexing")));
 		ps->SetMessage(from_wx(_("Decoding the full track to ensure perfect frame accuracy. This will take a while!")));
 		try {
-			bs = agi::make_unique<BestVideoSource>(filename.string(), "", 0, static_cast<int>(track_info.first), false, OPT_GET("Provider/Video/BestSource/Threads")->GetInt(), 1, provider_bs::GetCacheFile(filename), &bsopts, [=](int Track, int64_t Current, int64_t Total) {
+			bs = agi::make_unique<BestVideoSource>(filename.string(), "", 0, static_cast<int>(track_info.first), OPT_GET("Provider/Video/BestSource/Threads")->GetInt(), 1, provider_bs::GetCacheFile(filename), &bsopts, [=](int Track, int64_t Current, int64_t Total) {
 				ps->SetProgress(Current, Total);
 				return !ps->IsCancelled();
 			});

subprojects/bestsource.wrap

@@ -1,8 +1,7 @@
 [wrap-git]
 url = https://github.com/vapoursynth/bestsource
-revision = R8
+revision = master
 clone-recursive = true
-diff_files = bestsource/0001.patch
 
 [provide]
 bestsource = bestsource_dep

subprojects/ffmpeg.wrap

@@ -1,7 +1,7 @@
 [wrap-git]
 directory = ffmpeg
 url = https://gitlab.freedesktop.org/gstreamer/meson-ports/ffmpeg.git
-revision = meson-6.1
+revision = meson-7.0
 depth = 1
 
 [provide]