Merge pull request ypresto#53 from PinkFloyded/cancel-bug-fix

ypresto · web-flow · commit e9c411c22897 · 2017-11-27T16:37:00.000+09:00
Cancel bug fix
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.2'
+        classpath 'com.android.tools.build:gradle:2.3.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/example/build.gradle b/example/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 24
-    buildToolsVersion "24.0.1"
+    buildToolsVersion '25.0.0'
 
     defaultConfig {
         applicationId "net.ypresto.androidtranscoder.example"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Mar 09 14:43:12 JST 2015
+#Thu Jun 08 12:40:11 IST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
diff --git a/lib/build.gradle b/lib/build.gradle
@@ -12,7 +12,7 @@ apply plugin: 'bintray-release'
 
 android {
     compileSdkVersion 24
-    buildToolsVersion "24.0.1"
+    buildToolsVersion '25.0.2'
 
     defaultConfig {
         minSdkVersion 18
diff --git a/lib/src/main/java/net/ypresto/androidtranscoder/engine/MediaTranscoderEngine.java b/lib/src/main/java/net/ypresto/androidtranscoder/engine/MediaTranscoderEngine.java
@@ -180,7 +180,7 @@ public void onDetermineOutputFormat() {
         mExtractor.selectTrack(trackResult.mAudioTrackIndex);
     }
 
-    private void runPipelines() {
+    private void runPipelines() throws InterruptedException {
         long loopCount = 0;
         if (mDurationUs <= 0) {
             double progress = PROGRESS_UNKNOWN;
@@ -199,11 +199,7 @@ private void runPipelines() {
                 if (mProgressCallback != null) mProgressCallback.onProgress(progress);
             }
             if (!stepped) {
-                try {
-                    Thread.sleep(SLEEP_TO_WAIT_TRACK_TRANSCODERS);
-                } catch (InterruptedException e) {
-                    // nothing to do
-                }
+                Thread.sleep(SLEEP_TO_WAIT_TRACK_TRANSCODERS);
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ buildscript {`
`5`	`5`	`jcenter()`
`6`	`6`	`}`
`7`	`7`	`dependencies {`
`8`		`- classpath 'com.android.tools.build:gradle:2.1.2'`
	`8`	`+ classpath 'com.android.tools.build:gradle:2.3.3'`
`9`	`9`
`10`	`10`	`// NOTE: Do not place your application dependencies here; they belong`
`11`	`11`	`// in the individual module build.gradle files`
Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ public void onDetermineOutputFormat() {`
`180`	`180`	`mExtractor.selectTrack(trackResult.mAudioTrackIndex);`
`181`	`181`	`}`
`182`	`182`
`183`		`- private void runPipelines() {`
	`183`	`+ private void runPipelines() throws InterruptedException {`
`184`	`184`	`long loopCount = 0;`
`185`	`185`	`if (mDurationUs <= 0) {`
`186`	`186`	`double progress = PROGRESS_UNKNOWN;`
`@@ -199,11 +199,7 @@ private void runPipelines() {`
`199`	`199`	`if (mProgressCallback != null) mProgressCallback.onProgress(progress);`
`200`	`200`	`}`
`201`	`201`	`if (!stepped) {`
`202`		`- try {`
`203`		`- Thread.sleep(SLEEP_TO_WAIT_TRACK_TRANSCODERS);`
`204`		`- } catch (InterruptedException e) {`
`205`		`- // nothing to do`
`206`		`- }`
	`202`	`+ Thread.sleep(SLEEP_TO_WAIT_TRACK_TRANSCODERS);`
`207`	`203`	`}`
`208`	`204`	`}`
`209`	`205`	`}`