From d370cfd3e27c258fb882f5ea3ccbb5ee784a43b8 Mon Sep 17 00:00:00 2001 From: Taner Sener Date: Wed, 10 Nov 2021 01:12:49 +0000 Subject: [PATCH] use unique method names for overloaded methods on android --- .../com/arthenica/ffmpegkit/FFmpegKit.java | 33 +++++++++---------- .../com/arthenica/ffmpegkit/FFprobeKit.java | 28 ++++++++-------- 2 files changed, 30 insertions(+), 31 deletions(-) diff --git a/android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/FFmpegKit.java b/android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/FFmpegKit.java index 150e723..dc15539 100644 --- a/android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/FFmpegKit.java +++ b/android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/FFmpegKit.java @@ -19,7 +19,6 @@ package com.arthenica.ffmpegkit; -import java.util.ArrayList; import java.util.List; import java.util.concurrent.ExecutorService; @@ -73,8 +72,8 @@ public class FFmpegKit { * @param executeCallback callback that will be called when the execution is completed * @return FFmpeg session created for this execution */ - public static FFmpegSession executeAsync(final String[] arguments, - final ExecuteCallback executeCallback) { + public static FFmpegSession executeWithArgumentsAsync(final String[] arguments, + final ExecuteCallback executeCallback) { final FFmpegSession session = new FFmpegSession(arguments, executeCallback); FFmpegKitConfig.asyncFFmpegExecute(session); @@ -94,10 +93,10 @@ public class FFmpegKit { * @param statisticsCallback callback that will receive statistics * @return FFmpeg session created for this execution */ - public static FFmpegSession executeAsync(final String[] arguments, - final ExecuteCallback executeCallback, - final LogCallback logCallback, - final StatisticsCallback statisticsCallback) { + public static FFmpegSession executeWithArgumentsAsync(final String[] arguments, + final ExecuteCallback executeCallback, + final LogCallback logCallback, + final StatisticsCallback statisticsCallback) { final FFmpegSession session = new FFmpegSession(arguments, executeCallback, logCallback, statisticsCallback); FFmpegKitConfig.asyncFFmpegExecute(session); @@ -116,9 +115,9 @@ public class FFmpegKit { * @param executorService executor service that will be used to run this asynchronous operation * @return FFmpeg session created for this execution */ - public static FFmpegSession executeAsync(final String[] arguments, - final ExecuteCallback executeCallback, - final ExecutorService executorService) { + public static FFmpegSession executeWithArgumentsAsync(final String[] arguments, + final ExecuteCallback executeCallback, + final ExecutorService executorService) { final FFmpegSession session = new FFmpegSession(arguments, executeCallback); FFmpegKitConfig.asyncFFmpegExecute(session, executorService); @@ -139,11 +138,11 @@ public class FFmpegKit { * @param executorService executor service that will be used to run this asynchronous operation * @return FFmpeg session created for this execution */ - public static FFmpegSession executeAsync(final String[] arguments, - final ExecuteCallback executeCallback, - final LogCallback logCallback, - final StatisticsCallback statisticsCallback, - final ExecutorService executorService) { + public static FFmpegSession executeWithArgumentsAsync(final String[] arguments, + final ExecuteCallback executeCallback, + final LogCallback logCallback, + final StatisticsCallback statisticsCallback, + final ExecutorService executorService) { final FFmpegSession session = new FFmpegSession(arguments, executeCallback, logCallback, statisticsCallback); FFmpegKitConfig.asyncFFmpegExecute(session, executorService); @@ -176,7 +175,7 @@ public class FFmpegKit { */ public static FFmpegSession executeAsync(final String command, final ExecuteCallback executeCallback) { - return executeAsync(FFmpegKitConfig.parseArguments(command), executeCallback); + return executeWithArgumentsAsync(FFmpegKitConfig.parseArguments(command), executeCallback); } /** @@ -196,7 +195,7 @@ public class FFmpegKit { final ExecuteCallback executeCallback, final LogCallback logCallback, final StatisticsCallback statisticsCallback) { - return executeAsync(FFmpegKitConfig.parseArguments(command), executeCallback, logCallback, statisticsCallback); + return executeWithArgumentsAsync(FFmpegKitConfig.parseArguments(command), executeCallback, logCallback, statisticsCallback); } /** diff --git a/android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/FFprobeKit.java b/android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/FFprobeKit.java index 3db4611..2854287 100644 --- a/android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/FFprobeKit.java +++ b/android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/FFprobeKit.java @@ -76,8 +76,8 @@ public class FFprobeKit { * @param executeCallback callback that will be called when the execution is completed * @return FFprobe session created for this execution */ - public static FFprobeSession executeAsync(final String[] arguments, - final ExecuteCallback executeCallback) { + public static FFprobeSession executeWithArgumentsAsync(final String[] arguments, + final ExecuteCallback executeCallback) { final FFprobeSession session = new FFprobeSession(arguments, executeCallback); FFmpegKitConfig.asyncFFprobeExecute(session); @@ -96,9 +96,9 @@ public class FFprobeKit { * @param logCallback callback that will receive logs * @return FFprobe session created for this execution */ - public static FFprobeSession executeAsync(final String[] arguments, - final ExecuteCallback executeCallback, - final LogCallback logCallback) { + public static FFprobeSession executeWithArgumentsAsync(final String[] arguments, + final ExecuteCallback executeCallback, + final LogCallback logCallback) { final FFprobeSession session = new FFprobeSession(arguments, executeCallback, logCallback); FFmpegKitConfig.asyncFFprobeExecute(session); @@ -117,9 +117,9 @@ public class FFprobeKit { * @param executorService executor service that will be used to run this asynchronous operation * @return FFprobe session created for this execution */ - public static FFprobeSession executeAsync(final String[] arguments, - final ExecuteCallback executeCallback, - final ExecutorService executorService) { + public static FFprobeSession executeWithArgumentsAsync(final String[] arguments, + final ExecuteCallback executeCallback, + final ExecutorService executorService) { final FFprobeSession session = new FFprobeSession(arguments, executeCallback); FFmpegKitConfig.asyncFFprobeExecute(session, executorService); @@ -139,10 +139,10 @@ public class FFprobeKit { * @param executorService executor service that will be used to run this asynchronous operation * @return FFprobe session created for this execution */ - public static FFprobeSession executeAsync(final String[] arguments, - final ExecuteCallback executeCallback, - final LogCallback logCallback, - final ExecutorService executorService) { + public static FFprobeSession executeWithArgumentsAsync(final String[] arguments, + final ExecuteCallback executeCallback, + final LogCallback logCallback, + final ExecutorService executorService) { final FFprobeSession session = new FFprobeSession(arguments, executeCallback, logCallback); FFmpegKitConfig.asyncFFprobeExecute(session, executorService); @@ -175,7 +175,7 @@ public class FFprobeKit { */ public static FFprobeSession executeAsync(final String command, final ExecuteCallback executeCallback) { - return executeAsync(FFmpegKitConfig.parseArguments(command), executeCallback); + return executeWithArgumentsAsync(FFmpegKitConfig.parseArguments(command), executeCallback); } /** @@ -193,7 +193,7 @@ public class FFprobeKit { public static FFprobeSession executeAsync(final String command, final ExecuteCallback executeCallback, final LogCallback logCallback) { - return executeAsync(FFmpegKitConfig.parseArguments(command), executeCallback, logCallback); + return executeWithArgumentsAsync(FFmpegKitConfig.parseArguments(command), executeCallback, logCallback); } /**