Removed compiler option '-m486'

CONTRIBUTORS

@@ -329,3 +329,22 @@ Oliver Lorei <oliverlorei@cityweb.de>
 
 Andreas Böttger <fboettger@t-online.de>
  for reporting a bug in skipping forward in time shift mode near the end of the recording
+
+Rudi Hofer (Rudi.Hofer@cadsoft.de)
+ for his help in keeping 'channels.conf' up to date
+
+Gregoire Favre <greg@ulima.unil.ch>
+ for fixing some function headers to make them compile with gcc 3.x
+
+Sven Grothklags <sven@uni-paderborn.de>
+ for fixing the cutting mechanism to make it re-sync in case a frame is larger
+ than the buffer
+
+Tomas Prybil <tomas.prybil@copper.se>
+ for translating OSD texts to the Swedish language
+
+Paul Lacatus <paul@campina.iiruc.ro>
+ for translating OSD texts to the Romanian language
+
+Alastair McKinstry <mckinstry@computer.org>
+ for pointing out a problem with the '-m486' compiler option on non-Intel platforms

HISTORY

@@ -1242,3 +1242,18 @@ Video Disk Recorder Revision History
   'channels.conf.cable' whenever a new version is sent to me.
 - Fixed skipping forward in time shift mode near the end of the recording (thanks
   to Andreas Böttger for reporting this one).
+
+2002-05-26: Version 1.0.3
+
+- Updated 'Premiere Sport 2' in channels.conf (thanks to Rudi Hofer).
+- Fixed some function headers to make them compile with gcc 3.x (thanks to
+  Gregoire Favre).
+- Fixed the cutting mechanism to make it re-sync in case a frame is larger than the
+  buffer (thanks to Sven Grothklags).
+- Added Swedish language texts (thanks to Tomas Prybil).
+
+2002-06-10: Version 1.0.4
+
+- Added Romanian language texts (thanks to Paul Lacatus).
+- Removed compiler option '-m486' to make it work on non-Intel platforms (thanks
+  to Alastair McKinstry for pointing this out).

Makefile

@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.33 2002/04/01 12:50:48 kls Exp $
+# $Id: Makefile 1.33.1.1 2002/06/10 16:04:46 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -55,7 +55,7 @@ font: genfontfile fontfix.c fontosd.c
 # Implicit rules:
 
 %.o: %.c
-	g++ -g -O2 -Wall -Woverloaded-virtual -m486 -c $(DEFINES) $(INCLUDES) $<
+	g++ -g -O2 -Wall -Woverloaded-virtual -c $(DEFINES) $(INCLUDES) $<
 
 # Dependencies:
 

channels.conf

@@ -87,7 +87,7 @@ Premiere Erotik 3:11719:h:0:27500:1791:1792:0:101:779
 Premiere Erotik 4:11719:h:0:27500:3583:3584:0:101:780
 :Sportsworld
 Premiere Sport 1:11720:h:0:27500:255:256,257:0:101:17
-Premiere Sport 2:12070:h:0:27500:3839:3840:0:101:27
+Premiere Sport 2:12031:h:0:27500:3839:3840:0:101:27
 :Formel 1
 Supersignal:12070:h:0:27500:255:256:0:101:211
 Cockpitkanal:12070:h:0:27500:511:512:0:101:212

config.h

@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.112 2002/04/26 13:56:30 kls Exp $
+ * $Id: config.h 1.112.1.2 2002/06/10 15:54:14 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,7 +19,7 @@
 #include "eit.h"
 #include "tools.h"
 
-#define VDRVERSION "1.0.2"
+#define VDRVERSION "1.0.4"
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99

dvbapi.c

@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbapi.c 1.174 2002/05/03 15:59:32 kls Exp $
+ * $Id: dvbapi.c 1.174.1.1 2002/05/18 14:15:36 kls Exp $
  */
 
 #include "dvbapi.h"
@@ -1527,11 +1527,15 @@ void cCuttingBuffer::Action(void)
                  CurrentFileNumber = FileNumber;
                  }
               if (fromFile >= 0) {
-                 Length = ReadFrame(fromFile, buffer,  Length, sizeof(buffer));
+                 int len = ReadFrame(fromFile, buffer,  Length, sizeof(buffer));
-                 if (Length < 0) {
+                 if (len < 0) {
                     error = "ReadFrame";
                     break;
                     }
+                 if (len != Length) {
+                    CurrentFileNumber = 0; // this re-syncs in case the frame was larger than the buffer
+                    Length = len;
+                    }
                  }
               else {
                  error = "fromFile";

dvbosd.c

@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbosd.c 1.13 2002/04/13 11:34:48 kls Exp $
+ * $Id: dvbosd.c 1.13.1.1 2002/05/18 08:44:46 kls Exp $
  */
 
 #include "dvbosd.h"
@@ -528,7 +528,7 @@ eDvbFont cDvbOsd::SetFont(eDvbFont Font)
   return oldFont;
 }
 
-void cDvbOsd::Text(int x, int y, const char *s, eDvbColor ColorFg = clrWhite, eDvbColor ColorBg = clrBackground, tWindowHandle Window)
+void cDvbOsd::Text(int x, int y, const char *s, eDvbColor ColorFg, eDvbColor ColorBg, tWindowHandle Window)
 {
   cWindow *w = (Window == ALL_TILED_WINDOWS) ? GetWindow(x, y) : GetWindow(Window);
   if (w)

ringbuffer.c

@@ -7,7 +7,7 @@
  * Parts of this file were inspired by the 'ringbuffy.c' from the
  * LinuxDVB driver (see linuxtv.org).
  *
- * $Id: ringbuffer.c 1.6 2002/04/19 12:38:44 kls Exp $
+ * $Id: ringbuffer.c 1.6.1.1 2002/05/18 08:45:09 kls Exp $
  */
 
 #include "ringbuffer.h"
@@ -239,7 +239,7 @@ cFrame::~cFrame()
 
 // --- cRingBufferFrame ------------------------------------------------------
 
-cRingBufferFrame::cRingBufferFrame(int Size, bool Statistics = false)
+cRingBufferFrame::cRingBufferFrame(int Size, bool Statistics)
 :cRingBuffer(Size, Statistics)
 {
   head = NULL;