From 335a57291373aa25739a7192807fbfe1c8de0efd Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 18 Jul 2004 18:00:00 +0200
Subject: =?UTF-8?q?Version=201.3.12=20-=20Removed=20all=20error=20messages?=
 =?UTF-8?q?=20from=20cRecordings::ScanVideoDir()=20and=20just=20skipping?=
 =?UTF-8?q?=20=20=20entries=20that=20cause=20errors=20in=20order=20to=20av?=
 =?UTF-8?q?oid=20failure=20in=20case=20of=20things=20like=20=20=20broken?=
 =?UTF-8?q?=20links=20etc.=20-=20The=20function=20cTimers::SetEvents()=20n?=
 =?UTF-8?q?ow=20immediately=20returns=20if=20there=20is=20some=20user=20?=
 =?UTF-8?q?=20=20input.=20-=20Fixed=20handling=20menu=20status=20messages?=
 =?UTF-8?q?=20when=20the=20list=20contents=20is=20scrolled=20(thanks=20to?=
 =?UTF-8?q?=20=20=20Alfred=20Zastrow=20for=20reporting=20this=20one).=20-?=
 =?UTF-8?q?=20Fixed=20checking=20the=20last=20area=20for=20misalignment=20?=
 =?UTF-8?q?in=20cOsd::CanHandleAreas()=20(thanks=20=20=20to=20Reinhard=20N?=
 =?UTF-8?q?issl=20for=20reporting=20this=20one).=20-=20No=20longer=20addin?=
 =?UTF-8?q?g=20section=20filters=20to=20the=20list=20of=20filters=20if=20t?=
 =?UTF-8?q?hey=20can't=20be=20opened=20=20=20(thanks=20to=20Marco=20Schl?=
 =?UTF-8?q?=C3=BC=C3=9Fler=20for=20pointing=20this=20out).=20-=20Fixed=20h?=
 =?UTF-8?q?andling=20error=20case=20'-1'=20when=20polling=20section=20filt?=
 =?UTF-8?q?ers=20(thanks=20to=20Marco=20=20=20Schl=C3=BC=C3=9Fler).=20-=20?=
 =?UTF-8?q?Fixed=20handling=20error=20case=20'-1'=20when=20polling=20CAM?=
 =?UTF-8?q?=20connections.=20-=20Making=20sure=20the=20OSD=20reports=20oeW?=
 =?UTF-8?q?rongAlignment=20errors=20before=20any=20oeAreasOverlap=20=20=20?=
 =?UTF-8?q?error=20(suggested=20by=20Reinhard=20Nissl).=20-=20Avoiding=20f?=
 =?UTF-8?q?lashing=20effects=20in=20the=20OSD=20of=20full=20featured=20DVB?=
 =?UTF-8?q?=20cards=20by=20explicitly=20=20=20clearing=20the=20OSD=20windo?=
 =?UTF-8?q?ws=20before=20opening=20them=20(suggested=20by=20Marco=20Schl?=
 =?UTF-8?q?=C3=BC=C3=9Fler).=20-=20Experimental=20support=20for=20NVOD=20c?=
 =?UTF-8?q?hannels.=20Currently=20these=20channels=20are=20detected=20=20?=
 =?UTF-8?q?=20and=20linked=20to=20their=20"base"=20channels=20using=20the?=
 =?UTF-8?q?=20same=20mechanisms=20as=20for=20the=20=20=20"linked=20service?=
 =?UTF-8?q?s"=20(let's=20see=20if=20this=20is=20useful).=20Thanks=20to=20M?=
 =?UTF-8?q?ike=20parker=20for=20=20=20helping=20to=20test=20this.=20Also?=
 =?UTF-8?q?=20used=20some=20input=20from=20the=20'autopid'=20patch=20by=20?=
 =?UTF-8?q?Andreas=20=20=20Schultz).=20-=20Now=20storing=20the=20name=20of?=
 =?UTF-8?q?=20the=20service=20provider=20(aka=20"bouquet")=20in=20the=20ch?=
 =?UTF-8?q?annel=20=20=20name,=20separated=20by=20a=20semicolon=20(see=20m?=
 =?UTF-8?q?an=20vdr(5)=20for=20details).=20Explicit=20usage=20=20=20of=20t?=
 =?UTF-8?q?he=20various=20parts=20of=20the=20channel=20name=20is=20yet=20t?=
 =?UTF-8?q?o=20come.=20-=20The=20'radio'=20channel=20icon=20is=20now=20onl?=
 =?UTF-8?q?y=20displayed=20in=20the=20ST:TNG=20skin=20if=20the=20channel?=
 =?UTF-8?q?=20=20=20actually=20has=20an=20APID.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 recording.c | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

(limited to 'recording.c')

diff --git a/recording.c b/recording.c
index cbc916a..e33e231 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.88 2004/06/13 20:25:19 kls Exp $
+ * $Id: recording.c 1.89 2004/07/17 11:22:29 kls Exp $
  */
 
 #include "recording.h"
@@ -626,7 +626,7 @@ cRecordings::cRecordings(bool Deleted)
   lastUpdate = 0;
 }
 
-bool cRecordings::ScanVideoDir(const char *DirName)
+void cRecordings::ScanVideoDir(const char *DirName)
 {
   DIR *d = opendir(DirName);
   if (d) {
@@ -641,10 +641,10 @@ bool cRecordings::ScanVideoDir(const char *DirName)
                     free(buffer);
                     buffer = ReadLink(buffer);
                     if (!buffer)
-                       return false;
+                       continue;
                     if (stat(buffer, &st) != 0) {
-                       LOG_ERROR_STR(DirName);
-                       return false;
+                       free(buffer);
+                       continue;
                        }
                     }
                  if (S_ISDIR(st.st_mode)) {
@@ -655,24 +655,15 @@ bool cRecordings::ScanVideoDir(const char *DirName)
                        else
                           delete r;
                        }
-                    else if (!ScanVideoDir(buffer))
-                       return false;
+                    else
+                       ScanVideoDir(buffer);
                     }
                  }
-              else {
-                 LOG_ERROR_STR(DirName);
-                 return false;
-                 }
               free(buffer);
               }
            }
      closedir(d);
      }
-  else {
-     LOG_ERROR_STR(DirName);
-     return false;
-     }
-  return true;
 }
 
 bool cRecordings::NeedsUpdate(void)
-- 
cgit v1.2.3