Revision 59be6a47 src/tuner.h

View differences:

src/tuner.h
29 29

  
30 30
class TuneParams;
31 31
class Demuxer;
32
class PSFilter;
32 33

  
33 34
class Tuner : public Source, public Selectable {
34 35
public:
......
45 46
  virtual void addSelectFDs(Select &) const;
46 47
  virtual bool isReady(const Select &) const;
47 48

  
48
  Demuxer *getDemuxer(int pid, bool convertToPS, Demuxer::PESType pesType) const;
49
  Source *getDemuxer(int pid, bool convertToPS, Demuxer::PESType pesType) const;
49 50

  
50 51
  int getMaxNumSubscribers() const { return 8; }
51 52
  virtual bool subscribe(Sink *s);
......
55 56
  void process();
56 57

  
57 58
protected:
58
  virtual Demuxer *makeNewDemuxer(int pid, bool convertToPS, Demuxer::PESType pesType) const;
59
  virtual Demuxer *makeNewDemuxer(int pid, Demuxer::PESType pesType) const;
59 60
  virtual bool openFrontend();
60 61
  virtual void closeFrontend();
61 62
  virtual bool openDvr();
......
73 74

  
74 75
  typedef std::map <int, Demuxer *> PIDMap;
75 76
  typedef std::map <const TuneParams *, PIDMap> DemuxerMap;
77
  typedef std::map <Demuxer *, PSFilter *> PSFilterMap;
78

  
79
  mutable DemuxerMap demuxerMap;
80
  mutable PSFilterMap psfilterMap;
76 81

  
77
  // demuxerMap[0] for TS
78
  // demuxerMap[1] for PS
79
  mutable DemuxerMap demuxerMap[2];
80 82
};
81 83

  
82 84
#endif // __TUNER_H

Also available in: Unified diff