Ticket #2426: endprompt_cutlists.diff
File endprompt_cutlists.diff, 2.3 KB (added by , 17 years ago) |
---|
-
NuppelVideoPlayer.cpp
3388 3388 { 3389 3389 ++deleteIter; 3390 3390 if (deleteIter.key() == totalFrames) 3391 eof = true; 3391 { 3392 if (!(gContext->GetNumSetting("EndofRecordingExitPrompt") == 1 && 3393 m_tv && m_tv->GetState() == kState_WatchingPreRecorded)) 3394 { 3395 eof = true; 3396 } 3397 } 3392 3398 else 3393 3399 { 3394 3400 PauseVideo(); … … 4027 4033 4028 4034 if (m_tv && m_tv->GetState() == kState_WatchingPreRecorded) 4029 4035 { 4030 framesLeft = totalFrames - framesRead; 4036 if (!editmode && hasdeletetable && IsInDelete(framesRead)) 4037 { 4038 QMapConstIterator<long long, int> it = deleteMap.end(); 4039 --it; 4040 if (it.key() == totalFrames) 4041 { 4042 --it; 4043 if (framesRead >= it.key()) 4044 return true; 4045 } 4046 } 4047 else 4048 framesLeft = totalFrames - framesRead; 4031 4049 return (framesLeft < margin); 4032 4050 } 4033 4051 … … 4054 4072 long long number = fftime - 1; 4055 4073 long long desiredFrame = framesPlayed + number; 4056 4074 4075 if (!editmode && hasdeletetable && IsInDelete(desiredFrame)) 4076 { 4077 QMap<long long, int>::Iterator it = deleteMap.end(); 4078 --it; 4079 if ( it.key() == totalFrames) 4080 { 4081 --it; 4082 if (desiredFrame > it.key()) 4083 desiredFrame = it.key(); 4084 } 4085 } 4057 4086 if (paused && !editmode) 4058 4087 GetDecoder()->setExactSeeks(true); 4059 4088 GetDecoder()->DoFastForward(desiredFrame); -
tv_play.cpp
1785 1799 ClearOSD(); 1786 1800 1787 1801 requestDelete = false; 1788 if (activenvp->IsNearEnd()) 1789 { 1790 exitPlayer = true; 1791 wantsToQuit = true; 1792 } 1802 exitPlayer = true; 1803 wantsToQuit = true; 1793 1804 } 1794 1805 } 1795 1806