Merge branches 'bugfixes' and 'bestsource' into feature

meson.build

@@ -249,7 +249,7 @@ needs_ffmpeg = false
 
 if get_option('bestsource').enabled()
     conf.set('WITH_BESTSOURCE', 1)
-    bs = subproject('bestsource', default_options: ['link_static=' + (get_option('default_library') == 'static').to_string()])
+    bs = subproject('bestsource', default_options: ['enable_plugin=false'])
     deps += bs.get_variable('bestsource_dep')
     dep_avail += 'BestSource'
     needs_ffmpeg = true

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, 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, false, 0, 1, provider_bs::GetCacheFile(filename), &bsopts, 0, [=](int Track, int64_t Current, int64_t Total) {
 				ps->SetProgress(Current, Total);
 				return !ps->IsCancelled();
 			});

src/video_provider_bestsource.cpp

@@ -128,7 +128,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(), 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), false, 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 = 9d7e218588867bf2b1334e5382b0f4d1b6a45aa1
+revision = R4
 clone-recursive = true
-diff_files = bestsource/0001.patch
 
 [provide]
 bestsource = bestsource_dep

tools/osx-dmg.sh

@@ -57,10 +57,6 @@ echo "---- Mounting image ----"
 DEV_NAME=`/usr/bin/hdiutil attach -readwrite -noverify -noautoopen "${DMG_RW_PATH}" |awk '/GUID_partition_scheme/ {print $1}'`
 echo "Device name: ${DEV_NAME}"
 
-echo
-echo "---- Setting bless -openfolder ----"
-bless -openfolder "/Volumes/${PKG_NAME_VOLUME}"
-
 echo
 echo "---- Setting root icon using SetFile ----"
 SetFile -a C "/Volumes/${PKG_NAME_VOLUME}"