diff options
| author | Andreas Mair <andreas@vdr-developer.org> | 2010-08-26 07:50:59 +0200 |
|---|---|---|
| committer | Andreas Mair <andreas@vdr-developer.org> | 2010-08-26 07:57:29 +0200 |
| commit | 57a99e05234ffc28bb3a1d16c058bf38ce629d82 (patch) | |
| tree | fd24bf63611cfe9aad299e2cb88c1c85df950c1d /myreplaycontrol.c | |
| parent | acf461064b16ec85ef52887773d8d6a364826106 (diff) | |
| download | vdr-plugin-extrecmenu-57a99e05234ffc28bb3a1d16c058bf38ce629d82.tar.gz vdr-plugin-extrecmenu-57a99e05234ffc28bb3a1d16c058bf38ce629d82.tar.bz2 | |
Merge from v1.3-devel head (Submitted by Joe_D @vdr-portal.de).
Diffstat (limited to 'myreplaycontrol.c')
| -rw-r--r-- | myreplaycontrol.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/myreplaycontrol.c b/myreplaycontrol.c index 248fa1d..9403962 100644 --- a/myreplaycontrol.c +++ b/myreplaycontrol.c @@ -48,13 +48,12 @@ eOSState myReplayControl::ProcessKey(eKeys Key) else { cMarks _marks; -#if VDRVERSNUM >= 10703 + #if VDRVERSNUM > 10713 cRecording Recording(filename); - _marks.Load(filename, Recording.FramesPerSecond(), Recording.IsPesRecording()); -#else - _marks.Load(filename); -#endif - + _marks.Load(filename, Recording.FramesPerSecond(), Recording.IsPesRecording()); + #else + _marks.Load(filename); + #endif if(!_marks.Count()) Skins.Message(mtError,tr("No editing marks defined!")); else @@ -69,7 +68,7 @@ eOSState myReplayControl::ProcessKey(eKeys Key) if(Key==kRed) timesearchactive=true; - } + } if(Key==kBack) return osEnd; } |