Merge pull request #18 from iLLiac4/master

Kodi v17 api changes

Author: brindosch

resources/lib/state.py

@@ -61,7 +61,7 @@ def execute(self):
 
 			# continue in the error state
 			return ErrorState(self.__settings)
-
+			
 class ConnectedState:
 	'''
 	State class when connected to Hyperion and grabbing video
@@ -76,6 +76,9 @@ def __init__(self, settings):
 		self.__settings = settings
 		self.__hyperion = None
 		self.__capture = None
+		self.__captureState = None
+		self.__data = None
+		self.__useLegacyApi = True
 
 		# try to connect to hyperion
 		self.__hyperion = Hyperion(self.__settings.address, self.__settings.port)
@@ -89,6 +92,9 @@ def __del__(self):
 		'''
 		del self.__hyperion
 		del self.__capture
+		del self.__captureState
+		del self.__data
+		del self.__useLegacyApi
 
 	def execute(self):
 		'''Execute the state
@@ -99,29 +105,47 @@ def execute(self):
 			# return to the disconnected state
 			return DisconnectedState(self.__settings)
 
+		# check the xbmc API Version
+		try:
+			self.__capture.getCaptureState()
+		except:
+			self.__useLegacyApi = False
+
 		# capture an image
-		self.__capture.waitForCaptureStateChangeEvent(200)
-		captureState = self.__capture.getCaptureState()
-		if captureState == xbmc.CAPTURE_STATE_DONE:
-			# retrieve image data and reformat into rgb format
-			data = self.__capture.getImage()
+		startReadOut = False
+		if self.__useLegacyApi:
+			self.__capture.waitForCaptureStateChangeEvent(200)
+			self.__captureState = self.__capture.getCaptureState()
+			if self.__captureState == xbmc.CAPTURE_STATE_DONE:
+				startReadOut = True
+		else:
+			self.__data = self.__capture.getImage()
+			if len(self.__data) > 0:
+				startReadOut = True
+
+		if startReadOut:
+			if self.__useLegacyApi:
+				self.__data = self.__capture.getImage()
+				
+			# retrieve image data and reformat into rgb format			
 			if self.__capture.getImageFormat() == 'ARGB':
-				del data[0::4]
+				del self.__data[0::4]
 			elif self.__capture.getImageFormat() == 'BGRA':
-				del data[3::4]
-				data[0::3], data[2::3] = data[2::3], data[0::3]
-
+				del self.__data[3::4]
+				self.__data[0::3], self.__data[2::3] = self.__data[2::3], self.__data[0::3]
+				
 			try:
 				#send image to hyperion
-				self.__hyperion.sendImage(self.__capture.getWidth(), self.__capture.getHeight(), str(data), self.__settings.priority, 500)
+				self.__hyperion.sendImage(self.__capture.getWidth(), self.__capture.getHeight(), str(self.__data), self.__settings.priority, 500)
 			except Exception, e:
 				# unable to send image. notify and go to the error state
 				notify(xbmcaddon.Addon().getLocalizedString(32101))
 				return ErrorState(self.__settings)
-			
-		if captureState != xbmc.CAPTURE_STATE_WORKING:		
-			#the current capture is processed or it has failed, we request a new one
-			self.__capture.capture(64, 64)
+				
+		if self.__useLegacyApi:
+			if self.__captureState != xbmc.CAPTURE_STATE_WORKING:
+				#the current capture is processed or it has failed, we request a new one
+				self.__capture.capture(64, 64)
 
 		#limit the maximum number of frames sent to hyperion		
 		xbmc.sleep(100)
@@ -132,7 +156,7 @@ class ErrorState:
 	'''
 	State class which is activated upon an error
 	'''
-
+	
 	def __init__(self, settings):
 		'''Constructor
 			- settings: Settings structure