Diff for /margi2/dvb_demux.h between versions 1.2 and 1.3

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

Removed from v.1.2  
changed lines
  Added in v.1.3


LinuxTV legacy CVS <linuxtv.org/cvs>