Merge pull request #50 from remotv/fix-audio-bug

Fix audio bug by upping version of ControlSDK to 0.8.1
remotv · Oct 18, 2019 · 67de072 · 67de072
2 parents fe62634 + b183b08
commit 67de072
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -21,7 +21,7 @@ android {
         minSdkVersion 16
         targetSdkVersion 28
         versionCode 3
-        versionName "0.9.2"
+        versionName "0.9.3"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

diff --git a/app/src/main/java/tv/remo/android/controller/activities/SplashScreen.kt b/app/src/main/java/tv/remo/android/controller/activities/SplashScreen.kt
@@ -10,13 +10,10 @@ import android.preference.PreferenceManager
 import android.widget.Toast
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.FragmentActivity
-import com.github.hiteshsondhi88.libffmpeg.FFmpeg
-import kotlinx.coroutines.runBlocking
 import org.btelman.controlsdk.hardware.drivers.BluetoothClassicDriver
 import org.btelman.controlsdk.hardware.interfaces.DriverComponent
 import org.btelman.controlsdk.hardware.interfaces.HardwareDriver
 import org.btelman.controlsdk.services.ControlSDKService
-import org.btelman.controlsdk.streaming.utils.FFmpegUtil
 import org.btelman.controlsdk.utils.ClassScanner
 import tv.remo.android.controller.R
 import tv.remo.android.controller.sdk.RemoSettingsUtil
@@ -75,7 +72,6 @@ class SplashScreen : FragmentActivity() {
                 ClassScanner.getClasses(this)
                 runOnUiThread {
                     @Suppress("DeferredResultUnused")
-                    runBlocking { FFmpegUtil.initFFmpeg(FFmpeg.getInstance(applicationContext)) }
                     classScanComplete = true
                     next()
                 }

diff --git a/sdk/build.gradle b/sdk/build.gradle
@@ -33,7 +33,7 @@ dependencies {
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    def controlsdk_version = "0.8.0"
+    def controlsdk_version = "0.8.1"
     api "org.btelman.controlsdk:core:$controlsdk_version"
     api "org.btelman.controlsdk:streaming:$controlsdk_version"
     api "org.btelman.controlsdk:hardware:$controlsdk_version"