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

Merge conflict playbackutils

Browse source
This commit is contained in:
tomkat83 2016-01-15 10:10:44 +01:00
parent c1c19cbc68
commit accd8f4ac4
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
resources/lib/playbackutils.py
View file

@ -90,7 +90,7 @@ class PlaybackUtils():
############### RESUME POINT ################ ############### RESUME POINT ################
userdata = API.getUserData() userdata = API.getUserData()
seektime = API.adjustResume(userdata['Resume']) seektime = userdata['Resume']
# We need to ensure we add the intro and additional parts only once. # We need to ensure we add the intro and additional parts only once.
# Otherwise we get a loop. # Otherwise we get a loop.

8
service.py
View file

@ -103,7 +103,7 @@ class Service():
# Initialize important threads # Initialize important threads
user = userclient.UserClient() user = userclient.UserClient()
ws = wsc.WebSocket_Client() # ws = wsc.WebSocket_Client()
library = librarysync.LibrarySync() library = librarysync.LibrarySync()
kplayer = player.Player() kplayer = player.Player()
# Sync and progress report # Sync and progress report
@ -184,9 +184,9 @@ class Service():
self.kodimonitor_running = kodimonitor.KodiMonitor() self.kodimonitor_running = kodimonitor.KodiMonitor()
# Start the Websocket Client # Start the Websocket Client
if not self.websocket_running: # if not self.websocket_running:
self.websocket_running = True # self.websocket_running = True
ws.start() # ws.start()
# Start the syncing thread # Start the syncing thread
if not self.library_running: if not self.library_running:
self.library_running = True self.library_running = True