Merge branches 'bugfixes' and 'video_provider_rework' into feature

arch1t3cht · Oct 15, 2023 · 49fe603 · 49fe603
3 parents b3eb182 + 7eb1304 + dd3016a
commit 49fe603
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -143,7 +143,7 @@ jobs:
         if: startsWith(matrix.config.os, 'ubuntu-')
         run: |
           sudo apt-get update
-          sudo apt-get install ninja-build build-essential libx11-dev libwxgtk3.0-gtk3-dev libfreetype6-dev pkg-config libfontconfig1-dev libass-dev libasound2-dev libffms2-dev intltool libboost-all-dev libhunspell-dev libuchardet-dev libpulse-dev libopenal-dev libjansson-dev
+          sudo apt-get install ninja-build build-essential libx11-dev libwxgtk3.0-gtk3-dev libfreetype6-dev pkg-config libfontconfig1-dev libass-dev libasound2-dev libffms2-dev intltool libboost-all-dev libhunspell-dev libuchardet-dev libpulse-dev libopenal-dev libjansson-dev nasm
 
       - name: Configure
         run: meson setup build ${{ matrix.config.args }} -Dbuildtype=${{ matrix.config.buildtype }}

diff --git a/src/audio_provider_factory.cpp b/src/audio_provider_factory.cpp
@@ -70,6 +70,11 @@ std::unique_ptr<agi::AudioProvider> SelectAudioProvider(fs::path const& filename
                                                         Path const& path_helper,
                                                         BackgroundRunner *br) {
 	auto preferred = OPT_GET("Audio/Provider")->GetString();
+
+	if (!std::any_of(std::begin(providers), std::end(providers), [&](factory provider) { return provider.name == preferred; })) {
+		preferred = OPT_GET("Audio/Provider")->GetDefaultString();
+	}
+
 	auto sorted = GetSorted(boost::make_iterator_range(std::begin(providers), std::end(providers)), preferred);
 
 	RearrangeWithPriority(sorted, filename);
@@ -84,9 +89,12 @@ std::unique_ptr<agi::AudioProvider> SelectAudioProvider(fs::path const& filename
 		std::string err;
 		try {
 			auto provider = factory->create(filename, br);
-			if (!provider) continue;
-			LOG_I("audio_provider") << "Using audio provider: " << factory->name;
-			return provider;
+			if (!provider) {
+				err = "Failed to create provider."; 	// Some generic error message here
+			} else {
+				LOG_I("audio_provider") << "Using audio provider: " << factory->name;
+				return provider;
+			}
 		}
 		catch (AudioDataNotFound const& ex) {
 			found_file = true;

diff --git a/src/libresrc/default_config.json b/src/libresrc/default_config.json
@@ -67,7 +67,7 @@
 		"Next Line on Commit" : true,
 		"Player" : "",
 		"Plays When Stepping Video" : false,
-		"Provider" : "ffmpegsource",
+		"Provider" : "FFmpegSource",
 		"Renderer" : {
 			"Spectrum" : {
 				"Cutoff" : 0,
@@ -661,7 +661,7 @@
 		"Last Script Resolution Mismatch Choice" : 2,
 		"Open Audio" : true,
 		"Overscan Mask" : false,
-		"Provider" : "ffmpegsource",
+		"Provider" : "FFmpegSource",
 		"Script Resolution Mismatch" : 1,
 		"Slider" : {
 			"Fast Jump Step" : 10,

diff --git a/src/libresrc/osx/default_config.json b/src/libresrc/osx/default_config.json
@@ -67,7 +67,7 @@
 		"Next Line on Commit" : true,
 		"Player" : "",
 		"Plays When Stepping Video" : false,
-		"Provider" : "ffmpegsource",
+		"Provider" : "FFmpegSource",
 		"Renderer" : {
 			"Spectrum" : {
 				"Cutoff" : 0,
@@ -661,7 +661,7 @@
 		"Last Script Resolution Mismatch Choice" : 2,
 		"Open Audio" : true,
 		"Overscan Mask" : false,
-		"Provider" : "ffmpegsource",
+		"Provider" : "FFmpegSource",
 		"Script Resolution Mismatch" : 1,
 		"Slider" : {
 			"Fast Jump Step" : 10,

diff --git a/src/video_provider_manager.cpp b/src/video_provider_manager.cpp
@@ -69,6 +69,11 @@ std::vector<std::string> VideoProviderFactory::GetClasses() {
 
 std::unique_ptr<VideoProvider> VideoProviderFactory::GetProvider(agi::fs::path const& filename, std::string const& colormatrix, agi::BackgroundRunner *br) {
 	auto preferred = OPT_GET("Video/Provider")->GetString();
+
+	if (!std::any_of(std::begin(providers), std::end(providers), [&](factory provider) { return provider.name == preferred; })) {
+		preferred = OPT_GET("Audio/Provider")->GetDefaultString();
+	}
+
 	auto sorted = GetSorted(boost::make_iterator_range(std::begin(providers), std::end(providers)), preferred);
 
 	RearrangeWithPriority(sorted, filename);
@@ -89,9 +94,12 @@ std::unique_ptr<VideoProvider> VideoProviderFactory::GetProvider(agi::fs::path c
 		std::string err;
 		try {
 			auto provider = factory->create(filename, colormatrix, br);
-			if (!provider) continue;
-			LOG_I("manager/video/provider") << factory->name << ": opened " << filename;
-			return finalize_provider(std::move(provider));
+			if (!provider) {
+				err = "Failed to create provider."; 	// Some generic error message here
+			} else {
+				LOG_I("manager/video/provider") << factory->name << ": opened " << filename;
+				return finalize_provider(std::move(provider));
+			}
 		}
 		catch (VideoNotSupported const& ex) {
 			found = true;

diff --git a/tools/osx-bundle.sh b/tools/osx-bundle.sh
@@ -105,5 +105,14 @@ echo
 echo "---- Fixing libraries ----"
 sudo python3 "${SRC_DIR}/tools/osx-fix-libs.py" "${PKG_DIR}/Contents/MacOS/aegisub" || exit $?
 
+echo
+echo "---- Resigning ----"
+# After bundling and rewriting dylib paths we need to resign everything.
+if codesign -d "${PKG_DIR}/Contents/MacoOS/aegisub"; then
+  for fname in "${PKG_DIR}/Contents/MacOS/"*; do
+    codesign -s ${AEGISUB_BUNDLE_SIGNATURE:--} -vf "${fname}"
+  done
+fi
+
 echo
 echo "Done creating \"${PKG_DIR}\""