Skip to content

Commit e9c411c

Browse files
authored
Merge pull request ypresto#53 from PinkFloyded/cancel-bug-fix
Cancel bug fix
2 parents f7d5712 + cfd083a commit e9c411c

File tree

5 files changed

+7
-11
lines changed

5 files changed

+7
-11
lines changed

build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
jcenter()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:2.1.2'
8+
classpath 'com.android.tools.build:gradle:2.3.3'
99

1010
// NOTE: Do not place your application dependencies here; they belong
1111
// in the individual module build.gradle files

example/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
22

33
android {
44
compileSdkVersion 24
5-
buildToolsVersion "24.0.1"
5+
buildToolsVersion '25.0.0'
66

77
defaultConfig {
88
applicationId "net.ypresto.androidtranscoder.example"
+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Mon Mar 09 14:43:12 JST 2015
1+
#Thu Jun 08 12:40:11 IST 2017
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

lib/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ apply plugin: 'bintray-release'
1212

1313
android {
1414
compileSdkVersion 24
15-
buildToolsVersion "24.0.1"
15+
buildToolsVersion '25.0.2'
1616

1717
defaultConfig {
1818
minSdkVersion 18

lib/src/main/java/net/ypresto/androidtranscoder/engine/MediaTranscoderEngine.java

+2-6
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ public void onDetermineOutputFormat() {
180180
mExtractor.selectTrack(trackResult.mAudioTrackIndex);
181181
}
182182

183-
private void runPipelines() {
183+
private void runPipelines() throws InterruptedException {
184184
long loopCount = 0;
185185
if (mDurationUs <= 0) {
186186
double progress = PROGRESS_UNKNOWN;
@@ -199,11 +199,7 @@ private void runPipelines() {
199199
if (mProgressCallback != null) mProgressCallback.onProgress(progress);
200200
}
201201
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);
207203
}
208204
}
209205
}

0 commit comments

Comments
 (0)