diff options
author | Klaus Schmidinger <vdr@tvdr.de> | 2011-08-21 11:34:30 +0200 |
---|---|---|
committer | Klaus Schmidinger <vdr@tvdr.de> | 2011-08-21 11:34:30 +0200 |
commit | 97ad2fa95df2f03e4c1dff9d4ff2d5abcaad42d8 (patch) | |
tree | 9df799cbd5216040b56e3bcc5af25c9e564c1614 /cutter.c | |
parent | e5d2240bbb98f24212213df92ad3ca3e1cf1e0e7 (diff) | |
download | vdr-97ad2fa95df2f03e4c1dff9d4ff2d5abcaad42d8.tar.gz vdr-97ad2fa95df2f03e4c1dff9d4ff2d5abcaad42d8.tar.bz2 |
Direct access to several class members is now deprecated
Diffstat (limited to 'cutter.c')
-rw-r--r-- | cutter.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: cutter.c 2.7 2011/08/20 09:57:27 kls Exp $ + * $Id: cutter.c 2.8 2011/08/21 11:08:08 kls Exp $ */ #include "cutter.h" @@ -75,7 +75,7 @@ void cCuttingThread::Action(void) if (!fromFile || !toFile) return; fromFile->SetReadAhead(MEGABYTE(20)); - int Index = Mark->position; + int Index = Mark->Position(); Mark = fromMarks.Next(Mark); off_t FileSize = 0; int CurrentFileNumber = 0; @@ -163,14 +163,14 @@ void cCuttingThread::Action(void) // Check editing marks: - if (Mark && Index >= Mark->position) { + if (Mark && Index >= Mark->Position()) { Mark = fromMarks.Next(Mark); toMarks.Add(LastIFrame); if (Mark) toMarks.Add(toIndex->Last() + 1); toMarks.Save(); if (Mark) { - Index = Mark->position; + Index = Mark->Position(); Mark = fromMarks.Next(Mark); CurrentFileNumber = 0; // triggers SetOffset before reading next frame cutIn = true; @@ -212,7 +212,7 @@ bool cCutter::Start(const char *FileName) cMarks FromMarks; FromMarks.Load(FileName); if (cMark *First = FromMarks.First()) - Recording.SetStartTime(Recording.start + (int(First->position / Recording.FramesPerSecond() + 30) / 60) * 60); + Recording.SetStartTime(Recording.Start() + (int(First->Position() / Recording.FramesPerSecond() + 30) / 60) * 60); const char *evn = Recording.PrefixFileName('%'); if (evn && RemoveVideoFile(evn) && MakeDirs(evn, true)) { |