From accd8f4ac4b2e27dc165b0fcc544235a5b56e2dd Mon Sep 17 00:00:00 2001 From: tomkat83 Date: Fri, 15 Jan 2016 10:10:44 +0100 Subject: [PATCH] Merge conflict playbackutils --- resources/lib/playbackutils.py | 2 +- service.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/resources/lib/playbackutils.py b/resources/lib/playbackutils.py index edc6f41f..ad738098 100644 --- a/resources/lib/playbackutils.py +++ b/resources/lib/playbackutils.py @@ -90,7 +90,7 @@ class PlaybackUtils(): ############### RESUME POINT ################ userdata = API.getUserData() - seektime = API.adjustResume(userdata['Resume']) + seektime = userdata['Resume'] # We need to ensure we add the intro and additional parts only once. # Otherwise we get a loop. diff --git a/service.py b/service.py index d74eeffc..ad45aa06 100644 --- a/service.py +++ b/service.py @@ -103,7 +103,7 @@ class Service(): # Initialize important threads user = userclient.UserClient() - ws = wsc.WebSocket_Client() + # ws = wsc.WebSocket_Client() library = librarysync.LibrarySync() kplayer = player.Player() # Sync and progress report @@ -184,9 +184,9 @@ class Service(): self.kodimonitor_running = kodimonitor.KodiMonitor() # Start the Websocket Client - if not self.websocket_running: - self.websocket_running = True - ws.start() + # if not self.websocket_running: + # self.websocket_running = True + # ws.start() # Start the syncing thread if not self.library_running: self.library_running = True