Commit e9c411c

authored

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

Cancel bug fix

2 parents f7d5712 + cfd083a commit e9c411cCopy full SHA for e9c411c

File tree

-11

lines changed

-11

lines changed

Lines changed: 1 addition & 1 deletion

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`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'`
`2`	`2`
`3`	`3`	`android {`
`4`	`4`	`compileSdkVersion 24`
`5`		`- buildToolsVersion "24.0.1"`
	`5`	`+ buildToolsVersion '25.0.0'`
`6`	`6`
`7`	`7`	`defaultConfig {`
`8`	`8`	`applicationId "net.ypresto.androidtranscoder.example"`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`		`-#Mon Mar 09 14:43:12 JST 2015`
	`1`	`+#Thu Jun 08 12:40:11 IST 2017`
`2`	`2`	`distributionBase=GRADLE_USER_HOME`
`3`	`3`	`distributionPath=wrapper/dists`
`4`	`4`	`zipStoreBase=GRADLE_USER_HOME`
`5`	`5`	`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`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ apply plugin: 'bintray-release'`
`12`	`12`
`13`	`13`	`android {`
`14`	`14`	`compileSdkVersion 24`
`15`		`- buildToolsVersion "24.0.1"`
	`15`	`+ buildToolsVersion '25.0.2'`
`16`	`16`
`17`	`17`	`defaultConfig {`
`18`	`18`	`minSdkVersion 18`

Lines changed: 2 additions & 6 deletions

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() throwsInterruptedException{`
`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`	`}`

Comments

(0)