From 4e9cccf26ac467d3aa77fe0fa6da81a4b07d4add Mon Sep 17 00:00:00 2001 From: kevingpqi Date: Mon, 19 Jun 2023 15:49:05 +0800 Subject: [PATCH] Rename function. --- android/libpag/src/main/java/org/libpag/PAGPlayer.java | 6 +++--- android/libpag/src/main/java/org/libpag/PAGView.java | 5 ++--- include/pag/pag.h | 6 +++--- src/platform/android/JPAGPlayer.cpp | 9 ++++----- src/platform/cocoa/PAGPlayer.h | 6 +++--- src/platform/cocoa/PAGPlayer.m | 8 ++++---- src/platform/cocoa/private/PAGPlayerImpl.h | 4 ++-- src/platform/cocoa/private/PAGPlayerImpl.mm | 8 ++++---- src/platform/ios/PAGView.m | 4 ++-- src/rendering/PAGPlayer.cpp | 8 ++++---- src/rendering/caches/RenderCache.h | 4 ++-- 11 files changed, 33 insertions(+), 35 deletions(-) diff --git a/android/libpag/src/main/java/org/libpag/PAGPlayer.java b/android/libpag/src/main/java/org/libpag/PAGPlayer.java index 9e9723670d..471abb2734 100644 --- a/android/libpag/src/main/java/org/libpag/PAGPlayer.java +++ b/android/libpag/src/main/java/org/libpag/PAGPlayer.java @@ -73,12 +73,12 @@ public void setSurface(PAGSurface surface) { * when first rendering BitmapComposition and VideoComposition, * which will reduces memory consumption, and increases stability. */ - public native boolean diskCacheEnabled(); + public native boolean useDiskCache(); /** - * Set the value of diskCacheEnabled property. + * Set the value of useDiskCache property. */ - public native void setDiskCacheEnabled(boolean value); + public native void setUseDiskCache(boolean value); /** * This value defines the scale factor for internal graphics caches, ranges from 0.0 to 1.0. The diff --git a/android/libpag/src/main/java/org/libpag/PAGView.java b/android/libpag/src/main/java/org/libpag/PAGView.java index 998b28dc09..246ecfde24 100644 --- a/android/libpag/src/main/java/org/libpag/PAGView.java +++ b/android/libpag/src/main/java/org/libpag/PAGView.java @@ -9,7 +9,6 @@ import android.opengl.EGLContext; import android.os.Build; import android.util.AttributeSet; -import android.util.Log; import android.view.TextureView; import android.view.View; @@ -287,14 +286,14 @@ public void setCacheEnabled(boolean value) { * which will reduces memory consumption, and increases stability. */ public boolean diskCacheEnabled() { - return pagPlayer.diskCacheEnabled(); + return pagPlayer.useDiskCache(); } /** * Set the value of diskCacheEnabled property. */ public void setDiskCacheEnabled(boolean value) { - pagPlayer.setDiskCacheEnabled(value); + pagPlayer.setUseDiskCache(value); } /** diff --git a/include/pag/pag.h b/include/pag/pag.h index fd3990e465..68cf8ca93e 100644 --- a/include/pag/pag.h +++ b/include/pag/pag.h @@ -1333,12 +1333,12 @@ class PAG_API PAGPlayer { * when first rendering BitmapComposition and VideoComposition, * which will reduces memory consumption, and increases stability. */ - bool diskCacheEnabled(); + bool useDiskCache(); /** - * Set the value of diskCacheEnabled property. + * Set the value of useDiskCache property. */ - void setDiskCacheEnabled(bool value); + void setUseDiskCache(bool value); /** * This value defines the scale factor for internal graphics caches, ranges from 0.0 to 1.0. The diff --git a/src/platform/android/JPAGPlayer.cpp b/src/platform/android/JPAGPlayer.cpp index 408157cf01..803591ba87 100644 --- a/src/platform/android/JPAGPlayer.cpp +++ b/src/platform/android/JPAGPlayer.cpp @@ -316,20 +316,19 @@ PAG_API jboolean Java_org_libpag_PAGPlayer_hitTestPoint(JNIEnv* env, jobject thi return (jboolean)player->hitTestPoint(pagLayer, x, y, pixelHitTest); } -PAG_API void Java_org_libpag_PAGPlayer_setDiskCacheEnabled(JNIEnv* env, jobject thiz, - jboolean value) { +PAG_API void Java_org_libpag_PAGPlayer_setUseDiskCache(JNIEnv* env, jobject thiz, jboolean value) { auto player = getPAGPlayer(env, thiz); if (player == nullptr) { return; } - player->setDiskCacheEnabled(value); + player->setUseDiskCache(value); } -PAG_API jboolean Java_org_libpag_PAGPlayer_diskCacheEnabled(JNIEnv* env, jobject thiz) { +PAG_API jboolean Java_org_libpag_PAGPlayer_useDiskCache(JNIEnv* env, jobject thiz) { auto player = getPAGPlayer(env, thiz); if (player == nullptr) { return JNI_FALSE; } - return player->diskCacheEnabled(); + return player->useDiskCache(); } } diff --git a/src/platform/cocoa/PAGPlayer.h b/src/platform/cocoa/PAGPlayer.h index 71b85c9413..a24d9b34a1 100644 --- a/src/platform/cocoa/PAGPlayer.h +++ b/src/platform/cocoa/PAGPlayer.h @@ -74,12 +74,12 @@ PAG_API @interface PAGPlayer : NSObject * when first rendering BitmapComposition and VideoComposition, * which will reduces memory consumption, and increases stability. */ -- (BOOL)diskCacheEnabled; +- (BOOL)useDiskCache; /** - * Set the value of diskCacheEnabled property. + * Set the value of useDiskCache property. */ -- (void)setDiskCacheEnabled:(BOOL)value; +- (void)setUseDiskCache:(BOOL)value; /** * This value defines the scale factor for internal graphics caches, ranges from 0.0 to 1.0. The diff --git a/src/platform/cocoa/PAGPlayer.m b/src/platform/cocoa/PAGPlayer.m index 076d220d43..b9ca972c47 100644 --- a/src/platform/cocoa/PAGPlayer.m +++ b/src/platform/cocoa/PAGPlayer.m @@ -88,12 +88,12 @@ - (void)setCacheEnabled:(BOOL)value { [pagPlayer setCacheEnabled:value]; } -- (BOOL)diskCacheEnabled { - return [pagPlayer diskCacheEnabled]; +- (BOOL)useDiskCache { + return [pagPlayer useDiskCache]; } -- (void)setDiskCacheEnabled:(BOOL)value { - [pagPlayer setDiskCacheEnabled:value]; +- (void)setUseDiskCache:(BOOL)value { + [pagPlayer setUseDiskCache:value]; } - (float)cacheScale { diff --git a/src/platform/cocoa/private/PAGPlayerImpl.h b/src/platform/cocoa/private/PAGPlayerImpl.h index 934ff64412..5b6b7b818f 100644 --- a/src/platform/cocoa/private/PAGPlayerImpl.h +++ b/src/platform/cocoa/private/PAGPlayerImpl.h @@ -35,9 +35,9 @@ - (void)setCacheEnabled:(BOOL)value; -- (BOOL)diskCacheEnabled; +- (BOOL)useDiskCache; -- (void)setDiskCacheEnabled:(BOOL)value; +- (void)setUseDiskCache:(BOOL)value; - (float)cacheScale; diff --git a/src/platform/cocoa/private/PAGPlayerImpl.mm b/src/platform/cocoa/private/PAGPlayerImpl.mm index eb6cbfd09c..5aaeb97705 100644 --- a/src/platform/cocoa/private/PAGPlayerImpl.mm +++ b/src/platform/cocoa/private/PAGPlayerImpl.mm @@ -82,12 +82,12 @@ - (void)setCacheEnabled:(BOOL)value { pagPlayer->setCacheEnabled(value); } -- (BOOL)diskCacheEnabled { - return pagPlayer->diskCacheEnabled(); +- (BOOL)useDiskCache { + return pagPlayer->useDiskCache(); } -- (void)setDiskCacheEnabled:(BOOL)value { - pagPlayer->setDiskCacheEnabled(value); +- (void)setUseDiskCache:(BOOL)value { + pagPlayer->setUseDiskCache(value); } - (float)cacheScale { diff --git a/src/platform/ios/PAGView.m b/src/platform/ios/PAGView.m index 631b37f880..fcc6600f65 100644 --- a/src/platform/ios/PAGView.m +++ b/src/platform/ios/PAGView.m @@ -238,11 +238,11 @@ - (void)setCacheEnabled:(BOOL)value { } - (BOOL)diskCacheEnabled { - return [pagPlayer diskCacheEnabled]; + return [pagPlayer useDiskCache]; } - (void)setDiskCacheEnabled:(BOOL)value { - [pagPlayer setDiskCacheEnabled:value]; + [pagPlayer setUseDiskCache:value]; } - (float)cacheScale { diff --git a/src/rendering/PAGPlayer.cpp b/src/rendering/PAGPlayer.cpp index e0420f161c..a5c57d1ec5 100644 --- a/src/rendering/PAGPlayer.cpp +++ b/src/rendering/PAGPlayer.cpp @@ -122,14 +122,14 @@ void PAGPlayer::setCacheEnabled(bool value) { renderCache->setSnapshotEnabled(value); } -bool PAGPlayer::diskCacheEnabled() { +bool PAGPlayer::useDiskCache() { LockGuard autoLock(rootLocker); - return renderCache->diskCacheEnabled(); + return renderCache->useDiskCache(); } -void PAGPlayer::setDiskCacheEnabled(bool value) { +void PAGPlayer::setUseDiskCache(bool value) { LockGuard autoLock(rootLocker); - renderCache->setDiskCacheEnabled(value); + renderCache->setUseDiskCache(value); } float PAGPlayer::cacheScale() { diff --git a/src/rendering/caches/RenderCache.h b/src/rendering/caches/RenderCache.h index e9b7ddcc8d..911cbf9698 100644 --- a/src/rendering/caches/RenderCache.h +++ b/src/rendering/caches/RenderCache.h @@ -101,14 +101,14 @@ class RenderCache : public Performance { * when first rendering BitmapComposition and VideoComposition, * which will reduces memory consumption, and increases stability. */ - bool diskCacheEnabled() const { + bool useDiskCache() const { return _diskCacheEnabled; } /** * Set the value of diskCacheEnabled property. */ - void setDiskCacheEnabled(bool value) { + void setUseDiskCache(bool value) { _diskCacheEnabled = value; }