From 2fcbdbd22272aae4f30e0842a42e11e0ca1844a1 Mon Sep 17 00:00:00 2001 From: Christian Wieninger Date: Wed, 9 Jan 2008 22:37:59 +0100 Subject: - first try with favorites --- epgsearch.h | 1 + 1 file changed, 1 insertion(+) (limited to 'epgsearch.h') diff --git a/epgsearch.h b/epgsearch.h index 4519490..51c73cf 100644 --- a/epgsearch.h +++ b/epgsearch.h @@ -375,6 +375,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: -- cgit v1.2.3 From 3be2cb060c30581bd1c59c72a90b0d0c3f79bd45 Mon Sep 17 00:00:00 2001 From: Christian Wieninger Date: Sun, 13 Jan 2008 13:46:22 +0100 Subject: - code for collecting and displaying EPG events in 'What's on' is now separated --- epgsearch.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'epgsearch.h') diff --git a/epgsearch.h b/epgsearch.h index 51c73cf..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; -- cgit v1.2.3