diff options
| -rw-r--r-- | xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.h | 2 | ||||
| -rw-r--r-- | xbmc/guilib/XBTFReader.cpp | 1 | ||||
| -rw-r--r-- | xbmc/utils/DownloadQueueManager.cpp | 9 |
3 files changed, 3 insertions, 9 deletions
diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.h b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.h index b757a26020..94cad53042 100644 --- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.h +++ b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.h @@ -119,8 +119,6 @@ protected: int ReadFrame(AVPacket *packet); void AddStream(int iId); - // void Lock() { EnterCriticalSection(&m_critSection); } - // void Unlock() { LeaveCriticalSection(&m_critSection); } double ConvertTimestamp(int64_t pts, int den, int num); void UpdateCurrentPTS(); diff --git a/xbmc/guilib/XBTFReader.cpp b/xbmc/guilib/XBTFReader.cpp index f803035987..db96fd1775 100644 --- a/xbmc/guilib/XBTFReader.cpp +++ b/xbmc/guilib/XBTFReader.cpp @@ -25,7 +25,6 @@ #include "utils/CharsetConverter.h" #ifdef _WIN32 #include "FileSystem/SpecialProtocol.h" -#include "PlatformDefs.h" //for PRIdS, PRId64 #endif #include <string.h> diff --git a/xbmc/utils/DownloadQueueManager.cpp b/xbmc/utils/DownloadQueueManager.cpp index c1e73f65e9..039e0df5cb 100644 --- a/xbmc/utils/DownloadQueueManager.cpp +++ b/xbmc/utils/DownloadQueueManager.cpp @@ -39,22 +39,19 @@ VOID CDownloadQueueManager::Initialize() TICKET CDownloadQueueManager::RequestContent(const CStdString& aUrl, IDownloadQueueObserver* aObserver) { CSingleLock lock(m_critical); - TICKET ticket = GetNextDownloadQueue()->RequestContent(aUrl, aObserver); - return ticket; + return GetNextDownloadQueue()->RequestContent(aUrl, aObserver); } TICKET CDownloadQueueManager::RequestFile(const CStdString& aUrl, const CStdString& aFilePath, IDownloadQueueObserver* aObserver) { CSingleLock lock(m_critical); - TICKET ticket = GetNextDownloadQueue()->RequestFile(aUrl, aFilePath, aObserver); - return ticket; + return GetNextDownloadQueue()->RequestFile(aUrl, aFilePath, aObserver); } TICKET CDownloadQueueManager::RequestFile(const CStdString& aUrl, IDownloadQueueObserver* aObserver) { CSingleLock lock(m_critical); - TICKET ticket = GetNextDownloadQueue()->RequestFile(aUrl, aObserver); - return ticket; + return GetNextDownloadQueue()->RequestFile(aUrl, aObserver); } void CDownloadQueueManager::CancelRequests(IDownloadQueueObserver *aObserver) |