diff --git a/bilibili.xcodeproj/project.pbxproj b/bilibili.xcodeproj/project.pbxproj index ccf7522..350cf77 100644 --- a/bilibili.xcodeproj/project.pbxproj +++ b/bilibili.xcodeproj/project.pbxproj @@ -130,12 +130,10 @@ FDA01C901C576C6700298CEF /* libopus.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = FDA01C771C576C6700298CEF /* libopus.0.dylib */; }; FDA01C911C576C6700298CEF /* libpng16.16.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = FDA01C781C576C6700298CEF /* libpng16.16.dylib */; }; FDA01C921C576C6700298CEF /* libpostproc.54.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = FDA01C791C576C6700298CEF /* libpostproc.54.dylib */; }; - FDA01C931C576C6700298CEF /* libSDL-1.2.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = FDA01C7A1C576C6700298CEF /* libSDL-1.2.0.dylib */; }; FDA01C941C576C6700298CEF /* libswresample.2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = FDA01C7B1C576C6700298CEF /* libswresample.2.dylib */; }; FDA01C951C576C6700298CEF /* libswscale.4.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = FDA01C7C1C576C6700298CEF /* libswscale.4.dylib */; }; FDA01C961C576C6700298CEF /* libx264.148.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = FDA01C7D1C576C6700298CEF /* libx264.148.dylib */; }; FDA01C971C576C6700298CEF /* libz.1.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = FDA01C7E1C576C6700298CEF /* libz.1.dylib */; }; - FDA01C981C576C6700298CEF /* libiconv.2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = FDA01C7F1C576C6700298CEF /* libiconv.2.dylib */; }; FDA01C991C576C6700298CEF /* libfontconfig.1.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = FDA01C801C576C6700298CEF /* libfontconfig.1.dylib */; }; FDA01C9A1C576C7E00298CEF /* libmpv.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = FDA01C681C576C6700298CEF /* libmpv.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; FDA01C9B1C576C7E00298CEF /* libavdevice.57.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = FDA01C691C576C6700298CEF /* libavdevice.57.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; @@ -155,12 +153,10 @@ FDA01CA91C576C7E00298CEF /* libopus.0.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = FDA01C771C576C6700298CEF /* libopus.0.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; FDA01CAA1C576C7E00298CEF /* libpng16.16.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = FDA01C781C576C6700298CEF /* libpng16.16.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; FDA01CAB1C576C7E00298CEF /* libpostproc.54.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = FDA01C791C576C6700298CEF /* libpostproc.54.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; - FDA01CAC1C576C7E00298CEF /* libSDL-1.2.0.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = FDA01C7A1C576C6700298CEF /* libSDL-1.2.0.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; FDA01CAD1C576C7E00298CEF /* libswresample.2.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = FDA01C7B1C576C6700298CEF /* libswresample.2.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; FDA01CAE1C576C7E00298CEF /* libswscale.4.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = FDA01C7C1C576C6700298CEF /* libswscale.4.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; FDA01CAF1C576C7E00298CEF /* libx264.148.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = FDA01C7D1C576C6700298CEF /* libx264.148.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; FDA01CB01C576C7E00298CEF /* libz.1.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = FDA01C7E1C576C6700298CEF /* libz.1.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; - FDA01CB11C576C7E00298CEF /* libiconv.2.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = FDA01C7F1C576C6700298CEF /* libiconv.2.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; FDA01CB21C576C7E00298CEF /* libfontconfig.1.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = FDA01C801C576C6700298CEF /* libfontconfig.1.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; FDA01CB31C576C7E00298CEF /* libmediainfo.0.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = FD2BD56D1AD15AE0001A7E16 /* libmediainfo.0.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; FDAF8BA71ACA502000C0C55D /* dsa_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = FDAF8BA61ACA502000C0C55D /* dsa_pub.pem */; }; @@ -297,12 +293,10 @@ FDA01CA91C576C7E00298CEF /* libopus.0.dylib in CopyFiles */, FDA01CAA1C576C7E00298CEF /* libpng16.16.dylib in CopyFiles */, FDA01CAB1C576C7E00298CEF /* libpostproc.54.dylib in CopyFiles */, - FDA01CAC1C576C7E00298CEF /* libSDL-1.2.0.dylib in CopyFiles */, FDA01CAD1C576C7E00298CEF /* libswresample.2.dylib in CopyFiles */, FDA01CAE1C576C7E00298CEF /* libswscale.4.dylib in CopyFiles */, FDA01CAF1C576C7E00298CEF /* libx264.148.dylib in CopyFiles */, FDA01CB01C576C7E00298CEF /* libz.1.dylib in CopyFiles */, - FDA01CB11C576C7E00298CEF /* libiconv.2.dylib in CopyFiles */, FDA01CB21C576C7E00298CEF /* libfontconfig.1.dylib in CopyFiles */, FDA01CB31C576C7E00298CEF /* libmediainfo.0.dylib in CopyFiles */, ); @@ -524,12 +518,10 @@ FDA01C771C576C6700298CEF /* libopus.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libopus.0.dylib; path = bilibili/libs/libopus.0.dylib; sourceTree = ""; }; FDA01C781C576C6700298CEF /* libpng16.16.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libpng16.16.dylib; path = bilibili/libs/libpng16.16.dylib; sourceTree = ""; }; FDA01C791C576C6700298CEF /* libpostproc.54.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libpostproc.54.dylib; path = bilibili/libs/libpostproc.54.dylib; sourceTree = ""; }; - FDA01C7A1C576C6700298CEF /* libSDL-1.2.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libSDL-1.2.0.dylib"; path = "bilibili/libs/libSDL-1.2.0.dylib"; sourceTree = ""; }; FDA01C7B1C576C6700298CEF /* libswresample.2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libswresample.2.dylib; path = bilibili/libs/libswresample.2.dylib; sourceTree = ""; }; FDA01C7C1C576C6700298CEF /* libswscale.4.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libswscale.4.dylib; path = bilibili/libs/libswscale.4.dylib; sourceTree = ""; }; FDA01C7D1C576C6700298CEF /* libx264.148.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libx264.148.dylib; path = bilibili/libs/libx264.148.dylib; sourceTree = ""; }; FDA01C7E1C576C6700298CEF /* libz.1.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.1.dylib; path = bilibili/libs/libz.1.dylib; sourceTree = ""; }; - FDA01C7F1C576C6700298CEF /* libiconv.2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libiconv.2.dylib; path = bilibili/libs/libiconv.2.dylib; sourceTree = ""; }; FDA01C801C576C6700298CEF /* libfontconfig.1.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libfontconfig.1.dylib; path = bilibili/libs/libfontconfig.1.dylib; sourceTree = ""; }; FDA775E01AD93DC900426483 /* aria2.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = aria2.hpp; path = bilibili/headers/aria2.hpp; sourceTree = ""; }; FDAF8BA61ACA502000C0C55D /* dsa_pub.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = dsa_pub.pem; sourceTree = ""; }; @@ -623,7 +615,6 @@ FDA01C8B1C576C6700298CEF /* libglib-2.0.0.dylib in Frameworks */, FD29EC691BAF9AF200B8724B /* VPPlugin.framework in Frameworks */, FDA01C921C576C6700298CEF /* libpostproc.54.dylib in Frameworks */, - FDA01C931C576C6700298CEF /* libSDL-1.2.0.dylib in Frameworks */, FDA01C991C576C6700298CEF /* libfontconfig.1.dylib in Frameworks */, FDA01C811C576C6700298CEF /* libmpv.dylib in Frameworks */, FDCA487C1BAB59A0001ACB8D /* QuartzCore.framework in Frameworks */, @@ -636,7 +627,6 @@ FD72571D1B9D534C0015B0F1 /* GCDWebServers.framework in Frameworks */, FDA01C941C576C6700298CEF /* libswresample.2.dylib in Frameworks */, FD62CC8B1B6E6BA5000AED57 /* Foundation.framework in Frameworks */, - FDA01C981C576C6700298CEF /* libiconv.2.dylib in Frameworks */, FDA01C961C576C6700298CEF /* libx264.148.dylib in Frameworks */, FDA01C8D1C576C6700298CEF /* libintl.8.dylib in Frameworks */, FDD5EEF71AC944020036B829 /* WebKit.framework in Frameworks */, @@ -760,12 +750,10 @@ FDA01C771C576C6700298CEF /* libopus.0.dylib */, FDA01C781C576C6700298CEF /* libpng16.16.dylib */, FDA01C791C576C6700298CEF /* libpostproc.54.dylib */, - FDA01C7A1C576C6700298CEF /* libSDL-1.2.0.dylib */, FDA01C7B1C576C6700298CEF /* libswresample.2.dylib */, FDA01C7C1C576C6700298CEF /* libswscale.4.dylib */, FDA01C7D1C576C6700298CEF /* libx264.148.dylib */, FDA01C7E1C576C6700298CEF /* libz.1.dylib */, - FDA01C7F1C576C6700298CEF /* libiconv.2.dylib */, FDA01C801C576C6700298CEF /* libfontconfig.1.dylib */, ); name = lib; diff --git a/bilibili/Info.plist b/bilibili/Info.plist index f5caf45..7c9e3cf 100644 --- a/bilibili/Info.plist +++ b/bilibili/Info.plist @@ -225,7 +225,7 @@ CFBundleVersion - 1767 + 1770 Fabric APIKey diff --git a/bilibili/PlayerView/PlayerView.mm b/bilibili/PlayerView/PlayerView.mm index 717608b..4e20048 100644 --- a/bilibili/PlayerView/PlayerView.mm +++ b/bilibili/PlayerView/PlayerView.mm @@ -544,6 +544,7 @@ - (void)PlayVideo:(NSString*) commentFile :(NSString*)res{ check_error(mpv_set_option_string(mpv, "fs-black-out-screens", "yes")); check_error(mpv_set_option_string(mpv, "vo", "opengl:pbo:dither=no:alpha=no")); check_error(mpv_set_option_string(mpv, "screenshot-directory", "~/Desktop")); + check_error(mpv_set_option_string(mpv, "screenshot-format", "png")); int disableMediaKey = [self getSettings:@"disableiTunesMediaKey"]; if(!disableMediaKey){ diff --git a/bilibili/libs/libSDL-1.2.0.dylib b/bilibili/libs/libSDL-1.2.0.dylib deleted file mode 100755 index fe149bd..0000000 --- a/bilibili/libs/libSDL-1.2.0.dylib +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:08200eb63396847739c0262842c9820c5b9fa8127e729e00cb809b362e38583c -size 287612 diff --git a/bilibili/libs/libavcodec.57.dylib b/bilibili/libs/libavcodec.57.dylib index ef65e4e..a153b2e 100755 --- a/bilibili/libs/libavcodec.57.dylib +++ b/bilibili/libs/libavcodec.57.dylib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d8d0612cd54be97b238903a3ae1c91992a7d136140a527975541f1e0d9fa475e -size 12158116 +oid sha256:a56a259896f77cb1f0763a10a8d8ef9b12e2692344e3a03807eb1743d7d2fdc3 +size 12179692 diff --git a/bilibili/libs/libiconv.2.dylib b/bilibili/libs/libiconv.2.dylib deleted file mode 100755 index e0e01ad..0000000 --- a/bilibili/libs/libiconv.2.dylib +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5ba4600083f97abf63aab7358b13edf9ddc41c4ccef26d91641b440ece02b917 -size 1001200 diff --git a/bilibili/libs/libmpv.dylib b/bilibili/libs/libmpv.dylib index ff6dee3..3f5310e 100755 --- a/bilibili/libs/libmpv.dylib +++ b/bilibili/libs/libmpv.dylib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3b9c21623dead7f11345546898020b0614497fc0b861026e5d9dd21c97fb5f32 -size 2430096 +oid sha256:ce70db073ad0661f36bfe2f9364e598eb5013388345d6cb60d0d55f098e251bd +size 2594672 diff --git a/bilibili/libs/libpng16.16.dylib b/bilibili/libs/libpng16.16.dylib index e4ec19a..55cb1c2 100755 --- a/bilibili/libs/libpng16.16.dylib +++ b/bilibili/libs/libpng16.16.dylib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:39f588a219a3d74b4286c5147f16d3a515075001a51301d3387b86fd57fca2cb +oid sha256:3252259d515be221013e3c398b84f943222d08e1ee96d49a4f7915ab70d3757b size 176868