From 7091b58295f2395bcf08df795262607dd85366d8 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Fri, 25 Nov 2016 12:27:29 +0100 Subject: VideoPlayer: change time parameter of SeekTime from int to double --- xbmc/addons/InputStream.cpp | 2 +- xbmc/addons/InputStream.h | 2 +- xbmc/addons/PVRClient.cpp | 2 +- xbmc/addons/PVRClient.h | 2 +- .../addons/kodi-addon-dev-kit/include/kodi/kodi_inputstream_dll.h | 2 +- .../kodi-addon-dev-kit/include/kodi/kodi_inputstream_types.h | 4 ++-- xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_dll.h | 2 +- xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_types.h | 6 +++--- xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemux.h | 2 +- xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxBXA.h | 2 +- xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxCC.h | 2 +- xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxCDDA.cpp | 2 +- xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxCDDA.h | 2 +- xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxClient.cpp | 2 +- xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxClient.h | 2 +- xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp | 4 ++-- xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.h | 2 +- xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxVobsub.cpp | 2 +- xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxVobsub.h | 2 +- xbmc/cores/VideoPlayer/DVDDemuxers/DemuxMultiSource.cpp | 6 +++--- xbmc/cores/VideoPlayer/DVDDemuxers/DemuxMultiSource.h | 2 +- xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStream.h | 2 +- .../VideoPlayer/DVDInputStreams/DVDInputStreamPVRManager.cpp | 2 +- xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamPVRManager.h | 2 +- xbmc/cores/VideoPlayer/DVDInputStreams/InputStreamAddon.cpp | 2 +- xbmc/cores/VideoPlayer/DVDInputStreams/InputStreamAddon.h | 2 +- xbmc/cores/VideoPlayer/VideoPlayer.cpp | 8 ++++---- 27 files changed, 36 insertions(+), 36 deletions(-) diff --git a/xbmc/addons/InputStream.cpp b/xbmc/addons/InputStream.cpp index 4c079181b0..45a2091639 100644 --- a/xbmc/addons/InputStream.cpp +++ b/xbmc/addons/InputStream.cpp @@ -494,7 +494,7 @@ DemuxPacket* CInputStream::ReadDemux() return pPacket; } -bool CInputStream::SeekTime(int time, bool backward, double* startpts) +bool CInputStream::SeekTime(double time, bool backward, double* startpts) { bool ret = false; try diff --git a/xbmc/addons/InputStream.h b/xbmc/addons/InputStream.h index c081472033..9ee8eb4b3d 100644 --- a/xbmc/addons/InputStream.h +++ b/xbmc/addons/InputStream.h @@ -75,7 +75,7 @@ namespace ADDON CDemuxStream* GetStream(int iStreamId); std::vector GetStreams() const; DemuxPacket* ReadDemux(); - bool SeekTime(int time, bool backward, double* startpts); + bool SeekTime(double time, bool backward, double* startpts); void AbortDemux(); void FlushDemux(); void SetSpeed(int iSpeed); diff --git a/xbmc/addons/PVRClient.cpp b/xbmc/addons/PVRClient.cpp index 0e7f7c084a..d85a00dd75 100644 --- a/xbmc/addons/PVRClient.cpp +++ b/xbmc/addons/PVRClient.cpp @@ -1383,7 +1383,7 @@ int64_t CPVRClient::SeekStream(int64_t iFilePosition, int iWhence/* = SEEK_SET*/ return -EINVAL; } -bool CPVRClient::SeekTime(int time, bool backwards, double *startpts) +bool CPVRClient::SeekTime(double time, bool backwards, double *startpts) { if (IsPlaying()) { diff --git a/xbmc/addons/PVRClient.h b/xbmc/addons/PVRClient.h index 5eef0ebc00..8262ed58e2 100644 --- a/xbmc/addons/PVRClient.h +++ b/xbmc/addons/PVRClient.h @@ -515,7 +515,7 @@ namespace PVR * @return True if the seek operation was possible * @remarks Optional, and only used if addon has its own demuxer. Return False if this add-on won't provide this function. */ - bool SeekTime(int time, bool backwards, double *startpts); + bool SeekTime(double time, bool backwards, double *startpts); /*! * Notify the pvr addon/demuxer that XBMC wishes to change playback speed diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_inputstream_dll.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_inputstream_dll.h index 372197140f..8dc49c0456 100644 --- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_inputstream_dll.h +++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_inputstream_dll.h @@ -122,7 +122,7 @@ extern "C" * @return True if the seek operation was possible * @remarks Optional, and only used if addon has its own demuxer. */ - bool DemuxSeekTime(int time, bool backwards, double *startpts); + bool DemuxSeekTime(double time, bool backwards, double *startpts); /*! * Notify the InputStream addon/demuxer that XBMC wishes to change playback speed diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_inputstream_types.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_inputstream_types.h index ad47bb5c0c..87807e2d47 100644 --- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_inputstream_types.h +++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_inputstream_types.h @@ -31,7 +31,7 @@ #endif /* current API version */ -#define INPUTSTREAM_API_VERSION "1.0.5" +#define INPUTSTREAM_API_VERSION "1.0.6" extern "C" { @@ -140,7 +140,7 @@ extern "C" { void (__cdecl* DemuxAbort)(void); void (__cdecl* DemuxFlush)(void); DemuxPacket* (__cdecl* DemuxRead)(void); - bool (__cdecl* DemuxSeekTime)(int, bool, double*); + bool (__cdecl* DemuxSeekTime)(double, bool, double*); void (__cdecl* DemuxSetSpeed)(int); void (__cdecl* SetVideoResolution)(int, int); diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_dll.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_dll.h index 2cf558af42..57bb129630 100644 --- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_dll.h +++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_dll.h @@ -589,7 +589,7 @@ extern "C" * @return True if the seek operation was possible * @remarks Optional, and only used if addon has its own demuxer. Return False if this add-on won't provide this function. */ - bool SeekTime(int time, bool backwards, double *startpts); + bool SeekTime(double time, bool backwards, double *startpts); /*! * Notify the pvr addon/demuxer that XBMC wishes to change playback speed diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_types.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_types.h index 08ae183e07..dbc7217ff5 100644 --- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_types.h +++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_types.h @@ -78,10 +78,10 @@ struct DemuxPacket; #define PVR_STREAM_MAX_STREAMS 20 /* current PVR API version */ -#define XBMC_PVR_API_VERSION "5.2.0" +#define XBMC_PVR_API_VERSION "5.2.1" /* min. PVR API version */ -#define XBMC_PVR_MIN_API_VERSION "5.2.0" +#define XBMC_PVR_MIN_API_VERSION "5.2.1" #ifdef __cplusplus extern "C" { @@ -594,7 +594,7 @@ extern "C" { bool (__cdecl* CanPauseStream)(void); void (__cdecl* PauseStream)(bool); bool (__cdecl* CanSeekStream)(void); - bool (__cdecl* SeekTime)(int, bool, double*); + bool (__cdecl* SeekTime)(double, bool, double*); void (__cdecl* SetSpeed)(int); time_t (__cdecl* GetPlayingTime)(void); time_t (__cdecl* GetBufferTimeStart)(void); diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemux.h b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemux.h index 03fdf6efa0..3bb003b634 100644 --- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemux.h +++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemux.h @@ -259,7 +259,7 @@ public: /* * Seek, time in msec calculated from stream start */ - virtual bool SeekTime(int time, bool backwords = false, double* startpts = NULL) = 0; + virtual bool SeekTime(double time, bool backwards = false, double* startpts = NULL) = 0; /* * Seek to a specified chapter. diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxBXA.h b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxBXA.h index 9510e1c9d1..6c1b2729d4 100644 --- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxBXA.h +++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxBXA.h @@ -64,7 +64,7 @@ public: void Abort(); void Flush(); DemuxPacket* Read(); - bool SeekTime(int time, bool backwords = false, double* startpts = NULL) { return false; } + bool SeekTime(double time, bool backwards = false, double* startpts = NULL) override { return false; } void SetSpeed(int iSpeed) {}; int GetStreamLength() { return (int)m_header.durationMs; } CDemuxStream* GetStream(int iStreamId) const override; diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxCC.h b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxCC.h index 83190ccf3f..1af0f5a4d5 100644 --- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxCC.h +++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxCC.h @@ -35,7 +35,7 @@ public: virtual void Abort() {}; virtual void Flush() {}; virtual DemuxPacket* Read() { return NULL; }; - virtual bool SeekTime(int time, bool backwords = false, double* startpts = NULL) {return true;}; + virtual bool SeekTime(double time, bool backwards = false, double* startpts = NULL) override {return true;}; virtual void SetSpeed(int iSpeed) {}; virtual int GetStreamLength() {return 0;}; virtual CDemuxStream* GetStream(int iStreamId) const override; diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxCDDA.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxCDDA.cpp index e19c5074d8..2997f38eb7 100644 --- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxCDDA.cpp +++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxCDDA.cpp @@ -136,7 +136,7 @@ DemuxPacket* CDVDDemuxCDDA::Read() return pPacket; } -bool CDVDDemuxCDDA::SeekTime(int time, bool backwords, double* startpts) +bool CDVDDemuxCDDA::SeekTime(double time, bool backwards, double* startpts) { int bytes_per_second = m_stream->iBitRate>>3; // clamp seeks to bytes per full sample diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxCDDA.h b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxCDDA.h index 213f46b537..6d443b3ec5 100644 --- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxCDDA.h +++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxCDDA.h @@ -45,7 +45,7 @@ public: void Abort(); void Flush(); DemuxPacket* Read(); - bool SeekTime(int time, bool backwords = false, double* startpts = NULL); + bool SeekTime(double time, bool backwards = false, double* startpts = NULL) override; void SetSpeed(int iSpeed) {}; int GetStreamLength() ; CDemuxStream* GetStream(int iStreamId) const override; diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxClient.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxClient.cpp index be96f83fef..06ef7da58a 100644 --- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxClient.cpp +++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxClient.cpp @@ -586,7 +586,7 @@ std::string CDVDDemuxClient::GetStreamCodecName(int iStreamId) return strName; } -bool CDVDDemuxClient::SeekTime(int timems, bool backwards, double *startpts) +bool CDVDDemuxClient::SeekTime(double timems, bool backwards, double *startpts) { if (m_IDemux) { diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxClient.h b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxClient.h index 9da5e89acc..4dfc4c1139 100644 --- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxClient.h +++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxClient.h @@ -41,7 +41,7 @@ public: void Abort() override; void Flush() override; DemuxPacket* Read() override; - bool SeekTime(int time, bool backwords = false, double* startpts = NULL) override; + bool SeekTime(double time, bool backwards = false, double* startpts = NULL) override; void SetSpeed(int iSpeed) override; int GetStreamLength() override { return 0; } CDemuxStream* GetStream(int iStreamId) const override; diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp index c5a6fc1c6d..3b3a10ded1 100644 --- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp +++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp @@ -1064,7 +1064,7 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() return pPacket; } -bool CDVDDemuxFFmpeg::SeekTime(int time, bool backwords, double *startpts) +bool CDVDDemuxFFmpeg::SeekTime(double time, bool backwards, double *startpts) { bool hitEnd = false; @@ -1109,7 +1109,7 @@ bool CDVDDemuxFFmpeg::SeekTime(int time, bool backwords, double *startpts) int ret; { CSingleLock lock(m_critSection); - ret = av_seek_frame(m_pFormatContext, -1, seek_pts, backwords ? AVSEEK_FLAG_BACKWARD : 0); + ret = av_seek_frame(m_pFormatContext, -1, seek_pts, backwards ? AVSEEK_FLAG_BACKWARD : 0); // demuxer can return failure, if seeking behind eof if (ret < 0 && m_pFormatContext->duration && diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.h b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.h index a0fd997a52..0bc498e8e3 100644 --- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.h +++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.h @@ -100,7 +100,7 @@ public: DemuxPacket* Read() override; - bool SeekTime(int time, bool backwords = false, double* startpts = NULL) override; + bool SeekTime(double time, bool backwards = false, double* startpts = NULL) override; bool SeekByte(int64_t pos); int GetStreamLength() override; CDemuxStream* GetStream(int iStreamId) const override; diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxVobsub.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxVobsub.cpp index a241dcbc00..f791efdb66 100644 --- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxVobsub.cpp +++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxVobsub.cpp @@ -141,7 +141,7 @@ void CDVDDemuxVobsub::Flush() m_Demuxer->Flush(); } -bool CDVDDemuxVobsub::SeekTime(int time, bool backwords, double* startpts) +bool CDVDDemuxVobsub::SeekTime(double time, bool backwards, double* startpts) { double pts = DVD_MSEC_TO_TIME(time); m_Timestamp = m_Timestamps.begin(); diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxVobsub.h b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxVobsub.h index bf412a17b8..7c2c3b776b 100644 --- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxVobsub.h +++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxVobsub.h @@ -39,7 +39,7 @@ public: virtual void Abort() {}; virtual void Flush(); virtual DemuxPacket* Read(); - virtual bool SeekTime(int time, bool backwords, double* startpts = NULL); + virtual bool SeekTime(double time, bool backwards, double* startpts = NULL) override; virtual void SetSpeed(int speed) {} virtual CDemuxStream* GetStream(int index) const override { return m_Streams[index]; } virtual std::vector GetStreams() const override; diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxMultiSource.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxMultiSource.cpp index 9cfc1a884d..67ee62d9c4 100644 --- a/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxMultiSource.cpp +++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxMultiSource.cpp @@ -203,7 +203,7 @@ DemuxPacket* CDemuxMultiSource::Read() return packet; } -bool CDemuxMultiSource::SeekTime(int time, bool backwords, double* startpts) +bool CDemuxMultiSource::SeekTime(double time, bool backwards, double* startpts) { DemuxQueue demuxerQueue = DemuxQueue(); bool ret = false; @@ -212,12 +212,12 @@ bool CDemuxMultiSource::SeekTime(int time, bool backwords, double* startpts) if (iter.second->SeekTime(time, false, startpts)) { demuxerQueue.push(std::make_pair(*startpts, iter.second)); - CLog::Log(LOGDEBUG, "%s - starting demuxer from: %d", __FUNCTION__, time); + CLog::Log(LOGDEBUG, "%s - starting demuxer from: %f", __FUNCTION__, time); ret = true; } else { - CLog::Log(LOGDEBUG, "%s - failed to start demuxing from: %d", __FUNCTION__, time); + CLog::Log(LOGDEBUG, "%s - failed to start demuxing from: %f", __FUNCTION__, time); } } m_demuxerQueue = demuxerQueue; diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxMultiSource.h b/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxMultiSource.h index 3864b93daa..a4763d7bc2 100644 --- a/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxMultiSource.h +++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxMultiSource.h @@ -59,7 +59,7 @@ public: bool Open(CDVDInputStream* pInput); DemuxPacket* Read(); void Reset(); - bool SeekTime(int time, bool backwords = false, double* startpts = NULL); + bool SeekTime(double time, bool backwards = false, double* startpts = NULL) override; virtual void SetSpeed(int iSpeed) {}; private: diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStream.h b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStream.h index aa204ddd69..932f0e4093 100644 --- a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStream.h +++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStream.h @@ -125,7 +125,7 @@ public: virtual void EnableStream(int iStreamId, bool enable) = 0; virtual int GetNrOfStreams() const = 0; virtual void SetSpeed(int iSpeed) = 0; - virtual bool SeekTime(int time, bool backward = false, double* startpts = NULL) = 0; + virtual bool SeekTime(double time, bool backward = false, double* startpts = NULL) = 0; virtual void AbortDemux() = 0; virtual void FlushDemux() = 0; virtual void SetVideoResolution(int width, int height) {}; diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamPVRManager.cpp b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamPVRManager.cpp index 6d56d0b7fa..f310338fe1 100644 --- a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamPVRManager.cpp +++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamPVRManager.cpp @@ -553,7 +553,7 @@ void CDVDInputStreamPVRManager::SetSpeed(int Speed) } } -bool CDVDInputStreamPVRManager::SeekTime(int timems, bool backwards, double *startpts) +bool CDVDInputStreamPVRManager::SeekTime(double timems, bool backwards, double *startpts) { PVR_CLIENT client; if (g_PVRClients->GetPlayingClient(client)) diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamPVRManager.h b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamPVRManager.h index 2ce0231ed5..baf819f149 100644 --- a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamPVRManager.h +++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamPVRManager.h @@ -101,7 +101,7 @@ public: virtual std::vector GetStreams() const override; virtual int GetNrOfStreams() const override; virtual void SetSpeed(int iSpeed) override; - virtual bool SeekTime(int time, bool backward = false, double* startpts = NULL) override; + virtual bool SeekTime(double time, bool backward = false, double* startpts = NULL) override; virtual void AbortDemux() override; virtual void FlushDemux() override; virtual void EnableStream(int iStreamId, bool enable) override {}; diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/InputStreamAddon.cpp b/xbmc/cores/VideoPlayer/DVDInputStreams/InputStreamAddon.cpp index 0ba6f0ef86..11b5dd3e3c 100644 --- a/xbmc/cores/VideoPlayer/DVDInputStreams/InputStreamAddon.cpp +++ b/xbmc/cores/VideoPlayer/DVDInputStreams/InputStreamAddon.cpp @@ -221,7 +221,7 @@ void CInputStreamAddon::SetSpeed(int iSpeed) m_addon->SetSpeed(iSpeed); } -bool CInputStreamAddon::SeekTime(int time, bool backward, double* startpts) +bool CInputStreamAddon::SeekTime(double time, bool backward, double* startpts) { if (!m_addon) return false; diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/InputStreamAddon.h b/xbmc/cores/VideoPlayer/DVDInputStreams/InputStreamAddon.h index 0996d68cc9..b64caae3f5 100644 --- a/xbmc/cores/VideoPlayer/DVDInputStreams/InputStreamAddon.h +++ b/xbmc/cores/VideoPlayer/DVDInputStreams/InputStreamAddon.h @@ -81,7 +81,7 @@ public: virtual void EnableStream(int iStreamId, bool enable) override; virtual int GetNrOfStreams() const override; virtual void SetSpeed(int iSpeed) override; - virtual bool SeekTime(int time, bool backward = false, double* startpts = NULL) override; + virtual bool SeekTime(double time, bool backward = false, double* startpts = NULL) override; virtual void AbortDemux() override; virtual void FlushDemux() override; virtual void SetVideoResolution(int width, int height) override; diff --git a/xbmc/cores/VideoPlayer/VideoPlayer.cpp b/xbmc/cores/VideoPlayer/VideoPlayer.cpp index b1a93da78b..c2d80719ba 100644 --- a/xbmc/cores/VideoPlayer/VideoPlayer.cpp +++ b/xbmc/cores/VideoPlayer/VideoPlayer.cpp @@ -2561,7 +2561,7 @@ void CVideoPlayer::HandleMessages() double start = DVD_NOPTS_VALUE; - int time = msg.GetTime(); + double time = msg.GetTime(); if (msg.GetRelative()) time = GetTime() + time; @@ -2576,14 +2576,14 @@ void CVideoPlayer::HandleMessages() if (m_pInputStream->GetIPosTime() == nullptr) time -= DVD_TIME_TO_MSEC(m_State.time_offset); - CLog::Log(LOGDEBUG, "demuxer seek to: %d", time); + CLog::Log(LOGDEBUG, "demuxer seek to: %f", time); if (m_pDemuxer && m_pDemuxer->SeekTime(time, msg.GetBackward(), &start)) { - CLog::Log(LOGDEBUG, "demuxer seek to: %d, success", time); + CLog::Log(LOGDEBUG, "demuxer seek to: %f, success", time); if(m_pSubtitleDemuxer) { if(!m_pSubtitleDemuxer->SeekTime(time, msg.GetBackward())) - CLog::Log(LOGDEBUG, "failed to seek subtitle demuxer: %d, success", time); + CLog::Log(LOGDEBUG, "failed to seek subtitle demuxer: %f, success", time); } // dts after successful seek if (start == DVD_NOPTS_VALUE) -- cgit v1.2.3 From 0fbd2ae718d9933173e3b17454e53f9da6ed806c Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Fri, 25 Nov 2016 16:21:47 +0100 Subject: pvr: bump addon api to 5.2.1 --- addons/xbmc.pvr/addon.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/xbmc.pvr/addon.xml b/addons/xbmc.pvr/addon.xml index cee4e3e2ee..3c70c577c4 100644 --- a/addons/xbmc.pvr/addon.xml +++ b/addons/xbmc.pvr/addon.xml @@ -1,6 +1,6 @@ - - + + -- cgit v1.2.3 From acd5a3a8e92cd020d82670ab0d0c99635a38de5a Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Fri, 25 Nov 2016 16:22:27 +0100 Subject: inputstream: bump addon api to 1.0.6 --- addons/kodi.inputstream/addon.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/kodi.inputstream/addon.xml b/addons/kodi.inputstream/addon.xml index 3705def489..45f5dc4ea9 100644 --- a/addons/kodi.inputstream/addon.xml +++ b/addons/kodi.inputstream/addon.xml @@ -1,6 +1,6 @@ - - + + -- cgit v1.2.3