diff options
| author | Voyager1 <voyager@xbmc.org> | 2013-07-15 00:05:53 -0700 |
|---|---|---|
| committer | Voyager1 <voyager@xbmc.org> | 2013-07-15 00:05:53 -0700 |
| commit | 52e2c692d2e6d37d811e944519db3607bb1092ca (patch) | |
| tree | 9f58b0249f3b98f1d39ad68e1ede0be8869f0127 | |
| parent | c218d5c22c739cbc90bf36dc33863b4afa6eafd7 (diff) | |
| parent | 6c3aa00afb860a2dbeb1cc8d0edc8932c64a5bd2 (diff) | |
Merge pull request #2951 from jmbreuer/upstream-diskuniqueid
Generate stable DVD disk IDs by performing CSS first
| -rw-r--r-- | xbmc/filesystem/iso9660.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/xbmc/filesystem/iso9660.cpp b/xbmc/filesystem/iso9660.cpp index 5099b01f83..e04be21b32 100644 --- a/xbmc/filesystem/iso9660.cpp +++ b/xbmc/filesystem/iso9660.cpp @@ -902,15 +902,13 @@ long iso9660::ReadFile(HANDLE hFile, uint8_t *pBuffer, long lSize) if ( pContext->m_bUseMode2 ) sectorSize = MODE2_DATA_SIZE; - while (lSize > 0 && pContext->m_dwFilePos <= pContext->m_dwFileSize) + while (lSize > 0 && pContext->m_dwFilePos < pContext->m_dwFileSize) { pContext->m_dwCurrentBlock = (DWORD) (pContext->m_dwFilePos / sectorSize); int64_t iOffsetInBuffer = pContext->m_dwFilePos - (sectorSize * pContext->m_dwCurrentBlock); pContext->m_dwCurrentBlock += pContext->m_dwStartBlock; - //char szBuf[256]; - //sprintf(szBuf,"pos:%i cblk:%i sblk:%i off:%i",(long)m_dwFilePos, (long)m_dwCurrentBlock,(long)m_dwStartBlock,(long)iOffsetInBuffer); - //DBG(szBuf); + // CLog::Log(LOGDEBUG, "pos:%li cblk:%li sblk:%li off:%li",(long)pContext->m_dwFilePos, (long)pContext->m_dwCurrentBlock,(long)pContext->m_dwStartBlock,(long)iOffsetInBuffer); uint8_t* pSector; bError = !ReadSectorFromCache(pContext, pContext->m_dwCurrentBlock, &pSector); |