Some heavy changes today:

[vlc] / plugins / mpeg_system / mpeg_ts.c

diff --git a/plugins/mpeg_system/mpeg_ts.c b/plugins/mpeg_system/mpeg_ts.c
index 9259905685cc4eb33e23dad23e43fd914719e609..4717079b3ebee1d32751cb8479cb3b2bb5ec2370 100644 (file)
--- a/plugins/mpeg_system/mpeg_ts.c
+++ b/plugins/mpeg_system/mpeg_ts.c
@@ -2,7 +2,7 @@
  * mpeg_ts.c : Transport Stream input module for vlc
  *****************************************************************************
  * Copyright (C) 2000-2001 VideoLAN
- * $Id: mpeg_ts.c,v 1.1 2001/12/09 17:01:36 sam Exp $
+ * $Id: mpeg_ts.c,v 1.2 2001/12/30 07:09:55 sam Exp $
  *
  * Authors: Henri Fallon <henri@via.ecp.fr>
  *
@@ -21,24 +21,13 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#define MODULE_NAME mpeg_ts
-#include "modules_inner.h"
-
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include "defs.h"
-
 #include <stdlib.h>                                      /* malloc(), free() */
 #include <string.h>                                              /* strdup() */
 
-#include "common.h"                                     /* boolean_t, byte_t */
-#include "intf_msg.h"
-#include "threads.h"
-#include "mtime.h"
-
-#include "modules.h"
-#include "modules_export.h"
+#include <videolan/vlc.h>
 
 /*****************************************************************************
  * Capabilities defined in the other files.
@@ -49,14 +38,12 @@ void _M( input_getfunctions )( function_list_t * p_function_list );
  * Build configuration tree.
  *****************************************************************************/
 MODULE_CONFIG_START
-ADD_WINDOW( "Configuration for TS module" )
-    ADD_COMMENT( "foobar !" )
 MODULE_CONFIG_STOP
 
 MODULE_INIT_START
-    p_module->i_capabilities = MODULE_CAPABILITY_NULL
-                                | MODULE_CAPABILITY_INPUT;
-    p_module->psz_longname = "ISO 13818-1 MPEG Transport Stream input module";
+    SET_DESCRIPTION( "ISO 13818-1 MPEG Transport Stream input" )
+    ADD_CAPABILITY( INPUT, 50 )
+    ADD_SHORTCUT( "ts" )
 MODULE_INIT_STOP
 
 MODULE_ACTIVATE_START