diff options
| author | Dieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de> | 2008-01-14 00:57:11 +0100 |
|---|---|---|
| committer | Dieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de> | 2008-01-14 00:57:11 +0100 |
| commit | 7b630c706db7b2a7ef4529bb65e695ebec5d3467 (patch) | |
| tree | 36ae350d796fb4dd327a6011fa4a797265bd6e37 /epgsearch.h | |
| parent | 2570f29fe69d32a841425c93eff64d8da68bc26a (diff) | |
| parent | c1b029ee77466aab34207d06dd2e7a475bbbb053 (diff) | |
| download | vdr-plugin-live-7b630c706db7b2a7ef4529bb65e695ebec5d3467.tar.gz vdr-plugin-live-7b630c706db7b2a7ef4529bb65e695ebec5d3467.tar.bz2 | |
Merge branch 'master' into devel
Diffstat (limited to 'epgsearch.h')
| -rw-r--r-- | epgsearch.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/epgsearch.h b/epgsearch.h index 4519490..b63f109 100644 --- a/epgsearch.h +++ b/epgsearch.h @@ -339,6 +339,8 @@ public: time_t TimerStopTime() const { return m_timerstop; } int TimerMode() const { return m_timerMode; } bool operator<( SearchResult const& other ) const { return m_starttime < other.m_starttime; } + const cEvent* GetEvent(); + const cChannel* GetChannel() { return Channels.GetByChannelID(m_channel); } private: int m_searchId; @@ -375,6 +377,7 @@ public: iterator end() { return m_list.end(); } const_iterator end() const { return m_list.end(); } + void merge(SearchResults& r) {m_list.merge(r.m_list); m_list.sort();} static std::string AddQuery(std::string const& query); static std::string PopQuery(std::string const& md5); private: |