diff options
| author | ghost <andreas.monzner@multimedia-labs.de> | 2011-02-16 14:36:53 +0100 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2011-02-16 14:36:53 +0100 |
| commit | 0c417aee83bac3ab0a70d5e0b3360d18b3663a23 (patch) | |
| tree | 4fbc37d651cd2e7e3f545b8077e64b7d69c1064d /lib/dvb/pmt.h | |
| parent | dec9693d8437a31dab8e4010b33b57e1476a315c (diff) | |
| parent | 2c4829db1915266f51900d5da0e98173c5b87148 (diff) | |
| download | enigma2-0c417aee83bac3ab0a70d5e0b3360d18b3663a23.tar.gz enigma2-0c417aee83bac3ab0a70d5e0b3360d18b3663a23.zip | |
Merge branch 'bug_672_removed_pvr_device'
Conflicts:
lib/dvb/dvb.cpp
Diffstat (limited to 'lib/dvb/pmt.h')
| -rw-r--r-- | lib/dvb/pmt.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/dvb/pmt.h b/lib/dvb/pmt.h index 1888e054..0c44f35a 100644 --- a/lib/dvb/pmt.h +++ b/lib/dvb/pmt.h @@ -86,8 +86,8 @@ class eDVBServicePMTHandler: public Object eUsePtr<iDVBChannel> m_channel; eUsePtr<iDVBPVRChannel> m_pvr_channel; ePtr<eDVBResourceManager> m_resourceManager; - ePtr<iDVBDemux> m_demux; - + ePtr<iDVBDemux> m_demux, m_pvr_demux_tmp; + void channelStateChanged(iDVBChannel *); ePtr<eConnection> m_channelStateChanged_connection; void channelEvent(iDVBChannel *, int event); |