diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/addons/pvr.argustv/addon/addon.xml.in xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.argustv/addon/addon.xml.in --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/addons/pvr.argustv/addon/addon.xml.in 2013-03-08 12:41:18.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.argustv/addon/addon.xml.in 2013-03-12 10:51:22.000000000 +0000 @@ -1,12 +1,12 @@ - + - + bSupportsEPG = true; @@ -329,7 +313,6 @@ PVR_ERROR SetRecordingPlayCount(const PVR_RECORDING &recording, int count) { return PVR_ERROR_NOT_IMPLEMENTED; } PVR_ERROR SetRecordingLastPlayedPosition(const PVR_RECORDING &recording, int lastplayedposition) { return PVR_ERROR_NOT_IMPLEMENTED; } int GetRecordingLastPlayedPosition(const PVR_RECORDING &recording) { return -1; } -PVR_ERROR GetRecordingEdl(const PVR_RECORDING&, PVR_EDL_ENTRY[], int*) { return PVR_ERROR_NOT_IMPLEMENTED; }; int GetTimersAmount(void) { return -1; } PVR_ERROR GetTimers(ADDON_HANDLE handle) { return PVR_ERROR_NOT_IMPLEMENTED; } PVR_ERROR AddTimer(const PVR_TIMER &timer) { return PVR_ERROR_NOT_IMPLEMENTED; } diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/addons/pvr.demo/src/client.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.demo/src/client.h --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/addons/pvr.demo/src/client.h 2013-03-08 12:41:18.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.demo/src/client.h 2013-03-12 10:51:19.000000000 +0000 @@ -22,7 +22,6 @@ #include "libXBMC_addon.h" #include "libXBMC_pvr.h" -#include "libXBMC_gui.h" extern bool m_bCreated; extern std::string g_strUserPath; diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/addons/pvr.dvbviewer/addon/addon.xml.in xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.dvbviewer/addon/addon.xml.in --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/addons/pvr.dvbviewer/addon/addon.xml.in 2013-03-08 12:41:18.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.dvbviewer/addon/addon.xml.in 2013-03-12 10:51:19.000000000 +0000 @@ -1,12 +1,12 @@ - + bSupportsChannelSettings = false; @@ -517,7 +501,6 @@ PVR_ERROR SetRecordingPlayCount(const PVR_RECORDING &recording, int count) { return PVR_ERROR_NOT_IMPLEMENTED; } PVR_ERROR SetRecordingLastPlayedPosition(const PVR_RECORDING &recording, int lastplayedposition) { return PVR_ERROR_NOT_IMPLEMENTED; } int GetRecordingLastPlayedPosition(const PVR_RECORDING &recording) { return -1; } -PVR_ERROR GetRecordingEdl(const PVR_RECORDING&, PVR_EDL_ENTRY[], int*) { return PVR_ERROR_NOT_IMPLEMENTED; }; unsigned int GetChannelSwitchDelay(void) { return 0; } void PauseStream(bool bPaused) {} bool CanPauseStream(void) { return false; } diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/addons/pvr.dvbviewer/src/client.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.dvbviewer/src/client.h --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/addons/pvr.dvbviewer/src/client.h 2013-03-08 12:41:18.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.dvbviewer/src/client.h 2013-03-12 10:51:19.000000000 +0000 @@ -22,7 +22,6 @@ #include "libXBMC_addon.h" #include "libXBMC_pvr.h" -#include "libXBMC_gui.h" #define DEFAULT_HOST "127.0.0.1" #define DEFAULT_CONNECT_TIMEOUT 30 diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/addons/pvr.hts/addon/addon.xml.in xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.hts/addon/addon.xml.in --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/addons/pvr.hts/addon/addon.xml.in 2013-03-08 12:41:18.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.hts/addon/addon.xml.in 2013-03-12 10:51:22.000000000 +0000 @@ -1,12 +1,12 @@ - + bSupportsEPG = true; @@ -726,7 +710,6 @@ PVR_ERROR SetRecordingPlayCount(const PVR_RECORDING &recording, int count) { return PVR_ERROR_NOT_IMPLEMENTED; } PVR_ERROR SetRecordingLastPlayedPosition(const PVR_RECORDING &recording, int lastplayedposition) { return PVR_ERROR_NOT_IMPLEMENTED; } int GetRecordingLastPlayedPosition(const PVR_RECORDING &recording) { return -1; } -PVR_ERROR GetRecordingEdl(const PVR_RECORDING&, PVR_EDL_ENTRY[], int*) { return PVR_ERROR_NOT_IMPLEMENTED; }; unsigned int GetChannelSwitchDelay(void) { return 0; } void PauseStream(bool bPaused) {} diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/addons/pvr.mediaportal.tvserver/addon/addon.xml.in xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mediaportal.tvserver/addon/addon.xml.in --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/addons/pvr.mediaportal.tvserver/addon/addon.xml.in 2013-03-08 12:41:18.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mediaportal.tvserver/addon/addon.xml.in 2013-03-12 10:51:22.000000000 +0000 @@ -1,12 +1,12 @@ - + - + Log(LOG_INFO, "Received announcement: %s, %s, %s", flag, sender, message); - - if (g_client == NULL) - return; - - if (strcmp("xbmc", sender) == 0) - { - if (strcmp("System", flag) == 0) - { - if (strcmp("OnSleep", message) == 0) - g_client->OnSleep(); - else if (strcmp("OnWake", message) == 0) - g_client->OnWake(); - } - } -} - ADDON_STATUS ADDON_GetStatus() { return m_CurStatus; @@ -461,18 +441,6 @@ return strMinApiVersion; } -const char* GetGUIAPIVersion(void) -{ - static const char *strGuiApiVersion = XBMC_GUI_API_VERSION; - return strGuiApiVersion; -} - -const char* GetMininumGUIAPIVersion(void) -{ - static const char *strMinGuiApiVersion = XBMC_GUI_MIN_API_VERSION; - return strMinGuiApiVersion; -} - PVR_ERROR GetAddonCapabilities(PVR_ADDON_CAPABILITIES *pCapabilities) { if (g_client != NULL) @@ -492,7 +460,6 @@ pCapabilities->bSupportsRecordings = true; pCapabilities->bSupportsRecordingPlayCount = true; pCapabilities->bSupportsLastPlayedPosition = true; - pCapabilities->bSupportsRecordingEdl = true; return PVR_ERROR_NO_ERROR; } else @@ -686,14 +653,6 @@ return g_client->GetRecordingLastPlayedPosition(recording); } -PVR_ERROR GetRecordingEdl(const PVR_RECORDING &recording, PVR_EDL_ENTRY entries[], int *size) -{ - if (g_client == NULL) - return PVR_ERROR_SERVER_ERROR; - - return g_client->GetRecordingEdl(recording, entries, size); -} - /*******************************************/ /** PVR Timer Functions **/ diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/addons/pvr.mythtv.cmyth/src/cppmyth/MythConnection.cpp xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/src/cppmyth/MythConnection.cpp --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/addons/pvr.mythtv.cmyth/src/cppmyth/MythConnection.cpp 2013-03-08 12:41:18.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/src/cppmyth/MythConnection.cpp 2013-03-12 10:51:22.000000000 +0000 @@ -359,41 +359,3 @@ CMYTH_CONN_CALL(bookmark, bookmark < 0, cmyth_get_bookmark(*m_conn_t, *recording.m_proginfo_t)); return bookmark; } - -Edl MythConnection::GetCommbreakList(MythProgramInfo &recording) -{ - Edl retval; - cmyth_commbreaklist_t list = NULL; - CMYTH_CONN_CALL(list, list == NULL, cmyth_get_commbreaklist(*m_conn_t, *recording.m_proginfo_t)); - if (!list) - return retval; - - retval.reserve(list->commbreak_count); - for (int i = 0; i < list->commbreak_count; ++i) - { - cmyth_commbreak commbreak = *list->commbreak_list[i]; - retval.push_back(commbreak); - } - - ref_release(list); - return retval; -} - -Edl MythConnection::GetCutList(MythProgramInfo &recording) -{ - Edl retval; - cmyth_commbreaklist_t list = NULL; - CMYTH_CONN_CALL(list, list == NULL, cmyth_get_cutlist(*m_conn_t, *recording.m_proginfo_t)); - if (!list) - return retval; - - retval.reserve(list->commbreak_count); - for (int i = 0; i < list->commbreak_count; ++i) - { - cmyth_commbreak commbreak = *list->commbreak_list[i]; - retval.push_back(commbreak); - } - - ref_release(list); - return retval; -} diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/addons/pvr.mythtv.cmyth/src/cppmyth/MythConnection.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/src/cppmyth/MythConnection.h --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/addons/pvr.mythtv.cmyth/src/cppmyth/MythConnection.h 2013-03-08 12:41:18.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/src/cppmyth/MythConnection.h 2013-03-12 10:51:22.000000000 +0000 @@ -41,9 +41,6 @@ typedef std::map ProgramInfoMap; -typedef cmyth_commbreak MythEdlEntry; -typedef std::vector Edl; - class MythConnection { public: @@ -92,10 +89,6 @@ long long GetBookmark(MythProgramInfo &recording); bool SetBookmark(MythProgramInfo &recording, long long bookmark); - // Edl - Edl GetCutList(MythProgramInfo &recording); - Edl GetCommbreakList(MythProgramInfo &recording); - private: boost::shared_ptr > m_conn_t; CStdString m_server; diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/addons/pvr.mythtv.cmyth/src/cppmyth/MythEventHandler.cpp xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/src/cppmyth/MythEventHandler.cpp --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/addons/pvr.mythtv.cmyth/src/cppmyth/MythEventHandler.cpp 2013-03-08 12:41:18.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/src/cppmyth/MythEventHandler.cpp 2013-03-12 10:51:22.000000000 +0000 @@ -508,29 +508,6 @@ m_imp->m_observer = observer; } -void MythEventHandler::Suspend() -{ - if (m_imp->IsRunning()) - { - m_imp->StopThread(); - // We must close the connection to be able to restart properly. - // On resume the thread will retry to connect by RetryConnect(). - // So all recordings will be reloaded after restoring the connection. - m_imp->m_hang = true; - ref_release(*(m_imp->m_conn_t)); - *(m_imp->m_conn_t) = NULL; - } -} - -void MythEventHandler::Resume() -{ - if (m_imp->IsStopped()) - { - m_imp->Clear(); - m_imp->CreateThread(); - } -} - void MythEventHandler::PreventLiveChainUpdate() { m_imp->Lock(); diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/addons/pvr.mythtv.cmyth/src/cppmyth/MythEventHandler.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/src/cppmyth/MythEventHandler.h --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/addons/pvr.mythtv.cmyth/src/cppmyth/MythEventHandler.h 2013-03-08 12:41:18.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/src/cppmyth/MythEventHandler.h 2013-03-12 10:51:22.000000000 +0000 @@ -51,9 +51,6 @@ MythEventHandler(const CStdString &server, unsigned short port); void RegisterObserver(MythEventObserver *observer); - void Suspend(); - void Resume(); - void PreventLiveChainUpdate(); void AllowLiveChainUpdate(); diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/addons/pvr.mythtv.cmyth/src/pvrclient-mythtv.cpp xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/src/pvrclient-mythtv.cpp --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/addons/pvr.mythtv.cmyth/src/pvrclient-mythtv.cpp 2013-03-08 12:41:18.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/src/pvrclient-mythtv.cpp 2013-03-12 10:51:22.000000000 +0000 @@ -252,22 +252,6 @@ return m_con.GetDriveSpace(*iTotal, *iUsed); } -void PVRClientMythTV::OnSleep() -{ - if (m_pEventHandler) - m_pEventHandler->Suspend(); - if (m_fileOps) - m_fileOps->Suspend(); -} - -void PVRClientMythTV::OnWake() -{ - if (m_pEventHandler) - m_pEventHandler->Resume(); - if (m_fileOps) - m_fileOps->Resume(); -} - PVR_ERROR PVRClientMythTV::GetEPGForChannel(ADDON_HANDLE handle, const PVR_CHANNEL &channel, time_t iStart, time_t iEnd) { if (g_bExtraDebug) @@ -524,7 +508,6 @@ tag.recordingTime = it->second.StartTime(); tag.iDuration = it->second.Duration(); tag.iPlayCount = it->second.IsWatched() ? 1 : 0; - tag.iLastPlayedPosition = GetRecordingLastPlayedPosition(it->second); CStdString id = it->second.UID(); CStdString title = it->second.Title(); @@ -825,15 +808,22 @@ return PVR_ERROR_FAILED; } -int PVRClientMythTV::GetRecordingLastPlayedPosition(MythProgramInfo &programInfo) +int PVRClientMythTV::GetRecordingLastPlayedPosition(const PVR_RECORDING &recording) { // MythTV provides it's bookmarks as frame offsets whereas XBMC expects a time offset. // The bookmark in seconds is calculated by: bookmark = frameOffset / frameRate. int bookmark = 0; - if (programInfo.HasBookmark()) + if (g_bExtraDebug) + { + XBMC->Log(LOG_DEBUG, "%s - Reading Bookmark for: %s", __FUNCTION__, recording.strTitle); + } + + CLockObject lock(m_recordingsLock); + ProgramInfoMap::iterator it = m_recordings.find(recording.strRecordingId); + if (it != m_recordings.end() && it->second.HasBookmark()) { - long long frameOffset = m_con.GetBookmark(programInfo); // returns 0 if no bookmark was found + long long frameOffset = m_con.GetBookmark(it->second); // returns 0 if no bookmark was found if (frameOffset > 0) { if (g_bExtraDebug) @@ -841,9 +831,9 @@ XBMC->Log(LOG_DEBUG, "%s - FrameOffset: %lld)", __FUNCTION__, frameOffset); } // Pin framerate value - if (programInfo.Framterate() < 0) - programInfo.SetFramerate(m_db.GetRecordingFrameRate(programInfo)); - float frameRate = (float)programInfo.Framterate() / 1000.0f; + if (it->second.Framterate() <0) + it->second.SetFramerate(m_db.GetRecordingFrameRate(it->second)); + float frameRate = (float)it->second.Framterate() / 1000.0f; if (frameRate > 0) { bookmark = (int)((float)frameOffset / frameRate); @@ -856,91 +846,18 @@ } else { - if (g_bExtraDebug) + if (it == m_recordings.end()) { - XBMC->Log(LOG_DEBUG, "%s - Recording %s has no bookmark", __FUNCTION__, programInfo.Title().c_str()); + XBMC->Log(LOG_ERROR, "%s - Recording %s does not exist", __FUNCTION__, recording.strRecordingId); } - } - - if (bookmark < 0) bookmark = 0; - return bookmark; -} - -PVR_ERROR PVRClientMythTV::GetRecordingEdl(const PVR_RECORDING &recording, PVR_EDL_ENTRY entries[], int *size) -{ - if (g_bExtraDebug) - { - XBMC->Log(LOG_DEBUG, "%s - Reading edl for: %s", __FUNCTION__, recording.strTitle); - } - - CLockObject lock(m_recordingsLock); - ProgramInfoMap::iterator it = m_recordings.find(recording.strRecordingId); - if (it == m_recordings.end()) - { - XBMC->Log(LOG_DEBUG, "%s - Recording %s does not exist", __FUNCTION__, recording.strRecordingId); - *size = 0; - return PVR_ERROR_FAILED; - } - - float frameRate = m_db.GetRecordingFrameRate(it->second) / 1000.0f; - if (frameRate <= 0) - { - XBMC->Log(LOG_DEBUG, "%s - Failed to read framerate for %s", __FUNCTION__, recording.strRecordingId); - *size = 0; - return PVR_ERROR_FAILED; - } - - Edl commbreakList = m_con.GetCommbreakList(it->second); - int commbreakCount = commbreakList.size(); - XBMC->Log(LOG_DEBUG, "%s - Found %d commercial breaks for: %s", __FUNCTION__, commbreakCount, recording.strTitle); - - Edl cutList = m_con.GetCutList(it->second); - XBMC->Log(LOG_DEBUG, "%s - Found %d cut list entries for: %s", __FUNCTION__, cutList.size(), recording.strTitle); - - commbreakList.insert(commbreakList.end(), cutList.begin(), cutList.end()); - - int index = 0; - Edl::const_iterator edlIt; - for (edlIt = commbreakList.begin(); edlIt != commbreakList.end(); ++edlIt) - { - if (index < *size) - { - PVR_EDL_ENTRY entry; - entry.start = (int64_t)(edlIt->start_mark / frameRate * 1000); - entry.end = (int64_t)(edlIt->end_mark / frameRate * 1000); - entry.type = index < commbreakCount ? PVR_EDL_TYPE_COMBREAK : PVR_EDL_TYPE_CUT; - entries[index] = entry; - index++; - } - else + else if (!it->second.HasBookmark() && g_bExtraDebug) { - XBMC->Log(LOG_ERROR, "%s - Maximum number of edl entries reached for: %s", __FUNCTION__, recording.strTitle); - break; + XBMC->Log(LOG_DEBUG, "%s - Recording %s has no bookmark", __FUNCTION__, recording.strRecordingId); } + return bookmark; } - *size = index; - return PVR_ERROR_NO_ERROR; -} - -int PVRClientMythTV::GetRecordingLastPlayedPosition(const PVR_RECORDING &recording) -{ - // MythTV provides it's bookmarks as frame offsets whereas XBMC expects a time offset. - // The bookmark in seconds is calculated by: bookmark = frameOffset / frameRate. - int bookmark = 0; - - if (g_bExtraDebug) - { - XBMC->Log(LOG_DEBUG, "%s - Reading Bookmark for: %s", __FUNCTION__, recording.strTitle); - } - - CLockObject lock(m_recordingsLock); - ProgramInfoMap::iterator it = m_recordings.find(recording.strRecordingId); - if (it != m_recordings.end()) - bookmark = GetRecordingLastPlayedPosition(it->second); - else - XBMC->Log(LOG_ERROR, "%s - Recording %s does not exist", __FUNCTION__, recording.strRecordingId); - + if (bookmark < 0) bookmark = 0; return bookmark; } diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/addons/pvr.mythtv.cmyth/src/pvrclient-mythtv.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/src/pvrclient-mythtv.h --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/addons/pvr.mythtv.cmyth/src/pvrclient-mythtv.h 2013-03-08 12:41:18.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/src/pvrclient-mythtv.h 2013-03-12 10:51:22.000000000 +0000 @@ -65,8 +65,6 @@ const char *GetBackendVersion(); const char *GetConnectionString(); bool GetDriveSpace(long long *iTotal, long long *iUsed); - void OnSleep(); - void OnWake(); // EPG PVR_ERROR GetEPGForChannel(ADDON_HANDLE handle, const PVR_CHANNEL &channel, time_t iStart, time_t iEnd); @@ -87,7 +85,6 @@ PVR_ERROR SetRecordingPlayCount(const PVR_RECORDING &recording, int count); PVR_ERROR SetRecordingLastPlayedPosition(const PVR_RECORDING &recording, int lastplayedposition); int GetRecordingLastPlayedPosition(const PVR_RECORDING &recording); - PVR_ERROR GetRecordingEdl(const PVR_RECORDING &recording, PVR_EDL_ENTRY entries[], int *size); // Timers int GetTimersAmount(); @@ -149,7 +146,6 @@ void EventUpdateRecordings(); void ForceUpdateRecording(ProgramInfoMap::iterator it); int FillRecordings(); - int GetRecordingLastPlayedPosition(MythProgramInfo &programInfo); // Timers RecordingRuleList m_recordingRules; diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/addons/pvr.nextpvr/addon/addon.xml.in xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.nextpvr/addon/addon.xml.in --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/addons/pvr.nextpvr/addon/addon.xml.in 2013-03-08 12:41:18.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.nextpvr/addon/addon.xml.in 2013-03-12 10:51:19.000000000 +0000 @@ -1,12 +1,12 @@ - + - + - + bSupportsEPG = true; @@ -663,7 +647,6 @@ PVR_ERROR SetRecordingPlayCount(const PVR_RECORDING &recording, int count) { return PVR_ERROR_NOT_IMPLEMENTED; } PVR_ERROR SetRecordingLastPlayedPosition(const PVR_RECORDING &recording, int lastplayedposition) { return PVR_ERROR_NOT_IMPLEMENTED; } int GetRecordingLastPlayedPosition(const PVR_RECORDING &recording) { return -1; } -PVR_ERROR GetRecordingEdl(const PVR_RECORDING&, PVR_EDL_ENTRY[], int*) { return PVR_ERROR_NOT_IMPLEMENTED; }; unsigned int GetChannelSwitchDelay(void) { return 0; } void PauseStream(bool bPaused) {} bool CanPauseStream(void) { return false; } diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/addons/pvr.vdr.vnsi/src/client.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/src/client.h --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/addons/pvr.vdr.vnsi/src/client.h 2013-03-08 12:41:18.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/src/client.h 2013-03-12 10:51:19.000000000 +0000 @@ -21,8 +21,8 @@ */ #include "libXBMC_addon.h" -#include "libXBMC_pvr.h" #include "libXBMC_gui.h" +#include "libXBMC_pvr.h" #define DEFAULT_HOST "127.0.0.1" #define DEFAULT_PORT 34890 diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/addons/pvr.vuplus/addon/addon.xml.in xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vuplus/addon/addon.xml.in --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/addons/pvr.vuplus/addon/addon.xml.in 2013-03-08 12:41:18.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vuplus/addon/addon.xml.in 2013-03-12 10:51:22.000000000 +0000 @@ -1,12 +1,12 @@ - + bSupportsEPG = true; @@ -604,7 +588,6 @@ long long PositionLiveStream(void) { return -1; } long long LengthLiveStream(void) { return -1; } PVR_ERROR SetRecordingPlayCount(const PVR_RECORDING &recording, int count) { return PVR_ERROR_NOT_IMPLEMENTED; } -PVR_ERROR GetRecordingEdl(const PVR_RECORDING&, PVR_EDL_ENTRY[], int*) { return PVR_ERROR_NOT_IMPLEMENTED; }; unsigned int GetChannelSwitchDelay(void) { return 0; } void PauseStream(bool bPaused) {} bool CanPauseStream(void) { return false; } diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/addons/pvr.vuplus/src/client.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vuplus/src/client.h --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/addons/pvr.vuplus/src/client.h 2013-03-08 12:41:18.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vuplus/src/client.h 2013-03-12 10:51:22.000000000 +0000 @@ -22,7 +22,6 @@ #include "libXBMC_addon.h" #include "libXBMC_pvr.h" -#include "libXBMC_gui.h" #define DEFAULT_HOST "127.0.0.1" #define DEFAULT_CONNECT_TIMEOUT 30 diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/configure.ac xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/configure.ac --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/configure.ac 2013-03-08 12:41:18.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/configure.ac 2013-03-12 10:51:19.000000000 +0000 @@ -138,12 +138,6 @@ fi AC_SUBST(FFMPEG_INCLUDES) -AC_CHECK_LIB([GL],[main],have_gl=yes, have_gl=no) -if test "$have_gl" = "yes"; then - AC_DEFINE([HAVE_GL],[1],["Define to 1 if we have gl"]) -fi -echo "GL: $have_gl" - ### End external Libraries ### Build addons with dependencies diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/changelog xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/changelog --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/changelog 2013-03-08 15:10:21.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/changelog 2013-03-12 10:54:38.000000000 +0000 @@ -1,48 +1,8 @@ -xbmc-pvr-addons (1.0.0~git20130308.1607-ed5ff3c-0~precise) precise; urgency=high - - - - - - [Lars Op den Kamp] - * [mythtv-cmyth] bump to 1.7.10. we already had a 1.7.9 and forgot to bump after the last change - - [Christian Fetzer] - * [mythtv-cmyth] Changelog for 1.7.9 - - [Christian Fetzer] - * [mythtv-cmyth] Fill iLastPlayedPosition when transfering recordings - - [Lars Op den Kamp] - * bump add-on versions and pvr api dependency version - - [Lars Op den Kamp] - * bumped api to v1.7.0 - - [Christian Fetzer] - * sync: Add iLastPlayedPosition to PVR_RECORDING. Issue #170 - - [Lars Op den Kamp] - * sync api date bump in the copyright - - [Jörg Dembski] - * [vuplus] fix typo in langugage file +xbmc-pvr-addons (1.0.0~git20130312.1151-590f862-0~precise) precise; urgency=high [Lars Op den Kamp] * updated README for windows - [xbmc] - * bump api version to 1.6.1 - - [xbmc] - * add version for addongui lib - - [xbmc] - * configure: check for GL - - [xbmc] - * addongui: sync with xbmc - [Adam Sutton] * [tvheadend] fix return PTS when skipping @@ -65,28 +25,73 @@ * [tvheadend] added working seek support. [Christian Fetzer] - * [mythtv-cmyth] Implement GetRecordingEdl + * [mythtv-cmyth] Fix crash when starting Live TV after a failed attempt - [Christian Fetzer] - * [mythtv-cmyth] Add GetCommbreakList and GetCutList functions to MythConnection + [Jörg Dembski] + * [vuplus]: increment version number in addon.xml.in - [Christian Fetzer] - * sync: Add GetRecordingEdl stubs to all addons + [Jörg Dembski] + * [vuplus]: Add several new features - [Christian Fetzer] - * sync: GetRecordingEdl + [Rainer Hochecker] + * vdr-plugin-vnsiserver: bump version - [Christian Fetzer] - * sync: Add WakeOnLan + [Lucian Muresan] + * vdr-vnsiserver Makefile vdr-1.7.36 - [Christian Fetzer] - * [mythtv-cmyth] Handle OnSleep/OnWake announcements + [Rainer Hochecker] + * vdr-plugin-vnsiserver: redesign for timeshift, revised parsers - [Christian Fetzer] - * sync: Add ADDON_Announce to all addons + [Rainer Hochecker] + * vdr-plugin-vnsiserver: revised socket + + [Rainer Hochecker] + * vdr-plugin-vnsiserver: osd - increase memory + + [Rainer Hochecker] + * vdr-plugin-vnsiserver: trigger epg update + + [Rainer Hochecker] + * vdr-plugin-vnsiserver: vdr osd [Christian Fetzer] - * sync: Add ADDON_Announce + * [mythtv-cmyth] Release 1.6.8 + + [Marcel Groothuis] + * [MediaPortal] Update version number and changelog + + [Marcel Groothuis] + * [MediaPortal] Solve CppCheck warning about missing copy constructor + + [Marcel Groothuis] + * [MediaPortal] Cleanup unused NoSignalStream related variables + + [Marcel Groothuis] + * [MediaPortal] Added: Extra debug info on errors + + [Marcel Groothuis] + * [MediaPortal] Setting recording play count is only supported since TVServerXBMC build 117 + + [Marcel Groothuis] + * MediaPortal: refactor: move loading card settings to separate function + + [Marcel Groothuis] + * [MediaPortal] MultiFileReader: continue as soon as the buffer file has a non-zero length + + [Marcel Groothuis] + * MediaPortal: search also for the genre_translation.xml file in the profile folder (userdata/addon_data/pvr.team-mediaportal.tvserver) This allows for storing a modified file at a writable location + + [Marcel Groothuis] + * MediaPortal: channel icons: search also for these extensions: .jpg .jpeg .bmp .gif (Still Windows only) + + [Marcel Groothuis] + * [MediaPortal] Channels: Use MediaPortal VisibleInGuide property as inverted IsHidden flag in XBMC. (requires TVServerXBMC build 120) + + [Marcel Groothuis] + * [MediaPortal] Don't load other channel groups when the user selected to import channels from a single group. + + [Fred Hoogduin] + * [argustv-fix] If we can not connect to the pvr server at startup do not return ADDON_STATUS_PERMANENT_FAILURE as this causes the add-on to become disabled. * Initial release diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/changelog.in xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/changelog.in --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/changelog.in 2013-03-08 15:07:14.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/changelog.in 2013-03-12 10:51:34.000000000 +0000 @@ -1,48 +1,8 @@ -xbmc-pvr-addons (1.0.0~git20130308.1607-ed5ff3c-0~#DIST#) #DIST#; urgency=high - - - - - - [Lars Op den Kamp] - * [mythtv-cmyth] bump to 1.7.10. we already had a 1.7.9 and forgot to bump after the last change - - [Christian Fetzer] - * [mythtv-cmyth] Changelog for 1.7.9 - - [Christian Fetzer] - * [mythtv-cmyth] Fill iLastPlayedPosition when transfering recordings - - [Lars Op den Kamp] - * bump add-on versions and pvr api dependency version - - [Lars Op den Kamp] - * bumped api to v1.7.0 - - [Christian Fetzer] - * sync: Add iLastPlayedPosition to PVR_RECORDING. Issue #170 - - [Lars Op den Kamp] - * sync api date bump in the copyright - - [Jörg Dembski] - * [vuplus] fix typo in langugage file +xbmc-pvr-addons (1.0.0~git20130312.1151-590f862-0~#DIST#) #DIST#; urgency=high [Lars Op den Kamp] * updated README for windows - [xbmc] - * bump api version to 1.6.1 - - [xbmc] - * add version for addongui lib - - [xbmc] - * configure: check for GL - - [xbmc] - * addongui: sync with xbmc - [Adam Sutton] * [tvheadend] fix return PTS when skipping @@ -65,28 +25,73 @@ * [tvheadend] added working seek support. [Christian Fetzer] - * [mythtv-cmyth] Implement GetRecordingEdl + * [mythtv-cmyth] Fix crash when starting Live TV after a failed attempt - [Christian Fetzer] - * [mythtv-cmyth] Add GetCommbreakList and GetCutList functions to MythConnection + [Jörg Dembski] + * [vuplus]: increment version number in addon.xml.in - [Christian Fetzer] - * sync: Add GetRecordingEdl stubs to all addons + [Jörg Dembski] + * [vuplus]: Add several new features - [Christian Fetzer] - * sync: GetRecordingEdl + [Rainer Hochecker] + * vdr-plugin-vnsiserver: bump version - [Christian Fetzer] - * sync: Add WakeOnLan + [Lucian Muresan] + * vdr-vnsiserver Makefile vdr-1.7.36 - [Christian Fetzer] - * [mythtv-cmyth] Handle OnSleep/OnWake announcements + [Rainer Hochecker] + * vdr-plugin-vnsiserver: redesign for timeshift, revised parsers - [Christian Fetzer] - * sync: Add ADDON_Announce to all addons + [Rainer Hochecker] + * vdr-plugin-vnsiserver: revised socket + + [Rainer Hochecker] + * vdr-plugin-vnsiserver: osd - increase memory + + [Rainer Hochecker] + * vdr-plugin-vnsiserver: trigger epg update + + [Rainer Hochecker] + * vdr-plugin-vnsiserver: vdr osd [Christian Fetzer] - * sync: Add ADDON_Announce + * [mythtv-cmyth] Release 1.6.8 + + [Marcel Groothuis] + * [MediaPortal] Update version number and changelog + + [Marcel Groothuis] + * [MediaPortal] Solve CppCheck warning about missing copy constructor + + [Marcel Groothuis] + * [MediaPortal] Cleanup unused NoSignalStream related variables + + [Marcel Groothuis] + * [MediaPortal] Added: Extra debug info on errors + + [Marcel Groothuis] + * [MediaPortal] Setting recording play count is only supported since TVServerXBMC build 117 + + [Marcel Groothuis] + * MediaPortal: refactor: move loading card settings to separate function + + [Marcel Groothuis] + * [MediaPortal] MultiFileReader: continue as soon as the buffer file has a non-zero length + + [Marcel Groothuis] + * MediaPortal: search also for the genre_translation.xml file in the profile folder (userdata/addon_data/pvr.team-mediaportal.tvserver) This allows for storing a modified file at a writable location + + [Marcel Groothuis] + * MediaPortal: channel icons: search also for these extensions: .jpg .jpeg .bmp .gif (Still Windows only) + + [Marcel Groothuis] + * [MediaPortal] Channels: Use MediaPortal VisibleInGuide property as inverted IsHidden flag in XBMC. (requires TVServerXBMC build 120) + + [Marcel Groothuis] + * [MediaPortal] Don't load other channel groups when the user selected to import channels from a single group. + + [Fred Hoogduin] + * [argustv-fix] If we can not connect to the pvr server at startup do not return ADDON_STATUS_PERMANENT_FAILURE as this causes the add-on to become disabled. * Initial release diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/changelog.in.old xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/changelog.in.old --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/changelog.in.old 2013-03-08 15:07:04.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/changelog.in.old 2013-03-12 10:51:24.000000000 +0000 @@ -1,93 +1,5 @@ xbmc-pvr-addons (#PACKAGEVERSION#-0~#DIST#) #DIST#; urgency=high - - - - [Lars Op den Kamp] - * [mythtv-cmyth] bump to 1.7.10. we already had a 1.7.9 and forgot to bump after the last change - - [Christian Fetzer] - * [mythtv-cmyth] Changelog for 1.7.9 - - [Christian Fetzer] - * [mythtv-cmyth] Fill iLastPlayedPosition when transfering recordings - - [Lars Op den Kamp] - * bump add-on versions and pvr api dependency version - - [Lars Op den Kamp] - * bumped api to v1.7.0 - - [Christian Fetzer] - * sync: Add iLastPlayedPosition to PVR_RECORDING. Issue #170 - - [Lars Op den Kamp] - * sync api date bump in the copyright - - [Jörg Dembski] - * [vuplus] fix typo in langugage file - - [Lars Op den Kamp] - * updated README for windows - - [xbmc] - * bump api version to 1.6.1 - - [xbmc] - * add version for addongui lib - - [xbmc] - * configure: check for GL - - [xbmc] - * addongui: sync with xbmc - - [Adam Sutton] - * [tvheadend] fix return PTS when skipping - - [Adam Sutton] - * [tvheadend] update addon version info - - [Adam Sutton] - * [tvheadend] correct previous mistaken fix to webroot processing - - [Adam Sutton] - * [tvheadend] update subscriptionSeek call to use abs PTS - - [Christian Fetzer] - * [mythtv-cmyth] Release v1.6.9 - - [Adam Sutton] - * [tvheadend] ensure timeshiftStatus does not spam logs - - [Adam Sutton] - * [tvheadend] added working seek support. - - [Christian Fetzer] - * [mythtv-cmyth] Implement GetRecordingEdl - - [Christian Fetzer] - * [mythtv-cmyth] Add GetCommbreakList and GetCutList functions to MythConnection - - [Christian Fetzer] - * sync: Add GetRecordingEdl stubs to all addons - - [Christian Fetzer] - * sync: GetRecordingEdl - - [Christian Fetzer] - * sync: Add WakeOnLan - - [Christian Fetzer] - * [mythtv-cmyth] Handle OnSleep/OnWake announcements - - [Christian Fetzer] - * sync: Add ADDON_Announce to all addons - - [Christian Fetzer] - * sync: Add ADDON_Announce - - * Initial release -- wsnipex Fri, 21 Dec 2012 11:06:07 +0100 diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/control xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/control --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/control 2013-03-08 15:10:21.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/control 2013-03-12 10:54:38.000000000 +0000 @@ -11,7 +11,7 @@ Package: xbmc-pvr-mythtv-cmyth Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libmysqlclient19 | libmysqlclient18 | libmysqlclient17 | libmysqlclient16 | libmysqlclient15 | libmysqlclient14 -Description: XBMC PVR Addon MythTv - Cmyth - PVR API:1.7.0 +Description: XBMC PVR Addon MythTv - Cmyth - PVR API:1.6.0 This package contains the Cmyth PVR (Personal Video Recorder) Addon for XBMC, the award winning free and open source software media-player and entertainment hub for all your digital media @@ -19,7 +19,7 @@ Package: xbmc-pvr-vuplus Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Description: XBMC PVR Addon Vuplus - PVR API:1.7.0 +Description: XBMC PVR Addon Vuplus - PVR API:1.6.0 This package contains the Vuplus PVR (Personal Video Recorder) Addon for XBMC, the award winning free and open source software media-player and entertainment hub for all your digital media @@ -27,7 +27,7 @@ Package: xbmc-pvr-vdr-vnsi Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Description: XBMC PVR Addon VDR Vnsi - PVR API:1.7.0 +Description: XBMC PVR Addon VDR Vnsi - PVR API:1.6.0 This package contains the VDR Vnsi PVR (Personal Video Recorder) Addon for XBMC, the award winning free and open source software media-player and entertainment hub for all your digital media @@ -35,13 +35,13 @@ Package: vdr-plugin-vnsiserver Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, ${vdr:Depends} -Description: VDR-Network-Streaming-Interface - PVR API:1.7.0 +Description: VDR-Network-Streaming-Interface - PVR API:1.6.0 VDR-Network-Streaming-Interface Package: xbmc-pvr-njoy Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Description: XBMC PVR Addon Njoy - PVR API:1.7.0 +Description: XBMC PVR Addon Njoy - PVR API:1.6.0 This package contains the Njoy PVR (Personal Video Recorder) Addon for XBMC, the award winning free and open source software media-player and entertainment hub for all your digital media @@ -49,7 +49,7 @@ Package: xbmc-pvr-nextpvr Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Description: XBMC PVR Addon NextPvr - PVR API:1.7.0 +Description: XBMC PVR Addon NextPvr - PVR API:1.6.0 This package contains the NextPvr PVR (Personal Video Recorder) Addon for XBMC, the award winning free and open source software media-player and entertainment hub for all your digital media @@ -57,7 +57,7 @@ Package: xbmc-pvr-mediaportal-tvserver Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Description: XBMC PVR Addon Mediaportal Tvserver - PVR API:1.7.0 +Description: XBMC PVR Addon Mediaportal Tvserver - PVR API:1.6.0 This package contains the Mediaportal PVR (Personal Video Recorder) Addon for XBMC, the award winning free and open source software media-player and entertainment hub for all your digital media @@ -65,7 +65,7 @@ Package: xbmc-pvr-tvheadend-hts Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Description: XBMC PVR Addon TvHeadend Hts - PVR API:1.7.0 +Description: XBMC PVR Addon TvHeadend Hts - PVR API:1.6.0 This package contains the TvHeadend PVR (Personal Video Recorder) Addon for XBMC, the award winning free and open source software media-player and entertainment hub for all your digital media @@ -73,7 +73,7 @@ Package: xbmc-pvr-dvbviewer Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Description: XBMC PVR Addon Dvbviewer - PVR API:1.7.0 +Description: XBMC PVR Addon Dvbviewer - PVR API:1.6.0 This package contains the Dvbviewer PVR (Personal Video Recorder) Addon for XBMC, the award winning free and open source software media-player and entertainment hub for all your digital media @@ -81,7 +81,7 @@ Package: xbmc-pvr-argustv Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Description: XBMC PVR Addon Argustv - PVR API:1.7.0 +Description: XBMC PVR Addon Argustv - PVR API:1.6.0 This package contains the Argustv PVR (Personal Video Recorder) Addon for XBMC, the award winning free and open source software media-player and entertainment hub for all your digital media @@ -89,7 +89,7 @@ Package: xbmc-pvr-demo Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Description: XBMC PVR Demo Addon - PVR API:1.7.0 +Description: XBMC PVR Demo Addon - PVR API:1.6.0 This package contains the Demo PVR (Personal Video Recorder) Addon for XBMC, the award winning free and open source software media-player and entertainment hub for all your digital media diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/vdr-plugin-vnsiserver.changelog xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/vdr-plugin-vnsiserver.changelog --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/vdr-plugin-vnsiserver.changelog 2013-03-08 15:10:52.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/vdr-plugin-vnsiserver.changelog 2013-03-12 10:55:08.000000000 +0000 @@ -1,5 +1,5 @@ -xbmc-pvr-addons (1:0.9.1-2precise) precise; urgency=low +xbmc-pvr-addons (1:0.9.1-0precise) precise; urgency=low * no upstream changelog available - -- wsnipex Fri, 08 Mar 2013 16:10:52 +0100 + -- wsnipex Tue, 12 Mar 2013 11:55:08 +0100 diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/vdr-plugin-vnsiserver.changelog.old xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/vdr-plugin-vnsiserver.changelog.old --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/vdr-plugin-vnsiserver.changelog.old 2013-03-08 15:09:19.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/vdr-plugin-vnsiserver.changelog.old 2013-03-12 10:53:37.000000000 +0000 @@ -1,5 +1,5 @@ -xbmc-pvr-addons (1:0.9.1-2quantal) quantal; urgency=low +xbmc-pvr-addons (1:0.9.1-0quantal) quantal; urgency=low * no upstream changelog available - -- wsnipex Fri, 08 Mar 2013 16:09:19 +0100 + -- wsnipex Tue, 12 Mar 2013 11:53:37 +0100 diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/vdr-plugin-vnsiserver.version xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/vdr-plugin-vnsiserver.version --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/vdr-plugin-vnsiserver.version 2013-03-08 15:10:49.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/vdr-plugin-vnsiserver.version 2013-03-12 10:55:06.000000000 +0000 @@ -1 +1 @@ -1:0.9.1-2precise +1:0.9.1-0precise diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/versiontag xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/versiontag --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/versiontag 2013-03-08 15:07:04.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/versiontag 2013-03-12 10:51:24.000000000 +0000 @@ -1 +1 @@ -2 +0 diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-argustv.changelog xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-argustv.changelog --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-argustv.changelog 2013-03-08 15:10:32.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-argustv.changelog 2013-03-12 10:54:49.000000000 +0000 @@ -1,4 +1,4 @@ -xbmc-pvr-addons (1.7.165-2precise) precise; urgency=low +xbmc-pvr-addons (1.6.165-0precise) precise; urgency=low * v0.0.1.133 (31-03-2012) - The add-on now sets the time a recording was last watched on the server v0.0.1.132 (20-03-2012) - Small fix @@ -59,4 +59,4 @@ tuning of live TV and live radio (tsbuffer only, no rtsp), basic EPG - Tested ForTheRecord Argus version: v1.5.0.3 - -- wsnipex Fri, 08 Mar 2013 16:10:32 +0100 + -- wsnipex Tue, 12 Mar 2013 11:54:49 +0100 diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-argustv.changelog.old xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-argustv.changelog.old --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-argustv.changelog.old 2013-03-08 15:09:00.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-argustv.changelog.old 2013-03-12 10:53:18.000000000 +0000 @@ -1,4 +1,4 @@ -xbmc-pvr-addons (1.7.165-2quantal) quantal; urgency=low +xbmc-pvr-addons (1.6.165-0quantal) quantal; urgency=low * v0.0.1.133 (31-03-2012) - The add-on now sets the time a recording was last watched on the server v0.0.1.132 (20-03-2012) - Small fix @@ -59,4 +59,4 @@ tuning of live TV and live radio (tsbuffer only, no rtsp), basic EPG - Tested ForTheRecord Argus version: v1.5.0.3 - -- wsnipex Fri, 08 Mar 2013 16:09:00 +0100 + -- wsnipex Tue, 12 Mar 2013 11:53:18 +0100 diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-argustv.version xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-argustv.version --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-argustv.version 2013-03-08 15:10:29.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-argustv.version 2013-03-12 10:54:46.000000000 +0000 @@ -1 +1 @@ -1.7.165-2precise +1.6.165-0precise diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-demo.changelog xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-demo.changelog --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-demo.changelog 2013-03-08 15:10:49.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-demo.changelog 2013-03-12 10:55:05.000000000 +0000 @@ -1,5 +1,5 @@ -xbmc-pvr-addons (1.7.1-2precise) precise; urgency=low +xbmc-pvr-addons (1.6.1-0precise) precise; urgency=low * no upstream changelog available - -- wsnipex Fri, 08 Mar 2013 16:10:49 +0100 + -- wsnipex Tue, 12 Mar 2013 11:55:05 +0100 diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-demo.changelog.old xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-demo.changelog.old --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-demo.changelog.old 2013-03-08 15:09:17.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-demo.changelog.old 2013-03-12 10:53:35.000000000 +0000 @@ -1,5 +1,5 @@ -xbmc-pvr-addons (1.7.1-2quantal) quantal; urgency=low +xbmc-pvr-addons (1.6.1-0quantal) quantal; urgency=low * no upstream changelog available - -- wsnipex Fri, 08 Mar 2013 16:09:17 +0100 + -- wsnipex Tue, 12 Mar 2013 11:53:35 +0100 diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-demo.version xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-demo.version --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-demo.version 2013-03-08 15:10:47.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-demo.version 2013-03-12 10:55:03.000000000 +0000 @@ -1 +1 @@ -1.7.1-2precise +1.6.1-0precise diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-dvbviewer.changelog xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-dvbviewer.changelog --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-dvbviewer.changelog 2013-03-08 15:10:46.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-dvbviewer.changelog 2013-03-12 10:55:03.000000000 +0000 @@ -1,20 +1,19 @@ -xbmc-pvr-addons (1.7.5-2precise) precise; urgency=low +xbmc-pvr-addons (1.6.5-0precise) precise; urgency=low - * 1.7.5 [updated] Bump after PVR API version bump 1.6.5 [updated] - Language files from Transifex 1.6.4 [fixed] Use utf-8 encoding to - get and set the timers. [fixed] Channel names with more than 25 - chars could crash the add-on. 1.6.3 [updated] Language files from - Transifex 1.6.2 New version number by Team XBMC 0.1.8 [fixed] - Changed the way timers are calculated. This should fix problems with - scheduled and instant recordings on some machines. [fixed] - Favourites didn't show channels if the audio track wasn't the first - one. [fixed] Channel settings weren't saved/restored after a channel - switch with the channels OSD. [fixed] XBMC could hang after a - channel switch with the channels OSD. 0.1.7 [added] The Recording - Service version 1.21 or higher is now required. Download the latest - version from the DVBViewer members area and install it. [added] - Display a notification if the add-on can't connect to the Recording - Service. Please, check that the RS is enabled and the IP, + * 1.6.5 [updated] Language files from Transifex 1.6.4 [fixed] Use utf- + 8 encoding to get and set the timers. [fixed] Channel names with + more than 25 chars could crash the add-on. 1.6.3 [updated] Language + files from Transifex 1.6.2 New version number by Team XBMC 0.1.8 + [fixed] Changed the way timers are calculated. This should fix + problems with scheduled and instant recordings on some machines. + [fixed] Favourites didn't show channels if the audio track wasn't + the first one. [fixed] Channel settings weren't saved/restored after + a channel switch with the channels OSD. [fixed] XBMC could hang + after a channel switch with the channels OSD. 0.1.7 [added] The + Recording Service version 1.21 or higher is now required. Download + the latest version from the DVBViewer members area and install it. + [added] Display a notification if the add-on can't connect to the + Recording Service. Please, check that the RS is enabled and the IP, webinterface port, username and pass are correct. [added] If the favourites.xml selector is empty, the favourites are loaded from the web interface. [added] Don't fetch recording thumbnails at startup @@ -35,4 +34,4 @@ [fixed] When the EPG is missing the description entry, the event entry is used instead. 0.1.0 First version. - -- wsnipex Fri, 08 Mar 2013 16:10:46 +0100 + -- wsnipex Tue, 12 Mar 2013 11:55:03 +0100 diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-dvbviewer.changelog.old xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-dvbviewer.changelog.old --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-dvbviewer.changelog.old 2013-03-08 15:09:14.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-dvbviewer.changelog.old 2013-03-12 10:53:32.000000000 +0000 @@ -1,20 +1,19 @@ -xbmc-pvr-addons (1.7.5-2quantal) quantal; urgency=low +xbmc-pvr-addons (1.6.5-0quantal) quantal; urgency=low - * 1.7.5 [updated] Bump after PVR API version bump 1.6.5 [updated] - Language files from Transifex 1.6.4 [fixed] Use utf-8 encoding to - get and set the timers. [fixed] Channel names with more than 25 - chars could crash the add-on. 1.6.3 [updated] Language files from - Transifex 1.6.2 New version number by Team XBMC 0.1.8 [fixed] - Changed the way timers are calculated. This should fix problems with - scheduled and instant recordings on some machines. [fixed] - Favourites didn't show channels if the audio track wasn't the first - one. [fixed] Channel settings weren't saved/restored after a channel - switch with the channels OSD. [fixed] XBMC could hang after a - channel switch with the channels OSD. 0.1.7 [added] The Recording - Service version 1.21 or higher is now required. Download the latest - version from the DVBViewer members area and install it. [added] - Display a notification if the add-on can't connect to the Recording - Service. Please, check that the RS is enabled and the IP, + * 1.6.5 [updated] Language files from Transifex 1.6.4 [fixed] Use utf- + 8 encoding to get and set the timers. [fixed] Channel names with + more than 25 chars could crash the add-on. 1.6.3 [updated] Language + files from Transifex 1.6.2 New version number by Team XBMC 0.1.8 + [fixed] Changed the way timers are calculated. This should fix + problems with scheduled and instant recordings on some machines. + [fixed] Favourites didn't show channels if the audio track wasn't + the first one. [fixed] Channel settings weren't saved/restored after + a channel switch with the channels OSD. [fixed] XBMC could hang + after a channel switch with the channels OSD. 0.1.7 [added] The + Recording Service version 1.21 or higher is now required. Download + the latest version from the DVBViewer members area and install it. + [added] Display a notification if the add-on can't connect to the + Recording Service. Please, check that the RS is enabled and the IP, webinterface port, username and pass are correct. [added] If the favourites.xml selector is empty, the favourites are loaded from the web interface. [added] Don't fetch recording thumbnails at startup @@ -35,4 +34,4 @@ [fixed] When the EPG is missing the description entry, the event entry is used instead. 0.1.0 First version. - -- wsnipex Fri, 08 Mar 2013 16:09:14 +0100 + -- wsnipex Tue, 12 Mar 2013 11:53:32 +0100 diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-dvbviewer.version xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-dvbviewer.version --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-dvbviewer.version 2013-03-08 15:10:44.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-dvbviewer.version 2013-03-12 10:55:00.000000000 +0000 @@ -1 +1 @@ -1.7.5-2precise +1.6.5-0precise diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-mediaportal-tvserver.changelog xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-mediaportal-tvserver.changelog --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-mediaportal-tvserver.changelog 2013-03-08 15:10:35.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-mediaportal-tvserver.changelog 2013-03-12 10:54:52.000000000 +0000 @@ -1,4 +1,4 @@ -xbmc-pvr-addons (1.7.8-2precise) precise; urgency=low +xbmc-pvr-addons (1.6.8-0precise) precise; urgency=low * - Added: use channel icons from MediaPortal (Windows, localhost only) - Changed: switch from libPlatform + libTcpSocket to platform @@ -51,4 +51,4 @@ client should abort connection when the TVServerXBMC version is too old v1.1.0.60 - Fix PVR client destroy - -- wsnipex Fri, 08 Mar 2013 16:10:35 +0100 + -- wsnipex Tue, 12 Mar 2013 11:54:52 +0100 diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-mediaportal-tvserver.changelog.old xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-mediaportal-tvserver.changelog.old --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-mediaportal-tvserver.changelog.old 2013-03-08 15:09:02.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-mediaportal-tvserver.changelog.old 2013-03-12 10:53:21.000000000 +0000 @@ -1,4 +1,4 @@ -xbmc-pvr-addons (1.7.8-2quantal) quantal; urgency=low +xbmc-pvr-addons (1.6.8-0quantal) quantal; urgency=low * - Added: use channel icons from MediaPortal (Windows, localhost only) - Changed: switch from libPlatform + libTcpSocket to platform @@ -51,4 +51,4 @@ client should abort connection when the TVServerXBMC version is too old v1.1.0.60 - Fix PVR client destroy - -- wsnipex Fri, 08 Mar 2013 16:09:02 +0100 + -- wsnipex Tue, 12 Mar 2013 11:53:21 +0100 diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-mediaportal-tvserver.version xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-mediaportal-tvserver.version --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-mediaportal-tvserver.version 2013-03-08 15:10:32.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-mediaportal-tvserver.version 2013-03-12 10:54:49.000000000 +0000 @@ -1 +1 @@ -1.7.8-2precise +1.6.8-0precise diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-mythtv-cmyth.changelog xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-mythtv-cmyth.changelog --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-mythtv-cmyth.changelog 2013-03-08 15:10:43.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-mythtv-cmyth.changelog 2013-03-12 10:55:00.000000000 +0000 @@ -1,10 +1,6 @@ -xbmc-pvr-addons (1.7.10-2precise) precise; urgency=low +xbmc-pvr-addons (1.6.9-0precise) precise; urgency=low - * v1.7.10 - Get last played position for recordings from the server - v1.7.9 - Provide EDLs if available (commercial skip data cut lists) - Currently only works for videos with constant frame - Disconnect - from / reconnect to backend when XBMC goes to / resumes from standby - v1.6.9 - Added Live TV vs. recording conflict handling - Fixed + * v1.6.9 - Added Live TV vs. recording conflict handling - Fixed recovering from backend connection loss on Windows - Fixed error when trying to set watched flag for recordings that already have been marked as watched v1.6.8 - Performance improvements - Reduced @@ -41,4 +37,4 @@ - Supports setting / reading resume bookmarks and watched state on MythTV backend - -- wsnipex Fri, 08 Mar 2013 16:10:43 +0100 + -- wsnipex Tue, 12 Mar 2013 11:55:00 +0100 diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-mythtv-cmyth.changelog.old xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-mythtv-cmyth.changelog.old --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-mythtv-cmyth.changelog.old 2013-03-08 15:09:11.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-mythtv-cmyth.changelog.old 2013-03-12 10:53:29.000000000 +0000 @@ -1,10 +1,6 @@ -xbmc-pvr-addons (1.7.10-2quantal) quantal; urgency=low +xbmc-pvr-addons (1.6.9-0quantal) quantal; urgency=low - * v1.7.10 - Get last played position for recordings from the server - v1.7.9 - Provide EDLs if available (commercial skip data cut lists) - Currently only works for videos with constant frame - Disconnect - from / reconnect to backend when XBMC goes to / resumes from standby - v1.6.9 - Added Live TV vs. recording conflict handling - Fixed + * v1.6.9 - Added Live TV vs. recording conflict handling - Fixed recovering from backend connection loss on Windows - Fixed error when trying to set watched flag for recordings that already have been marked as watched v1.6.8 - Performance improvements - Reduced @@ -41,4 +37,4 @@ - Supports setting / reading resume bookmarks and watched state on MythTV backend - -- wsnipex Fri, 08 Mar 2013 16:09:11 +0100 + -- wsnipex Tue, 12 Mar 2013 11:53:29 +0100 diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-mythtv-cmyth.version xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-mythtv-cmyth.version --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-mythtv-cmyth.version 2013-03-08 15:10:41.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-mythtv-cmyth.version 2013-03-12 10:54:57.000000000 +0000 @@ -1 +1 @@ -1.7.10-2precise +1.6.9-0precise diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-nextpvr.changelog xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-nextpvr.changelog --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-nextpvr.changelog 2013-03-08 15:10:29.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-nextpvr.changelog 2013-03-12 10:54:46.000000000 +0000 @@ -1,16 +1,16 @@ -xbmc-pvr-addons (1.7.4-2precise) precise; urgency=low +xbmc-pvr-addons (1.6.4-0precise) precise; urgency=low - * v1.7.4 - Bump after PVR API version bump v1.6.4 - small change to - improve the performance of radio channels v1.6.3 - updated language - files from Transifex v1.6.2 - updated language files from Transifex - v1.6.0 - New version number by Team XBMC v1.0.1.0 - added: new - experimental timeshift support. This requires updated backend - components, otherwise falls back to previous non-timeshift live tv. - - added: new 'advanced' settings page where timeshift can be - enabled/disabled. - added: radio support, mainly to workaround an - XBMC channel group bug. - changed: now using XBMC curl abstraction - for HTTP requests - added: detection of live tv having to exit if - tuner was required for a recording. Shows user a notification - message when this was required. v1.0.0.0 - Created + * v1.6.4 - small change to improve the performance of radio channels + v1.6.3 - updated language files from Transifex v1.6.2 - updated + language files from Transifex v1.6.0 - New version number by Team + XBMC v1.0.1.0 - added: new experimental timeshift support. This + requires updated backend components, otherwise falls back to + previous non-timeshift live tv. - added: new 'advanced' settings + page where timeshift can be enabled/disabled. - added: radio + support, mainly to workaround an XBMC channel group bug. - changed: + now using XBMC curl abstraction for HTTP requests - added: detection + of live tv having to exit if tuner was required for a recording. + Shows user a notification message when this was required. v1.0.0.0 - + Created - -- wsnipex Fri, 08 Mar 2013 16:10:29 +0100 + -- wsnipex Tue, 12 Mar 2013 11:54:46 +0100 diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-nextpvr.changelog.old xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-nextpvr.changelog.old --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-nextpvr.changelog.old 2013-03-08 15:08:57.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-nextpvr.changelog.old 2013-03-12 10:53:15.000000000 +0000 @@ -1,16 +1,16 @@ -xbmc-pvr-addons (1.7.4-2quantal) quantal; urgency=low +xbmc-pvr-addons (1.6.4-0quantal) quantal; urgency=low - * v1.7.4 - Bump after PVR API version bump v1.6.4 - small change to - improve the performance of radio channels v1.6.3 - updated language - files from Transifex v1.6.2 - updated language files from Transifex - v1.6.0 - New version number by Team XBMC v1.0.1.0 - added: new - experimental timeshift support. This requires updated backend - components, otherwise falls back to previous non-timeshift live tv. - - added: new 'advanced' settings page where timeshift can be - enabled/disabled. - added: radio support, mainly to workaround an - XBMC channel group bug. - changed: now using XBMC curl abstraction - for HTTP requests - added: detection of live tv having to exit if - tuner was required for a recording. Shows user a notification - message when this was required. v1.0.0.0 - Created + * v1.6.4 - small change to improve the performance of radio channels + v1.6.3 - updated language files from Transifex v1.6.2 - updated + language files from Transifex v1.6.0 - New version number by Team + XBMC v1.0.1.0 - added: new experimental timeshift support. This + requires updated backend components, otherwise falls back to + previous non-timeshift live tv. - added: new 'advanced' settings + page where timeshift can be enabled/disabled. - added: radio + support, mainly to workaround an XBMC channel group bug. - changed: + now using XBMC curl abstraction for HTTP requests - added: detection + of live tv having to exit if tuner was required for a recording. + Shows user a notification message when this was required. v1.0.0.0 - + Created - -- wsnipex Fri, 08 Mar 2013 16:08:57 +0100 + -- wsnipex Tue, 12 Mar 2013 11:53:15 +0100 diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-nextpvr.version xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-nextpvr.version --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-nextpvr.version 2013-03-08 15:10:26.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-nextpvr.version 2013-03-12 10:54:43.000000000 +0000 @@ -1 +1 @@ -1.7.4-2precise +1.6.4-0precise diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-njoy.changelog xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-njoy.changelog --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-njoy.changelog 2013-03-08 15:10:41.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-njoy.changelog 2013-03-12 10:54:57.000000000 +0000 @@ -1,5 +1,5 @@ -xbmc-pvr-addons (1.7.2-2precise) precise; urgency=low +xbmc-pvr-addons (1.6.2-0precise) precise; urgency=low * no upstream changelog available - -- wsnipex Fri, 08 Mar 2013 16:10:41 +0100 + -- wsnipex Tue, 12 Mar 2013 11:54:57 +0100 diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-njoy.changelog.old xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-njoy.changelog.old --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-njoy.changelog.old 2013-03-08 15:09:08.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-njoy.changelog.old 2013-03-12 10:53:26.000000000 +0000 @@ -1,5 +1,5 @@ -xbmc-pvr-addons (1.7.2-2quantal) quantal; urgency=low +xbmc-pvr-addons (1.6.2-0quantal) quantal; urgency=low * no upstream changelog available - -- wsnipex Fri, 08 Mar 2013 16:09:08 +0100 + -- wsnipex Tue, 12 Mar 2013 11:53:26 +0100 diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-njoy.version xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-njoy.version --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-njoy.version 2013-03-08 15:10:38.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-njoy.version 2013-03-12 10:54:54.000000000 +0000 @@ -1 +1 @@ -1.7.2-2precise +1.6.2-0precise diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-tvheadend-hts.changelog xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-tvheadend-hts.changelog --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-tvheadend-hts.changelog 2013-03-08 15:10:26.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-tvheadend-hts.changelog 2013-03-12 10:54:43.000000000 +0000 @@ -1,4 +1,4 @@ -xbmc-pvr-addons (1.7.19-2precise) precise; urgency=low +xbmc-pvr-addons (1.6.19-0precise) precise; urgency=low * - add timeshift skip support (FF/RW still not working) - fix bug in tvh webroot processing 1.6.18 - ensure channel count is not cleared @@ -32,4 +32,4 @@ removed unneeded member in CHTSPDemux - better handling of disconnect and reconnects 1.6.4 - initial release - -- wsnipex Fri, 08 Mar 2013 16:10:26 +0100 + -- wsnipex Tue, 12 Mar 2013 11:54:43 +0100 diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-tvheadend-hts.changelog.old xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-tvheadend-hts.changelog.old --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-tvheadend-hts.changelog.old 2013-03-08 15:08:54.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-tvheadend-hts.changelog.old 2013-03-12 10:53:12.000000000 +0000 @@ -1,4 +1,4 @@ -xbmc-pvr-addons (1.7.19-2quantal) quantal; urgency=low +xbmc-pvr-addons (1.6.19-0quantal) quantal; urgency=low * - add timeshift skip support (FF/RW still not working) - fix bug in tvh webroot processing 1.6.18 - ensure channel count is not cleared @@ -32,4 +32,4 @@ removed unneeded member in CHTSPDemux - better handling of disconnect and reconnects 1.6.4 - initial release - -- wsnipex Fri, 08 Mar 2013 16:08:54 +0100 + -- wsnipex Tue, 12 Mar 2013 11:53:12 +0100 diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-tvheadend-hts.version xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-tvheadend-hts.version --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-tvheadend-hts.version 2013-03-08 15:10:24.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-tvheadend-hts.version 2013-03-12 10:54:40.000000000 +0000 @@ -1 +1 @@ -1.7.19-2precise +1.6.19-0precise diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-vdr-vnsi.changelog xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-vdr-vnsi.changelog --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-vdr-vnsi.changelog 2013-03-08 15:10:23.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-vdr-vnsi.changelog 2013-03-12 10:54:40.000000000 +0000 @@ -1,5 +1,5 @@ -xbmc-pvr-addons (1.7.4-2precise) precise; urgency=low +xbmc-pvr-addons (1.6.4-0precise) precise; urgency=low * no upstream changelog available - -- wsnipex Fri, 08 Mar 2013 16:10:23 +0100 + -- wsnipex Tue, 12 Mar 2013 11:54:40 +0100 diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-vdr-vnsi.changelog.old xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-vdr-vnsi.changelog.old --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-vdr-vnsi.changelog.old 2013-03-08 15:08:51.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-vdr-vnsi.changelog.old 2013-03-12 10:53:09.000000000 +0000 @@ -1,5 +1,5 @@ -xbmc-pvr-addons (1.7.4-2quantal) quantal; urgency=low +xbmc-pvr-addons (1.6.4-0quantal) quantal; urgency=low * no upstream changelog available - -- wsnipex Fri, 08 Mar 2013 16:08:51 +0100 + -- wsnipex Tue, 12 Mar 2013 11:53:09 +0100 diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-vdr-vnsi.version xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-vdr-vnsi.version --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-vdr-vnsi.version 2013-03-08 15:10:21.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-vdr-vnsi.version 2013-03-12 10:54:38.000000000 +0000 @@ -1 +1 @@ -1.7.4-2precise +1.6.4-0precise diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-vuplus.changelog xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-vuplus.changelog --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-vuplus.changelog 2013-03-08 15:10:38.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-vuplus.changelog 2013-03-12 10:54:54.000000000 +0000 @@ -1,4 +1,4 @@ -xbmc-pvr-addons (1.7.7-2precise) precise; urgency=low +xbmc-pvr-addons (1.6.7-0precise) precise; urgency=low * 0.2.4 - fix: put username & password into the streaming url 0.2.3 - fix: put username & password into recording-url 0.2.2: - fix: escape @@ -48,4 +48,4 @@ 0.1.1 - fix: URLEncode the service reference when fetching EPG 0.1.0 - Iniital Version - -- wsnipex Fri, 08 Mar 2013 16:10:38 +0100 + -- wsnipex Tue, 12 Mar 2013 11:54:54 +0100 diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-vuplus.changelog.old xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-vuplus.changelog.old --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-vuplus.changelog.old 2013-03-08 15:09:05.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-vuplus.changelog.old 2013-03-12 10:53:23.000000000 +0000 @@ -1,4 +1,4 @@ -xbmc-pvr-addons (1.7.7-2quantal) quantal; urgency=low +xbmc-pvr-addons (1.6.7-0quantal) quantal; urgency=low * 0.2.4 - fix: put username & password into the streaming url 0.2.3 - fix: put username & password into recording-url 0.2.2: - fix: escape @@ -48,4 +48,4 @@ 0.1.1 - fix: URLEncode the service reference when fetching EPG 0.1.0 - Iniital Version - -- wsnipex Fri, 08 Mar 2013 16:09:05 +0100 + -- wsnipex Tue, 12 Mar 2013 11:53:23 +0100 diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-vuplus.version xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-vuplus.version --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-vuplus.version 2013-03-08 15:10:35.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-vuplus.version 2013-03-12 10:54:52.000000000 +0000 @@ -1 +1 @@ -1.7.7-2precise +1.6.7-0precise diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/xbmc/DVDDemuxPacket.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/xbmc/DVDDemuxPacket.h --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/xbmc/DVDDemuxPacket.h 2013-03-08 12:41:18.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/xbmc/DVDDemuxPacket.h 2013-03-12 10:51:19.000000000 +0000 @@ -1,7 +1,7 @@ #pragma once /* - * Copyright (C) 2012-2013 Team XBMC + * Copyright (C) 2012 Team XBMC * http://www.xbmc.org * * This Program is free software; you can redistribute it and/or modify diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/xbmc/libXBMC_addon.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/xbmc/libXBMC_addon.h --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/xbmc/libXBMC_addon.h 2013-03-08 12:41:18.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/xbmc/libXBMC_addon.h 2013-03-12 10:51:19.000000000 +0000 @@ -1,6 +1,6 @@ #pragma once /* - * Copyright (C) 2005-2013 Team XBMC + * Copyright (C) 2005-2010 Team XBMC * http://www.xbmc.org * * This Program is free software; you can redistribute it and/or modify @@ -158,10 +158,6 @@ dlsym(m_libXBMC_addon, "XBMC_queue_notification"); if (XBMC_queue_notification == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; } - XBMC_wake_on_lan = (bool (*)(void* HANDLE, void *CB, const char *mac)) - dlsym(m_libXBMC_addon, "XBMC_wake_on_lan"); - if (XBMC_wake_on_lan == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; } - XBMC_unknown_to_utf8 = (char* (*)(void* HANDLE, void* CB, const char* str)) dlsym(m_libXBMC_addon, "XBMC_unknown_to_utf8"); if (XBMC_unknown_to_utf8 == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; } @@ -300,16 +296,6 @@ } /*! - * @brief Send WakeOnLan magic packet. - * @param mac Network address of the host to wake. - * @return True if the magic packet was successfully sent, false otherwise. - */ - bool WakeOnLan(const char* mac) - { - return XBMC_wake_on_lan(m_Handle, m_Callbacks, mac); - } - - /*! * @brief Translate a string with an unknown encoding to UTF8. * @param str The string to translate. * @return The string translated to UTF8. Must be freed by calling FreeString() when done. @@ -555,7 +541,6 @@ 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); 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); char* (*XBMC_get_localized_string)(void *HANDLE, void* CB, int dwCode); char* (*XBMC_get_dvd_menu_language)(void *HANDLE, void* CB); diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/xbmc/libXBMC_gui.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/xbmc/libXBMC_gui.h --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/xbmc/libXBMC_gui.h 2013-03-08 12:41:18.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/xbmc/libXBMC_gui.h 2013-03-12 10:51:19.000000000 +0000 @@ -1,6 +1,6 @@ #pragma once /* - * Copyright (C) 2005-2013 Team XBMC + * Copyright (C) 2005-2010 Team XBMC * http://www.xbmc.org * * This Program is free software; you can redistribute it and/or modify @@ -35,12 +35,6 @@ #define GUI_HELPER_DLL "/library.xbmc.gui/" GUI_HELPER_DLL_NAME #endif -/* current ADDONGUI API version */ -#define XBMC_GUI_API_VERSION "1.0.0" - -/* min. ADDONGUI API version */ -#define XBMC_GUI_MIN_API_VERSION "1.0.0" - #define ADDON_ACTION_PREVIOUS_MENU 10 #define ADDON_ACTION_CLOSE_DIALOG 51 @@ -49,7 +43,6 @@ class CAddonGUIRadioButton; class CAddonGUIProgressControl; class CAddonListItem; -class CAddonGUIRenderingControl; class CHelper_libXBMC_gui { @@ -161,14 +154,6 @@ dlsym(m_libXBMC_gui, "GUI_ListItem_destroy"); if (GUI_ListItem_destroy == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; } - GUI_control_get_rendering = (CAddonGUIRenderingControl* (*)(void *HANDLE, void *CB, CAddonGUIWindow *window, int controlId)) - dlsym(m_libXBMC_gui, "GUI_control_get_rendering"); - if (GUI_control_get_rendering == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; } - - GUI_control_release_rendering = (void (*)(CAddonGUIRenderingControl* p)) - dlsym(m_libXBMC_gui, "GUI_control_release_rendering"); - if (GUI_control_release_rendering == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; } - m_Callbacks = GUI_register_me(m_Handle); return m_Callbacks != NULL; @@ -249,16 +234,6 @@ return GUI_ListItem_destroy(p); } - CAddonGUIRenderingControl* Control_getRendering(CAddonGUIWindow *window, int controlId) - { - return GUI_control_get_rendering(m_Handle, m_Callbacks, window, controlId); - } - - void Control_releaseRendering(CAddonGUIRenderingControl* p) - { - return GUI_control_release_rendering(p); - } - protected: void* (*GUI_register_me)(void *HANDLE); void (*GUI_unregister_me)(void *HANDLE, void* CB); @@ -277,8 +252,6 @@ void (*GUI_control_release_progress)(CAddonGUIProgressControl* p); CAddonListItem* (*GUI_ListItem_create)(void *HANDLE, void* CB, const char *label, const char *label2, const char *iconImage, const char *thumbnailImage, const char *path); void (*GUI_ListItem_destroy)(CAddonListItem* p); - CAddonGUIRenderingControl* (*GUI_control_get_rendering)(void *HANDLE, void* CB, CAddonGUIWindow *window, int controlId); - void (*GUI_control_release_rendering)(CAddonGUIRenderingControl* p); private: void *m_libXBMC_gui; @@ -382,7 +355,6 @@ friend class CAddonGUISpinControl; friend class CAddonGUIRadioButton; friend class CAddonGUIProgressControl; -friend class CAddonGUIRenderingControl; public: CAddonGUIWindow(void *hdl, void *cb, const char *xmlFilename, const char *defaultSkin, bool forceFallback, bool asDialog); @@ -413,7 +385,6 @@ virtual void SetCurrentListPosition(int listPos); virtual int GetCurrentListPosition(); virtual void SetControlLabel(int controlId, const char *label); - virtual void MarkDirtyRegion(); virtual bool OnClick(int controlId); virtual bool OnFocus(int controlId); @@ -431,29 +402,3 @@ void *m_Handle; void *m_cb; }; - -class CAddonGUIRenderingControl -{ -public: - CAddonGUIRenderingControl(void *hdl, void *cb, CAddonGUIWindow *window, int controlId); - virtual ~CAddonGUIRenderingControl(); - virtual void Init(); - - virtual bool Create(int x, int y, int w, int h, void *device); - virtual void Render(); - virtual void Stop(); - virtual bool Dirty(); - - GUIHANDLE m_cbhdl; - bool (*CBCreate)(GUIHANDLE cbhdl, int x, int y, int w, int h, void *device); - void (*CBRender)(GUIHANDLE cbhdl); - void (*CBStop)(GUIHANDLE cbhdl); - bool (*CBDirty)(GUIHANDLE cbhdl); - -private: - CAddonGUIWindow *m_Window; - int m_ControlId; - GUIHANDLE m_RenderingHandle; - void *m_Handle; - void *m_cb; -}; diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/xbmc/libXBMC_pvr.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/xbmc/libXBMC_pvr.h --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/xbmc/libXBMC_pvr.h 2013-03-08 12:41:18.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/xbmc/libXBMC_pvr.h 2013-03-12 10:51:19.000000000 +0000 @@ -1,6 +1,6 @@ #pragma once /* - * Copyright (C) 2005-2013 Team XBMC + * Copyright (C) 2005-2010 Team XBMC * http://www.xbmc.org * * This Program is free software; you can redistribute it and/or modify diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/xbmc/xbmc_addon_cpp_dll.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/xbmc/xbmc_addon_cpp_dll.h --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/xbmc/xbmc_addon_cpp_dll.h 2013-03-08 12:41:18.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/xbmc/xbmc_addon_cpp_dll.h 2013-03-12 10:51:19.000000000 +0000 @@ -2,7 +2,7 @@ #define __XBMC_ADDON_CPP_H__ /* - * Copyright (C) 2005-2013 Team XBMC + * Copyright (C) 2005-2012 Team XBMC * http://www.xbmc.org * * This Program is free software; you can redistribute it and/or modify diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/xbmc/xbmc_addon_dll.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/xbmc/xbmc_addon_dll.h --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/xbmc/xbmc_addon_dll.h 2013-03-08 12:41:18.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/xbmc/xbmc_addon_dll.h 2013-03-12 10:51:19.000000000 +0000 @@ -2,7 +2,7 @@ #define __XBMC_ADDON_DLL_H__ /* - * Copyright (C) 2005-2013 Team XBMC + * Copyright (C) 2005-2012 Team XBMC * http://www.xbmc.org * * This Program is free software; you can redistribute it and/or modify @@ -46,7 +46,6 @@ 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 -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/xbmc/xbmc_addon_types.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/xbmc/xbmc_addon_types.h --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/xbmc/xbmc_addon_types.h 2013-03-08 12:41:18.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/xbmc/xbmc_addon_types.h 2013-03-12 10:51:19.000000000 +0000 @@ -2,7 +2,7 @@ #define __XBMC_ADDON_TYPES_H__ /* - * Copyright (C) 2005-2013 Team XBMC + * Copyright (C) 2005-2012 Team XBMC * http://www.xbmc.org * * This Program is free software; you can redistribute it and/or modify diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/xbmc/xbmc_epg_types.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/xbmc/xbmc_epg_types.h --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/xbmc/xbmc_epg_types.h 2013-03-08 12:41:18.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/xbmc/xbmc_epg_types.h 2013-03-12 10:51:19.000000000 +0000 @@ -1,6 +1,6 @@ #pragma once /* - * Copyright (C) 2005-2013 Team XBMC + * Copyright (C) 2005-2012 Team XBMC * http://www.xbmc.org * * This Program is free software; you can redistribute it and/or modify diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/xbmc/xbmc_pvr_dll.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/xbmc/xbmc_pvr_dll.h --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/xbmc/xbmc_pvr_dll.h 2013-03-08 12:41:18.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/xbmc/xbmc_pvr_dll.h 2013-03-12 10:51:19.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2013 Team XBMC + * Copyright (C) 2005-2012 Team XBMC * http://www.xbmc.org * * This Program is free software; you can redistribute it and/or modify @@ -51,22 +51,6 @@ const char* GetMininumPVRAPIVersion(void); /*! - * Get the XBMC_GUI_API_VERSION that was used to compile this add-on. - * Used to check if this add-on is compatible with XBMC. - * @return The XBMC_GUI_API_VERSION that was used to compile this add-on. - * @remarks Valid implementation required. - */ - const char* GetGUIAPIVersion(void); - - /*! - * Get the XBMC_GUI_MIN_API_VERSION that was used to compile this add-on. - * Used to check if this add-on is compatible with XBMC. - * @return The XBMC_GUI_MIN_API_VERSION that was used to compile this add-on. - * @remarks Valid implementation required. - */ - const char* GetMininumGUIAPIVersion(void); - - /*! * Get the list of features that this add-on provides. * Called by XBMC to query the add-on's capabilities. * Used to check which options should be presented in the UI, which methods to call, etc. @@ -300,16 +284,6 @@ */ int GetRecordingLastPlayedPosition(const PVR_RECORDING& recording); - /*! - * Retrieve the edit decision list (EDL) of a recording on the backend. - * @param recording The recording. - * @param edl out: The function has to write the EDL list into this array. - * @param size in: The maximum size of the EDL, out: the actual size of the EDL. - * @return PVR_ERROR_NO_ERROR if the EDL was successfully read. - * @remarks Required if bSupportsRecordingEdl is set to true. Return PVR_ERROR_NOT_IMPLEMENTED if this add-on won't provide this function. - */ - PVR_ERROR GetRecordingEdl(const PVR_RECORDING&, PVR_EDL_ENTRY edl[], int *size); - //@} /** @name PVR timer methods * @remarks Only used by XBMC is bSupportsTimers is set to true. @@ -582,8 +556,6 @@ { pClient->GetPVRAPIVersion = GetPVRAPIVersion; pClient->GetMininumPVRAPIVersion = GetMininumPVRAPIVersion; - pClient->GetGUIAPIVersion = GetGUIAPIVersion; - pClient->GetMininumGUIAPIVersion = GetMininumGUIAPIVersion; pClient->GetAddonCapabilities = GetAddonCapabilities; pClient->GetStreamProperties = GetStreamProperties; pClient->GetConnectionString = GetConnectionString; @@ -614,7 +586,6 @@ pClient->SetRecordingPlayCount = SetRecordingPlayCount; pClient->SetRecordingLastPlayedPosition = SetRecordingLastPlayedPosition; pClient->GetRecordingLastPlayedPosition = GetRecordingLastPlayedPosition; - pClient->GetRecordingEdl = GetRecordingEdl; pClient->GetTimersAmount = GetTimersAmount; pClient->GetTimers = GetTimers; diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/xbmc/xbmc_pvr_types.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/xbmc/xbmc_pvr_types.h --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/xbmc/xbmc_pvr_types.h 2013-03-08 12:41:18.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/xbmc/xbmc_pvr_types.h 2013-03-12 10:51:19.000000000 +0000 @@ -1,6 +1,6 @@ #pragma once /* - * Copyright (C) 2005-2013 Team XBMC + * Copyright (C) 2005-2012 Team XBMC * http://www.xbmc.org * * This Program is free software; you can redistribute it and/or modify @@ -33,7 +33,6 @@ #endif #endif #include -#include #include "xbmc_addon_types.h" #include "xbmc_epg_types.h" @@ -68,16 +67,15 @@ #define PVR_ADDON_URL_STRING_LENGTH 1024 #define PVR_ADDON_DESC_STRING_LENGTH 1024 #define PVR_ADDON_INPUT_FORMAT_STRING_LENGTH 32 -#define PVR_ADDON_EDL_LENGTH 32 /* using the default avformat's MAX_STREAMS value to be safe */ #define PVR_STREAM_MAX_STREAMS 20 /* current PVR API version */ -#define XBMC_PVR_API_VERSION "1.7.0" +#define XBMC_PVR_API_VERSION "1.6.0" /* min. PVR API version */ -#define XBMC_PVR_MIN_API_VERSION "1.7.0" +#define XBMC_PVR_MIN_API_VERSION "1.6.0" #ifdef __cplusplus extern "C" { @@ -156,7 +154,6 @@ bool bSupportsRecordingFolders; /*!< @brief true if the backend supports timers / recordings in folders. */ bool bSupportsRecordingPlayCount; /*!< @brief true if the backend supports play count for recordings. */ bool bSupportsLastPlayedPosition; /*!< @brief true if the backend supports store/retrieve of last played position for recordings. */ - bool bSupportsRecordingEdl; /*!< @brief true if the backend supports retrieving an edit decision list for recordings. */ } ATTRIBUTE_PACKED PVR_ADDON_CAPABILITIES; /*! @@ -288,36 +285,15 @@ int iGenreType; /*!< @brief (optional) genre type */ int iGenreSubType; /*!< @brief (optional) genre sub type */ int iPlayCount; /*!< @brief (optional) play count of this recording on the client */ - int iLastPlayedPosition; /*!< @brief (optional) last played position of this recording on the client */ } ATTRIBUTE_PACKED PVR_RECORDING; /*! - * @brief Edit definition list (EDL) - */ - typedef enum - { - PVR_EDL_TYPE_CUT = 0, /*!< @brief cut (completly remove content) */ - PVR_EDL_TYPE_MUTE = 1, /*!< @brief mute audio */ - PVR_EDL_TYPE_SCENE = 2, /*!< @brief scene markers (chapter seeking) */ - PVR_EDL_TYPE_COMBREAK = 3 /*!< @brief commercial breaks */ - } PVR_EDL_TYPE; - - typedef struct PVR_EDL_ENTRY - { - int64_t start; // ms - int64_t end; // ms - PVR_EDL_TYPE type; - } ATTRIBUTE_PACKED PVR_EDL_ENTRY; - - /*! * @brief Structure to transfer the methods from xbmc_pvr_dll.h to XBMC */ typedef struct PVRClient { const char* (__cdecl* GetPVRAPIVersion)(void); const char* (__cdecl* GetMininumPVRAPIVersion)(void); - const char* (__cdecl* GetGUIAPIVersion)(void); - const char* (__cdecl* GetMininumGUIAPIVersion)(void); PVR_ERROR (__cdecl* GetAddonCapabilities)(PVR_ADDON_CAPABILITIES*); PVR_ERROR (__cdecl* GetStreamProperties)(PVR_STREAM_PROPERTIES*); const char* (__cdecl* GetBackendName)(void); @@ -344,7 +320,6 @@ PVR_ERROR (__cdecl* SetRecordingPlayCount)(const PVR_RECORDING&, int); PVR_ERROR (__cdecl* SetRecordingLastPlayedPosition)(const PVR_RECORDING&, int); int (__cdecl* GetRecordingLastPlayedPosition)(const PVR_RECORDING&); - PVR_ERROR (__cdecl* GetRecordingEdl)(const PVR_RECORDING&, PVR_EDL_ENTRY[], int*); int (__cdecl* GetTimersAmount)(void); PVR_ERROR (__cdecl* GetTimers)(ADDON_HANDLE); PVR_ERROR (__cdecl* AddTimer)(const PVR_TIMER&); diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/xbmc/xbmc_scr_dll.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/xbmc/xbmc_scr_dll.h --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/xbmc/xbmc_scr_dll.h 2013-03-08 12:41:18.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/xbmc/xbmc_scr_dll.h 2013-03-12 10:51:19.000000000 +0000 @@ -1,6 +1,6 @@ #pragma once /* - * Copyright (C) 2005-2013 Team XBMC + * Copyright (C) 2005-2012 Team XBMC * http://www.xbmc.org * * This Program is free software; you can redistribute it and/or modify diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/xbmc/xbmc_scr_types.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/xbmc/xbmc_scr_types.h --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/xbmc/xbmc_scr_types.h 2013-03-08 12:41:18.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/xbmc/xbmc_scr_types.h 2013-03-12 10:51:19.000000000 +0000 @@ -1,6 +1,6 @@ #pragma once /* - * Copyright (C) 2005-2013 Team XBMC + * Copyright (C) 2005-2012 Team XBMC * http://www.xbmc.org * * This Program is free software; you can redistribute it and/or modify diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/xbmc/xbmc_vis_dll.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/xbmc/xbmc_vis_dll.h --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/xbmc/xbmc_vis_dll.h 2013-03-08 12:41:18.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/xbmc/xbmc_vis_dll.h 2013-03-12 10:51:19.000000000 +0000 @@ -2,7 +2,7 @@ #define __XBMC_VIS_H__ /* - * Copyright (C) 2005-2013 Team XBMC + * Copyright (C) 2005-2012 Team XBMC * http://www.xbmc.org * * This Program is free software; you can redistribute it and/or modify diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/xbmc/xbmc_vis_types.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/xbmc/xbmc_vis_types.h --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/xbmc/xbmc_vis_types.h 2013-03-08 12:41:18.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/xbmc/xbmc_vis_types.h 2013-03-12 10:51:19.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2013 Team XBMC + * Copyright (C) 2005-2012 Team XBMC * http://www.xbmc.org * * This Program is free software; you can redistribute it and/or modify