From 1e3db88e722116f798561cc8bb1ff86c0796af7d Mon Sep 17 00:00:00 2001 From: upstream svn Date: Sat, 15 Oct 2011 15:43:21 +0000 Subject: [PATCH] Removed a little unused stuff --- .svn-revision | 2 +- src/PartFile.cpp | 7 +------ src/PartFile.h | 7 ------- 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/.svn-revision b/.svn-revision index 57e478f4..cd3f5556 100644 --- a/.svn-revision +++ b/.svn-revision @@ -1 +1 @@ -10646 +10647 diff --git a/src/PartFile.cpp b/src/PartFile.cpp index 6e03370c..db8e8d82 100644 --- a/src/PartFile.cpp +++ b/src/PartFile.cpp @@ -1368,10 +1368,7 @@ uint32 CPartFile::Process(uint32 reducedownload/*in percent*/,uint8 m_icounter) // If buffer size exceeds limit, or if not written within time limit, flush data if ( (m_nTotalBufferData > thePrefs::GetFileBufferSize()) || (dwCurTick > (m_nLastBufferFlushTime + BUFFER_TIME_LIMIT))) { - // Avoid flushing while copying preview file - if (!m_bPreviewing) { - FlushBuffer(); - } + FlushBuffer(); } @@ -3653,7 +3650,6 @@ void CPartFile::Init() m_count = 0; percentcompleted = 0; completedsize=0; - m_bPreviewing = false; lastseencomplete = 0; m_availablePartsCount=0; m_ClientSrcAnswered = 0; @@ -3662,7 +3658,6 @@ void CPartFile::Init() m_nTotalBufferData = 0; m_nLastBufferFlushTime = 0; m_bPercentUpdated = false; - m_bRecoveringArchive = false; m_iGainDueToCompression = 0; m_iLostDueToCorruption = 0; m_iTotalPacketsSavedDueToICH = 0; diff --git a/src/PartFile.h b/src/PartFile.h index 257afbd6..951cbd06 100644 --- a/src/PartFile.h +++ b/src/PartFile.h @@ -150,7 +150,6 @@ public: #endif uint16 GetTransferingSrcCount() const { return transferingsrc; } uint16 GetNotCurrentSourcesCount() const { return m_notCurrentSources; }; - //void SetNotCurrentSourcesCount(uint16 new_count) { m_notCurrentSources = new_count; }; uint16 GetValidSourcesCount() const { return m_validSources; }; uint64 GetNeededSpace(); @@ -166,9 +165,6 @@ public: uint32 WriteToBuffer(uint32 transize, byte *data, uint64 start, uint64 end, Requested_Block_Struct *block, const CUpDownClient* client); void FlushBuffer(bool fromAICHRecoveryDataAvailable = false); - // Barry - Is archive recovery in progress - volatile bool m_bRecoveringArchive; - // Barry - Added to prevent list containing deleted blocks on shutdown void RemoveAllRequestedBlocks(void); @@ -201,7 +197,6 @@ public: void SetCategory(uint8 cat); void RemoveCategory(uint8 cat); - volatile bool m_bPreviewing; void SetDownPriority(uint8 newDownPriority, bool bSave = true, bool bRefresh = true); bool IsAutoDownPriority() const { return m_bAutoDownPriority; } void SetAutoDownPriority(bool flag) { m_bAutoDownPriority = flag; } @@ -397,8 +392,6 @@ public: uint32 GetLastSearchTime() const { return m_lastsearchtime; } void SetLastSearchTime(uint32 time) { m_lastsearchtime = time; } -// void CleanUpSources( bool noNeeded, bool fullQueue = false, bool highQueue = false ); - void AddDownloadingSource(CUpDownClient* client); void RemoveDownloadingSource(CUpDownClient* client); -- 2.11.4.GIT