* ./BUGS: added a list of known bugs. Please add your findings!

[vlc] / plugins / dvdread / dvdread.c

diff --git a/plugins/dvdread/dvdread.c b/plugins/dvdread/dvdread.c
index 8f89d271fa28e1cb2697d09abdbd9d745a7d844a..9f101b54a39139151aaa6030a79986f968323484 100644 (file)
--- a/plugins/dvdread/dvdread.c
+++ b/plugins/dvdread/dvdread.c
@@ -2,7 +2,7 @@
  * dvdread.c : DvdRead input module for vlc
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: dvdread.c,v 1.3 2001/12/09 17:01:36 sam Exp $
+ * $Id: dvdread.c,v 1.6 2002/01/04 14:01:34 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -21,30 +21,19 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#define MODULE_NAME dvdread
-#include "modules_inner.h"
-
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include "defs.h"
-
 #include <stdlib.h>                                      /* malloc(), free() */
 #include <string.h>                                              /* strdup() */
 
+#include <videolan/vlc.h>
+
 #ifdef GOD_DAMN_DMCA
 #   include <dlfcn.h>
 #   include "dummy_dvdcss.h"
 #endif
 
-#include "common.h"                                     /* boolean_t, byte_t */
-#include "intf_msg.h"
-#include "threads.h"
-#include "mtime.h"
-
-#include "modules.h"
-#include "modules_export.h"
-
 /*****************************************************************************
  * Capabilities defined in the other files.
  *****************************************************************************/
@@ -63,18 +52,18 @@ static void UnprobeLibDVDCSS( void );
  * Build configuration tree.
  *****************************************************************************/
 MODULE_CONFIG_START
-ADD_WINDOW( "Configuration for DVD module" )
-    ADD_COMMENT( "foobar !" )
 MODULE_CONFIG_STOP
 
 MODULE_INIT_START
-    p_module->i_capabilities = MODULE_CAPABILITY_NULL
-                                | MODULE_CAPABILITY_INPUT;
 #ifdef GOD_DAMN_DMCA
-    p_module->psz_longname = "DVD input module, uses libdvdcss if present";
+    SET_DESCRIPTION( "DVDRead input module, uses libdvdcss if present" )
+    ADD_CAPABILITY( INPUT, 70 )
 #else
-    p_module->psz_longname = "DVD input module, linked with libdvdcss";
+    SET_DESCRIPTION( "DVDRead input module, linked with libdvdcss" )
+    ADD_CAPABILITY( INPUT, 80 )
 #endif
+    ADD_SHORTCUT( "dvdread" )
+    
 MODULE_INIT_STOP
 
 MODULE_ACTIVATE_START