diff options
| author | Christian Wieninger <cwieninger (at) gmx (dot) de> | 2008-01-15 19:10:46 +0100 |
|---|---|---|
| committer | Christian Wieninger <cwieninger (at) gmx (dot) de> | 2008-01-15 19:10:46 +0100 |
| commit | 775641afd15fd7871cecfa0112e50b2889166327 (patch) | |
| tree | 35e64791bb43ce8f46b6b5230cbedc3ac018f2d1 /epg_events.h | |
| parent | 6765dec2da43418dba16da021a9adef392199a43 (diff) | |
| parent | c1b029ee77466aab34207d06dd2e7a475bbbb053 (diff) | |
| download | vdr-plugin-live-775641afd15fd7871cecfa0112e50b2889166327.tar.gz vdr-plugin-live-775641afd15fd7871cecfa0112e50b2889166327.tar.bz2 | |
Merge commit 'tadi/master'
Diffstat (limited to 'epg_events.h')
| -rw-r--r-- | epg_events.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/epg_events.h b/epg_events.h index f1b8bdf..8678eef 100644 --- a/epg_events.h +++ b/epg_events.h @@ -35,7 +35,7 @@ namespace vdrlive virtual std::string const LongDescr() const = 0; - virtual const cChannel* Channel() const = 0; + virtual cChannel const * Channel() const { return 0; } virtual std::string const Archived() const { return ""; } @@ -84,8 +84,6 @@ namespace vdrlive virtual time_t GetEndTime() const; - virtual const cChannel* Channel() const; - private: const std::string m_info; }; @@ -99,7 +97,7 @@ namespace vdrlive protected: EpgEvent(std::string const &id, cEvent const *event, - const char* channelName); + char const *channelName); public: virtual ~EpgEvent(); @@ -114,10 +112,10 @@ namespace vdrlive virtual time_t GetEndTime() const { return m_event->EndTime(); } - virtual const cChannel* Channel() const { return Channels.GetByChannelID(m_event->ChannelID());} + virtual cChannel const * Channel() const { return Channels.GetByChannelID(m_event->ChannelID());} private: - const cEvent* m_event; + cEvent const * m_event; }; // ------------------------------------------------------------------------- @@ -150,8 +148,6 @@ namespace vdrlive virtual time_t GetEndTime() const; - virtual const cChannel* Channel() const; - private: const cRecording* m_recording; bool m_ownCaption; |