Version 0.65vdr-0.65

- Modified LIRC interface to better handle repeat function.
- Faster OSD by first writing into a bitmap and then sending the entire bitmap
  to the DVB driver at once (requires the patch 'dvb.c.071.diff' to be applied
  against the version 0.71 DVB driver file 'dvb.c').
- When switching channels the channel is now immediately displayed, and the
  current/next information is shown as soon as it becomes available.
- No longer displaying the year in the 'Recordings' menu to saves space for the
  title.
- The 'Recordings' menu now displays a '*' to indicate new recordings.
- Added the description of the timers.conf file to the FORMATS file (thanks to
  Bastian Guse).
- Displaying as much as possible of the current/next info (dropping characters
  that would display only partially).
- In normal viewing mode the '0' key now toggles between the current and the
  previous channel.

1 files changed, 42 insertions, 13 deletions

diff --git a/Makefile b/Makefile
index fef7a6f..1575774 100644
--- a/Makefile
+++ b/Makefile
@@ -4,12 +4,15 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.11 2000/09/20 17:01:57 kls Exp $
+# $Id: Makefile 1.12 2000/10/01 14:27:12 kls Exp $
 
 DVBDIR   = ../DVB
 
 INCLUDES = -I$(DVBDIR)/driver
-OBJS = config.o dvbapi.o eit.o interface.o menu.o osd.o recording.o remote.o svdrp.o tools.o vdr.o videodir.o
+OBJS = config.o dvbapi.o dvbosd.o eit.o font.o interface.o menu.o osd.o\
+       recording.o remote.o svdrp.o tools.o vdr.o videodir.o
+
+OSDFONT = -adobe-helvetica-medium-r-normal--23-*-100-100-p-*-iso8859-1
 
 ifndef REMOTE
 REMOTE = KBD
@@ -21,26 +24,52 @@ ifdef DEBUG_OSD
 DEFINES += -DDEBUG_OSD
 endif
 
+all: vdr
+font: genfontfile fontosd.c
+	@echo "font file created."
+
+# Implicit rules:
+
 %.o: %.c
 	g++ -g -O2 -Wall -m486 -c $(DEFINES) $(INCLUDES) $<
 
-all: vdr
+# Dependencies:
 
-config.o   : config.c config.h dvbapi.h eit.h interface.h svdrp.h tools.h
-dvbapi.o   : dvbapi.c config.h dvbapi.h interface.h svdrp.h tools.h videodir.h
+config.o   : config.c config.h dvbapi.h dvbosd.h eit.h font.h interface.h svdrp.h tools.h
+dvbapi.o   : dvbapi.c config.h dvbapi.h dvbosd.h font.h interface.h svdrp.h tools.h videodir.h
+dvbosd.o   : dvbosd.c dvbosd.h font.h tools.h
 eit.o      : eit.c eit.h tools.h
-interface.o: interface.c config.h dvbapi.h eit.h interface.h remote.h svdrp.h tools.h
-menu.o     : menu.c config.h dvbapi.h interface.h menu.h osd.h recording.h svdrp.h tools.h
-osd.o      : osd.c config.h dvbapi.h interface.h osd.h svdrp.h tools.h
-recording.o: recording.c config.h dvbapi.h interface.h recording.h svdrp.h tools.h videodir.h
-remote.o   : remote.c config.h dvbapi.h remote.h tools.h
-svdrp.o    : svdrp.c config.h dvbapi.h interface.h svdrp.h tools.h
+font.o     : font.c font.h fontosd.c tools.h
+interface.o: interface.c config.h dvbapi.h dvbosd.h eit.h font.h interface.h remote.h svdrp.h tools.h
+menu.o     : menu.c config.h dvbapi.h dvbosd.h font.h interface.h menu.h osd.h recording.h svdrp.h tools.h
+osd.o      : osd.c config.h dvbapi.h dvbosd.h font.h interface.h osd.h svdrp.h tools.h
+recording.o: recording.c config.h dvbapi.h dvbosd.h font.h interface.h recording.h svdrp.h tools.h videodir.h
+remote.o   : remote.c config.h dvbapi.h dvbosd.h font.h remote.h tools.h
+svdrp.o    : svdrp.c config.h dvbapi.h dvbosd.h font.h interface.h svdrp.h tools.h
 tools.o    : tools.c tools.h
-vdr.o      : vdr.c config.h dvbapi.h interface.h menu.h osd.h recording.h svdrp.h tools.h videodir.h
+vdr.o      : vdr.c config.h dvbapi.h dvbosd.h font.h interface.h menu.h osd.h recording.h svdrp.h tools.h videodir.h
 videodir.o : videodir.c tools.h videodir.h
 
+# The main program:
+
 vdr: $(OBJS)
 	g++ -g -O2 $(OBJS) -lncurses -ljpeg -o vdr
 
+# The font file:
+
+fontosd.c:
+	genfontfile "cFont::tPixelData FontOsd" $(OSDFONT) > $@
+
+# The font file generator:
+
+genfontfile.o: genfontfile.c
+	gcc -O2 -c $<
+genfontfile: genfontfile.o
+	gcc -o $@ -L/usr/X11R6/lib $< -lX11
+
+# Housekeeping:
+
 clean:
-	-rm $(OBJS) vdr
+	-rm -f $(OBJS) vdr genfontfile genfontfile.o
+CLEAN: clean
+	-rm -f fontosd.c