Ticket #7916: save_cutlist_incrementally.patch
File save_cutlist_incrementally.patch, 2.8 KB (added by , 14 years ago) |
---|
-
libs/libmythtv/NuppelVideoPlayer.h
493 493 494 494 // Private edit stuff 495 495 void SaveCutList(void); 496 void SaveCutListContinueEditing(void); 496 497 void LoadCutList(void); 497 498 void DisableEdit(void); 498 499 -
libs/libmythtv/NuppelVideoPlayer.cpp
5101 5101 osd->HideEditArrow(it.key(), *it); 5102 5102 5103 5103 deleteMap.clear(); 5104 SaveCutListContinueEditing(); 5104 5105 UpdateEditSlider(); 5105 5106 } 5106 5107 else if (action == "INVERTMAP") … … 5108 5109 QMap<long long, int>::Iterator it; 5109 5110 for (it = deleteMap.begin(); it != deleteMap.end(); ++it) 5110 5111 ReverseMark(it.key()); 5112 SaveCutListContinueEditing(); 5111 5113 5112 5114 UpdateEditSlider(); 5113 5115 UpdateTimeDisplay(); … … 5129 5131 } 5130 5132 } 5131 5133 commBreakMapLock.unlock(); 5134 SaveCutListContinueEditing(); 5132 5135 UpdateEditSlider(); 5133 5136 UpdateTimeDisplay(); 5134 5137 } … … 5427 5430 { 5428 5431 case 1: 5429 5432 DeleteMark(deleteframe); 5433 SaveCutListContinueEditing(); 5430 5434 break; 5431 5435 case 2: 5432 5436 DeleteMark(deleteframe); 5433 5437 AddMark(framesPlayed, type); 5438 SaveCutListContinueEditing(); 5434 5439 break; 5435 5440 case 3: 5436 5441 ReverseMark(deleteframe); 5442 SaveCutListContinueEditing(); 5437 5443 break; 5438 5444 case 4: 5439 5445 HandleSelect(true); … … 5448 5454 { 5449 5455 case 1: 5450 5456 AddMark(framesPlayed, MARK_CUT_END); 5457 SaveCutListContinueEditing(); 5451 5458 break; 5452 5459 case 2: 5453 5460 AddMark(framesPlayed, MARK_CUT_START); 5461 SaveCutListContinueEditing(); 5454 5462 break; 5455 5463 case 3: case 0: default: 5456 5464 break; … … 5607 5615 return player_ctx->tvchain && player_ctx->tvchain->HasNext(); 5608 5616 } 5609 5617 5618 void NuppelVideoPlayer::SaveCutListContinueEditing(void) 5619 { 5620 // Save a snapshot of the current cutlist without the cleanup that 5621 // SaveCutList() does. Namely, SaveCutList() removes redundant 5622 // marks. 5623 QMap<long long, int> original = deleteMap; 5624 SaveCutList(); 5625 deleteMap = original; 5626 } 5627 5610 5628 void NuppelVideoPlayer::SaveCutList(void) 5611 5629 { 5612 5630 if (!player_ctx->playingInfo)