-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 ChangeLog: + adds function to cStatus.[c/h] to support cutter + adds fucntion calls to cStatus in cCuttingThread Such a patch is useful to all status plugins. Greets, Christian - -- Christian Gmeiner - student of computer science http://dxr3plugin.sf.net http://itb04.ath.cx http://javamill.ath.cx -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFEGoLMDwe2AbwGBA8RApJ6AJwNdfSR0/CvHrrKTq2BaWjYt8KVHwCdFMEa 6QZfrTbAKafeCq/gGnmitTM= =Wn5v -----END PGP SIGNATURE----- -------------- next part -------------- diff -ur vdr-1.3.44/cutter.c vdr-1.3.44_pached/cutter.c --- vdr-1.3.44/cutter.c 2006-02-12 11:07:23.000000000 +0100 +++ vdr-1.3.44_pached/cutter.c 2006-03-17 10:17:31.000000000 +0100 @@ -12,6 +12,7 @@ #include "remux.h" #include "thread.h" #include "videodir.h" +#include "status.h" // --- cCuttingThread -------------------------------------------------------- @@ -207,6 +208,7 @@ Recording.WriteInfo(); Recordings.AddByName(editedVersionName); cuttingThread = new cCuttingThread(FileName, editedVersionName); + cStatus::MsgCutterRunning(true); return true; } } @@ -227,6 +229,7 @@ RemoveVideoFile(editedVersionName); //XXX what if this file is currently being replayed? Recordings.DelByName(editedVersionName); } + cStatus::MsgCutterRunning(false); } bool cCutter::Active(void) Nur in vdr-1.3.44_pached/: cutter.c~. diff -ur vdr-1.3.44/status.c vdr-1.3.44_pached/status.c --- vdr-1.3.44/status.c 2005-12-31 16:10:10.000000000 +0100 +++ vdr-1.3.44_pached/status.c 2006-03-17 10:12:04.000000000 +0100 @@ -112,3 +112,9 @@ for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm)) sm->OsdProgramme(PresentTime, PresentTitle, PresentSubtitle, FollowingTime, FollowingTitle, FollowingSubtitle); } + +void cStatus::MsgCutterRunning(bool running) +{ + for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm)) + sm->CutterRunning(running); +} Nur in vdr-1.3.44_pached/: status.c~. diff -ur vdr-1.3.44/status.h vdr-1.3.44_pached/status.h --- vdr-1.3.44/status.h 2005-12-31 16:15:25.000000000 +0100 +++ vdr-1.3.44_pached/status.h 2006-03-17 10:02:17.000000000 +0100 @@ -67,6 +67,8 @@ // The OSD displays the single line Text with the current channel information. virtual void OsdProgramme(time_t PresentTime, const char *PresentTitle, const char *PresentSubtitle, time_t FollowingTime, const char *FollowingTitle, const char *FollowingSubtitle) {} // The OSD displays the given programme information. + virtual void CutterRunning(bool running) {} + // Inform if cutting process is running. public: cStatus(void); virtual ~cStatus(); @@ -86,6 +88,7 @@ static void MsgOsdTextItem(const char *Text, bool Scroll = false); static void MsgOsdChannel(const char *Text); static void MsgOsdProgramme(time_t PresentTime, const char *PresentTitle, const char *PresentSubtitle, time_t FollowingTime, const char *FollowingTitle, const char *FollowingSubtitle); + static void MsgCutterRunning(bool running); }; #endif //__STATUS_H Nur in vdr-1.3.44_pached/: status.h~.