Skip to content

Commit

Permalink
bestsource: Bump to R4
Browse files Browse the repository at this point in the history
  • Loading branch information
0tkl authored and arch1t3cht committed May 30, 2024
1 parent e6da4e8 commit 0a01ecf
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 59 deletions.
2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,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: ['prefer_static=' + (get_option('default_library') == 'static').to_string(), 'enable_plugin=false'])
deps += bs.get_variable('bestsource_dep')
dep_avail += 'BestSource'
needs_ffmpeg = true
Expand Down
2 changes: 1 addition & 1 deletion src/audio_provider_bestsource.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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();
});
Expand Down
2 changes: 1 addition & 1 deletion src/video_provider_bestsource.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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();
});
Expand Down
3 changes: 1 addition & 2 deletions subprojects/bestsource.wrap
Original file line number Diff line number Diff line change
@@ -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
54 changes: 0 additions & 54 deletions subprojects/packagefiles/bestsource/0001.patch

This file was deleted.

0 comments on commit 0a01ecf

Please sign in to comment.