Merge branch 'develop' into feature/singleApp

This commit is contained in:
Felix 2020-06-11 22:09:39 +02:00
commit ddb2ef28de
2 changed files with 4 additions and 4 deletions

View file

@ -11,8 +11,8 @@ import de.nicidienase.chaosflix.touch.browse.streaming.StreamingItem
import kotlinx.coroutines.CoroutineScope
abstract class CastService(
private val playbackProgressDao: PlaybackProgressDao,
private val scope: CoroutineScope
val playbackProgressDao: PlaybackProgressDao,
val scope: CoroutineScope
) {
abstract val connected: Boolean

View file

@ -25,8 +25,8 @@ import pl.droidsonroids.casty.Casty
import pl.droidsonroids.casty.MediaData
class CastServiceImpl(
private val playbackProgressDao: PlaybackProgressDao,
private val scope: CoroutineScope
playbackProgressDao: PlaybackProgressDao,
scope: CoroutineScope
) : LifecycleObserver, CastService(playbackProgressDao, scope) {
private var currentEvent: Event? = null