From eee8d852b9ae3262d7b8710cc7d6a95188104ec3 Mon Sep 17 00:00:00 2001 From: Taner Sener Date: Mon, 8 Nov 2021 00:12:32 +0000 Subject: [PATCH] differentiate class and insance methods in ReturnCode class for native platforms --- .../main/java/com/arthenica/ffmpegkit/FFmpegKitConfig.java | 2 +- .../src/main/java/com/arthenica/ffmpegkit/ReturnCode.java | 6 +++--- apple/src/ReturnCode.h | 6 +++--- apple/src/ReturnCode.m | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/FFmpegKitConfig.java b/android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/FFmpegKitConfig.java index a5eacac..2ad1936 100644 --- a/android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/FFmpegKitConfig.java +++ b/android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/FFmpegKitConfig.java @@ -688,7 +688,7 @@ public class FFmpegKitConfig { final int returnCodeValue = nativeFFprobeExecute(mediaInformationSession.getSessionId(), mediaInformationSession.getArguments()); final ReturnCode returnCode = new ReturnCode(returnCodeValue); mediaInformationSession.complete(returnCode); - if (returnCode.isSuccess()) { + if (returnCode.isValueSuccess()) { MediaInformation mediaInformation = MediaInformationJsonParser.fromWithError(mediaInformationSession.getAllLogsAsString(waitTimeout)); mediaInformationSession.setMediaInformation(mediaInformation); } diff --git a/android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/ReturnCode.java b/android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/ReturnCode.java index a91ff9e..78d6033 100644 --- a/android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/ReturnCode.java +++ b/android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/ReturnCode.java @@ -43,15 +43,15 @@ public class ReturnCode { return value; } - public boolean isSuccess() { + public boolean isValueSuccess() { return (value == SUCCESS); } - public boolean isError() { + public boolean isValueError() { return ((value != SUCCESS) && (value != CANCEL)); } - public boolean isCancel() { + public boolean isValueCancel() { return (value == CANCEL); } diff --git a/apple/src/ReturnCode.h b/apple/src/ReturnCode.h index 3d47ee4..8047793 100644 --- a/apple/src/ReturnCode.h +++ b/apple/src/ReturnCode.h @@ -37,11 +37,11 @@ typedef NS_ENUM(NSUInteger, ReturnCodeEnum) { - (int)getValue; -- (BOOL)isSuccess; +- (BOOL)isValueSuccess; -- (BOOL)isError; +- (BOOL)isValueError; -- (BOOL)isCancel; +- (BOOL)isValueCancel; @end diff --git a/apple/src/ReturnCode.m b/apple/src/ReturnCode.m index c2e6c3c..e7ca2ef 100644 --- a/apple/src/ReturnCode.m +++ b/apple/src/ReturnCode.m @@ -44,15 +44,15 @@ return _value; } -- (BOOL)isSuccess { +- (BOOL)isValueSuccess { return (_value == ReturnCodeSuccess); } -- (BOOL)isError { +- (BOOL)isValueError { return ((_value != ReturnCodeSuccess) && (_value != ReturnCodeCancel)); } -- (BOOL)isCancel { +- (BOOL)isValueCancel { return (_value == ReturnCodeCancel); }