summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--BUGS2
-rw-r--r--HISTORY4
-rw-r--r--Makefile16
-rw-r--r--README14
-rw-r--r--config.c4
-rw-r--r--config.h4
-rw-r--r--dvbapi.c4
-rw-r--r--dvbapi.h4
-rw-r--r--interface.c4
-rw-r--r--interface.h4
-rw-r--r--menu.c4
-rw-r--r--menu.h4
-rw-r--r--osd.c4
-rw-r--r--osd.h4
-rw-r--r--recording.c4
-rw-r--r--recording.h6
-rw-r--r--remote.c4
-rw-r--r--remote.h4
-rw-r--r--tools.c4
-rw-r--r--tools.h4
-rw-r--r--vdr.c (renamed from osm.c)4
21 files changed, 53 insertions, 53 deletions
diff --git a/BUGS b/BUGS
index bcb37728..c9c4a311 100644
--- a/BUGS
+++ b/BUGS
@@ -15,7 +15,7 @@ Video Disk Recorder - Known Bugs
the current channel.
* Every now and then the on-screen display shows nothing but
- "noise". If that occurs, I have to stop the 'osm' program
+ "noise". If that occurs, I have to stop the 'vdr' program
and do a 'make reload' for the card driver. After that it
works fine again.
Presumably this is a problem in the card driver or firmware?
diff --git a/HISTORY b/HISTORY
index c013340d..8cc675eb 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,5 +1,5 @@
-Video Disk Recorder OSM Revision History
-----------------------------------------
+Video Disk Recorder Revision History
+------------------------------------
2000-02-19: Version 0.01 (Initial revision).
diff --git a/Makefile b/Makefile
index b5153cfc..0ed17ca7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,12 @@
#
# Makefile for the On Screen Menu of the Video Disk Recorder
#
-# See the main source file 'osm.c' for copyright information and
+# See the main source file 'vdr.c' for copyright information and
# how to reach the author.
#
-# $Id: Makefile 1.2 2000/03/05 13:51:57 kls Exp $
+# $Id: Makefile 1.3 2000/04/24 09:44:10 kls Exp $
-OBJS = config.o dvbapi.o interface.o menu.o osd.o recording.o remote.o tools.o osm.o
+OBJS = config.o dvbapi.o interface.o menu.o osd.o recording.o remote.o tools.o vdr.o
ifdef DEBUG_REMOTE
DEFINES += -DDEBUG_REMOTE
@@ -19,20 +19,20 @@ endif
%.o: %.c
g++ -g -O2 -Wall -c $(DEFINES) $<
-all: osm
+all: vdr
config.o : config.c config.h dvbapi.h interface.h tools.h
dvbapi.o : dvbapi.c config.h dvbapi.h interface.h tools.h
interface.o: interface.c config.h dvbapi.h interface.h remote.h tools.h
menu.o : menu.c config.h dvbapi.h interface.h menu.h osd.h recording.h tools.h
osd.o : osd.c config.h dvbapi.h interface.h osd.h tools.h
-osm.o : osm.c config.h dvbapi.h interface.h menu.h osd.h recording.h tools.h
+vdr.o : vdr.c config.h dvbapi.h interface.h menu.h osd.h recording.h tools.h
recording.o: recording.c config.h dvbapi.h interface.h recording.h tools.h
remote.o : remote.c remote.h tools.h
tools.o : tools.c tools.h
-osm: $(OBJS)
- g++ -g -O2 $(OBJS) -lncurses -o osm
+vdr: $(OBJS)
+ g++ -g -O2 $(OBJS) -lncurses -o vdr
clean:
- -rm $(OBJS) osm
+ -rm $(OBJS) vdr
diff --git a/README b/README
index e2b27a4f..0de0d557 100644
--- a/README
+++ b/README
@@ -34,17 +34,17 @@ driver source for the Siemens DVB-S PCI card (refer to
http://linuxtv.org/dvb/siemens_dvb.html for more information
about that driver). For example, if the DVB driver was
extracted into the directory /home/kls/vdr/DVB, then this
-package should be extracted into /home/kls/vdr/OSM.
+package should be extracted into /home/kls/vdr/VDR.
This program requires the card driver version 0.04 or higher
to work properly.
-After extracting the package, change into the OSM directory
+After extracting the package, change into the VDR directory
and type 'make'. This should produce an executable file
-named 'osm', which can be run after the DVB driver has been
+named 'vdr', which can be run after the DVB driver has been
installed.
-There are two macros you can use to customize the 'osm' program
+There are two macros you can use to customize the 'vdr' program
at compile time. Adding "DEBUG_REMOTE=1" to the 'make' call
will use the PC's keyboard as input device instead of the "Remote
Control Unit" (see http://www.cadsoft.de/people/kls/vdr/remote.htm).
@@ -59,10 +59,10 @@ Configuration files:
There are three configuration files that hold information about
channels, remote control keys and timers. These files are currrently
-assumed to be located in the directory from which the 'osm' program
+assumed to be located in the directory from which the 'vdr' program
was started (this will become configurable later). The configuration
files can be edited with any text editor, or will be written by the
-'osm' program if any changes are made inside the on-screen menus.
+'vdr' program if any changes are made inside the on-screen menus.
The meaning of the data entries may still vary in future releases,
so for the moment please look at the source code (config.c) to see
the meaning of the various fields.
@@ -102,7 +102,7 @@ The default PC key assignments are:
SkipBack 'PgUp' in numeric block
If you prefer different key assignments, simply delete the file
-'keys-pc.conf' and restart 'osm' to get into learning mode.
+'keys-pc.conf' and restart 'vdr' to get into learning mode.
Navigating through the On Screen Menus:
---------------------------------------
diff --git a/config.c b/config.c
index 64c09147..0a39cc50 100644
--- a/config.c
+++ b/config.c
@@ -1,10 +1,10 @@
/*
* config.c: Configuration file handling
*
- * See the main source file 'osm.c' for copyright information and
+ * See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: config.c 1.4 2000/04/22 13:32:27 kls Exp $
+ * $Id: config.c 1.5 2000/04/24 09:44:15 kls Exp $
*/
#include "config.h"
diff --git a/config.h b/config.h
index 6184f562..42af0f85 100644
--- a/config.h
+++ b/config.h
@@ -1,10 +1,10 @@
/*
* config.h: Configuration file handling
*
- * See the main source file 'osm.c' for copyright information and
+ * See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: config.h 1.3 2000/04/15 12:44:23 kls Exp $
+ * $Id: config.h 1.4 2000/04/24 09:44:17 kls Exp $
*/
#ifndef __CONFIG_H
diff --git a/dvbapi.c b/dvbapi.c
index 67cb0439..b38c25f8 100644
--- a/dvbapi.c
+++ b/dvbapi.c
@@ -1,10 +1,10 @@
/*
* dvbapi.c: Interface to the DVB driver
*
- * See the main source file 'osm.c' for copyright information and
+ * See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: dvbapi.c 1.5 2000/04/23 15:32:00 kls Exp $
+ * $Id: dvbapi.c 1.6 2000/04/24 09:44:19 kls Exp $
*/
#include "dvbapi.h"
diff --git a/dvbapi.h b/dvbapi.h
index 63bea31d..1015db1b 100644
--- a/dvbapi.h
+++ b/dvbapi.h
@@ -1,10 +1,10 @@
/*
* dvbapi.h: Interface to the DVB driver
*
- * See the main source file 'osm.c' for copyright information and
+ * See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: dvbapi.h 1.5 2000/04/23 10:08:27 kls Exp $
+ * $Id: dvbapi.h 1.6 2000/04/24 09:44:21 kls Exp $
*/
#ifndef __DVBAPI_H
diff --git a/interface.c b/interface.c
index 2eaf5f3a..446f9c43 100644
--- a/interface.c
+++ b/interface.c
@@ -1,10 +1,10 @@
/*
* interface.c: Abstract user interface layer
*
- * See the main source file 'osm.c' for copyright information and
+ * See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: interface.c 1.5 2000/04/23 15:11:41 kls Exp $
+ * $Id: interface.c 1.6 2000/04/24 09:44:23 kls Exp $
*/
#include "interface.h"
diff --git a/interface.h b/interface.h
index 050e17c4..eb4e76bc 100644
--- a/interface.h
+++ b/interface.h
@@ -1,10 +1,10 @@
/*
* interface.h: Abstract user interface layer
*
- * See the main source file 'osm.c' for copyright information and
+ * See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: interface.h 1.6 2000/04/23 14:57:13 kls Exp $
+ * $Id: interface.h 1.7 2000/04/24 09:44:25 kls Exp $
*/
#ifndef __INTERFACE_H
diff --git a/menu.c b/menu.c
index cdabed8d..1a26730d 100644
--- a/menu.c
+++ b/menu.c
@@ -1,10 +1,10 @@
/*
* menu.c: The actual menu implementations
*
- * See the main source file 'osm.c' for copyright information and
+ * See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: menu.c 1.6 2000/04/23 15:38:16 kls Exp $
+ * $Id: menu.c 1.7 2000/04/24 09:44:27 kls Exp $
*/
#include "menu.h"
diff --git a/menu.h b/menu.h
index 096c7a57..85758c8c 100644
--- a/menu.h
+++ b/menu.h
@@ -1,10 +1,10 @@
/*
* menu.h: The actual menu implementations
*
- * See the main source file 'osm.c' for copyright information and
+ * See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: menu.h 1.3 2000/04/23 09:25:33 kls Exp $
+ * $Id: menu.h 1.4 2000/04/24 09:44:29 kls Exp $
*/
#ifndef _MENU_H
diff --git a/osd.c b/osd.c
index 82551570..ee9ba287 100644
--- a/osd.c
+++ b/osd.c
@@ -1,10 +1,10 @@
/*
* osd.c: Abstract On Screen Display layer
*
- * See the main source file 'osm.c' for copyright information and
+ * See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: osd.c 1.3 2000/04/23 09:52:39 kls Exp $
+ * $Id: osd.c 1.4 2000/04/24 09:44:31 kls Exp $
*/
#include "osd.h"
diff --git a/osd.h b/osd.h
index 3b92467a..99821b87 100644
--- a/osd.h
+++ b/osd.h
@@ -1,10 +1,10 @@
/*
* osd.h: Abstract On Screen Display layer
*
- * See the main source file 'osm.c' for copyright information and
+ * See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: osd.h 1.3 2000/04/23 09:53:19 kls Exp $
+ * $Id: osd.h 1.4 2000/04/24 09:44:32 kls Exp $
*/
#ifndef __OSD_H
diff --git a/recording.c b/recording.c
index 2ac20e00..46fe53f4 100644
--- a/recording.c
+++ b/recording.c
@@ -1,10 +1,10 @@
/*
* recording.h: Recording file handling
*
- * See the main source file 'osm.c' for copyright information and
+ * See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: recording.c 1.5 2000/04/24 09:35:29 kls Exp $
+ * $Id: recording.c 1.6 2000/04/24 09:45:13 kls Exp $
*/
#define _GNU_SOURCE
diff --git a/recording.h b/recording.h
index 4b75a3a6..eeea5609 100644
--- a/recording.h
+++ b/recording.h
@@ -1,10 +1,10 @@
/*
* recording.h: Recording file handling
*
- * See the main source file 'osm.c' for copyright information and
+ * See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: recording.h 1.5 2000/04/24 09:33:58 kls Exp $
+ * $Id: recording.h 1.6 2000/04/24 09:45:49 kls Exp $
*/
#ifndef __RECORDING_H
@@ -33,7 +33,7 @@ public:
const char *FileName(void);
const char *Title(char Delimiter = ' ');
bool Delete(void);
- // Changes the file name so that it will no longer be visible in the OSM
+ // Changes the file name so that it will no longer be visible in the "Recordings" menu
// Returns false in case of error
bool Remove(void);
// Actually removes the file from the disk
diff --git a/remote.c b/remote.c
index f547add7..2ba5b22b 100644
--- a/remote.c
+++ b/remote.c
@@ -1,10 +1,10 @@
/*
* remote.c: Interface to the Remote Control Unit
*
- * See the main source file 'osm.c' for copyright information and
+ * See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: remote.c 1.5 2000/04/23 14:41:21 kls Exp $
+ * $Id: remote.c 1.6 2000/04/24 09:45:56 kls Exp $
*/
#include "remote.h"
diff --git a/remote.h b/remote.h
index 0e2a04e7..73e50eb7 100644
--- a/remote.h
+++ b/remote.h
@@ -1,10 +1,10 @@
/*
* remote.h: Interface to the Remote Control Unit
*
- * See the main source file 'osm.c' for copyright information and
+ * See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: remote.h 1.3 2000/04/23 14:40:16 kls Exp $
+ * $Id: remote.h 1.4 2000/04/24 09:46:00 kls Exp $
*/
#ifndef __REMOTE_H
diff --git a/tools.c b/tools.c
index d12ac495..68009b6f 100644
--- a/tools.c
+++ b/tools.c
@@ -1,10 +1,10 @@
/*
* tools.c: Various tools
*
- * See the main source file 'osm.c' for copyright information and
+ * See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: tools.c 1.4 2000/04/23 15:30:17 kls Exp $
+ * $Id: tools.c 1.5 2000/04/24 09:46:02 kls Exp $
*/
#define _GNU_SOURCE
diff --git a/tools.h b/tools.h
index cb91fc7b..c6708332 100644
--- a/tools.h
+++ b/tools.h
@@ -1,10 +1,10 @@
/*
* tools.h: Various tools
*
- * See the main source file 'osm.c' for copyright information and
+ * See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: tools.h 1.4 2000/04/16 13:54:04 kls Exp $
+ * $Id: tools.h 1.5 2000/04/24 09:46:05 kls Exp $
*/
#ifndef __TOOLS_H
diff --git a/osm.c b/vdr.c
index 32231848..8141fded 100644
--- a/osm.c
+++ b/vdr.c
@@ -1,5 +1,5 @@
/*
- * osm.c: On Screen Menu for the Video Disk Recorder
+ * vdr.c: Video Disk Recorder main program
*
* Copyright (C) 2000 Klaus Schmidinger
*
@@ -22,7 +22,7 @@
*
* The project's page is at http://www.cadsoft.de/people/kls/vdr
*
- * $Id: osm.c 1.9 2000/04/23 15:56:16 kls Exp $
+ * $Id: vdr.c 1.10 2000/04/24 09:45:03 kls Exp $
*/
#include <signal.h>