Troplo/PlexKodiConnect
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix merge conflicts

Browse source
This commit is contained in:
tomkat83 2016-02-04 13:18:06 +01:00
parent 5aa88bdca8
commit 332885a5a4
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
resources/lib/playbackutils.py
View file

@ -304,7 +304,7 @@ class PlaybackUtils():
# - artist : list (['U2']) # - artist : list (['U2'])
listItem.setProperty('IsPlayable', 'true') listItem.setProperty('IsPlayable', 'true')
listItem.setProperty('IsFolder', 'false') listItem.setProperty('IsFolder', 'false')
listItem.setProperty('StartOffset', -1) listItem.setProperty('StartOffset', '-1')
listItem.setLabel(metadata['title']) listItem.setLabel(metadata['title'])
listItem.setInfo('video', infoLabels=metadata) listItem.setInfo('video', infoLabels=metadata)
""" """

3
resources/settings.xml
View file

@ -29,6 +29,7 @@
<setting id="plexLogin" label="plex.tv username" type="text" default="" visible="eq(-1,true)" /> <setting id="plexLogin" label="plex.tv username" type="text" default="" visible="eq(-1,true)" />
<setting id="plexhome" label="Plex home in use" type="bool" default="true" visible="false" /> <setting id="plexhome" label="Plex home in use" type="bool" default="true" visible="false" />
<setting id="plexToken" label="plexToken" type="text" default="" visible="false" /> <setting id="plexToken" label="plexToken" type="text" default="" visible="false" />
</category>
<category label="30506"><!-- Sync Options --> <category label="30506"><!-- Sync Options -->
<setting id="serverSync" type="bool" label="30514" default="true" /> <setting id="serverSync" type="bool" label="30514" default="true" />
<setting id="dbSyncIndicator" label="30507" type="bool" default="false" /> <setting id="dbSyncIndicator" label="30507" type="bool" default="false" />
@ -46,8 +47,6 @@
<setting id="enableUpdateSongRating" type="bool" label="30526" default="false" /> <setting id="enableUpdateSongRating" type="bool" label="30526" default="false" />
</category> </category>
</category>
<category label="30516"><!-- Playback --> <category label="30516"><!-- Playback -->
<setting label="30517" type="action" action="RunPlugin(plugin://plugin.video.plexkodiconnect?mode=passwords)" option="close" /> <setting label="30517" type="action" action="RunPlugin(plugin://plugin.video.plexkodiconnect?mode=passwords)" option="close" />
<setting type="sep" /> <setting type="sep" />