* ALL: the first libvlc commit.

[vlc] / plugins / dvdread / dvdread.c

diff --git a/plugins/dvdread/dvdread.c b/plugins/dvdread/dvdread.c
index 18429e9a2bbdadee9a1b003d25b3eb79243993c7..d78c48cc45f2911b15432ee0c6db00f72851a5ab 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.9 2002/02/25 18:42:09 stef Exp $
+ * $Id: dvdread.c,v 1.16 2002/06/01 12:31:59 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -27,34 +27,31 @@
 #include <stdlib.h>                                      /* malloc(), free() */
 #include <string.h>                                              /* strdup() */
 
-#include <videolan/vlc.h>
+#include <vlc/vlc.h>
 
 /*****************************************************************************
  * Capabilities defined in the other files.
  *****************************************************************************/
-void _M( input_getfunctions )( function_list_t * p_function_list );
+void _M( access_getfunctions)( function_list_t * p_function_list );
+void _M( demux_getfunctions)( function_list_t * p_function_list );
 
 /*****************************************************************************
  * Build configuration tree.
  *****************************************************************************/
 MODULE_CONFIG_START
-ADD_CATEGORY_HINT( "Play Options", NULL )
-ADD_INTEGER ( INPUT_TITLE_VAR, -1, NULL, "choose title", NULL )
-ADD_INTEGER ( INPUT_CHAPTER_VAR, -1, NULL, "choose chapter", NULL )
-ADD_INTEGER ( INPUT_ANGLE_VAR, -1, NULL, "choose angle", NULL )
-ADD_CATEGORY_HINT( "Misc Options", NULL )
-ADD_STRING  ( INPUT_DVD_DEVICE_VAR, "/dev/dvd", NULL, "DVD device", NULL )
+ADD_CATEGORY_HINT( N_("[dvdread:][device][@[title][,[chapter][,angle]]]"), NULL )
 MODULE_CONFIG_STOP
 
 MODULE_INIT_START
-    SET_DESCRIPTION( "DVDRead input module" )
-    ADD_CAPABILITY( INPUT, 110 )
-    ADD_SHORTCUT( "dvdread" )
-    
+    SET_DESCRIPTION( _("DVDRead input module") )
+    ADD_CAPABILITY( DEMUX, 0 )
+    ADD_CAPABILITY( ACCESS, 110 )
+    ADD_SHORTCUT( "dvd" )
 MODULE_INIT_STOP
 
 MODULE_ACTIVATE_START
-    _M( input_getfunctions )( &p_module->p_functions->input );
+    _M( access_getfunctions)( &p_module->p_functions->access );
+    _M( demux_getfunctions)( &p_module->p_functions->demux );
 MODULE_ACTIVATE_STOP
 
 MODULE_DEACTIVATE_START