Account for changes in the MediaStreamHandler. Better encapsulation o…

…f classes.
5G-MAG · Feb 28, 2024 · b4ddfbd · b4ddfbd
1 parent 6755796
commit b4ddfbd
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/...MSdAwareApplication/app/src/main/java/com/fivegmag/a5gmsdawareapplication/MainActivity.kt b/...MSdAwareApplication/app/src/main/java/com/fivegmag/a5gmsdawareapplication/MainActivity.kt
@@ -35,7 +35,7 @@ import com.fivegmag.a5gmscommonlibrary.models.EntryPoint
 import com.fivegmag.a5gmscommonlibrary.models.M8Model
 import com.fivegmag.a5gmscommonlibrary.models.ServiceListEntry
 import com.fivegmag.a5gmsdawareapplication.network.M8InterfaceApi
-import com.fivegmag.a5gmsmediastreamhandler.ExoPlayerAdapter
+import com.fivegmag.a5gmsmediastreamhandler.player.exoplayer.ExoPlayerAdapter
 import com.fivegmag.a5gmsmediastreamhandler.MediaSessionHandlerAdapter
 import androidx.media3.ui.PlayerView
 import kotlinx.serialization.json.*
@@ -56,10 +56,10 @@ const val TAG_AWARE_APPLICATION = "5GMS Aware Application"
 @UnstableApi
 class MainActivity : AppCompatActivity(), AdapterView.OnItemSelectedListener {
 
-	private val mediaSessionHandlerAdapter = MediaSessionHandlerAdapter()
-    private val exoPlayerAdapter = ExoPlayerAdapter()
+    private val mediaSessionHandlerAdapter = MediaSessionHandlerAdapter()
     private val mediaStreamHandlerEventHandler = MediaStreamHandlerEventHandler()
     private var currentSelectedStreamIndex: Int = 0
+    private lateinit var exoPlayerAdapter: ExoPlayerAdapter
     private lateinit var currentSelectedM8Key: String
     private lateinit var m8InterfaceApi: M8InterfaceApi
     private lateinit var m8Data: M8Model
@@ -219,9 +219,9 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemSelectedListener {
             registerButtonListener()
             mediaSessionHandlerAdapter.initialize(
                 this,
-                exoPlayerAdapter,
                 ::onConnectionToMediaSessionHandlerEstablished
             )
+            exoPlayerAdapter = mediaSessionHandlerAdapter.getExoPlayerAdapter()
             val representationInfoTextView = findViewById<TextView>(R.id.representation_info)
             mediaStreamHandlerEventHandler.initialize(representationInfoTextView, this)
         } catch (e: Exception) {
@@ -233,7 +233,7 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemSelectedListener {
         EventBus.getDefault().unregister(mediaStreamHandlerEventHandler)
         super.onStop()
         // Unbind from the service
-        mediaSessionHandlerAdapter.reset(this)
+        mediaSessionHandlerAdapter.reset()
     }
 
     override fun onStart() {
@@ -310,7 +310,7 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemSelectedListener {
     }
 
     private fun onConnectionToMediaSessionHandlerEstablished() {
-        exoPlayerAdapter.initialize(exoPlayerView, this, mediaSessionHandlerAdapter)
+        exoPlayerAdapter.initialize(exoPlayerView, this)
     }
 
     private fun registerButtonListener() {