Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed problem with automatic EDL cuts being seeked to multiple times.

  • Loading branch information...
commit ebb4217b2bbd82f82f6c9cec32af5d842e4c7bee 1 parent 35e9b07
David Teirney authored
View
5 xbmc/cores/dvdplayer/DVDPlayer.cpp
@@ -1777,11 +1777,6 @@ void CDVDPlayer::CheckAutoSceneSkip()
m_EdlAutoSkipMarkers.commbreak_end = cut.end;
m_EdlAutoSkipMarkers.seek_to_start = true; // Allow backwards Seek() to go directly to the start
}
-
- /*
- * Reset the EDL automatic skip cut marker every 500 ms.
- */
- m_EdlAutoSkipMarkers.ResetCutMarker(500); // in msec
}
View
18 xbmc/cores/dvdplayer/DVDPlayer.h
@@ -451,31 +451,13 @@ class CDVDPlayer : public IPlayer, public CThread, public IDVDPlayer
commbreak_start = -1;
commbreak_end = -1;
seek_to_start = false;
- reset = 0;
mute = false;
}
- void ResetCutMarker(double timeout)
- {
- if(reset != 0
- && reset + DVD_MSEC_TO_TIME(timeout) > CDVDClock::GetAbsoluteClock())
- return;
-
- /*
- * Reset the automatic EDL skip marker for a cut so automatic seeking can happen again if,
- * for example, the initial automatic skip ended up back in the cut due to seeking
- * inaccuracies.
- */
- cut = -1;
-
- reset = CDVDClock::GetAbsoluteClock();
- }
-
int cut; // last automatically skipped EDL cut seek position
int commbreak_start; // start time of the last commercial break automatically skipped
int commbreak_end; // end time of the last commercial break automatically skipped
bool seek_to_start; // whether seeking can go back to the start of a previously skipped break
- double reset; // last actual reset time
bool mute; // whether EDL mute is on
} m_EdlAutoSkipMarkers;
Please sign in to comment.
Something went wrong with that request. Please try again.