sync with upstream

9 files changed, 56 insertions, 10 deletions

diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_inputstream_dll.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_inputstream_dll.h
index 6ecf566..bb9a2d4 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_inputstream_dll.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_inputstream_dll.h
@@ -139,6 +139,11 @@ extern "C"
    */
   void DemuxSetSpeed(int speed);
 
+  /*!
+   * Sets desired width / height
+   * @param width / hight
+   */
+  void SetVideoResolution(int width, int height);
 
   /*!
    * Totel time in ms
@@ -238,6 +243,7 @@ extern "C"
     pClient->DemuxRead = DemuxRead;
     pClient->DemuxSeekTime = DemuxSeekTime;
     pClient->DemuxSetSpeed = DemuxSetSpeed;
+    pClient->SetVideoResolution = SetVideoResolution;
 
     pClient->GetTotalTime = GetTotalTime;
     pClient->GetTime = GetTime;
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_inputstream_types.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_inputstream_types.h
index 0560708..3a2e2da 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_inputstream_types.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_inputstream_types.h
@@ -69,6 +69,7 @@ extern "C" {
     } m_ListItemProperties[MAX_INFO_COUNT];
 
     const char *m_libFolder;
+    const char *m_profileFolder;
   } INPUTSTREAM;
 
   /*!
@@ -139,6 +140,7 @@ extern "C" {
     DemuxPacket* (__cdecl* DemuxRead)(void);
     bool (__cdecl* DemuxSeekTime)(int, bool, double*);
     void (__cdecl* DemuxSetSpeed)(int);
+    void (__cdecl* SetVideoResolution)(int, int);
 
     // IDisplayTime
     int (__cdecl* GetTotalTime)(void);
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/libXBMC_addon.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/libXBMC_addon.h
index b32ad86..ddeb1db 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/libXBMC_addon.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/libXBMC_addon.h
@@ -179,6 +179,10 @@ namespace ADDON
         dlsym(m_libXBMC_addon, "XBMC_get_setting");
       if (XBMC_get_setting == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
 
+      XBMC_translate_special = (char* (*)(void* HANDLE, void* CB, const char* source))
+        dlsym(m_libXBMC_addon, "XBMC_translate_special");
+      if (XBMC_translate_special == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
+
       XBMC_queue_notification = (void (*)(void* HANDLE, void* CB, const queue_msg_t loglevel, const char *msg))
         dlsym(m_libXBMC_addon, "XBMC_queue_notification");
       if (XBMC_queue_notification == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
@@ -334,6 +338,16 @@ namespace ADDON
     }
 
     /*!
+    * @brief Translates a special protocol folder.
+    * @param source The file / folder to translate.
+    * @return The string translated to resolved path. Must be freed by calling FreeString() when done.
+    */
+    char *TranslateSpecialProtocol(const char *source)
+    {
+      return XBMC_translate_special(m_Handle, m_Callbacks, source);
+    }
+
+    /*!
      * @brief Queue a notification in the GUI.
      * @param type The message type.
      * @param format The format of the message to pass to display in XBMC.
@@ -671,6 +685,7 @@ namespace ADDON
     void (*XBMC_unregister_me)(void *HANDLE, void* CB);
     void (*XBMC_log)(void *HANDLE, void* CB, const addon_log_t loglevel, const char *msg);
     bool (*XBMC_get_setting)(void *HANDLE, void* CB, const char* settingName, void *settingValue);
+    char*(*XBMC_translate_special)(void *HANDLE, void* CB, const char* source);
     void (*XBMC_queue_notification)(void *HANDLE, void* CB, const queue_msg_t type, const char *msg);
     bool (*XBMC_wake_on_lan)(void *HANDLE, void* CB, const char* mac);
     char* (*XBMC_unknown_to_utf8)(void *HANDLE, void* CB, const char* str);
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/libXBMC_pvr.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/libXBMC_pvr.h
index 3e3d479..700f912 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/libXBMC_pvr.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/libXBMC_pvr.h
@@ -35,7 +35,9 @@
 #endif
 
 #define DVD_TIME_BASE 1000000
-#define DVD_NOPTS_VALUE    (-1LL<<52) // should be possible to represent in both double and __int64
+
+//TODO original definition is in DVDClock.h
+#define DVD_NOPTS_VALUE 0xFFF0000000000000
 
 class CHelper_libXBMC_pvr
 {
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_addon_dll.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_addon_dll.h
index ff7194f..e3c8785 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_addon_dll.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_addon_dll.h
@@ -45,7 +45,6 @@ extern "C" {
   unsigned int __declspec(dllexport) ADDON_GetSettings(ADDON_StructSetting ***sSet);
   ADDON_STATUS __declspec(dllexport) ADDON_SetSetting(const char *settingName, const void *settingValue);
   void         __declspec(dllexport) ADDON_FreeSettings();
-  void         __declspec(dllexport) ADDON_Announce(const char *flag, const char *sender, const char *message, const void *data);
 
 #ifdef __cplusplus
 };
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_dll.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_dll.h
index 5cb6075..2cf558a 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_dll.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_dll.h
@@ -648,6 +648,14 @@ extern "C"
   PVR_ERROR SetEPGTimeFrame(int iDays);
 
   /*!
+   * Notify the pvr addon for power management events
+   */
+  void OnSystemSleep();
+  void OnSystemWake();
+  void OnPowerSavingActivated();
+  void OnPowerSavingDeactivated();
+
+  /*!
    * Called by XBMC to assign the function pointers of this add-on to pClient.
    * @param pClient The struct to assign the function pointers to.
    */
