From 27919ee969866b68fc95b327a047a9989e4b4153 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 27 Jan 2002 18:00:00 +0100
Subject: Version 0.99pre2 - Fixed setting the OSD size in the 'Confirm'
 interface call (thanks to   Deti Fliegl). - Removed the 'read incomplete
 section...' error message in the EIT processor. - Fixed channel data for "DW
 TV" (thanks to Axel Gruber). - Added DPID to "PREMIERE MOVIE 1" in
 channels.conf.cable (thanks to Stephan   Schreiber). - Prepared the OSD
 functions for multiple overlapping windows. - Removed the check to see
 whether the system time is running linearly. - Improved performance of SVDRP
 command entry. - Removed EPGBugfixLevel '3' - after more than a year Pro-7
 finally managed to   broadcast the correct timestamps for EPG events between
 0:00 and 6:00! - Fixed failing watchdog timer if program hangs in OSD
 activities (thanks to   Carsten Koch). - No longer requiring 'libncurses' if
 compiling without DEBUG_OSD=1 and   REMOTE=KBD (thanks to Lauri Pesonen). -
 The "Recordings" menu now displays a hierarchical structure if there are  
 subdirectories for the recordings. This can be controlled through the  
 "RecordingDirs" parameter in the "Setup" menu.   See "MANUAL/Replaying a
 Recording" for details. - Improved speed of setting the Help button texts. -
 Fixed handling file names that contain single quotes (') or dollar signs ($) 
  in the call to the shutdown command (option '-s') and the recording command 
  (option '-r'). - Improved error handling in the editing process; the
 resulting file will be   deleted if an error occured. - A message is now
 prompted at the end of the editing process, indicating   whether the process
 succeeded or failed. - Fixed setting the LastActivity timestamp after a
 shutdown prompt (thanks to   Sergei Haller). - A message is now prompted if
 free disk space becomes low during recording. - The editing process now calls
 AssertFreeDiskSpace() to remove deleted   recordings if the disk becomes
 full. - The "Main" menu now displays in its title the used disk space (in
 percent)   and the estimated free disk space (in hh:mm), assuming a data rate
 of 30 MB   per minute. - Activating the "Recordings" menu now displays
 "scanning recordings..." to   give the user some feedback in case this takes
 longer. - Status messages are now displayed centered. - Removed the 'Tools'
 subdirectory from the VDR archive. All contributed tools   can now be found
 at ftp://ftp.cadsoft.de/pub/people/kls/vdr/Tools.

---
 videodir.c | 30 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

(limited to 'videodir.c')

diff --git a/videodir.c b/videodir.c
index d9d3f85..dbb1bd1 100644
--- a/videodir.c
+++ b/videodir.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: videodir.c 1.6 2001/09/02 14:55:15 kls Exp $
+ * $Id: videodir.c 1.7 2002/01/27 12:37:26 kls Exp $
  */
 
 #include "videodir.h"
@@ -27,7 +27,7 @@ private:
 public:
   cVideoDirectory(void);
   ~cVideoDirectory();
-  uint FreeMB(void);
+  int FreeMB(int *UsedMB = NULL);
   const char *Name(void) { return name ? name : VideoDirectory; }
   const char *Stored(void) { return stored; }
   int Length(void) { return length; }
@@ -53,9 +53,9 @@ cVideoDirectory::~cVideoDirectory()
   delete adjusted;
 }
 
-uint cVideoDirectory::FreeMB(void)
+int cVideoDirectory::FreeMB(int *UsedMB)
 {
-  return FreeDiskSpaceMB(name ? name : VideoDirectory);
+  return FreeDiskSpaceMB(name ? name : VideoDirectory, UsedMB);
 }
 
 bool cVideoDirectory::Next(void)
@@ -117,9 +117,9 @@ int OpenVideoFile(const char *FileName, int Flags)
      cVideoDirectory Dir;
      if (Dir.IsDistributed()) {
         // Find the directory with the most free space:
-        uint MaxFree = Dir.FreeMB();
+        int MaxFree = Dir.FreeMB();
         while (Dir.Next()) {
-              uint Free = FreeDiskSpaceMB(Dir.Name());
+              int Free = FreeDiskSpaceMB(Dir.Name());
               if (Free > MaxFree) {
                  Dir.Store();
                  MaxFree = Free;
@@ -166,7 +166,7 @@ bool RemoveVideoFile(const char *FileName)
   return RemoveFileOrDir(FileName, true);
 }
 
-bool VideoFileSpaceAvailable(unsigned int SizeMB)
+bool VideoFileSpaceAvailable(int SizeMB)
 {
   cVideoDirectory Dir;
   if (Dir.IsDistributed()) {
@@ -181,6 +181,22 @@ bool VideoFileSpaceAvailable(unsigned int SizeMB)
   return Dir.FreeMB() >= SizeMB;
 }
 
+int VideoDiskSpace(int *FreeMB, int *UsedMB)
+{
+  int free = 0, used = 0;
+  cVideoDirectory Dir;
+  do {
+     int u;
+     free += Dir.FreeMB(&u);
+     used += u;
+     } while (Dir.Next());
+  if (FreeMB)
+     *FreeMB = free;
+  if (UsedMB)
+     *UsedMB = used;
+  return (free + used) ? used * 100 / (free + used) : 0;
+}
+
 const char *PrefixVideoFileName(const char *FileName, char Prefix)
 {
   static char *PrefixedName = NULL;
-- 
cgit v1.2.3