chrome: fix getting default audio device

Setting "audiooutput.audiodevice" was not found any more because
settings format has be changed to version 2.

Read the setting value via Kodi json RPC.
This commit is contained in:
mglae 2020-11-16 23:49:31 +01:00
parent 39978d99da
commit d0a4824728
3 changed files with 20 additions and 16 deletions

View File

@ -1,3 +1,6 @@
103
- fix getting default audio device
102 102
- add dark mode at options - add dark mode at options
- support for latest Chrome - support for latest Chrome

View File

@ -3,7 +3,7 @@
PKG_NAME="chrome" PKG_NAME="chrome"
PKG_VERSION="1.0" PKG_VERSION="1.0"
PKG_REV="102" PKG_REV="103"
PKG_ARCH="x86_64" PKG_ARCH="x86_64"
PKG_LICENSE="Custom" PKG_LICENSE="Custom"
PKG_SITE="http://www.google.com/chrome" PKG_SITE="http://www.google.com/chrome"

View File

@ -7,7 +7,7 @@ import sys
import time import time
import xbmcaddon import xbmcaddon
import subprocess import subprocess
from xml.dom.minidom import parse import json
sys.path.append('/usr/share/kodi/addons/@DISTRO_PKG_SETTINGS_ID@') sys.path.append('/usr/share/kodi/addons/@DISTRO_PKG_SETTINGS_ID@')
@ -59,21 +59,22 @@ def isRuning(pname):
return False return False
def getAudioDevice(): def getAudioDevice():
try: dev = json.loads(xbmc.executeJSONRPC(json.dumps({
dom = parse("/storage/.kodi/userdata/guisettings.xml") "jsonrpc": "2.0",
audiooutput=dom.getElementsByTagName('audiooutput') "method": "Settings.GetSettingValue",
for node in audiooutput: "params": {
dev = node.getElementsByTagName('audiodevice')[0].childNodes[0].nodeValue "setting": "audiooutput.audiodevice",
if dev.startswith("ALSA:"): },
dev = dev.split("ALSA:")[1] "id": 1,
if dev == "@": })))['result']['value']
return None if dev.startswith("ALSA:"):
if dev.startswith("@:"): dev = dev.split("ALSA:")[1]
dev = dev.split("@:")[1] if dev == "@":
else:
# not ALSA
return None return None
except: if dev.startswith("@:"):
dev = dev.split("@:")[1]
else:
# not ALSA
return None return None
if dev.startswith("CARD="): if dev.startswith("CARD="):
dev = "plughw:" + dev dev = "plughw:" + dev