Merge pull request #99 from margro/master

Update the plugin to v3.5.14 (Fixes for v18)
kodi-pvr · Dec 15, 2018 · 25e3e7d · 25e3e7d
2 parents b17fdad + e873ca2
commit 25e3e7d
Show file tree

Hide file tree

Showing 20 changed files with 125 additions and 97 deletions.
diff --git a/pvr.mediaportal.tvserver/addon.xml.in b/pvr.mediaportal.tvserver/addon.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="pvr.mediaportal.tvserver"
-  version="3.5.13"
+  version="3.5.14"
   name="MediaPortal PVR Client"
   provider-name="Marcel Groothuis">
   <requires>@ADDON_DEPENDS@</requires>

diff --git a/pvr.mediaportal.tvserver/changelog.txt b/pvr.mediaportal.tvserver/changelog.txt
@@ -1,3 +1,19 @@
+v3.5.14:
+- Fixed: Delete the tsreader when tuning to a new channel failed. This fixes the first re-tune to a working channel after a failure
+- Updated: recommended TVServerKodi version to build 140
+- Recording playback: update the end time if the recording is still ongoing
+- Recording: Prevent setting a negative last played position. MediaPortal does not like this.
+- Recording: mark in-progress recording as "real-time" also on non-Windows targets
+- Fixed: various 64-bit compiler warnings
+- Fixed: Increase the command buffer size to fit the full contents of strRecordingId in DeleteRecording() and GetRecordings()
+- Fixed: tsreader: checking for < 0 on unsigned values is useless
+
+v3.5.13:
+- Translation update from Transifex
+
+v3.5.12:
+- Translation update from Transifex
+
 v3.5.11:
 - Fixed: GetAddonCapabilities() did not explicitly set all newly added capabilities
 - Fixed: Error: "Couldn't get 'defaultrecordinglifetime' setting, falling back to '100' as default"

diff --git a/src/Socket.cpp b/src/Socket.cpp
@@ -433,7 +433,7 @@ bool Socket::connect ( const std::string& host, const unsigned short port )
       continue;
     }
 
