Skip to content
Browse files

changed: replace usage of __int64 with posix [u]int64_t

  • Loading branch information...
1 parent e7f32aa commit a43a8e5047bf01b22fdbb7a56c17e42f01b7f78c @elupus elupus committed May 3, 2012
Showing with 211 additions and 211 deletions.
  1. +2 −2 xbmc/Application.cpp
  2. +1 −1 xbmc/DynamicDll.h
  3. +2 −2 xbmc/GUIInfoManager.cpp
  4. +1 −1 xbmc/GUIInfoManager.h
  5. +2 −2 xbmc/Util.cpp
  6. +6 −6 xbmc/cores/DummyVideoPlayer.cpp
  7. +3 −3 xbmc/cores/DummyVideoPlayer.h
  8. +4 −4 xbmc/cores/ExternalPlayer/ExternalPlayer.cpp
  9. +2 −2 xbmc/cores/ExternalPlayer/ExternalPlayer.h
  10. +2 −2 xbmc/cores/IPlayer.h
  11. +1 −1 xbmc/cores/dvdplayer/DVDClock.h
  12. +2 −2 xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
  13. +1 −1 xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.h
  14. +1 −1 xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxVobsub.h
  15. +2 −2 xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStream.h
  16. +2 −2 xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamBluray.cpp
  17. +2 −2 xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamBluray.h
  18. +2 −2 xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamFFmpeg.cpp
  19. +2 −2 xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamFFmpeg.h
  20. +3 −3 xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamFile.cpp
  21. +2 −2 xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamFile.h
  22. +2 −2 xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamHTSP.h
  23. +4 −4 xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamHttp.cpp
  24. +2 −2 xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamHttp.h
  25. +2 −2 xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamMemory.cpp
  26. +2 −2 xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamMemory.h
  27. +4 −4 xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.cpp
  28. +6 −6 xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.h
  29. +2 −2 xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.cpp
  30. +2 −2 xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.h
  31. +4 −4 xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamStack.cpp
  32. +5 −5 xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamStack.h
  33. +3 −3 xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamTV.cpp
  34. +2 −2 xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamTV.h
  35. +3 −3 xbmc/cores/dvdplayer/DVDPerformanceCounter.cpp
  36. +13 −13 xbmc/cores/dvdplayer/DVDPlayer.cpp
  37. +4 −4 xbmc/cores/dvdplayer/DVDPlayer.h
  38. +2 −2 xbmc/cores/dvdplayer/DVDPlayerAudio.cpp
  39. +4 −4 xbmc/cores/dvdplayer/DVDPlayerAudio.h
  40. +1 −1 xbmc/cores/paplayer/ADPCMCodec.cpp
  41. +2 −2 xbmc/cores/paplayer/ADPCMCodec.h
  42. +1 −1 xbmc/cores/paplayer/ASAPCodec.cpp
  43. +1 −1 xbmc/cores/paplayer/ASAPCodec.h
  44. +3 −3 xbmc/cores/paplayer/AudioDecoder.cpp
  45. +3 −3 xbmc/cores/paplayer/AudioDecoder.h
  46. +1 −1 xbmc/cores/paplayer/BXAcodec.cpp
  47. +1 −1 xbmc/cores/paplayer/BXAcodec.h
  48. +1 −1 xbmc/cores/paplayer/CDDAcodec.cpp
  49. +1 −1 xbmc/cores/paplayer/CDDAcodec.h
  50. +1 −1 xbmc/cores/paplayer/DVDPlayerCodec.cpp
  51. +1 −1 xbmc/cores/paplayer/DVDPlayerCodec.h
  52. +4 −4 xbmc/cores/paplayer/FLACcodec.cpp
  53. +1 −1 xbmc/cores/paplayer/FLACcodec.h
  54. +3 −3 xbmc/cores/paplayer/ICodec.h
  55. +3 −3 xbmc/cores/paplayer/MP3codec.cpp
  56. +2 −2 xbmc/cores/paplayer/MP3codec.h
  57. +2 −2 xbmc/cores/paplayer/ModplugCodec.cpp
  58. +1 −1 xbmc/cores/paplayer/ModplugCodec.h
  59. +1 −1 xbmc/cores/paplayer/NSFCodec.cpp
  60. +2 −2 xbmc/cores/paplayer/NSFCodec.h
  61. +3 −3 xbmc/cores/paplayer/OGGcodec.cpp
  62. +1 −1 xbmc/cores/paplayer/OGGcodec.h
  63. +12 −12 xbmc/cores/paplayer/PAPlayer.cpp
  64. +7 −7 xbmc/cores/paplayer/PAPlayer.h
  65. +1 −1 xbmc/cores/paplayer/PCMCodec.cpp
  66. +1 −1 xbmc/cores/paplayer/PCMCodec.h
  67. +2 −2 xbmc/cores/paplayer/SIDCodec.cpp
  68. +3 −3 xbmc/cores/paplayer/SIDCodec.h
  69. +2 −2 xbmc/cores/paplayer/SPCCodec.cpp
  70. +2 −2 xbmc/cores/paplayer/SPCCodec.h
  71. +3 −3 xbmc/cores/paplayer/TimidityCodec.cpp
  72. +2 −2 xbmc/cores/paplayer/TimidityCodec.h
  73. +3 −3 xbmc/cores/paplayer/VGMCodec.cpp
  74. +2 −2 xbmc/cores/paplayer/VGMCodec.h
  75. +1 −1 xbmc/cores/paplayer/WAVcodec.cpp
  76. +1 −1 xbmc/cores/paplayer/WAVcodec.h
  77. +1 −1 xbmc/cores/paplayer/YMCodec.cpp
  78. +2 −2 xbmc/cores/paplayer/YMCodec.h
  79. +1 −1 xbmc/filesystem/PipeFile.cpp
  80. +1 −1 xbmc/filesystem/PipeFile.h
  81. +1 −1 xbmc/music/karaoke/GUIWindowKaraokeLyrics.cpp
  82. +1 −1 xbmc/music/karaoke/karaokelyrics.h
  83. +1 −1 xbmc/music/karaoke/karaokelyricscdg.cpp
  84. +1 −1 xbmc/music/karaoke/karaokelyricscdg.h
  85. +1 −1 xbmc/music/karaoke/karaokelyricstext.cpp
  86. +2 −2 xbmc/music/karaoke/karaokelyricstext.h
  87. +1 −1 xbmc/music/karaoke/karaokewindowbackground.cpp
  88. +2 −2 xbmc/music/karaoke/karaokewindowbackground.h
  89. +2 −2 xbmc/utils/PerformanceStats.h
  90. +1 −1 xbmc/utils/StdString.h
