Removed DVD support from the core VDR source

1 files changed, 2 insertions, 30 deletions

diff --git a/vdr.c b/vdr.c
index 296478fa..90c1d843 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/people/kls/vdr
  *
- * $Id: vdr.c 1.96 2002/02/23 16:35:36 kls Exp $
+ * $Id: vdr.c 1.97 2002/02/24 12:55:10 kls Exp $
  */
 
 #include <getopt.h>
@@ -32,9 +32,6 @@
 #include <unistd.h>
 #include "config.h"
 #include "dvbapi.h"
-#ifdef DVDSUPPORT
-#include "dvd.h"
-#endif //DVDSUPPORT
 #include "eit.h"
 #include "i18n.h"
 #include "interface.h"
@@ -105,14 +102,13 @@ int main(int argc, char *argv[])
       { "shutdown", required_argument, NULL, 's' },
       { "terminal", required_argument, NULL, 't' },
       { "video",    required_argument, NULL, 'v' },
-      { "dvd",      required_argument, NULL, 'V' },
       { "watchdog", required_argument, NULL, 'w' },
       { NULL }
     };
 
   int c;
   int option_index = 0;
-  while ((c = getopt_long(argc, argv, "a:c:dD:E:hl:p:r:s:t:v:V:w:", long_options, &option_index)) != -1) {
+  while ((c = getopt_long(argc, argv, "a:c:dD:E:hl:p:r:s:t:v:w:", long_options, &option_index)) != -1) {
         switch (c) {
           case 'a': cDvbApi::SetAudioCommand(optarg);
                     break;
@@ -153,7 +149,6 @@ int main(int argc, char *argv[])
                            "  -s CMD,   --shutdown=CMD call CMD to shutdown the computer\n"
                            "  -t TTY,   --terminal=TTY controlling tty\n"
                            "  -v DIR,   --video=DIR    use DIR as video directory (default: %s)\n"
-                           "  -V DEV,   --dvd=DEV      use DEV as the DVD device (default: %s)\n"
                            "  -w SEC,   --watchdog=SEC activate the watchdog timer with a timeout of SEC\n"
                            "                           seconds (default: %d); '0' disables the watchdog\n"
                            "\n"
@@ -161,11 +156,6 @@ int main(int argc, char *argv[])
                            cSIProcessor::GetEpgDataFileName() ? cSIProcessor::GetEpgDataFileName() : "'-'",
                            DEFAULTSVDRPPORT,
                            VideoDirectory,
-#ifdef DVDSUPPORT
-                           cDVD::DeviceName(),
-#else
-                           "no DVD support",
-#endif //DVDSUPPORT
                            DEFAULTWATCHDOG
                            );
                     return 0;
@@ -197,18 +187,6 @@ int main(int argc, char *argv[])
                     while (optarg && *optarg && optarg[strlen(optarg) - 1] == '/')
                           optarg[strlen(optarg) - 1] = 0;
                     break;
-          case 'V': 
-#ifdef DVDSUPPORT
-                    cDVD::SetDeviceName(optarg);
-                    if (!cDVD::DriveExists()) {
-                       fprintf(stderr, "vdr: DVD drive not found: %s\n", optarg);
-                       return 2;
-                       }
-#else
-                    fprintf(stderr, "vdr: DVD support has not been compiled in!");
-                    return 2;
-#endif //DVDSUPPORT
-                    break;
           case 'w': if (isnumber(optarg)) {
                        int t = atoi(optarg);
                        if (t >= 0) {
@@ -409,12 +387,6 @@ int main(int argc, char *argv[])
                                 DELETENULL(ReplayControl);
                                 ReplayControl = new cReplayControl;
                                 break;
-#ifdef DVDSUPPORT
-                 case osDVD:    DELETENULL(Menu);
-                                DELETENULL(ReplayControl);
-                                Menu = new cMenuMain(ReplayControl, osDVD);
-                                break;
-#endif //DVDSUPPORT
                  case osStopReplay:
                                 DELETENULL(*Interact);
                                 DELETENULL(ReplayControl);