Solved compile errors under Linux + add possibility to set timers margin to 0 #529

Closed
wants to merge 2 commits into
from
Jump to file
+41 −41
Split
@@ -129,9 +129,9 @@ class CDVDInputStream
virtual bool Open(const char* strFileName, const std::string& content);
virtual void Close() = 0;
virtual int Read(BYTE* buf, int buf_size) = 0;
- virtual int64_t Seek(int64_t offset, int whence) = 0;
+ virtual __int64 Seek(__int64 offset, int whence) = 0;
virtual bool Pause(double dTime) = 0;
- virtual int64_t GetLength() = 0;
+ virtual __int64 GetLength() = 0;
virtual std::string& GetContent() { return m_content; };
virtual std::string& GetFileName() { return m_strFileName; }
virtual ENextStream NextStream() { return NEXTSTREAM_NONE; }
@@ -806,7 +806,7 @@ bool CDVDInputStreamBluray::SeekChapter(int ch)
return true;
}
-int64_t CDVDInputStreamBluray::Seek(int64_t offset, int whence)
+__int64 CDVDInputStreamBluray::Seek(__int64 offset, int whence)
{
#if LIBBLURAY_BYTESEEK
if(whence == SEEK_POSSIBLE)
@@ -841,7 +841,7 @@ int64_t CDVDInputStreamBluray::Seek(int64_t offset, int whence)
#endif
}
-int64_t CDVDInputStreamBluray::GetLength()
+__int64 CDVDInputStreamBluray::GetLength()
{
return m_dll->bd_get_title_size(m_bd);
}
@@ -48,10 +48,10 @@ class CDVDInputStreamBluray
virtual bool Open(const char* strFile, const std::string &content);
virtual void Close();
virtual int Read(BYTE* buf, int buf_size);
- virtual int64_t Seek(int64_t offset, int whence);
+ virtual __int64 Seek(__int64 offset, int whence);
virtual bool Pause(double dTime) { return false; };
virtual bool IsEOF();
- virtual int64_t GetLength();
+ virtual __int64 GetLength();
virtual int GetBlockSize() { return 6144; }
virtual ENextStream NextStream();
@@ -58,12 +58,12 @@ int CDVDInputStreamFFmpeg::Read(BYTE* buf, int buf_size)
return -1;
}
-int64_t CDVDInputStreamFFmpeg::GetLength()
+__int64 CDVDInputStreamFFmpeg::GetLength()
{
return 0;
}
-int64_t CDVDInputStreamFFmpeg::Seek(int64_t offset, int whence)
+__int64 CDVDInputStreamFFmpeg::Seek(__int64 offset, int whence)
{
return -1;
}
@@ -31,10 +31,10 @@ class CDVDInputStreamFFmpeg : public CDVDInputStream
virtual bool Open(const char* strFile, const std::string &content);
virtual void Close();
virtual int Read(BYTE* buf, int buf_size);
- virtual int64_t Seek(int64_t offset, int whence);
+ virtual __int64 Seek(__int64 offset, int whence);
virtual bool Pause(double dTime) { return false; };
virtual bool IsEOF();
- virtual int64_t GetLength();
+ virtual __int64 GetLength();
protected:
};
@@ -92,7 +92,7 @@ int CDVDInputStreamFile::Read(BYTE* buf, int buf_size)
return (int)(ret & 0xFFFFFFFF);
}
-int64_t CDVDInputStreamFile::Seek(int64_t offset, int whence)
+__int64 CDVDInputStreamFile::Seek(__int64 offset, int whence)
{
if(!m_pFile) return -1;
@@ -107,7 +107,7 @@ int64_t CDVDInputStreamFile::Seek(int64_t offset, int whence)
return ret;
}
-int64_t CDVDInputStreamFile::GetLength()
+__int64 CDVDInputStreamFile::GetLength()
{
if (m_pFile)
return m_pFile->GetLength();
@@ -31,10 +31,10 @@ class CDVDInputStreamFile : public CDVDInputStream
virtual bool Open(const char* strFile, const std::string &content);
virtual void Close();
virtual int Read(BYTE* buf, int buf_size);
- virtual int64_t Seek(int64_t offset, int whence);
+ virtual __int64 Seek(__int64 offset, int whence);
virtual bool Pause(double dTime) { return false; };
virtual bool IsEOF();
- virtual int64_t GetLength();
+ virtual __int64 GetLength();
virtual BitstreamStats GetBitstreamStats() const ;
virtual int GetBlockSize();
virtual void SetReadRate(unsigned rate);
@@ -33,10 +33,10 @@ class CDVDInputStreamHTSP
virtual bool Open(const char* file, const std::string &content);
virtual void Close();
virtual int Read(BYTE* buf, int buf_size);
- virtual int64_t Seek(int64_t offset, int whence) { return -1; }
+ virtual __int64 Seek(__int64 offset, int whence) { return -1; }
virtual bool Pause(double dTime) { return false; };
virtual bool IsEOF();
- virtual int64_t GetLength() { return -1; }
+ virtual __int64 GetLength() { return -1; }
virtual ENextStream NextStream() { return m_startup ? NEXTSTREAM_OPEN : NEXTSTREAM_NONE; }
@@ -103,7 +103,7 @@ int CDVDInputStreamHttp::Read(BYTE* buf, int buf_size)
return (int)(ret & 0xFFFFFFFF);
}
-int64_t CDVDInputStreamHttp::Seek(int64_t offset, int whence)
+__int64 CDVDInputStreamHttp::Seek(__int64 offset, int whence)
{
if(!m_pFile)
return -1;
@@ -124,7 +124,7 @@ CHttpHeader* CDVDInputStreamHttp::GetHttpHeader()
else return NULL;
}
-int64_t CDVDInputStreamHttp::GetLength()
+__int64 CDVDInputStreamHttp::GetLength()
{
if (m_pFile)
return m_pFile->GetLength();
@@ -37,9 +37,9 @@ class CDVDInputStreamHttp : public CDVDInputStream
virtual bool Open(const char* strFile, const std::string& content);
virtual void Close();
virtual int Read(BYTE* buf, int buf_size);
- virtual int64_t Seek(int64_t offset, int whence);
+ virtual __int64 Seek(__int64 offset, int whence);
virtual bool IsEOF();
- virtual int64_t GetLength();
+ virtual __int64 GetLength();
CHttpHeader* GetHttpHeader();
@@ -74,7 +74,7 @@ int CDVDInputStreamMemory::Read(BYTE* buf, int buf_size)
return iBytesToCopy;
}
-int64_t CDVDInputStreamMemory::Seek(int64_t offset, int whence)
+__int64 CDVDInputStreamMemory::Seek(__int64 offset, int whence)
{
switch (whence)
{
@@ -101,7 +101,7 @@ int64_t CDVDInputStreamMemory::Seek(int64_t offset, int whence)
return m_iDataPos;
}
-int64_t CDVDInputStreamMemory::GetLength()
+__int64 CDVDInputStreamMemory::GetLength()
{
return m_iDataSize;
}
@@ -31,9 +31,9 @@ class CDVDInputStreamMemory : public CDVDInputStream
virtual bool Open(const char* strFile, const std::string& content);
virtual void Close();
virtual int Read(BYTE* buf, int buf_size);
- virtual int64_t Seek(int64_t offset, int whence);
+ virtual __int64 Seek(__int64 offset, int whence);
virtual bool IsEOF();
- virtual int64_t GetLength();
+ virtual __int64 GetLength();
protected:
BYTE* m_pData;
@@ -252,7 +252,7 @@ int CDVDInputStreamNavigator::Read(BYTE* buf, int buf_size)
}
// not working yet, but it is the recommanded way for seeking
-int64_t CDVDInputStreamNavigator::Seek(int64_t offset, int whence)
+__int64 CDVDInputStreamNavigator::Seek(__int64 offset, int whence)
{
if(whence == SEEK_POSSIBLE)
return 0;
@@ -68,11 +68,11 @@ class CDVDInputStreamNavigator
virtual bool Open(const char* strFile, const std::string& content);
virtual void Close();
virtual int Read(BYTE* buf, int buf_size);
- virtual int64_t Seek(int64_t offset, int whence);
+ virtual __int64 Seek(__int64 offset, int whence);
virtual bool Pause(double dTime) { return false; };
virtual int GetBlockSize() { return DVDSTREAM_BLOCK_SIZE_DVD; }
virtual bool IsEOF() { return m_bEOF; }
- virtual int64_t GetLength() { return 0; }
+ virtual __int64 GetLength() { return 0; }
virtual ENextStream NextStream() ;
void ActivateButton();
@@ -192,7 +192,7 @@ int CDVDInputStreamRTMP::Read(BYTE* buf, int buf_size)
return i;
}
-int64_t CDVDInputStreamRTMP::Seek(int64_t offset, int whence)
+__int64 CDVDInputStreamRTMP::Seek(__int64 offset, int whence)
{
if (whence == SEEK_POSSIBLE)
return 0;
@@ -211,7 +211,7 @@ bool CDVDInputStreamRTMP::SeekTime(int iTimeInMsec)
return false;
}
-int64_t CDVDInputStreamRTMP::GetLength()
+__int64 CDVDInputStreamRTMP::GetLength()
{
return -1;
}
@@ -35,11 +35,11 @@ class CDVDInputStreamRTMP
virtual bool Open(const char* strFile, const std::string &content);
virtual void Close();
virtual int Read(BYTE* buf, int buf_size);
- virtual int64_t Seek(int64_t offset, int whence);
+ virtual __int64 Seek(__int64 offset, int whence);
bool SeekTime(int iTimeInMsec);
virtual bool Pause(double dTime);
virtual bool IsEOF();
- virtual int64_t GetLength();
+ virtual __int64 GetLength();
CCriticalSection m_RTMPSection;
@@ -133,7 +133,7 @@ int CDVDInputStreamStack::Read(BYTE* buf, int buf_size)
return (int)ret;
}
-int64_t CDVDInputStreamStack::Seek(int64_t offset, int whence)
+__int64 CDVDInputStreamStack::Seek(__int64 offset, int whence)
{
int64_t pos, len;
@@ -170,7 +170,7 @@ int64_t CDVDInputStreamStack::Seek(int64_t offset, int whence)
return -1;
}
-int64_t CDVDInputStreamStack::GetLength()
+__int64 CDVDInputStreamStack::GetLength()
{
return m_length;
}
@@ -33,10 +33,10 @@ class CDVDInputStreamStack : public CDVDInputStream
virtual bool Open(const char* path, const std::string &content);
virtual void Close();
virtual int Read(BYTE* buf, int buf_size);
- virtual int64_t Seek(int64_t offset, int whence);
+ virtual __int64 Seek(__int64 offset, int whence);
virtual bool Pause(double dTime) { return false; };
virtual bool IsEOF();
- virtual int64_t GetLength();
+ virtual __int64 GetLength();
protected:
@@ -109,7 +109,7 @@ int CDVDInputStreamTV::Read(BYTE* buf, int buf_size)
return (int)(ret & 0xFFFFFFFF);
}
-int64_t CDVDInputStreamTV::Seek(int64_t offset, int whence)
+__int64 CDVDInputStreamTV::Seek(__int64 offset, int whence)
{
if(!m_pFile) return -1;
int64_t ret = m_pFile->Seek(offset, whence);
@@ -120,7 +120,7 @@ int64_t CDVDInputStreamTV::Seek(int64_t offset, int whence)
return ret;
}
-int64_t CDVDInputStreamTV::GetLength()
+__int64 CDVDInputStreamTV::GetLength()
{
if (!m_pFile) return 0;
return m_pFile->GetLength();
@@ -39,10 +39,10 @@ class CDVDInputStreamTV
virtual bool Open(const char* strFile, const std::string &content);
virtual void Close();
virtual int Read(BYTE* buf, int buf_size);
- virtual int64_t Seek(int64_t offset, int whence);
+ virtual __int64 Seek(__int64 offset, int whence);
virtual bool Pause(double dTime) { return false; };
virtual bool IsEOF();
- virtual int64_t GetLength();
+ virtual __int64 GetLength();
virtual ENextStream NextStream();
virtual int GetBlockSize();
@@ -949,8 +949,8 @@ void CGUISettings::Initialize()
AddInt(pvrr, "pvrrecord.instantrecordtime", 19172, 180, 1, 1, 720, SPIN_CONTROL_INT_PLUS, MASK_MINS);
AddInt(pvrr, "pvrrecord.defaultpriority", 19173, 50, 1, 1, 100, SPIN_CONTROL_INT_PLUS);
AddInt(pvrr, "pvrrecord.defaultlifetime", 19174, 99, 1, 1, 365, SPIN_CONTROL_INT_PLUS, MASK_DAYS);
- AddInt(pvrr, "pvrrecord.marginstart", 19175, 2, 1, 1, 60, SPIN_CONTROL_INT_PLUS, MASK_MINS);
- AddInt(pvrr, "pvrrecord.marginend", 19176, 10, 1, 1, 60, SPIN_CONTROL_INT_PLUS, MASK_MINS);
+ AddInt(pvrr, "pvrrecord.marginstart", 19175, 2, 0, 1, 60, SPIN_CONTROL_INT_PLUS, MASK_MINS);
+ AddInt(pvrr, "pvrrecord.marginend", 19176, 10, 0, 1, 60, SPIN_CONTROL_INT_PLUS, MASK_MINS);
AddSeparator(pvrr, "pvrrecord.sep1");
AddBool(pvr, "pvrrecord.timernotifications", 19233, true);