ETM-Schurig/etm-powersync-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix kodi playback states with new kodi version

Browse Source
This commit is contained in:
Michael Zanetti 2018-07-13 23:17:39 +02:00
parent bea46cb954
commit 2443cf2701
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kodi/devicepluginkodi.cpp
View File

@ -313,9 +313,9 @@ void DevicePluginKodi::onPlaybackStatusChanged(const QString &playbackStatus)
Device *device = m_kodis.value(kodi); Device *device = m_kodis.value(kodi);
device->setStateValue(kodiPlaybackStatusStateTypeId, playbackStatus); device->setStateValue(kodiPlaybackStatusStateTypeId, playbackStatus);
// legacy events // legacy events
if (playbackStatus == "PLAYING") { if (playbackStatus == "Playing") {
emit emitEvent(Event(kodiOnPlayerPlayEventTypeId, device->id())); emit emitEvent(Event(kodiOnPlayerPlayEventTypeId, device->id()));
} else if (playbackStatus == "PAUSED") { } else if (playbackStatus == "Paused") {
emit emitEvent(Event(kodiOnPlayerPauseEventTypeId, device->id())); emit emitEvent(Event(kodiOnPlayerPauseEventTypeId, device->id()));
} else { } else {
emit emitEvent(Event(kodiOnPlayerStopEventTypeId, device->id())); emit emitEvent(Event(kodiOnPlayerStopEventTypeId, device->id()));

6
kodi/kodi.cpp
View File

@ -205,7 +205,7 @@ void Kodi::activePlayersChanged(const QVariantList &data)
qCDebug(dcKodi()) << "active players changed" << data.count(); qCDebug(dcKodi()) << "active players changed" << data.count();
m_activePlayerCount = data.count(); m_activePlayerCount = data.count();
if (m_activePlayerCount == 0) { if (m_activePlayerCount == 0) {
emit playbackStatusChanged("STOPPED"); emit playbackStatusChanged("Stopped");
return; return;
} }
int activePlayer = data.first().toMap().value("playerid").toInt(); int activePlayer = data.first().toMap().value("playerid").toInt();
@ -222,9 +222,9 @@ void Kodi::playerPropertiesReceived(const QVariantMap &properties)
qCDebug(dcKodi()) << "player props received" << properties; qCDebug(dcKodi()) << "player props received" << properties;
if (m_activePlayerCount > 0) { if (m_activePlayerCount > 0) {
if (properties.value("speed").toDouble() > 0) { if (properties.value("speed").toDouble() > 0) {
emit playbackStatusChanged("PLAYING"); emit playbackStatusChanged("Playing");
} else { } else {
emit playbackStatusChanged("PAUSED"); emit playbackStatusChanged("Paused");
} }
} }
} }

8
kodi/kodijsonhandler.cpp
View File

@ -56,12 +56,12 @@ void KodiJsonHandler::processNotification(const QString &method, const QVariantM
if (method == "Application.OnVolumeChanged") { if (method == "Application.OnVolumeChanged") {
QVariantMap data = params.value("data").toMap(); QVariantMap data = params.value("data").toMap();
emit volumeChanged(data.value("volume").toInt(), data.value("muted").toBool()); emit volumeChanged(data.value("volume").toInt(), data.value("muted").toBool());
} else if (method == "Player.OnPlay") { } else if (method == "Player.OnPlay" || method == "Player.OnResume") {
emit playbackStatusChanged("PLAYING"); emit playbackStatusChanged("Playing");
} else if (method == "Player.OnPause") { } else if (method == "Player.OnPause") {
emit playbackStatusChanged("PAUSED"); emit playbackStatusChanged("Paused");
} else if (method == "Player.OnStop") { } else if (method == "Player.OnStop") {
emit playbackStatusChanged("STOPPED"); emit playbackStatusChanged("Stopped");
} }
} }