View
4 xbmc/Application.cpp
@@ -5347,7 +5347,7 @@ void CApplication::SeekTime( double dTime )
{
long startOfNewFile = (i > 0) ? (*m_currentStack)[i-1]->m_lEndOffset : 0;
if (m_currentStackPosition == i)
- m_pPlayer->SeekTime((__int64)((dTime - startOfNewFile) * 1000.0));
+ m_pPlayer->SeekTime((int64_t)((dTime - startOfNewFile) * 1000.0));
else
{ // seeking to a new file
m_currentStackPosition = i;
@@ -5362,7 +5362,7 @@ void CApplication::SeekTime( double dTime )
}
}
// convert to milliseconds and perform seek
- m_pPlayer->SeekTime( static_cast<__int64>( dTime * 1000.0 ) );
+ m_pPlayer->SeekTime( static_cast<int64_t>( dTime * 1000.0 ) );
}
}
View
2 xbmc/DynamicDll.h
@@ -238,7 +238,7 @@ public: \
// entry as required by gcc compiled dlls, it is abit abfuscated
// to allow for different sized variables
//
-// __int64 test(__int64 p1, char p2, char p3)
+// int64_t test(int64_t p1, char p2, char p3)
// {
// int o,s = ((sizeof(p1)+3)&~3)+((sizeof(p2)+3)&~3)+((sizeof(p3)+3)&~3);
// __asm mov [o],esp;
View
4 xbmc/GUIInfoManager.cpp
@@ -3462,11 +3462,11 @@ CStdString CGUIInfoManager::GetVideoLabel(int item)
return "";
}
-__int64 CGUIInfoManager::GetPlayTime() const
+int64_t CGUIInfoManager::GetPlayTime() const
{
if (g_application.IsPlaying())
{
- __int64 lPTS = (__int64)(g_application.GetTime() * 1000);
+ int64_t lPTS = (int64_t)(g_application.GetTime() * 1000);
if (lPTS < 0) lPTS = 0;
return lPTS;
}
View
2 xbmc/GUIInfoManager.h
@@ -645,7 +645,7 @@ class CGUIInfoManager : public IMsgTargetCallback
const CStdString GetMusicPlaylistInfo(const GUIInfo& info);
CStdString GetPictureLabel(int item);
- __int64 GetPlayTime() const; // in ms
+ int64_t GetPlayTime() const; // in ms
CStdString GetCurrentPlayTime(TIME_FORMAT format = TIME_FORMAT_GUESS) const;
int GetPlayTimeRemaining() const;
int GetTotalPlayTime() const;
View
4 xbmc/Util.cpp
@@ -99,8 +99,8 @@ using namespace std;
using namespace XFILE;
#define clamp(x) (x) > 255.f ? 255 : ((x) < 0 ? 0 : (BYTE)(x+0.5f)) // Valid ranges: brightness[-1 -> 1 (0 is default)] contrast[0 -> 2 (1 is default)] gamma[0.5 -> 3.5 (1 is default)] default[ramp is linear]
-static const __int64 SECS_BETWEEN_EPOCHS = 11644473600LL;
-static const __int64 SECS_TO_100NS = 10000000;
+static const int64_t SECS_BETWEEN_EPOCHS = 11644473600LL;
+static const int64_t SECS_TO_100NS = 10000000;
using namespace AUTOPTR;
using namespace XFILE;
View
12 xbmc/cores/DummyVideoPlayer.cpp
@@ -52,7 +52,7 @@ bool CDummyVideoPlayer::OpenFile(const CFileItem& file, const CPlayerOptions &op
{
Create();
if( options.starttime > 0 )
- SeekTime( (__int64)(options.starttime * 1000) );
+ SeekTime( (int64_t)(options.starttime * 1000) );
return true;
}
catch(...)
@@ -191,14 +191,14 @@ void CDummyVideoPlayer::SwitchToNextAudioLanguage()
void CDummyVideoPlayer::SeekPercentage(float iPercent)
{
- __int64 iTotalMsec = GetTotalTime() * 1000;
- __int64 iTime = (__int64)(iTotalMsec * iPercent / 100);
+ int64_t iTotalMsec = GetTotalTime() * 1000;
+ int64_t iTime = (int64_t)(iTotalMsec * iPercent / 100);
SeekTime(iTime);
}
float CDummyVideoPlayer::GetPercentage()
{
- __int64 iTotalTime = GetTotalTime() * 1000;
+ int64_t iTotalTime = GetTotalTime() * 1000;
if (iTotalTime != 0)
{
@@ -227,15 +227,15 @@ float CDummyVideoPlayer::GetSubTitleDelay()
return 0.0;
}
-void CDummyVideoPlayer::SeekTime(__int64 iTime)
+void CDummyVideoPlayer::SeekTime(int64_t iTime)
{
int seekOffset = (int)(iTime - m_clock);
m_clock = iTime;
m_callback.OnPlayBackSeek((int)iTime, seekOffset);
}
// return the time in milliseconds
-__int64 CDummyVideoPlayer::GetTime()
+int64_t CDummyVideoPlayer::GetTime()
{
return m_clock;
}
View
6 xbmc/cores/DummyVideoPlayer.h
@@ -66,8 +66,8 @@ class CDummyVideoPlayer : public IPlayer, public CThread
virtual void SetSubTitleDelay(float fValue = 0.0f);
virtual float GetSubTitleDelay();
- virtual void SeekTime(__int64 iTime);
- virtual __int64 GetTime();
+ virtual void SeekTime(int64_t iTime);
+ virtual int64_t GetTime();
virtual int GetTotalTime();
virtual void ToFFRW(int iSpeed);
virtual void ShowOSD(bool bOnoff);
@@ -80,7 +80,7 @@ class CDummyVideoPlayer : public IPlayer, public CThread
virtual void Process();
bool m_paused;
- __int64 m_clock;
+ int64_t m_clock;
unsigned int m_lastTime;
int m_speed;
};
View
8 xbmc/cores/ExternalPlayer/ExternalPlayer.cpp
@@ -517,8 +517,8 @@ void CExternalPlayer::SeekPercentage(float iPercent)
float CExternalPlayer::GetPercentage()
{
- __int64 iTime = GetTime();
- __int64 iTotalTime = GetTotalTime() * 1000;
+ int64_t iTime = GetTime();
+ int64_t iTotalTime = GetTotalTime() * 1000;
if (iTotalTime != 0)
{
@@ -547,11 +547,11 @@ float CExternalPlayer::GetSubTitleDelay()
return 0.0;
}
-void CExternalPlayer::SeekTime(__int64 iTime)
+void CExternalPlayer::SeekTime(int64_t iTime)
{
}
-__int64 CExternalPlayer::GetTime() // in millis
+int64_t CExternalPlayer::GetTime() // in millis
{
if ((XbmcThreads::SystemClockMillis() - m_playbackStartTime) / 1000 > m_playCountMinTime)
{
View
4 xbmc/cores/ExternalPlayer/ExternalPlayer.h
@@ -70,8 +70,8 @@ class CExternalPlayer : public IPlayer, public CThread
virtual void SetSubTitleDelay(float fValue = 0.0f);
virtual float GetSubTitleDelay();
- virtual void SeekTime(__int64 iTime);
- virtual __int64 GetTime();
+ virtual void SeekTime(int64_t iTime);
+ virtual int64_t GetTime();
virtual int GetTotalTime();
virtual void ToFFRW(int iSpeed);
virtual void ShowOSD(bool bOnoff);
View
4 xbmc/cores/IPlayer.h
@@ -134,8 +134,8 @@ class IPlayer
// virtual bool GetChapterInfo(int chapter, SChapterInfo &info) { return false; }
virtual float GetActualFPS() { return 0.0f; };
- virtual void SeekTime(__int64 iTime = 0){};
- virtual __int64 GetTime(){ return 0;};
+ virtual void SeekTime(int64_t iTime = 0){};
+ virtual int64_t GetTime(){ return 0;};
virtual int GetTotalTime(){ return 0;};
virtual int GetAudioBitrate(){ return 0;}
virtual int GetVideoBitrate(){ return 0;}
View
2 xbmc/cores/dvdplayer/DVDClock.h
@@ -26,7 +26,7 @@
#include "threads/CriticalSection.h"
#define DVD_TIME_BASE 1000000
-#define DVD_NOPTS_VALUE (-1LL<<52) // should be possible to represent in both double and __int64
+#define DVD_NOPTS_VALUE (-1LL<<52) // should be possible to represent in both double and int64_t
#define DVD_TIME_TO_SEC(x) ((int)((double)(x) / DVD_TIME_BASE))
#define DVD_TIME_TO_MSEC(x) ((int)((double)(x) * 1000 / DVD_TIME_BASE))
View
4 xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
@@ -843,7 +843,7 @@ bool CDVDDemuxFFmpeg::SeekTime(int time, bool backwords, double *startpts)
return false;
}
- __int64 seek_pts = (__int64)time * (AV_TIME_BASE / 1000);
+ int64_t seek_pts = (int64_t)time * (AV_TIME_BASE / 1000);
if (m_pFormatContext->start_time != (int64_t)AV_NOPTS_VALUE)
seek_pts += m_pFormatContext->start_time;
@@ -872,7 +872,7 @@ bool CDVDDemuxFFmpeg::SeekTime(int time, bool backwords, double *startpts)
return (ret >= 0);
}
-bool CDVDDemuxFFmpeg::SeekByte(__int64 pos)
+bool CDVDDemuxFFmpeg::SeekByte(int64_t pos)
{
g_demuxer.set(this);
View
2 xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.h
@@ -98,7 +98,7 @@ class CDVDDemuxFFmpeg : public CDVDDemux
DemuxPacket* Read();
bool SeekTime(int time, bool backwords = false, double* startpts = NULL);
- bool SeekByte(__int64 pos);
+ bool SeekByte(int64_t pos);
int GetStreamLength();
CDemuxStream* GetStream(int iStreamId);
int GetNrOfStreams();
View
2 xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxVobsub.h
@@ -64,7 +64,7 @@ class CDVDDemuxVobsub : public CDVDDemux
typedef struct STimestamp
{
- __int64 pos;
+ int64_t pos;
double pts;
int id;
} STimestamp;
View
4 xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStream.h
@@ -121,9 +121,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 Seek(__int64 offset, int whence) = 0;
+ virtual int64_t Seek(int64_t offset, int whence) = 0;
virtual bool Pause(double dTime) = 0;
- virtual __int64 GetLength() = 0;
+ virtual int64_t GetLength() = 0;
virtual std::string& GetContent() { return m_content; };
virtual std::string& GetFileName() { return m_strFileName; }
virtual ENextStream NextStream() { return NEXTSTREAM_NONE; }
View
4 xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamBluray.cpp
@@ -806,7 +806,7 @@ bool CDVDInputStreamBluray::SeekChapter(int ch)
return true;
}
-__int64 CDVDInputStreamBluray::Seek(__int64 offset, int whence)
+int64_t CDVDInputStreamBluray::Seek(int64_t offset, int whence)
{
#if LIBBLURAY_BYTESEEK
if(whence == SEEK_POSSIBLE)
@@ -841,7 +841,7 @@ __int64 CDVDInputStreamBluray::Seek(__int64 offset, int whence)
#endif
}
-__int64 CDVDInputStreamBluray::GetLength()
+int64_t CDVDInputStreamBluray::GetLength()
{
return m_dll->bd_get_title_size(m_bd);
}
View
4 xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamBluray.h
@@ -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 Seek(__int64 offset, int whence);
+ virtual int64_t Seek(int64_t offset, int whence);
virtual bool Pause(double dTime) { return false; };
virtual bool IsEOF();
- virtual __int64 GetLength();
+ virtual int64_t GetLength();
virtual int GetBlockSize() { return 6144; }
virtual ENextStream NextStream();
View
4 xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamFFmpeg.cpp
@@ -58,12 +58,12 @@ int CDVDInputStreamFFmpeg::Read(BYTE* buf, int buf_size)
return -1;
}
-__int64 CDVDInputStreamFFmpeg::GetLength()
+int64_t CDVDInputStreamFFmpeg::GetLength()
{
return 0;
}
-__int64 CDVDInputStreamFFmpeg::Seek(__int64 offset, int whence)
+int64_t CDVDInputStreamFFmpeg::Seek(int64_t offset, int whence)
{
return -1;
}
View
4 xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamFFmpeg.h
@@ -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 Seek(__int64 offset, int whence);
+ virtual int64_t Seek(int64_t offset, int whence);
virtual bool Pause(double dTime) { return false; };
virtual bool IsEOF();
- virtual __int64 GetLength();
+ virtual int64_t GetLength();
protected:
};
View
6 xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamFile.cpp
@@ -92,22 +92,22 @@ int CDVDInputStreamFile::Read(BYTE* buf, int buf_size)
return (int)(ret & 0xFFFFFFFF);
}
-__int64 CDVDInputStreamFile::Seek(__int64 offset, int whence)
+int64_t CDVDInputStreamFile::Seek(int64_t offset, int whence)
{
if(!m_pFile) return -1;
if(whence == SEEK_POSSIBLE)
return m_pFile->IoControl(IOCTRL_SEEK_POSSIBLE, NULL);
- __int64 ret = m_pFile->Seek(offset, whence);
+ int64_t ret = m_pFile->Seek(offset, whence);
/* if we succeed, we are not eof anymore */
if( ret >= 0 ) m_eof = false;
return ret;
}
-__int64 CDVDInputStreamFile::GetLength()
+int64_t CDVDInputStreamFile::GetLength()
{
if (m_pFile)
return m_pFile->GetLength();
View
4 xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamFile.h
@@ -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 Seek(__int64 offset, int whence);
+ virtual int64_t Seek(int64_t offset, int whence);
virtual bool Pause(double dTime) { return false; };
virtual bool IsEOF();
- virtual __int64 GetLength();
+ virtual int64_t GetLength();
virtual BitstreamStats GetBitstreamStats() const ;
virtual int GetBlockSize();
virtual void SetReadRate(unsigned rate);
View
4 xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamHTSP.h
@@ -34,10 +34,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 Seek(__int64 offset, int whence) { return -1; }
+ virtual int64_t Seek(int64_t offset, int whence) { return -1; }
virtual bool Pause(double dTime) { return false; };
virtual bool IsEOF();
- virtual __int64 GetLength() { return -1; }
+ virtual int64_t GetLength() { return -1; }
virtual ENextStream NextStream() { return m_startup ? NEXTSTREAM_OPEN : NEXTSTREAM_NONE; }
View
8 xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamHttp.cpp
@@ -40,7 +40,7 @@ bool CDVDInputStreamHttp::IsEOF()
{
if(m_pFile && !m_eof)
{
- __int64 size = m_pFile->GetLength();
+ int64_t size = m_pFile->GetLength();
if( size > 0 && m_pFile->GetPosition() >= size )
{
m_eof = true;
@@ -103,15 +103,15 @@ int CDVDInputStreamHttp::Read(BYTE* buf, int buf_size)
return (int)(ret & 0xFFFFFFFF);
}
-__int64 CDVDInputStreamHttp::Seek(__int64 offset, int whence)
+int64_t CDVDInputStreamHttp::Seek(int64_t offset, int whence)
{
if(!m_pFile)
return -1;
if(whence == SEEK_POSSIBLE)
return m_pFile->IoControl(IOCTRL_SEEK_POSSIBLE, NULL);
- __int64 ret = m_pFile->Seek(offset, whence);
+ int64_t ret = m_pFile->Seek(offset, whence);
if( ret >= 0 ) m_eof = false;
@@ -124,7 +124,7 @@ CHttpHeader* CDVDInputStreamHttp::GetHttpHeader()
else return NULL;
}
-__int64 CDVDInputStreamHttp::GetLength()
+int64_t CDVDInputStreamHttp::GetLength()
{
if (m_pFile)
return m_pFile->GetLength();
View
4 xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamHttp.h
@@ -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 Seek(__int64 offset, int whence);
+ virtual int64_t Seek(int64_t offset, int whence);
virtual bool IsEOF();
- virtual __int64 GetLength();
+ virtual int64_t GetLength();
CHttpHeader* GetHttpHeader();
View
4 xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamMemory.cpp
@@ -74,7 +74,7 @@ int CDVDInputStreamMemory::Read(BYTE* buf, int buf_size)
return iBytesToCopy;
}
-__int64 CDVDInputStreamMemory::Seek(__int64 offset, int whence)
+int64_t CDVDInputStreamMemory::Seek(int64_t offset, int whence)
{
switch (whence)
{
@@ -101,7 +101,7 @@ __int64 CDVDInputStreamMemory::Seek(__int64 offset, int whence)
return m_iDataPos;
}
-__int64 CDVDInputStreamMemory::GetLength()
+int64_t CDVDInputStreamMemory::GetLength()
{
return m_iDataSize;
}
View
4 xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamMemory.h
@@ -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 Seek(__int64 offset, int whence);
+ virtual int64_t Seek(int64_t offset, int whence);
virtual bool IsEOF();
- virtual __int64 GetLength();
+ virtual int64_t GetLength();
protected:
BYTE* m_pData;
View
8 xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.cpp
@@ -252,7 +252,7 @@ int CDVDInputStreamNavigator::Read(BYTE* buf, int buf_size)
}
// not working yet, but it is the recommanded way for seeking
-__int64 CDVDInputStreamNavigator::Seek(__int64 offset, int whence)
+int64_t CDVDInputStreamNavigator::Seek(int64_t offset, int whence)
{
if(whence == SEEK_POSSIBLE)
return 0;
@@ -483,7 +483,7 @@ int CDVDInputStreamNavigator::ProcessBlock(BYTE* dest_buffer, int* read)
// Calculate current time
//unsigned int pos, len;
//m_dll.dvdnav_get_position(m_dvdnav, &pos, &len);
- //m_iTime = (int)(((__int64)m_iTotalTime * pos) / len);
+ //m_iTime = (int)(((int64_t)m_iTotalTime * pos) / len);
pci_t* pci = m_dll.dvdnav_get_current_nav_pci(m_dvdnav);
m_dll.dvdnav_get_current_nav_dsi(m_dvdnav);
@@ -498,7 +498,7 @@ int CDVDInputStreamNavigator::ProcessBlock(BYTE* dest_buffer, int* read)
m_bInMenu = pci->hli.hl_gi.hli_ss || (0 == m_dll.dvdnav_is_domain_vts(m_dvdnav));
/* check for any gap in the stream, this is likely a discontinuity */
- __int64 gap = (__int64)pci->pci_gi.vobu_s_ptm - m_iVobUnitStop;
+ int64_t gap = (int64_t)pci->pci_gi.vobu_s_ptm - m_iVobUnitStop;
if(gap)
{
/* make sure demuxer is flushed before we change any correction */
@@ -511,7 +511,7 @@ int CDVDInputStreamNavigator::ProcessBlock(BYTE* dest_buffer, int* read)
}
m_iVobUnitCorrection += gap;
- CLog::Log(LOGDEBUG, "DVDNAV_NAV_PACKET - DISCONTINUITY FROM:%"PRId64" TO:%"PRId64" DIFF:%"PRId64, (m_iVobUnitStop * 1000)/90, ((__int64)pci->pci_gi.vobu_s_ptm*1000)/90, (gap*1000)/90);
+ CLog::Log(LOGDEBUG, "DVDNAV_NAV_PACKET - DISCONTINUITY FROM:%"PRId64" TO:%"PRId64" DIFF:%"PRId64, (m_iVobUnitStop * 1000)/90, ((int64_t)pci->pci_gi.vobu_s_ptm*1000)/90, (gap*1000)/90);
}
m_iVobUnitStart = pci->pci_gi.vobu_s_ptm;
View
12 xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.h
@@ -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 Seek(__int64 offset, int whence);
+ virtual int64_t Seek(int64_t 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 GetLength() { return 0; }
+ virtual int64_t GetLength() { return 0; }
virtual ENextStream NextStream() ;
void ActivateButton();
@@ -155,13 +155,13 @@ class CDVDInputStreamNavigator
int m_iTotalTime;
int m_iTime;
- __int64 m_iCellStart; // start time of current cell in pts units (90khz clock)
+ int64_t m_iCellStart; // start time of current cell in pts units (90khz clock)
bool m_bInMenu;
- __int64 m_iVobUnitStart;
- __int64 m_iVobUnitStop;
- __int64 m_iVobUnitCorrection;
+ int64_t m_iVobUnitStart;
+ int64_t m_iVobUnitStop;
+ int64_t m_iVobUnitCorrection;
int m_iTitleCount;
int m_iTitle;
View
4 xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.cpp
@@ -192,7 +192,7 @@ int CDVDInputStreamRTMP::Read(BYTE* buf, int buf_size)
return i;
}
-__int64 CDVDInputStreamRTMP::Seek(__int64 offset, int whence)
+int64_t CDVDInputStreamRTMP::Seek(int64_t offset, int whence)
{
if (whence == SEEK_POSSIBLE)
return 0;
@@ -211,7 +211,7 @@ bool CDVDInputStreamRTMP::SeekTime(int iTimeInMsec)
return false;
}
-__int64 CDVDInputStreamRTMP::GetLength()
+int64_t CDVDInputStreamRTMP::GetLength()
{
return -1;
}
View
4 xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.h
@@ -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 Seek(__int64 offset, int whence);
+ virtual int64_t Seek(int64_t offset, int whence);
bool SeekTime(int iTimeInMsec);
virtual bool Pause(double dTime);
virtual bool IsEOF();
- virtual __int64 GetLength();
+ virtual int64_t GetLength();
CCriticalSection m_RTMPSection;
View
8 xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamStack.cpp
@@ -133,9 +133,9 @@ int CDVDInputStreamStack::Read(BYTE* buf, int buf_size)
return (int)ret;
}
-__int64 CDVDInputStreamStack::Seek(__int64 offset, int whence)
+int64_t CDVDInputStreamStack::Seek(int64_t offset, int whence)
{
- __int64 pos, len;
+ int64_t pos, len;
if (whence == SEEK_SET)
pos = offset;
@@ -152,7 +152,7 @@ __int64 CDVDInputStreamStack::Seek(__int64 offset, int whence)
if(len + it->length > pos)
{
TFile file = it->file;
- __int64 file_pos = pos - len;
+ int64_t file_pos = pos - len;
if(file->GetPosition() != file_pos)
{
if(file->Seek(file_pos, SEEK_SET) < 0)
@@ -170,7 +170,7 @@ __int64 CDVDInputStreamStack::Seek(__int64 offset, int whence)
return -1;
}
-__int64 CDVDInputStreamStack::GetLength()
+int64_t CDVDInputStreamStack::GetLength()
{
return m_length;
}
View
10 xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamStack.h
@@ -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 Seek(__int64 offset, int whence);
+ virtual int64_t Seek(int64_t offset, int whence);
virtual bool Pause(double dTime) { return false; };
virtual bool IsEOF();
- virtual __int64 GetLength();
+ virtual int64_t GetLength();
protected:
@@ -45,14 +45,14 @@ class CDVDInputStreamStack : public CDVDInputStream
struct TSeg
{
TFile file;
- __int64 length;
+ int64_t length;
};
typedef std::vector<TSeg> TSegVec;
TSegVec m_files; ///< collection of open ptr's to all files in stack
TFile m_file; ///< currently active file
bool m_eof;
- __int64 m_pos;
- __int64 m_length;
+ int64_t m_pos;
+ int64_t m_length;
};
View
6 xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamTV.cpp
@@ -107,18 +107,18 @@ int CDVDInputStreamTV::Read(BYTE* buf, int buf_size)
return (int)(ret & 0xFFFFFFFF);
}
-__int64 CDVDInputStreamTV::Seek(__int64 offset, int whence)
+int64_t CDVDInputStreamTV::Seek(int64_t offset, int whence)
{
if(!m_pFile) return -1;
- __int64 ret = m_pFile->Seek(offset, whence);
+ int64_t ret = m_pFile->Seek(offset, whence);
/* if we succeed, we are not eof anymore */
if( ret >= 0 ) m_eof = false;
return ret;
}
-__int64 CDVDInputStreamTV::GetLength()
+int64_t CDVDInputStreamTV::GetLength()
{
if (!m_pFile) return 0;
return m_pFile->GetLength();
View
4 xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamTV.h
@@ -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 Seek(__int64 offset, int whence);
+ virtual int64_t Seek(int64_t offset, int whence);
virtual bool Pause(double dTime) { return false; };
virtual bool IsEOF();
- virtual __int64 GetLength();
+ virtual int64_t GetLength();
virtual ENextStream NextStream();
virtual int GetBlockSize();
View
6 xbmc/cores/dvdplayer/DVDPerformanceCounter.cpp
@@ -67,7 +67,7 @@ HRESULT __stdcall DVDPerformanceCounterVideoQueue(PLARGE_INTEGER numerator, PLAR
return S_OK;
}
-inline __int64 get_thread_cpu_usage(ProcessPerformance* p)
+inline int64_t get_thread_cpu_usage(ProcessPerformance* p)
{
if (p->thread)
{
@@ -80,8 +80,8 @@ inline __int64 get_thread_cpu_usage(ProcessPerformance* p)
p->timer_thread.QuadPart = p->thread->GetAbsoluteUsage();
p->timer_system.QuadPart = CurrentHostCounter();
- __int64 threadTime = (p->timer_thread.QuadPart - old_time_thread.QuadPart);
- __int64 systemTime = (p->timer_system.QuadPart - old_time_system.QuadPart);
+ int64_t threadTime = (p->timer_thread.QuadPart - old_time_thread.QuadPart);
+ int64_t systemTime = (p->timer_system.QuadPart - old_time_system.QuadPart);
if (systemTime > 0 && threadTime > 0) return ((threadTime * 100) / systemTime);
}
View
26 xbmc/cores/dvdplayer/DVDPlayer.cpp
@@ -963,7 +963,7 @@ void CDVDPlayer::Process()
}
else
{
- starttime = m_Edl.RestoreCutTime((__int64)m_PlayerOptions.starttime * 1000); // s to ms
+ starttime = m_Edl.RestoreCutTime((int64_t)m_PlayerOptions.starttime * 1000); // s to ms
}
CLog::Log(LOGDEBUG, "%s - Start position set to last stopped position: %d", __FUNCTION__, starttime);
}
@@ -1482,7 +1482,7 @@ void CDVDPlayer::HandlePlaySpeed()
if(error > DVD_MSEC_TO_TIME(1000))
{
CLog::Log(LOGDEBUG, "CDVDPlayer::Process - Seeking to catch up");
- __int64 iTime = (__int64)DVD_TIME_TO_MSEC(m_clock.GetClock() + m_State.time_offset + 500000.0 * m_playSpeed / DVD_PLAYSPEED_NORMAL);
+ int64_t iTime = (int64_t)DVD_TIME_TO_MSEC(m_clock.GetClock() + m_State.time_offset + 500000.0 * m_playSpeed / DVD_PLAYSPEED_NORMAL);
m_messenger.Put(new CDVDMsgPlayerSeek(iTime, (GetPlaySpeed() < 0), true, false, false, true));
}
}
@@ -1773,7 +1773,7 @@ void CDVDPlayer::CheckAutoSceneSkip()
/*
* Seeking either goes to the start or the end of the cut depending on the play direction.
*/
- __int64 seek = GetPlaySpeed() >= 0 ? cut.end : cut.start;
+ int64_t seek = GetPlaySpeed() >= 0 ? cut.end : cut.start;
/*
* Seeking is NOT flushed so any content up to the demux point is retained when playing forwards.
*/
@@ -2312,7 +2312,7 @@ void CDVDPlayer::Seek(bool bPlus, bool bLargeStep)
return;
}
- __int64 seek;
+ int64_t seek;
if (g_advancedSettings.m_videoUseTimeSeeking && GetTotalTime() > 2*g_advancedSettings.m_videoTimeSeekForwardBig)
{
if (bLargeStep)
@@ -2329,7 +2329,7 @@ void CDVDPlayer::Seek(bool bPlus, bool bLargeStep)
percent = bPlus ? g_advancedSettings.m_videoPercentSeekForwardBig : g_advancedSettings.m_videoPercentSeekBackwardBig;
else
percent = bPlus ? g_advancedSettings.m_videoPercentSeekForward : g_advancedSettings.m_videoPercentSeekBackward;
- seek = (__int64)(GetTotalTimeInMsec()*(GetPercentage()+percent)/100);
+ seek = (int64_t)(GetTotalTimeInMsec()*(GetPercentage()+percent)/100);
}
bool restore = true;
@@ -2380,7 +2380,7 @@ void CDVDPlayer::Seek(bool bPlus, bool bLargeStep)
}
}
- __int64 time = GetTime();
+ int64_t time = GetTime();
if(g_application.CurrentFileItem().IsStack()
&& (seek > GetTotalTimeInMsec() || seek < 0))
{
@@ -2405,7 +2405,7 @@ bool CDVDPlayer::SeekScene(bool bPlus)
* There is a 5 second grace period applied when seeking for scenes backwards. If there is no
* grace period applied it is impossible to go backwards past a scene marker.
*/
- __int64 clock = GetTime();
+ int64_t clock = GetTime();
if (!bPlus && clock > 5 * 1000) // 5 seconds
clock -= 5 * 1000;
@@ -2479,17 +2479,17 @@ void CDVDPlayer::GetGeneralInfo(CStdString& strGeneralInfo)
void CDVDPlayer::SeekPercentage(float iPercent)
{
- __int64 iTotalTime = GetTotalTimeInMsec();
+ int64_t iTotalTime = GetTotalTimeInMsec();
if (!iTotalTime)
return;
- SeekTime((__int64)(iTotalTime * iPercent / 100));
+ SeekTime((int64_t)(iTotalTime * iPercent / 100));
}
float CDVDPlayer::GetPercentage()
{
- __int64 iTotalTime = GetTotalTimeInMsec();
+ int64_t iTotalTime = GetTotalTimeInMsec();
if (!iTotalTime)
return 0.0f;
@@ -2628,7 +2628,7 @@ void CDVDPlayer::LoadPage(int p, int sp, unsigned char* buffer)
return m_dvdPlayerTeletext.LoadPage(p, sp, buffer);
}
-void CDVDPlayer::SeekTime(__int64 iTime)
+void CDVDPlayer::SeekTime(int64_t iTime)
{
int seekOffset = (int)(iTime - GetTime());
m_messenger.Put(new CDVDMsgPlayerSeek((int)iTime, true, true, true));
@@ -2637,7 +2637,7 @@ void CDVDPlayer::SeekTime(__int64 iTime)
}
// return the time in milliseconds
-__int64 CDVDPlayer::GetTime()
+int64_t CDVDPlayer::GetTime()
{
CSingleLock lock(m_StateSection);
double offset = 0;
@@ -2652,7 +2652,7 @@ __int64 CDVDPlayer::GetTime()
}
// return length in msec
-__int64 CDVDPlayer::GetTotalTimeInMsec()
+int64_t CDVDPlayer::GetTotalTimeInMsec()
{
CSingleLock lock(m_StateSection);
return llrint(m_State.time_total);
View
8 xbmc/cores/dvdplayer/DVDPlayer.h
@@ -213,8 +213,8 @@ class CDVDPlayer : public IPlayer, public CThread, public IDVDPlayer
virtual void GetChapterName(CStdString& strChapterName);
virtual int SeekChapter(int iChapter);
- virtual void SeekTime(__int64 iTime);
- virtual __int64 GetTime();
+ virtual void SeekTime(int64_t iTime);
+ virtual int64_t GetTime();
virtual int GetTotalTime();
virtual void ToFFRW(int iSpeed);
virtual bool OnAction(const CAction &action);
@@ -285,7 +285,7 @@ class CDVDPlayer : public IPlayer, public CThread, public IDVDPlayer
int GetPlaySpeed() { return m_playSpeed; }
void SetCaching(ECacheState state);
- __int64 GetTotalTimeInMsec();
+ int64_t GetTotalTimeInMsec();
double GetQueueTime();
bool GetCachingTimes(double& play_left, double& cache_left, double& file_offset);
@@ -422,7 +422,7 @@ class CDVDPlayer : public IPlayer, public CThread, public IDVDPlayer
std::string demux_video;
std::string demux_audio;
- __int64 cache_bytes; // number of bytes current's cached
+ int64_t cache_bytes; // number of bytes current's cached
double cache_level; // current estimated required cache level
double cache_delay; // time until cache is expected to reach estimated level
double cache_offset; // percentage of file ahead of current position
View
4 xbmc/cores/dvdplayer/DVDPlayerAudio.cpp
@@ -92,7 +92,7 @@ double CPTSOutputQueue::Current()
return m_current.pts + min(m_current.duration, (CDVDClock::GetAbsoluteClock() - m_current.timestamp));
}
-void CPTSInputQueue::Add(__int64 bytes, double pts)
+void CPTSInputQueue::Add(int64_t bytes, double pts)
{
CSingleLock lock(m_sync);
@@ -105,7 +105,7 @@ void CPTSInputQueue::Flush()
m_list.clear();
}
-double CPTSInputQueue::Get(__int64 bytes, bool consume)
+double CPTSInputQueue::Get(int64_t bytes, bool consume)
{
CSingleLock lock(m_sync);
View
8 xbmc/cores/dvdplayer/DVDPlayerAudio.h
@@ -78,12 +78,12 @@ class CPTSOutputQueue
class CPTSInputQueue
{
private:
- typedef std::list<std::pair<__int64, double> >::iterator IT;
- std::list<std::pair<__int64, double> > m_list;
+ typedef std::list<std::pair<int64_t, double> >::iterator IT;
+ std::list<std::pair<int64_t, double> > m_list;
CCriticalSection m_sync;
public:
- void Add(__int64 bytes, double pts);
- double Get(__int64 bytes, bool consume);
+ void Add(int64_t bytes, double pts);
+ double Get(int64_t bytes, bool consume);
void Flush();
};
View
2 xbmc/cores/paplayer/ADPCMCodec.cpp
@@ -66,7 +66,7 @@ void ADPCMCodec::DeInit()
m_bIsPlaying = false;
}
-__int64 ADPCMCodec::Seek(__int64 iSeekTime)
+int64_t ADPCMCodec::Seek(int64_t iSeekTime)
{
m_dll.Seek(m_adpcm,(int)iSeekTime);
return iSeekTime;
View
4 xbmc/cores/paplayer/ADPCMCodec.h
@@ -32,7 +32,7 @@ class ADPCMCodec : public ICodec
virtual bool Init(const CStdString &strFile, unsigned int filecache);
virtual void DeInit();
- virtual __int64 Seek(__int64 iSeekTime);
+ virtual int64_t Seek(int64_t iSeekTime);
virtual int ReadPCM(BYTE *pBuffer, int size, int *actualsize);
virtual bool CanInit();
@@ -41,7 +41,7 @@ class ADPCMCodec : public ICodec
bool m_bIsPlaying;
DllADPCM m_dll;
- __int64 m_iDataPos;
+ int64_t m_iDataPos;
};
#endif
View
2 xbmc/cores/paplayer/ASAPCodec.cpp
@@ -65,7 +65,7 @@ void ASAPCodec::DeInit()
{
}
-__int64 ASAPCodec::Seek(__int64 iSeekTime)
+int64_t ASAPCodec::Seek(int64_t iSeekTime)
{
m_dll.asapSeek((int) iSeekTime);
return iSeekTime;
View
2 xbmc/cores/paplayer/ASAPCodec.h
@@ -33,7 +33,7 @@ class ASAPCodec : public ICodec
virtual bool Init(const CStdString &strFile, unsigned int filecache);
virtual void DeInit();
- virtual __int64 Seek(__int64 iSeekTime);
+ virtual int64_t Seek(int64_t iSeekTime);
virtual int ReadPCM(BYTE *pBuffer, int size, int *actualsize);
virtual bool CanInit();
View
6 xbmc/cores/paplayer/AudioDecoder.cpp
@@ -63,7 +63,7 @@ void CAudioDecoder::Destroy()
m_canPlay = false;
}
-bool CAudioDecoder::Create(const CFileItem &file, __int64 seekOffset, unsigned int nBufferSize)
+bool CAudioDecoder::Create(const CFileItem &file, int64_t seekOffset, unsigned int nBufferSize)
{
Destroy();
@@ -117,7 +117,7 @@ void CAudioDecoder::GetDataFormat(unsigned int *channels, unsigned int *samplera
if (bitspersample) *bitspersample = m_codec->m_BitsPerSample;
}
-__int64 CAudioDecoder::Seek(__int64 time)
+int64_t CAudioDecoder::Seek(int64_t time)
{
m_pcmBuffer.Clear();
if (!m_codec)
@@ -127,7 +127,7 @@ __int64 CAudioDecoder::Seek(__int64 time)
return m_codec->Seek(time);
}
-__int64 CAudioDecoder::TotalTime()
+int64_t CAudioDecoder::TotalTime()
{
if (m_codec)
return m_codec->m_TotalTime;
View
6 xbmc/cores/paplayer/AudioDecoder.h
@@ -56,14 +56,14 @@ class CAudioDecoder
CAudioDecoder();
~CAudioDecoder();
- bool Create(const CFileItem &file, __int64 seekOffset, unsigned int nBufferSize);
+ bool Create(const CFileItem &file, int64_t seekOffset, unsigned int nBufferSize);
void Destroy();
int ReadSamples(int numsamples);
bool CanSeek() { if (m_codec) return m_codec->CanSeek(); else return false; };
- __int64 Seek(__int64 time);
- __int64 TotalTime();
+ int64_t Seek(int64_t time);
+ int64_t TotalTime();
void Start() { m_canPlay = true;}; // cause a pre-buffered stream to start.
int GetStatus() { return m_status; };
void SetStatus(int status) { m_status = status; };
View
2 xbmc/cores/paplayer/BXAcodec.cpp
@@ -71,7 +71,7 @@ void BXACodec::DeInit()
m_file.Close();
}
-__int64 BXACodec::Seek(__int64 iSeekTime)
+int64_t BXACodec::Seek(int64_t iSeekTime)
{
return iSeekTime;
}
View
2 xbmc/cores/paplayer/BXAcodec.h
@@ -67,7 +67,7 @@ class BXACodec : public CachingCodec
virtual bool Init(const CStdString &strFile, unsigned int filecache);
virtual void DeInit();
- virtual __int64 Seek(__int64 iSeekTime);
+ virtual int64_t Seek(int64_t iSeekTime);
virtual int ReadPCM(BYTE *pBuffer, int size, int *actualsize);
virtual bool CanInit();
};
View
2 xbmc/cores/paplayer/CDDAcodec.cpp
@@ -73,7 +73,7 @@ void CDDACodec::DeInit()
m_file.Close();
}
-__int64 CDDACodec::Seek(__int64 iSeekTime)
+int64_t CDDACodec::Seek(int64_t iSeekTime)
{
// Calculate the next full second...
int iSeekTimeFullSec=(int)(iSeekTime+(1000-(iSeekTime%1000)))/1000;
View
2 xbmc/cores/paplayer/CDDAcodec.h
@@ -31,7 +31,7 @@ class CDDACodec : public CachingCodec
virtual bool Init(const CStdString &strFile, unsigned int filecache);
virtual void DeInit();
- virtual __int64 Seek(__int64 iSeekTime);
+ virtual int64_t Seek(int64_t iSeekTime);
virtual int ReadPCM(BYTE *pBuffer, int size, int *actualsize);
virtual bool CanInit();
View
2 xbmc/cores/paplayer/DVDPlayerCodec.cpp
@@ -207,7 +207,7 @@ void DVDPlayerCodec::DeInit()
m_nDecodedLen = 0;
}
-__int64 DVDPlayerCodec::Seek(__int64 iSeekTime)
+int64_t DVDPlayerCodec::Seek(int64_t iSeekTime)
{
if (m_pPacket)
CDVDDemuxUtils::FreeDemuxPacket(m_pPacket);
View
2 xbmc/cores/paplayer/DVDPlayerCodec.h
@@ -36,7 +36,7 @@ class DVDPlayerCodec : public ICodec
virtual bool Init(const CStdString &strFile, unsigned int filecache);
virtual void DeInit();
- virtual __int64 Seek(__int64 iSeekTime);
+ virtual int64_t Seek(int64_t iSeekTime);
virtual int ReadPCM(BYTE *pBuffer, int size, int *actualsize);
virtual bool CanInit();
virtual bool CanSeek();
View
8 xbmc/cores/paplayer/FLACcodec.cpp
@@ -89,7 +89,7 @@ bool FLACCodec::Init(const CStdString &strFile, unsigned int filecache)
// These are filled by the metadata callback
if (m_SampleRate==0 || m_Channels==0 || m_BitsPerSample==0 || m_TotalTime==0 || m_MaxFrameSize==0)
{
- CLog::Log(LOGERROR, "FLACCodec: Can't get stream info, SampleRate=%i, Channels=%i, BitsPerSample=%i, TotalTime=%llu, MaxFrameSize=%i", m_SampleRate, m_Channels, m_BitsPerSample, m_TotalTime, m_MaxFrameSize);
+ CLog::Log(LOGERROR, "FLACCodec: Can't get stream info, SampleRate=%i, Channels=%i, BitsPerSample=%i, TotalTime=%"PRIu64", MaxFrameSize=%i", m_SampleRate, m_Channels, m_BitsPerSample, m_TotalTime, m_MaxFrameSize);
FreeDecoder();
return false;
}
@@ -125,14 +125,14 @@ void FLACCodec::DeInit()
}
}
-__int64 FLACCodec::Seek(__int64 iSeekTime)
+int64_t FLACCodec::Seek(int64_t iSeekTime)
{
// Seek to the nearest sample
// set the buffer size to 0 first, as this invokes a WriteCallback which
// may be called when the buffer is almost full (resulting in a buffer
// overrun unless we reset m_BufferSize first).
m_BufferSize=0;
- if(!m_dll.FLAC__stream_decoder_seek_absolute(m_pFlacDecoder, (__int64)(iSeekTime*m_SampleRate)/1000))
+ if(!m_dll.FLAC__stream_decoder_seek_absolute(m_pFlacDecoder, (int64_t)(iSeekTime*m_SampleRate)/1000))
CLog::Log(LOGERROR, "FLACCodec::Seek - failed to seek");
if(m_dll.FLAC__stream_decoder_get_state(m_pFlacDecoder)==FLAC__STREAM_DECODER_SEEK_ERROR)
@@ -316,7 +316,7 @@ void FLACCodec::DecoderMetadataCallback(const FLAC__StreamDecoder *decoder, cons
pThis->m_SampleRate = metadata->data.stream_info.sample_rate;
pThis->m_Channels = metadata->data.stream_info.channels;
pThis->m_BitsPerSample = metadata->data.stream_info.bits_per_sample;
- pThis->m_TotalTime = (__int64)metadata->data.stream_info.total_samples * 1000 / metadata->data.stream_info.sample_rate;
+ pThis->m_TotalTime = (int64_t)metadata->data.stream_info.total_samples * 1000 / metadata->data.stream_info.sample_rate;
pThis->m_MaxFrameSize = metadata->data.stream_info.max_blocksize*(pThis->m_BitsPerSample/8)*pThis->m_Channels;
}
}
View
2 xbmc/cores/paplayer/FLACcodec.h
@@ -32,7 +32,7 @@ class FLACCodec : public CachingCodec
virtual bool Init(const CStdString &strFile, unsigned int filecache);
virtual void DeInit();
- virtual __int64 Seek(__int64 iSeekTime);
+ virtual int64_t Seek(int64_t iSeekTime);
virtual int ReadPCM(BYTE *pBuffer, int size, int *actualsize);
virtual bool CanInit();
View
6 xbmc/cores/paplayer/ICodec.h
@@ -66,7 +66,7 @@ class ICodec
// Should seek to the appropriate time (in ms) in the file, and return the
// time to which we managed to seek (in the case where seeking is problematic)
// This is used in FFwd/Rewd so can be called very often.
- virtual __int64 Seek(__int64 iSeekTime)=0;
+ virtual int64_t Seek(int64_t iSeekTime)=0;
// ReadPCM()
// Decodes audio into pBuffer up to size bytes. The actual amount of returned data
@@ -92,15 +92,15 @@ class ICodec
virtual bool SkipNext(){return false;}
// set the total time - useful when info comes from a preset tag
- virtual void SetTotalTime(__int64 totaltime) {}
+ virtual void SetTotalTime(int64_t totaltime) {}
virtual bool IsCaching() const {return false;}
virtual int GetCacheLevel() const {return -1;}
// true if we can retrieve normalized float data immediately
virtual bool HasFloatData() const { return false; }
- __int64 m_TotalTime; // time in ms
+ int64_t m_TotalTime; // time in ms
int m_SampleRate;
int m_BitsPerSample;
int m_Channels;
View
6 xbmc/cores/paplayer/MP3codec.cpp
@@ -117,7 +117,7 @@ bool MP3Codec::Init(const CStdString &strFile, unsigned int filecache)
int id3v2Size = 0;
int result = -1;
- __int64 length = 0;
+ int64_t length = 0;
bool bTags = false;
if (!m_file.Open(strFile, READ_CACHED))
@@ -137,7 +137,7 @@ bool MP3Codec::Init(const CStdString &strFile, unsigned int filecache)
length = m_file.GetLength();
if (bTags)
- m_TotalTime = (__int64)(m_seekInfo.GetDuration() * 1000.0f);
+ m_TotalTime = (int64_t)(m_seekInfo.GetDuration() * 1000.0f);
// Read in some data so we can determine the sample size and so on
// This needs to be made more intelligent - possibly use a temp output buffer
@@ -197,7 +197,7 @@ void MP3Codec::FlushDecoder()
m_CallAgainWithSameBuffer = false;
}
-__int64 MP3Codec::Seek(__int64 iSeekTime)
+int64_t MP3Codec::Seek(int64_t iSeekTime)
{
// calculate our offset to seek to in the file
m_lastByteOffset = m_seekInfo.GetByteOffset(0.001f * iSeekTime);
View
4 xbmc/cores/paplayer/MP3codec.h
@@ -59,7 +59,7 @@ class MP3Codec : public CachingCodec
virtual bool Init(const CStdString &strFile, unsigned int filecache);
virtual void DeInit();
virtual bool CanSeek();
- virtual __int64 Seek(__int64 iSeekTime);
+ virtual int64_t Seek(int64_t iSeekTime);
virtual int ReadPCM(BYTE *pBuffer, int size, int *actualsize);
virtual int ReadSamples(float *pBuffer, int numsamples, int *actualsamples);
virtual bool CanInit();
@@ -91,7 +91,7 @@ class MP3Codec : public CachingCodec
/* END decoder vars */
// Decoding variables
- __int64 m_lastByteOffset;
+ int64_t m_lastByteOffset;
bool m_eof;
bool m_Decoding;
bool m_CallAgainWithSameBuffer;
View
4 xbmc/cores/paplayer/ModplugCodec.cpp
@@ -73,7 +73,7 @@ bool ModplugCodec::Init(const CStdString &strFile, unsigned int filecache)
m_Channels = 2;
m_SampleRate = 44100;
m_BitsPerSample = 16;
- m_TotalTime = (__int64)(m_dll.ModPlug_GetLength(m_module));
+ m_TotalTime = (int64_t)(m_dll.ModPlug_GetLength(m_module));
return true;
}
@@ -85,7 +85,7 @@ void ModplugCodec::DeInit()
m_module = NULL;
}
-__int64 ModplugCodec::Seek(__int64 iSeekTime)
+int64_t ModplugCodec::Seek(int64_t iSeekTime)
{
m_dll.ModPlug_Seek(m_module, (int)iSeekTime);
return iSeekTime;
View
2 xbmc/cores/paplayer/ModplugCodec.h
@@ -32,7 +32,7 @@ class ModplugCodec : public ICodec
virtual bool Init(const CStdString &strFile, unsigned int filecache);
virtual void DeInit();
- virtual __int64 Seek(__int64 iSeekTime);
+ virtual int64_t Seek(int64_t iSeekTime);
virtual int ReadPCM(BYTE *pBuffer, int size, int *actualsize);
virtual bool CanInit();
private:
View
2 xbmc/cores/paplayer/NSFCodec.cpp
@@ -91,7 +91,7 @@ void NSFCodec::DeInit()
m_szBuffer = NULL;
}
-__int64 NSFCodec::Seek(__int64 iSeekTime)
+int64_t NSFCodec::Seek(int64_t iSeekTime)
{
if (m_iDataPos > iSeekTime/1000*48000*2)
{
View
4 xbmc/cores/paplayer/NSFCodec.h
@@ -33,7 +33,7 @@ class NSFCodec : public ICodec
virtual bool Init(const CStdString &strFile, unsigned int filecache);
virtual void DeInit();
- virtual __int64 Seek(__int64 iSeekTime);
+ virtual int64_t Seek(int64_t iSeekTime);
virtual int ReadPCM(BYTE *pBuffer, int size, int *actualsize);
virtual bool CanInit();
@@ -46,7 +46,7 @@ class NSFCodec : public ICodec
char* m_szBuffer;
char* m_szStartOfBuffer; // never allocated
int m_iDataInBuffer;
- __int64 m_iDataPos;
+ int64_t m_iDataPos;
};
#endif
View
6 xbmc/cores/paplayer/OGGcodec.cpp
@@ -118,14 +118,14 @@ bool OGGCodec::Init(const CStdString &strFile1, unsigned int filecache)
if (item.IsInternetStream())
m_TotalTime = -1;
else
- m_TotalTime = (__int64)m_dll.ov_time_total(&m_VorbisFile, m_CurrentStream)*1000;
+ m_TotalTime = (int64_t)m_dll.ov_time_total(&m_VorbisFile, m_CurrentStream)*1000;
m_Bitrate = pInfo->bitrate_nominal;
if (m_Bitrate == 0 && m_TotalTime > 0 && !item.IsInternetStream())
m_Bitrate = (int)(m_file.GetLength()*8 / (m_TotalTime / 1000));
if (m_SampleRate==0 || m_Channels==0 || m_BitsPerSample==0 || m_TotalTime==0)
{
- CLog::Log(LOGERROR, "OGGCodec: incomplete stream info from %s, SampleRate=%i, Channels=%i, BitsPerSample=%i, TotalTime=%llu", strFile1.c_str(), m_SampleRate, m_Channels, m_BitsPerSample, m_TotalTime);
+ CLog::Log(LOGERROR, "OGGCodec: incomplete stream info from %s, SampleRate=%i, Channels=%i, BitsPerSample=%i, TotalTime=%"PRIu64, strFile1.c_str(), m_SampleRate, m_Channels, m_BitsPerSample, m_TotalTime);
return false;
}
@@ -163,7 +163,7 @@ void OGGCodec::DeInit()
m_inited = false;
}
-__int64 OGGCodec::Seek(__int64 iSeekTime)
+int64_t OGGCodec::Seek(int64_t iSeekTime)
{
if (m_dll.ov_time_seek(&m_VorbisFile, m_TimeOffset+(double)(iSeekTime/1000.0f))!=0)
return 0;
View
2 xbmc/cores/paplayer/OGGcodec.h
@@ -33,7 +33,7 @@ class OGGCodec : public CachingCodec
virtual bool Init(const CStdString &strFile, unsigned int filecache);
virtual void DeInit();
- virtual __int64 Seek(__int64 iSeekTime);
+ virtual int64_t Seek(int64_t iSeekTime);
virtual int ReadPCM(BYTE *pBuffer, int size, int *actualsize);
virtual bool CanInit();
View
24 xbmc/cores/paplayer/PAPlayer.cpp
@@ -145,7 +145,7 @@ bool PAPlayer::OpenFile(const CFileItem& file, const CPlayerOptions &options)
// always open the file using the current decoder
m_currentDecoder = 0;
- if (!m_decoder[m_currentDecoder].Create(file, (__int64)(options.starttime * 1000), m_crossFading))
+ if (!m_decoder[m_currentDecoder].Create(file, (int64_t)(options.starttime * 1000), m_crossFading))
return false;
m_iSpeed = 1;
@@ -155,7 +155,7 @@ bool PAPlayer::OpenFile(const CFileItem& file, const CPlayerOptions &options)
CLog::Log(LOGINFO, "PAPlayer: Playing %s", file.GetPath().c_str());
- m_timeOffset = (__int64)(options.starttime * 1000);
+ m_timeOffset = (int64_t)(options.starttime * 1000);
unsigned int channel, sampleRate, bitsPerSample;
m_decoder[m_currentDecoder].GetDataFormat(&channel, &sampleRate, &bitsPerSample);
@@ -760,15 +760,15 @@ bool PAPlayer::ProcessPAP()
return true;
}
-__int64 PAPlayer::GetTime()
+int64_t PAPlayer::GetTime()
{
- __int64 timeplus = m_BytesPerSecond ? (__int64)(((float) m_bytesSentOut / (float) m_BytesPerSecond ) * 1000.0) : 0;
+ int64_t timeplus = m_BytesPerSecond ? (int64_t)(((float) m_bytesSentOut / (float) m_BytesPerSecond ) * 1000.0) : 0;
return m_timeOffset + timeplus - m_currentFile->m_lStartOffset * 1000 / 75;
}
-__int64 PAPlayer::GetTotalTime64()
+int64_t PAPlayer::GetTotalTime64()
{
- __int64 total = m_decoder[m_currentDecoder].TotalTime();
+ int64_t total = m_decoder[m_currentDecoder].TotalTime();
if (m_currentFile->m_lEndOffset)
total = m_currentFile->m_lEndOffset * 1000 / 75;
if (m_currentFile->m_lStartOffset)
@@ -837,7 +837,7 @@ bool PAPlayer::CanSeek()
void PAPlayer::Seek(bool bPlus, bool bLargeStep)
{
- __int64 seek;
+ int64_t seek;
if (g_advancedSettings.m_musicUseTimeSeeking && GetTotalTime() > 2*g_advancedSettings.m_musicTimeSeekForwardBig)
{
if (bLargeStep)
@@ -854,13 +854,13 @@ void PAPlayer::Seek(bool bPlus, bool bLargeStep)
percent = bPlus ? (float)g_advancedSettings.m_musicPercentSeekForwardBig : (float)g_advancedSettings.m_musicPercentSeekBackwardBig;
else
percent = bPlus ? (float)g_advancedSettings.m_musicPercentSeekForward : (float)g_advancedSettings.m_musicPercentSeekBackward;
- seek = (__int64)(GetTotalTime64()*(GetPercentage()+percent)/100);
+ seek = (int64_t)(GetTotalTime64()*(GetPercentage()+percent)/100);
}
SeekTime(seek);
}
-void PAPlayer::SeekTime(__int64 iTime /*=0*/)
+void PAPlayer::SeekTime(int64_t iTime /*=0*/)
{
if (!CanSeek()) return;
int seekOffset = (int)(iTime - GetTime());
@@ -875,7 +875,7 @@ void PAPlayer::SeekPercentage(float fPercent /*=0*/)
{
if (fPercent < 0.0f) fPercent = 0.0f;
if (fPercent > 100.0f) fPercent = 100.0f;
- SeekTime((__int64)(fPercent * 0.01f * (float)GetTotalTime64()));
+ SeekTime((int64_t)(fPercent * 0.01f * (float)GetTotalTime64()));
}
float PAPlayer::GetPercentage()
@@ -927,9 +927,9 @@ bool PAPlayer::HandleFFwdRewd()
if ( m_bytesSentOut >= snippet )
{
// Calculate offset to seek if we do FF/RW
- __int64 time = GetTime();
+ int64_t time = GetTime();
if (m_IsFFwdRewding) snippet = (int)m_bytesSentOut;
- time += (__int64)((double)snippet * (m_iSpeed - 1.0) / m_BytesPerSecond * 1000.0);
+ time += (int64_t)((double)snippet * (m_iSpeed - 1.0) / m_BytesPerSecond * 1000.0);
// Is our offset inside the track range?
if (time >= 0 && time <= m_decoder[m_currentDecoder].TotalTime())
View
14 xbmc/cores/paplayer/PAPlayer.h
@@ -78,14 +78,14 @@ class PAPlayer : public IPlayer, public CThread
virtual void ToFFRW(int iSpeed = 0);
virtual int GetCacheLevel() const;
virtual int GetTotalTime();
- __int64 GetTotalTime64();
+ int64_t GetTotalTime64();
virtual int GetAudioBitrate();
virtual int GetChannels();
virtual int GetBitsPerSample();
virtual int GetSampleRate();
virtual CStdString GetAudioCodecName();
- virtual __int64 GetTime();
- virtual void SeekTime(__int64 iTime = 0);
+ virtual int64_t GetTime();
+ virtual void SeekTime(int64_t iTime = 0);
// Skip to next track/item inside the current media (if supported).
virtual bool SkipNext();
@@ -113,7 +113,7 @@ class PAPlayer : public IPlayer, public CThread
bool m_cachingNextFile;
int m_crossFading;
bool m_currentlyCrossFading;
- __int64 m_crossFadeLength;
+ int64_t m_crossFadeLength;
CEvent m_startEvent;
@@ -123,9 +123,9 @@ class PAPlayer : public IPlayer, public CThread
bool ProcessPAP(); // does the actual reading and decode from our PAP dll
- __int64 m_SeekTime;
+ int64_t m_SeekTime;
int m_IsFFwdRewding;
- __int64 m_timeOffset;
+ int64_t m_timeOffset;
bool m_forceFadeToNext;
int m_currentDecoder;
@@ -171,7 +171,7 @@ class PAPlayer : public IPlayer, public CThread
IAudioCallback* m_pCallback;
- __int64 m_bytesSentOut;
+ int64_t m_bytesSentOut;
// format (this should be stored/retrieved from the audio device object probably)
unsigned int m_channelCount[2];
View
2 xbmc/cores/paplayer/PCMCodec.cpp
@@ -63,7 +63,7 @@ void PCMCodec::DeInit()
m_file.Close();
}
-__int64 PCMCodec::Seek(__int64 iSeekTime)
+int64_t PCMCodec::Seek(int64_t iSeekTime)
{
m_file.Seek((iSeekTime / 1000) * (m_Bitrate / 8));
return iSeekTime;
View
2 xbmc/cores/paplayer/PCMCodec.h
@@ -29,7 +29,7 @@ class PCMCodec : public CachingCodec
virtual ~PCMCodec(void);
virtual bool Init(const CStdString &strFile, unsigned int filecache);
virtual void DeInit();
- virtual __int64 Seek(__int64 iSeekTime);
+ virtual int64_t Seek(int64_t iSeekTime);
virtual int ReadPCM(BYTE *pBuffer, int size, int *actualsize);
virtual bool CanInit();
virtual void SetMimeParams(const CStdString& strMimeParams);
View
4 xbmc/cores/paplayer/SIDCodec.cpp
@@ -88,7 +88,7 @@ void SIDCodec::DeInit()
m_sid = 0;
}
-__int64 SIDCodec::Seek(__int64 iSeekTime)
+int64_t SIDCodec::Seek(int64_t iSeekTime)
{
char temp[3840*2];
if (m_iDataPos > iSeekTime/1000*48000*2)
@@ -99,7 +99,7 @@ __int64 SIDCodec::Seek(__int64 iSeekTime)
while (m_iDataPos < iSeekTime/1000*48000*2)
{
- __int64 iRead = iSeekTime/1000*48000*2-m_iDataPos;
+ int64_t iRead = iSeekTime/1000*48000*2-m_iDataPos;
if (iRead > 3840*2)
{
m_dll.SetSpeed(m_sid,32*100);
View
6 xbmc/cores/paplayer/SIDCodec.h
@@ -33,19 +33,19 @@ class SIDCodec : public ICodec
virtual bool Init(const CStdString &strFile, unsigned int filecache);
virtual void DeInit();
- virtual __int64 Seek(__int64 iSeekTime);
+ virtual int64_t Seek(int64_t iSeekTime);
virtual int ReadPCM(BYTE *pBuffer, int size, int *actualsize);
virtual bool CanInit();
- virtual void SetTotalTime(__int64 totaltime)
+ virtual void SetTotalTime(int64_t totaltime)
{
m_TotalTime = totaltime*1000;
}
private:
DllSidplay2 m_dll;
void* m_sid;
int m_iTrack;
- __int64 m_iDataPos;
+ int64_t m_iDataPos;
};
#endif
View
4 xbmc/cores/paplayer/SPCCodec.cpp
@@ -153,7 +153,7 @@ void SPCCodec::DeInit()
m_pApuRAM = NULL;
}
-__int64 SPCCodec::Seek(__int64 iSeekTime)
+int64_t SPCCodec::Seek(int64_t iSeekTime)
{
if (m_iDataPos > iSeekTime/1000*m_SampleRate*4)
{
@@ -162,7 +162,7 @@ __int64 SPCCodec::Seek(__int64 iSeekTime)
}
else
{
- __int64 iDataPos2 = m_iDataPos;
+ int64_t iDataPos2 = m_iDataPos;
m_iDataPos = iSeekTime/1000*m_SampleRate*4;
iSeekTime -= (iDataPos2*1000)/(m_SampleRate*4);
}
View
4 xbmc/cores/paplayer/SPCCodec.h
@@ -34,7 +34,7 @@ class SPCCodec : public ICodec
virtual bool Init(const CStdString &strFile, unsigned int filecache);
virtual void DeInit();
- virtual __int64 Seek(__int64 iSeekTime);
+ virtual int64_t Seek(int64_t iSeekTime);
virtual int ReadPCM(BYTE *pBuffer, int size, int *actualsize);
virtual bool CanInit();
private:
@@ -65,7 +65,7 @@ class SPCCodec : public ICodec
char* m_szBuffer;
u8* m_pApuRAM;
- __int64 m_iDataPos;
+ int64_t m_iDataPos;
};
#endif
View
6 xbmc/cores/paplayer/TimidityCodec.cpp
@@ -124,7 +124,7 @@ bool TimidityCodec::Init(const CStdString &strFile, unsigned int filecache)
m_Channels = 2;
m_SampleRate = 48000;
m_BitsPerSample = 16;
- m_TotalTime = (__int64)m_dll.GetLength(m_mid);
+ m_TotalTime = (int64_t)m_dll.GetLength(m_mid);
return true;
}
@@ -145,9 +145,9 @@ void TimidityCodec::DeInit()
m_loader = 0;
}
-__int64 TimidityCodec::Seek(__int64 iSeekTime)
+int64_t TimidityCodec::Seek(int64_t iSeekTime)
{
- __int64 result = (__int64)m_dll.Seek(m_mid,(unsigned long)iSeekTime);
+ int64_t result = (int64_t)m_dll.Seek(m_mid,(unsigned long)iSeekTime);
m_iDataPos = result/1000*48000*4;
return result;
View
4 xbmc/cores/paplayer/TimidityCodec.h
@@ -33,7 +33,7 @@ class TimidityCodec : public ICodec
virtual bool Init(const CStdString &strFile, unsigned int filecache);
virtual void DeInit();
- virtual __int64 Seek(__int64 iSeekTime);
+ virtual int64_t Seek(int64_t iSeekTime);
virtual int ReadPCM(BYTE *pBuffer, int size, int *actualsize);
virtual bool CanInit();
static bool IsSupportedFormat(const CStdString& strExt);
@@ -65,7 +65,7 @@ class TimidityCodec : public ICodec
void * m_mid;
int m_iTrack;
- __int64 m_iDataPos;
+ int64_t m_iDataPos;
};
#endif
View
6 xbmc/cores/paplayer/VGMCodec.cpp
@@ -53,7 +53,7 @@ bool VGMCodec::Init(const CStdString &strFile, unsigned int filecache)
return false;
}
- m_TotalTime = (__int64)m_dll.GetLength(m_vgm);
+ m_TotalTime = (int64_t)m_dll.GetLength(m_vgm);
return true;
}
@@ -65,9 +65,9 @@ void VGMCodec::DeInit()
m_vgm = 0;