diff options
Diffstat (limited to 'server')
| -rw-r--r-- | server/connection.c | 10 | ||||
| -rw-r--r-- | server/livestreamer.c | 14 | ||||
| -rw-r--r-- | server/menuHTTP.c | 10 | ||||
| -rw-r--r-- | server/menuHTTP.h | 2 | ||||
| -rw-r--r-- | server/setup.c | 3 |
5 files changed, 4 insertions, 35 deletions
diff --git a/server/connection.c b/server/connection.c index 629ed1d..3e00aa7 100644 --- a/server/connection.c +++ b/server/connection.c @@ -1,5 +1,5 @@ /* - * $Id: connection.c,v 1.10 2007/05/07 12:25:11 schmirl Exp $ + * $Id: connection.c,v 1.11 2008/04/08 14:18:18 schmirl Exp $ */ #include "server/connection.h" @@ -139,11 +139,7 @@ cDevice *cServerConnection::GetDevice(const cChannel *Channel, int Priority) Dprintf(" * GetDevice(const cChannel*, int)\n"); Dprintf(" * -------------------------------\n"); -#if VDRVERSNUM < 10500 - device = cDevice::GetDevice(Channel, Priority); -#else device = cDevice::GetDevice(Channel, Priority, false); -#endif Dprintf(" * Found following device: %p (%d)\n", device, device ? device->CardIndex() + 1 : 0); @@ -161,11 +157,7 @@ cDevice *cServerConnection::GetDevice(const cChannel *Channel, int Priority) const cChannel *current = Channels.GetByNumber(cDevice::CurrentChannel()); isyslog("streamdev-server: Detaching current receiver"); Detach(); -#if VDRVERSNUM < 10500 - device = cDevice::GetDevice(Channel, Priority); -#else device = cDevice::GetDevice(Channel, Priority, false); -#endif Attach(); Dprintf(" * Found following device: %p (%d)\n", device, device ? device->CardIndex() + 1 : 0); diff --git a/server/livestreamer.c b/server/livestreamer.c index 63a0738..dd65e65 100644 --- a/server/livestreamer.c +++ b/server/livestreamer.c @@ -27,23 +27,13 @@ protected: virtual void Receive(uchar *Data, int Length); public: -#if VDRVERSNUM < 10500 - cStreamdevLiveReceiver(cStreamdevStreamer *Streamer, int Ca, int Priority, const int *Pids); -#else cStreamdevLiveReceiver(cStreamdevStreamer *Streamer, tChannelID ChannelID, int Priority, const int *Pids); -#endif virtual ~cStreamdevLiveReceiver(); }; -#if VDRVERSNUM < 10500 -cStreamdevLiveReceiver::cStreamdevLiveReceiver(cStreamdevStreamer *Streamer, int Ca, - int Priority, const int *Pids): - cReceiver(Ca, Priority, 0, Pids), -#else cStreamdevLiveReceiver::cStreamdevLiveReceiver(cStreamdevStreamer *Streamer, tChannelID ChannelID, int Priority, const int *Pids): cReceiver(ChannelID, Priority, 0, Pids), -#endif m_Streamer(Streamer) { } @@ -434,11 +424,7 @@ void cStreamdevLiveStreamer::StartReceiver(void) DELETENULL(m_Receiver); if (m_NumPids > 0) { Dprintf("Creating Receiver to respect changed pids\n"); -#if VDRVERSNUM < 10500 - m_Receiver = new cStreamdevLiveReceiver(this, m_Channel->Ca(), m_Priority, m_Pids); -#else m_Receiver = new cStreamdevLiveReceiver(this, m_Channel->GetChannelID(), m_Priority, m_Pids); -#endif if (IsRunning() && m_Device != NULL) { Dprintf("Attaching new receiver\n"); Attach(); diff --git a/server/menuHTTP.c b/server/menuHTTP.c index b5bb299..89ca070 100644 --- a/server/menuHTTP.c +++ b/server/menuHTTP.c @@ -364,10 +364,8 @@ std::string cHtmlChannelList::ItemText() // ******************** cM3uChannelList ****************** cM3uChannelList::cM3uChannelList(cChannelIterator *Iterator, const char* Base) -: cChannelList(Iterator) -#if defined(APIVERSNUM) && APIVERSNUM >= 10503 - , m_IConv(cCharSetConv::SystemCharacterTable(), "UTF-8") -#endif +: cChannelList(Iterator), + m_IConv(cCharSetConv::SystemCharacterTable(), "UTF-8") { base = strdup(Base); m3uState = msFirst; @@ -398,11 +396,7 @@ std::string cM3uChannelList::Next() return ""; } -#if defined(APIVERSNUM) && APIVERSNUM >= 10503 std::string name = (std::string) m_IConv.Convert(channel->Name()); -#else - std::string name = channel->Name(); -#endif if (channel->GroupSep()) { diff --git a/server/menuHTTP.h b/server/menuHTTP.h index 8be613b..fa699b9 100644 --- a/server/menuHTTP.h +++ b/server/menuHTTP.h @@ -126,9 +126,7 @@ class cM3uChannelList: public cChannelList char *base; enum eM3uState { msFirst, msContinue, msLast }; eM3uState m3uState; -#if defined(APIVERSNUM) && APIVERSNUM >= 10503 cCharSetConv m_IConv; -#endif public: virtual std::string HttpHeader() { return cChannelList::HttpHeader() + "Content-type: audio/x-mpegurl\r\n"; }; virtual bool HasNext(); diff --git a/server/setup.c b/server/setup.c index 4b43adf..8af8920 100644 --- a/server/setup.c +++ b/server/setup.c @@ -1,12 +1,11 @@ /* - * $Id: setup.c,v 1.3 2008/04/07 14:50:33 schmirl Exp $ + * $Id: setup.c,v 1.4 2008/04/08 14:18:18 schmirl Exp $ */ #include <vdr/menuitems.h> #include "server/setup.h" #include "server/server.h" -#include "i18n.h" cStreamdevServerSetup StreamdevServerSetup; |