frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Now the program uses the values of VIDEODIR and PLUGINDIR defined in Makefile or Makefile.config as defaults

Browse Source
This commit is contained in:
Klaus Schmidinger 2003-08-02 14:32:53 +02:00
parent 746b232299
commit ba1c9fb534
6 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CONTRIBUTORS
View File

@ -534,6 +534,8 @@ Dennis Noordsij <dennis.noordsij@wiral.com>
Steffen Barszus <st_barszus@gmx.de> Steffen Barszus <st_barszus@gmx.de>
for reporting a bug in switching audio tracks in 'Transfer Mode' on the primary DVB device for reporting a bug in switching audio tracks in 'Transfer Mode' on the primary DVB device
for making the program use the values of VIDEODIR and PLUGINDIR defined in Makefile
or Makefile.config as defaults
Peter Seyringer <e9425234@student.tuwien.ac.at> Peter Seyringer <e9425234@student.tuwien.ac.at>
for reporting a bug in saving the polarization parameter of channels that have a for reporting a bug in saving the polarization parameter of channels that have a

2
HISTORY
View File

@ -2279,3 +2279,5 @@ Video Disk Recorder Revision History
CA recording (thanks to Emil Naepflein). CA recording (thanks to Emil Naepflein).
- Fixed a possible crash in case a VFAT file system is used without compiling VDR - Fixed a possible crash in case a VFAT file system is used without compiling VDR
with VFAT=1 (thanks to Ernst Fürst for reporting this one). with VFAT=1 (thanks to Ernst Fürst for reporting this one).
- Now the program uses the values of VIDEODIR and PLUGINDIR defined in Makefile
or Makefile.config as defaults (thanks to Steffen Barszus).

3
Make.config.template
View File

@ -6,7 +6,7 @@
# See the main source file 'vdr.c' for copyright information and # See the main source file 'vdr.c' for copyright information and
# how to reach the author. # how to reach the author.
# #
# $Id: Make.config.template 1.1 2002/11/01 14:05:36 kls Exp $ # $Id: Make.config.template 1.2 2003/08/02 14:25:53 kls Exp $
### The C compiler and options: ### The C compiler and options:
@ -22,4 +22,5 @@ DVBDIR = ../DVB
MANDIR = /usr/local/man MANDIR = /usr/local/man
BINDIR = /usr/local/bin BINDIR = /usr/local/bin
PLUGINDIR= ./PLUGINS
VIDEODIR = /video VIDEODIR = /video

5
Makefile
View File

@ -4,7 +4,7 @@
# See the main source file 'vdr.c' for copyright information and # See the main source file 'vdr.c' for copyright information and
# how to reach the author. # how to reach the author.
# #
# $Id: Makefile 1.56 2003/01/06 12:28:09 kls Exp $ # $Id: Makefile 1.57 2003/08/02 14:27:21 kls Exp $
.DELETE_ON_ERROR: .DELETE_ON_ERROR:
@ -49,6 +49,9 @@ DEFINES += -DREMOTE_$(REMOTE)
DEFINES += -D_GNU_SOURCE DEFINES += -D_GNU_SOURCE
DEFINES += -DVIDEODIR=\"$(VIDEODIR)\"
DEFINES += -DPLUGINDIR=\"$(PLUGINDIR)/lib\"
ifdef DEBUG_OSD ifdef DEBUG_OSD
DEFINES += -DDEBUG_OSD DEFINES += -DDEBUG_OSD
NCURSESLIB = -lncurses NCURSESLIB = -lncurses

4
vdr.c
View File

@ -22,7 +22,7 @@
* *
* The project's page is at http://www.cadsoft.de/vdr * The project's page is at http://www.cadsoft.de/vdr
* *
* $Id: vdr.c 1.161 2003/06/15 14:35:05 kls Exp $ * $Id: vdr.c 1.162 2003/08/02 14:01:32 kls Exp $
*/ */
#include <getopt.h> #include <getopt.h>
@ -93,7 +93,7 @@ int main(int argc, char *argv[])
#define DEFAULTSVDRPPORT 2001 #define DEFAULTSVDRPPORT 2001
#define DEFAULTWATCHDOG 0 // seconds #define DEFAULTWATCHDOG 0 // seconds
#define DEFAULTPLUGINDIR "./PLUGINS/lib" #define DEFAULTPLUGINDIR PLUGINDIR
int SVDRPport = DEFAULTSVDRPPORT; int SVDRPport = DEFAULTSVDRPPORT;
const char *AudioCommand = NULL; const char *AudioCommand = NULL;

4
videodir.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: videodir.c 1.9 2002/08/11 13:31:02 kls Exp $ * $Id: videodir.c 1.10 2003/08/02 13:43:28 kls Exp $
*/ */
#include "videodir.h" #include "videodir.h"
@ -18,7 +18,7 @@
#include <unistd.h> #include <unistd.h>
#include "tools.h" #include "tools.h"
const char *VideoDirectory = "/video"; const char *VideoDirectory = VIDEODIR;
class cVideoDirectory { class cVideoDirectory {
private: private: