riff
/
riff_app
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

disabled latency compensator in RadioService

remotes/origin/devel
yattoz 2020-01-17 17:47:07 +01:00
parent 06b4bfbc93
commit 669e1cdc70
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/fr/forum_thalie/tsumugi/RadioService.kt
View File

@ -140,7 +140,7 @@ class RadioService : MediaBrowserServiceCompat() {
PlayerStore.instance.isStreamDown = true PlayerStore.instance.isStreamDown = true
} }
else -> { else -> {
PlayerStore.instance.fetchApi(numberOfSongs >= 2) PlayerStore.instance.fetchApi(/* numberOfSongs >= 2 */)
} }
} }
} }

13
app/src/main/java/fr/forum_thalie/tsumugi/playerstore/PlayerStore.kt
View File

@ -7,6 +7,7 @@ import android.support.v4.media.session.PlaybackStateCompat
import android.util.Log import android.util.Log
import androidx.lifecycle.MutableLiveData import androidx.lifecycle.MutableLiveData
import fr.forum_thalie.tsumugi.* import fr.forum_thalie.tsumugi.*
import fr.forum_thalie.tsumugi.planning.Planning
import org.json.JSONObject import org.json.JSONObject
import java.net.URL import java.net.URL
import java.text.ParseException import java.text.ParseException
@ -58,9 +59,10 @@ class PlayerStore {
private fun getTimestamp(s: String) : Long private fun getTimestamp(s: String) : Long
{ {
val dateFormat = SimpleDateFormat("yyyy-MM-dd hh:mm:ss", Locale.getDefault()) val dateFormat = SimpleDateFormat("yyyy-MM-dd hh:mm:ss z", Locale.getDefault())
try { try {
val t: Date? = dateFormat.parse(s) val t: Date? = dateFormat.parse("$s ${Planning.instance.timeZone.id}")
Log.d(tag, "date: $s -> $t")
return t!!.time return t!!.time
} catch (e: ParseException) { } catch (e: ParseException) {
e.printStackTrace() e.printStackTrace()
@ -90,16 +92,17 @@ class PlayerStore {
currentSong.stopTime.value = ends currentSong.stopTime.value = ends
val apiTime = getTimestamp(res.getJSONObject("station").getString("schedulerTime"))
// I noticed that the server has a big (3 to 9 seconds !!) offset for current time. // I noticed that the server has a big (3 to 9 seconds !!) offset for current time.
// we can measure it when the player is playing, to compensate it and have our progress bar perfectly timed // we can measure it when the player is playing, to compensate it and have our progress bar perfectly timed
// latencyCompensator is set to null when beginPlaying() (we can't measure it at the moment we start playing, since we're in the middle of a song), // latencyCompensator is set to null when beginPlaying() (we can't measure it at the moment we start playing, since we're in the middle of a song),
// at this moment, we set it to 0. Then, next time the updateApi is called when we're playing, we measure the latency and we set out latencyComparator. // at this moment, we set it to 0. Then, next time the updateApi is called when we're playing, we measure the latency and we set out latencyComparator.
if(isCompensatingLatency) if(isCompensatingLatency)
{ {
latencyCompensator = getTimestamp(res.getJSONObject("station").getString("schedulerTime")) - (currentSong.startTime.value ?: getTimestamp(res.getJSONObject("station").getString("schedulerTime"))) latencyCompensator = apiTime - (currentSong.startTime.value!!)
//[REMOVE LOG CALLS]Log.d((tag, "latency compensator set to ${(latencyCompensator).toFloat()/1000} s") //[REMOVE LOG CALLS]Log.d(tag, "latency compensator set to ${(latencyCompensator).toFloat() / 1000} s")
} }
currentTime.value = getTimestamp(res.getJSONObject("station").getString("schedulerTime")) - (latencyCompensator) currentTime.value = apiTime - (latencyCompensator)
/* /*
val listeners = resMain.getInt("listeners") val listeners = resMain.getInt("listeners")