Ticket #1271: mythtv.bindkeys.diff
File mythtv.bindkeys.diff, 6.2 KB (added by , 18 years ago) |
---|
-
libs/libmythtv/NuppelVideoPlayer.h
84 84 void SetFileName(QString lfilename) { filename = lfilename; } 85 85 void SetExactSeeks(bool exact) { exactseeks = exact; } 86 86 void SetAutoCommercialSkip(int autoskip); 87 void SetCommercialSkipMethod(int m) { commercialskipmethod = m; }88 87 void SetCommBreakMap(QMap<long long, int> &newMap); 89 88 void SetRingBuffer(RingBuffer *rbuf) { ringBuffer = rbuf; } 90 89 void SetLiveTVChain(LiveTVChain *tvchain) { livetvchain = tvchain; } … … 525 524 QMutex commBreakMapLock; 526 525 int skipcommercials; 527 526 int autocommercialskip; 528 int commercialskipmethod;529 527 int commrewindamount; 530 528 int commnotifyamount; 531 529 int lastCommSkipDirection; -
libs/libmythtv/NuppelVideoPlayer.cpp
138 138 videoFilters(NULL), FiltMan(new FilterManager()), 139 139 // Commercial filtering 140 140 skipcommercials(0), autocommercialskip(0), 141 comm ercialskipmethod(0), commrewindamount(0),141 commrewindamount(0), 142 142 commnotifyamount(0), lastCommSkipDirection(0), 143 143 lastCommSkipTime(0/*1970*/), lastCommSkipStart(0), 144 144 lastSkipTime(0 /*1970*/), -
libs/libmythtv/tv_play.cpp
134 134 REG_KEY("TV Playback", "SPEEDDEC", "Decrease the playback speed", "J"); 135 135 REG_KEY("TV Playback", "ADJUSTSTRETCH", "Turn on time stretch control", "A"); 136 136 REG_KEY("TV Playback", "TOGGLESTRETCH", "Toggle time stretch speed", ""); 137 REG_KEY("TV Playback", "TOGGLEAUDIOSYNC", 138 "Turn on audio sync adjustment controls", "Y"); 137 139 REG_KEY("TV Playback", "TOGGLEPICCONTROLS", "Turn on the playback picture " 138 140 "adjustment controls", "F"); 139 141 REG_KEY("TV Playback", "TOGGLERECCONTROLS", "Turn on the recording picture " 140 142 "adjustment controls", "G"); 141 143 REG_KEY("TV Playback", "TOGGLEEDIT", "Start Edit Mode", "E"); 144 REG_KEY("TV Playback", "CYCLECOMMSKIPMODE", "Cycle Commercial Skip mode", "R"); 142 145 REG_KEY("TV Playback", "GUIDE", "Show the Program Guide", "S"); 143 146 REG_KEY("TV Playback", "TOGGLESLEEP", "Toggle the Sleep Timer", "F8"); 144 147 REG_KEY("TV Playback", "PLAY", "Play", "Ctrl+P"); … … 203 206 jumptime(0), usePicControls(false), smartChannelChange(false), 204 207 MuteIndividualChannels(false), arrowAccel(false), 205 208 osd_general_timeout(2), osd_prog_info_timeout(3), 206 autoCommercialSkip( false), tryUnflaggedSkip(false),209 autoCommercialSkip(CommSkipOff), tryUnflaggedSkip(false), 207 210 smartForward(false), stickykeys(0), 208 211 ff_rew_repos(1.0f), ff_rew_reverse(false), 209 212 vbimode(VBIMode::None), … … 319 322 persistentbrowsemode = gContext->GetNumSetting("PersistentBrowseMode", 0); 320 323 osd_general_timeout = gContext->GetNumSetting("OSDGeneralTimeout", 2); 321 324 osd_prog_info_timeout= gContext->GetNumSetting("OSDProgramInfoTimeout", 3); 322 autoCommercialSkip = gContext->GetNumSetting("AutoCommercialSkip", 0);325 autoCommercialSkip = (enum commSkipMode)gContext->GetNumSetting("AutoCommercialSkip", CommSkipOff); 323 326 tryUnflaggedSkip = gContext->GetNumSetting("TryUnflaggedSkip", 0); 324 327 smartForward = gContext->GetNumSetting("SmartForward", 0); 325 328 stickykeys = gContext->GetNumSetting("StickyKeys"); … … 2130 2133 } 2131 2134 ChangeTimeStretch(0, false); 2132 2135 } 2136 else if (action == "CYCLECOMMSKIPMODE") { 2137 SetAutoCommercialSkip((enum commSkipMode)((autoCommercialSkip + 1) % CommSkipModes)); 2138 } 2133 2139 else if (action == "TOGGLEAUDIOSYNC") 2134 2140 ChangeAudioSync(0); // just display 2135 2141 else if (action == "TOGGLEPICCONTROLS") … … 5482 5488 else if (action == "TOGGLEAUTOEXPIRE") 5483 5489 ToggleAutoExpire(); 5484 5490 else if (action.left(14) == "TOGGLECOMMSKIP") 5485 SetAutoCommercialSkip( action.right(1).toInt());5491 SetAutoCommercialSkip((enum commSkipMode)(action.right(1).toInt())); 5486 5492 else if (action == "QUEUETRANSCODE") 5487 5493 DoQueueTranscode(); 5488 5494 else if (action == "JUMPPREV") … … 5861 5867 } 5862 5868 } 5863 5869 5864 void TV::SetAutoCommercialSkip( intskipMode)5870 void TV::SetAutoCommercialSkip(enum commSkipMode skipMode) 5865 5871 { 5866 5872 QString desc = ""; 5867 5873 5868 5874 autoCommercialSkip = skipMode; 5869 5875 5870 if (autoCommercialSkip == 0)5876 if (autoCommercialSkip == CommSkipOff) 5871 5877 desc = tr("Auto-Skip OFF"); 5872 else if (autoCommercialSkip == 1)5878 else if (autoCommercialSkip == CommSkipOn) 5873 5879 desc = tr("Auto-Skip ON"); 5874 else if (autoCommercialSkip == 2)5880 else if (autoCommercialSkip == CommSkipNotify) 5875 5881 desc = tr("Auto-Skip Notify"); 5876 5882 5877 nvp->SetAutoCommercialSkip( autoCommercialSkip);5883 nvp->SetAutoCommercialSkip((int)autoCommercialSkip); 5878 5884 5879 5885 if (GetOSD() && activenvp == nvp && desc != "" ) 5880 5886 { -
libs/libmythtv/tv_play.h
262 262 263 263 void DoQueueTranscode(void); 264 264 265 void SetAutoCommercialSkip(int skipMode = 0); 265 enum commSkipMode { 266 CommSkipOff = 0, 267 CommSkipOn = 1, 268 CommSkipNotify = 2, 269 CommSkipModes = 3, /* placeholder */ 270 }; 271 void SetAutoCommercialSkip(enum commSkipMode skipMode = CommSkipOff); 266 272 void SetManualZoom(bool zoomON = false); 267 273 268 274 bool ClearOSD(void); … … 338 344 int osd_general_timeout; 339 345 int osd_prog_info_timeout; 340 346 341 intautoCommercialSkip;347 enum commSkipMode autoCommercialSkip; 342 348 bool tryUnflaggedSkip; 343 349 344 350 bool smartForward;