Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ import com.futo.platformplayer.views.casting.CastView.Companion
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.Job
import kotlinx.coroutines.isActive
import kotlinx.coroutines.cancel
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
Expand Down Expand Up @@ -234,7 +235,19 @@ class StateCasting {
fun startUpdateTimeJob(
onTimeJobTimeChanged_s: Event1<Long>,
setTime: (Long) -> Unit
): Job? = null
): Job? {
return CoroutineScope(Dispatchers.Main).launch {
while (isActive) {
val t_s = activeDevice?.expectedCurrentTime
if (t_s != null) {
val t_ms = (t_s * 1000.0).toLong()
setTime(t_ms)
onTimeJobTimeChanged_s.emit(t_s.toLong())
}
kotlinx.coroutines.delay(1000)
}
}
}

fun deviceFromInfo(deviceInfo: CastingDeviceInfo): CastingDevice? {
try {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -745,20 +745,24 @@ class VideoDetailView : ConstraintLayout {

StateCasting.instance.onActiveDeviceTimeChanged.subscribe(this) {
if (_isCasting) {
setLastPositionMilliseconds((it * 1000.0).toLong(), true);
val posMs = (it * 1000.0).toLong();
setLastPositionMilliseconds(posMs, true);
_cast.setTime(lastPositionMilliseconds);
_timeBar.setPosition(it.toLong());
_timeBar.setBufferedPosition(0);
_timeBar.setDuration(video?.duration ?: 0);
updatePlaybackTracking(posMs);
}
};

_cast.onTimeJobTimeChanged_s.subscribe {
if (_isCasting) {
setLastPositionMilliseconds((it * 1000.0).toLong(), true);
val posMs = (it * 1000.0).toLong();
setLastPositionMilliseconds(posMs, true);
_timeBar.setPosition(it);
_timeBar.setBufferedPosition(0);
_timeBar.setDuration(video?.duration ?: 0);
updatePlaybackTracking(posMs);
}
}
}
Expand Down Expand Up @@ -1583,7 +1587,7 @@ class VideoDetailView : ConstraintLayout {
)
}

if (me.video == video)
if (me.video == video || (me.video?.url == video.url && !video.url.isNullOrBlank()))
me._playbackTracker = tracker;
} else if (me.video == video)
me._playbackTracker = null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ class CastView : ConstraintLayout {
stopTimeJob()

if(isPlaying) {
StateCasting.instance.startUpdateTimeJob(
_updateTimeJob = StateCasting.instance.startUpdateTimeJob(
onTimeJobTimeChanged_s
) { setTime(it) }

Expand Down