Merge pull request #34 from janbar/master

adapt to PVR API 5.2.0
kodi-pvr · Apr 23, 2016 · 73df0ac · 73df0ac
2 parents 6ab861f + f6ffca2
commit 73df0ac
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 15 deletions.
diff --git a/pvr.dvbviewer/addon.xml.in b/pvr.dvbviewer/addon.xml.in
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="pvr.dvbviewer"
-  version="2.2.0"
+  version="2.3.0"
   name="DVBViewer Client"
   provider-name="A600, Manuel Mausz">
   <requires>
     <c-pluff version="0.1"/>
-    <import addon="xbmc.pvr" version="5.1.1"/>
+    <import addon="xbmc.pvr" version="5.2.0"/>
   </requires>
   <extension
     point="xbmc.pvrclient"

diff --git a/pvr.dvbviewer/changelog.txt b/pvr.dvbviewer/changelog.txt
@@ -1,3 +1,6 @@
+2.3.0
+[updated] to PVR API v5.2.0
+
 2.2.0
 [updated] to PVR API v5.1.1
 [updated] Require DVB Viewer Recording Service 1.30.1 or later

diff --git a/src/RecordingReader.cpp b/src/RecordingReader.cpp
@@ -94,8 +94,3 @@ int64_t RecordingReader::Length()
   return m_len;
 }
 
-void RecordingReader::Announce(const char *message)
-{
-  if (strcmp(message, "OnPlay") == 0)
-    m_playback = true;
-}
diff --git a/src/RecordingReader.h b/src/RecordingReader.h
@@ -15,7 +15,7 @@ class RecordingReader
   int64_t Seek(long long position, int whence);
   int64_t Position();
   int64_t Length();
-  void Announce(const char *message);
+  void OnPlay() { m_playback = true; }
 
 private:
   std::string m_streamURL;

diff --git a/src/client.cpp b/src/client.cpp
@@ -287,17 +287,26 @@ void ADDON_FreeSettings()
 {
 }
 
-void ADDON_Announce(const char *_UNUSED(flag), const char *sender,
-    const char *message, const void *_UNUSED(data))
-{
-  if (recReader != nullptr && strcmp(sender, "xbmc") == 0)
-    recReader->Announce(message);
-}
-
 /***********************************************************
  * PVR Client AddOn specific public library functions
  ***********************************************************/
 
+void OnSystemSleep()
+{
+}
+
+void OnSystemWake()
+{
+}
+
+void OnPowerSavingActivated()
+{
+}
+
+void OnPowerSavingDeactivated()
+{
+}
+
 const char* GetPVRAPIVersion(void)
 {
   return XBMC_PVR_API_VERSION;