@@ -736,6 +744,11 @@ extern "C"
     pClient->IsRealTimeStream               = IsRealTimeStream;
 
     pClient->SetEPGTimeFrame                = SetEPGTimeFrame;
+
+    pClient->OnSystemSleep                  = OnSystemSleep;
+    pClient->OnSystemWake                   = OnSystemWake;
+    pClient->OnPowerSavingActivated         = OnPowerSavingActivated;
+    pClient->OnPowerSavingDeactivated       = OnPowerSavingDeactivated;
   };
 };
 
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_types.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_types.h
index 8d73310..b50483d 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_types.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_types.h
@@ -32,6 +32,7 @@
 #endif
 #include <string.h>
 #include <stdint.h>
+#include <stdio.h>
 
 #include "xbmc_addon_types.h"
 #include "xbmc_epg_types.h"
@@ -77,10 +78,10 @@ struct DemuxPacket;
 #define PVR_STREAM_MAX_STREAMS 20
 
 /* current PVR API version */
-#define XBMC_PVR_API_VERSION "5.1.0"
+#define XBMC_PVR_API_VERSION "5.2.0"
 
 /* min. PVR API version */
-#define XBMC_PVR_MIN_API_VERSION "5.1.0"
+#define XBMC_PVR_MIN_API_VERSION "5.2.0"
 
 #ifdef __cplusplus
 extern "C" {
@@ -228,6 +229,7 @@ extern "C" {
     PVR_CONNECTION_STATE_ACCESS_DENIED      = 4,  /*!< @brief backend server is reachable, but denies client access (e.g. due to wrong credentials) */
     PVR_CONNECTION_STATE_CONNECTED          = 5,  /*!< @brief connection to backend server is established */
     PVR_CONNECTION_STATE_DISCONNECTED       = 6,  /*!< @brief no connection to backend server (e.g. due to network errors or client initiated disconnect)*/
+    PVR_CONNECTION_STATE_CONNECTING         = 7,  /*!< @brief connecting to backend */
   } PVR_CONNECTION_STATE;
 
   /*!
@@ -601,6 +603,10 @@ extern "C" {
     bool         (__cdecl* IsTimeshifting)(void);
     bool         (__cdecl* IsRealTimeStream)(void);
     PVR_ERROR    (__cdecl* SetEPGTimeFrame)(int);
+    void         (__cdecl* OnSystemSleep)(void);
+    void         (__cdecl* OnSystemWake)(void);
+    void         (__cdecl* OnPowerSavingActivated)(void);
+    void         (__cdecl* OnPowerSavingDeactivated)(void);
   } PVRClient;
 
 #ifdef __cplusplus
diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxPacket.h b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxPacket.h
index dbee80a..4f47118 100644
--- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxPacket.h
+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxPacket.h
@@ -36,4 +36,6 @@ typedef struct DemuxPacket
   double pts; // pts in DVD_TIME_BASE
   double dts; // dts in DVD_TIME_BASE
   double duration; // duration in DVD_TIME_BASE if available
+
+  int dispTime;
 } DemuxPacket;
diff --git a/xbmc/filesystem/IFileTypes.h b/xbmc/filesystem/IFileTypes.h
index d2d77eb..4c6dd98 100644
--- a/xbmc/filesystem/IFileTypes.h
+++ b/xbmc/filesystem/IFileTypes.h
@@ -60,15 +60,16 @@ struct SCacheStatus
   uint64_t forward;  /**< number of bytes cached forward of current position */
   unsigned maxrate;  /**< maximum number of bytes per second cache is allowed to fill */
   unsigned currate;  /**< average read rate from source file since last position change */
-  bool     full;     /**< is the cache full */
+  float    level;    /**< cache level (0.0 - 1.0) */
 };
 
 typedef enum {
-  IOCTRL_NATIVE        = 1, /**< SNativeIoControl structure, containing what should be passed to native ioctrl */
-  IOCTRL_SEEK_POSSIBLE = 2, /**< return 0 if known not to work, 1 if it should work */
-  IOCTRL_CACHE_STATUS  = 3, /**< SCacheStatus structure */
-  IOCTRL_CACHE_SETRATE = 4, /**< unsigned int with speed limit for caching in bytes per second */
-  IOCTRL_SET_CACHE    = 8, /** <CFileCache */
+  IOCTRL_NATIVE        = 1,  /**< SNativeIoControl structure, containing what should be passed to native ioctrl */
+  IOCTRL_SEEK_POSSIBLE = 2,  /**< return 0 if known not to work, 1 if it should work */
+  IOCTRL_CACHE_STATUS  = 3,  /**< SCacheStatus structure */
+  IOCTRL_CACHE_SETRATE = 4,  /**< unsigned int with speed limit for caching in bytes per second */
+  IOCTRL_SET_CACHE     = 8,  /**< CFileCache */
+  IOCTRL_SET_RETRY     = 16, /**< Enable/disable retry within the protocol handler (if supported) */
 } EIoControl;
 
 enum CURLOPTIONTYPE