--- margi2/dvb_demux.h	2001/03/08 01:41:26	1.2
+++ margi2/dvb_demux.h	2001/03/14 01:43:11	1.3
@@ -1,9 +1,9 @@
 /* 
  * dvb_demux.h - DVB kernel demux API
  *
- * Copyright (C) 2000 Marcus Metzler <marcus@convergence.de>
- *                  & Ralph  Metzler <ralph@convergence.de>
-                      for convergence integrated media GmbH
+ * Copyright (C) 2000-2001 Marcus Metzler <marcus@convergence.de>
+ *                       & Ralph  Metzler <ralph@convergence.de>
+ *                         for convergence integrated media GmbH
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License
@@ -111,18 +111,22 @@ typedef struct dvb_demux_feed_s {
 
 typedef struct dvb_demux_s {
         dmx_demux_t dmx;
+        void *priv;
+        int filternum;
+        int (*start_feed)(dvb_demux_feed_t *);
+        int (*stop_feed)(dvb_demux_feed_t *);
+        int (*write_to_decoder)(dvb_demux_feed_t *, u8 *, size_t);
 
+  
         int users;
 #define MAX_DVB_DEMUX_USERS 10
-        int filternum;
         dvb_demux_filter_t *filter;
         dvb_demux_feed_t feed[DVB_DEMUX_FEED_MAX];
 
         struct list_head frontend_list;
-        void *priv;
 
         dvb_demux_feed_t *pesfilter[DMX_TS_PES_OTHER]; //special PES filters
-        u16 pids[5];
+        u16 pids[DMX_TS_PES_OTHER-1];
         int playing; 
         int recording; 
 
@@ -130,14 +134,11 @@ typedef struct dvb_demux_s {
         u8 tsbuf[188];
         int tsbufp;
 
-        int (*start_feed)(dvb_demux_feed_t *);
-        int (*stop_feed)(dvb_demux_feed_t *);
-        int (*write_to_decoder)(dvb_demux_feed_t *, u8 *, size_t);
 } dvb_demux_t;
 
 
-int DvbDmxInit(dvb_demux_t *dvbdemux, char *id, char *vendor, char *model);
+int DvbDmxInit(dvb_demux_t *dvbdemux);
 int DvbDmxRelease(dvb_demux_t *dvbdemux);
-
 void DvbDmxSWFilterPackets(dvb_demux_t *dvbdmx, const u8 *buf, int count);
+
 #endif /* _DVB_DEMUX_H_ */