-    int status = ::connect(_sd, address->ai_addr, address->ai_addrlen);
+    int status = ::connect(_sd, address->ai_addr, static_cast<int>(address->ai_addrlen));
     if (status == SOCKET_ERROR)
     {
       close();

diff --git a/src/lib/tsreader/DeMultiplexer.cpp b/src/lib/tsreader/DeMultiplexer.cpp
@@ -99,25 +99,25 @@ namespace MPTV
     /// and processes the raw data
     /// When a TS packet has been discovered, OnTsPacket(byte* tsPacket) gets called
     //  which in its turn deals with the packet
-    int CDeMultiplexer::ReadFromFile()
+    size_t CDeMultiplexer::ReadFromFile()
     {
         if (m_filter.IsSeeking())
             return 0;       // Ambass : to check
 
         P8PLATFORM::CLockObject lock(m_sectionRead);
         if (NULL == m_reader)
-            return false;
+            return 0;
 
         byte buffer[READ_SIZE];
-        unsigned long dwReadBytes = 0;
+        size_t dwReadBytes = 0;
 
         // if we are playing a RTSP stream
         if (m_reader->IsBuffer())
         {
             // and, the current buffer holds data
-            int nBytesToRead = m_reader->HasData();
+            size_t nBytesToRead = m_reader->HasData();
 
-            if (nBytesToRead > (int) sizeof(buffer))
+            if (nBytesToRead > sizeof(buffer))
             {
                 nBytesToRead = sizeof(buffer);
             }
@@ -130,13 +130,13 @@ namespace MPTV
             if (nBytesToRead)
             {
               // then read raw data from the buffer
-              if (SUCCEEDED(m_reader->Read(buffer, nBytesToRead, (unsigned long*)&dwReadBytes)))
+              if (SUCCEEDED(m_reader->Read(buffer, nBytesToRead, &dwReadBytes)))
               {
                 if (dwReadBytes > 0)
                 {
                   // yes, then process the raw data
                   //result=true;
-                  OnRawData(buffer, (int)dwReadBytes);
+                  OnRawData(buffer, dwReadBytes);
                   m_LastDataFromRtsp = GetTickCount64();
                 }
               }
@@ -165,7 +165,7 @@ namespace MPTV
         {
             // playing a local file.
             // read raw data from the file
-            if (SUCCEEDED(m_reader->Read(buffer, sizeof(buffer), (unsigned long*)&dwReadBytes)))
+            if (SUCCEEDED(m_reader->Read(buffer, sizeof(buffer), &dwReadBytes)))
             {
                 if ((m_filter.IsTimeShifting()) && (dwReadBytes < sizeof(buffer)))
                 {

diff --git a/src/lib/tsreader/DeMultiplexer.h b/src/lib/tsreader/DeMultiplexer.h
@@ -55,7 +55,7 @@ namespace MPTV
         void       OnNewChannel(CChannelInfo& info);
         void       SetFileReader(FileReader* reader);
         void RequestNewPat(void);
-        int ReadFromFile();
+        size_t ReadFromFile();
 
     private:
         unsigned long long m_LastDataFromRtsp;

diff --git a/src/lib/tsreader/FileReader.cpp b/src/lib/tsreader/FileReader.cpp
@@ -202,9 +202,16 @@ namespace MPTV
     }
 
 
-    long FileReader::Read(unsigned char* pbData, unsigned long lDataLength, unsigned long *dwReadBytes)
+    long FileReader::Read(unsigned char* pbData, size_t lDataLength, size_t *dwReadBytes)
     {
-        *dwReadBytes = KODI->ReadFile(m_hFile, (void*)pbData, lDataLength);//Read file data into buffer
+		ssize_t read_bytes = KODI->ReadFile(m_hFile, (void*)pbData, lDataLength);//Read file data into buffer
+		if (read_bytes < 0)
+		{
+			TSDEBUG(LOG_DEBUG, "%s: ReadFile function failed.", __FUNCTION__);
+			*dwReadBytes = 0;
+			return S_FALSE;
+		}
+		*dwReadBytes = static_cast<size_t>(read_bytes);
         TSDEBUG(LOG_DEBUG, "%s: requested read length %d actually read %d.", __FUNCTION__, lDataLength, *dwReadBytes);
 
         if (*dwReadBytes < lDataLength)

diff --git a/src/lib/tsreader/FileReader.h b/src/lib/tsreader/FileReader.h
@@ -50,14 +50,14 @@ namespace MPTV
         virtual long OpenFile(const std::string& fileName);
         virtual long OpenFile();
         virtual long CloseFile();
-        virtual long Read(unsigned char* pbData, unsigned long lDataLength, unsigned long *dwReadBytes);
+        virtual long Read(unsigned char* pbData, size_t lDataLength, size_t *dwReadBytes);
         virtual bool IsFileInvalid();
         virtual int64_t SetFilePointer(int64_t llDistanceToMove, unsigned long dwMoveMethod);
         virtual int64_t GetFilePointer();
         virtual int64_t GetFileSize();
         virtual bool IsBuffer() { return false; };
         virtual int64_t OnChannelChange(void);
-        virtual int HasData(){ return 0; };
+        virtual size_t HasData(){ return 0; };
 
     protected:
         void*       m_hFile;               // Handle to file for streaming

diff --git a/src/lib/tsreader/MemoryBuffer.cpp b/src/lib/tsreader/MemoryBuffer.cpp
@@ -161,7 +161,7 @@ size_t CMemoryBuffer::ReadFromBuffer(unsigned char *pbData, size_t lDataLength)
 
 long CMemoryBuffer::PutBuffer(unsigned char *pbData, size_t lDataLength)
 {
-  if (lDataLength <= 0 || pbData == NULL) return E_FAIL;
+  if (lDataLength == 0 || pbData == NULL) return E_FAIL;
 
   BufferItem* item = new BufferItem();
   item->nOffset = 0;

diff --git a/src/lib/tsreader/MemoryReader.cpp b/src/lib/tsreader/MemoryReader.cpp
@@ -42,10 +42,10 @@ namespace MPTV
     {
     }
 
-    long CMemoryReader::Read(unsigned char* pbData, unsigned long lDataLength, unsigned long *dwReadBytes)
+    long CMemoryReader::Read(unsigned char* pbData, unsigned long lDataLength, size_t *dwReadBytes)
     {
-        *dwReadBytes = m_buffer.ReadFromBuffer(pbData,lDataLength);
-        if ((*dwReadBytes) <=0)
+        *dwReadBytes = m_buffer.ReadFromBuffer(pbData, lDataLength);
+        if ((*dwReadBytes) == 0)
             return S_FALSE;
         return S_OK;
     }
@@ -55,7 +55,7 @@ namespace MPTV
         return 0;
     }
 
-    int CMemoryReader::HasData()
+    size_t CMemoryReader::HasData()
     {
         return (m_buffer.Size());
     }

diff --git a/src/lib/tsreader/MemoryReader.h b/src/lib/tsreader/MemoryReader.h
@@ -40,11 +40,11 @@ namespace MPTV
       public:
         CMemoryReader(CMemoryBuffer& buffer);
         virtual ~CMemoryReader(void);
-        long Read(unsigned char* pbData, unsigned long lDataLength, unsigned long *dwReadBytes);
+        long Read(unsigned char* pbData, unsigned long lDataLength, size_t *dwReadBytes);
         unsigned long setFilePointer(int64_t llDistanceToMove, unsigned long dwMoveMethod);
         bool IsBuffer() { return true; };
         long CloseFile() { return S_OK; };
-        int HasData();
+        size_t HasData();
 
       private:
         CMemoryBuffer& m_buffer;

diff --git a/src/lib/tsreader/MultiFileReader.cpp b/src/lib/tsreader/MultiFileReader.cpp
@@ -241,7 +241,7 @@ namespace MPTV
         return m_currentPosition;
     }
 
-    long MultiFileReader::Read(unsigned char* pbData, unsigned long lDataLength, unsigned long *dwReadBytes)
+    long MultiFileReader::Read(unsigned char* pbData, size_t lDataLength, size_t *dwReadBytes)
     {
         // If the file has already been closed, don't continue
         if (m_TSBufferFile.IsFileInvalid())
@@ -306,22 +306,22 @@ namespace MPTV
                 }
             }
 
-            unsigned long bytesRead = 0;
+            size_t bytesRead = 0;
             long hr;
 
             int64_t bytesToRead = file->length - seekPosition;
             if ((int64_t)lDataLength > bytesToRead)
             {
                 // KODI->Log(LOG_DEBUG, "%s: datalength %lu bytesToRead %lli.", __FUNCTION__, lDataLength, bytesToRead);
-                hr = m_TSFile.Read(pbData, (unsigned long)bytesToRead, &bytesRead);
+                hr = m_TSFile.Read(pbData, (size_t)bytesToRead, &bytesRead);
                 if (FAILED(hr))
                 {
                     KODI->Log(LOG_ERROR, "READ FAILED1");
                     return S_FALSE;
                 }
                 m_currentPosition += bytesToRead;
 
-                hr = this->Read(pbData + bytesToRead, lDataLength - (unsigned long)bytesToRead, dwReadBytes);
+                hr = this->Read(pbData + bytesToRead, lDataLength - (size_t)bytesToRead, dwReadBytes);
                 if (FAILED(hr))
                 {
                     KODI->Log(LOG_ERROR, "READ FAILED2");
@@ -357,7 +357,7 @@ namespace MPTV
             return S_FALSE;
         }
 
-        unsigned long bytesRead;
+        size_t bytesRead;
         MultiFileReaderFile *file;
 
         int64_t currentPosition;
@@ -388,7 +388,7 @@ namespace MPTV
 
             m_TSBufferFile.SetFilePointer(0, FILE_BEGIN);
 
-            uint32_t readLength = sizeof(currentPosition) + sizeof(filesAdded) + sizeof(filesRemoved);
+            size_t readLength = sizeof(currentPosition) + sizeof(filesAdded) + sizeof(filesRemoved);
             unsigned char* readBuffer = new unsigned char[readLength];
 
             long result = m_TSBufferFile.Read(readBuffer, readLength, &bytesRead);
@@ -519,7 +519,7 @@ namespace MPTV
             std::vector<std::string> filenames;
 
             Wchar_t* pwCurrFile = pBuffer;    //Get a pointer to the first wchar filename string in pBuffer
-            long length = WcsLen(pwCurrFile);
+            size_t length = WcsLen(pwCurrFile);
 
             //KODI->Log(LOG_DEBUG, "%s: WcsLen(%d), sizeof(Wchar_t) == %d sizeof(wchar_t) == %d.", __FUNCTION__, length, sizeof(Wchar_t), sizeof(wchar_t));
 

diff --git a/src/lib/tsreader/MultiFileReader.h b/src/lib/tsreader/MultiFileReader.h
@@ -58,7 +58,7 @@ namespace MPTV
         virtual long OpenFile();
         virtual long OpenFile(const std::string& fileName);
         virtual long CloseFile();
-        virtual long Read(unsigned char* pbData, unsigned long lDataLength, unsigned long *dwReadBytes);
+        virtual long Read(unsigned char* pbData, size_t lDataLength, size_t *dwReadBytes);
 
         virtual bool IsFileInvalid();
 

diff --git a/src/lib/tsreader/PacketSync.cpp b/src/lib/tsreader/PacketSync.cpp
@@ -41,9 +41,9 @@ namespace MPTV
 
     // Ambass : Now, need to have 2 consecutive TS_PACKET_SYNC to try avoiding bad synchronisation.  
     //          In case of data flow change ( Seek, tv Zap .... ) Reset() should be called first to flush buffer.
-    void CPacketSync::OnRawData(byte* pData, int nDataLen)
+    void CPacketSync::OnRawData(byte* pData, size_t nDataLen)
     {
-        int syncOffset = 0;
+        size_t syncOffset = 0;
         if (m_tempBufferPos > 0)
         {
             if (pData[TS_PACKET_LEN - m_tempBufferPos] == TS_PACKET_SYNC)

diff --git a/src/lib/tsreader/PacketSync.h b/src/lib/tsreader/PacketSync.h
@@ -35,12 +35,12 @@ namespace MPTV
 
     public:
         virtual ~CPacketSync(void);
-        void OnRawData(byte* pData, int nDataLen);
+        void OnRawData(byte* pData, size_t nDataLen);
         virtual void OnTsPacket(byte* tsPacket);
         void Reset(void);
 
     private:
         byte  m_tempBuffer[200];
-        int   m_tempBufferPos;
+        ssize_t   m_tempBufferPos;
     };
 }
diff --git a/src/lib/tsreader/TSReader.cpp b/src/lib/tsreader/TSReader.cpp
@@ -208,7 +208,7 @@ namespace MPTV
             Close();
 
         // check file type
-        int length = m_fileName.length();
+        size_t length = m_fileName.length();
 
         if ((length > 7) && (strnicmp(m_fileName.c_str(), "rtsp://", 7) == 0))
         {
@@ -295,14 +295,14 @@ namespace MPTV
         return S_OK;
     }
 
-    long CTsReader::Read(unsigned char* pbData, unsigned long lDataLength, unsigned long *dwReadBytes)
+    long CTsReader::Read(unsigned char* pbData, size_t lDataLength, size_t *dwReadBytes)
     {
         if (m_fileReader)
         {
             return m_fileReader->Read(pbData, lDataLength, dwReadBytes);
         }
 
-        dwReadBytes = 0;
+        *dwReadBytes = 0;
         return S_FALSE;
     }
 
@@ -365,12 +365,19 @@ namespace MPTV
                 }
                 else
                 {
+                  if (timeShiftBufferPos < 0)
+                  {
+                    pos_after = m_fileReader->SetFilePointer(0LL, FILE_BEGIN);
+                  }
+                  else
+                  {
                     pos_after = m_fileReader->SetFilePointer(0LL, FILE_END);
                     if ((timeShiftBufferPos > 0) && (pos_after > timeShiftBufferPos))
                     {
-                        /* Move backward */
-                        pos_after = fileReader->SetFilePointer((timeShiftBufferPos - pos_after), FILE_CURRENT);
+                      /* Move backward */
+                      pos_after = fileReader->SetFilePointer((timeShiftBufferPos - pos_after), FILE_CURRENT);
                     }
+                  }
                 }
 
                 m_demultiplexer.RequestNewPat();
@@ -393,7 +400,7 @@ namespace MPTV
     {
         std::string tmp = directory;
 
-#ifdef TARGET_WINDOWS
+#ifdef TARGET_WINDOWS_DESKTOP
         if (tmp.find("smb://") != string::npos)
         {
           // Convert XBMC smb share name back to a real windows network share...

diff --git a/src/lib/tsreader/TSReader.h b/src/lib/tsreader/TSReader.h
@@ -52,7 +52,7 @@ namespace MPTV
         CTsReader();
         ~CTsReader(void);
         long Open(const char* pszFileName);
-        long Read(unsigned char* pbData, unsigned long lDataLength, unsigned long *dwReadBytes);
+        long Read(unsigned char* pbData, size_t lDataLength, size_t *dwReadBytes);
         void Close();
         int64_t SetFilePointer(int64_t llDistanceToMove, unsigned long dwMoveMethod);
         int64_t GetFileSize();