From 34a62eb2ef9ba0c9e5d269162772c4223bf5fa3b Mon Sep 17 00:00:00 2001
From: schmirl <schmirl>
Date: Tue, 8 Apr 2008 14:18:15 +0000
Subject: - added gettext support (thanks to Rolf Ahrenberg) - added
 vdr-1.6.0-ignore_missing_cam patch - dropped obsolete respect_ca patch -
 removed legacy code for < VDR 1.5.9 (thanks to Rolf Ahrenberg)

---
 client/device.c | 7 +------
 client/setup.c  | 3 +--
 client/socket.c | 3 +--
 3 files changed, 3 insertions(+), 10 deletions(-)

(limited to 'client')

diff --git a/client/device.c b/client/device.c
index 570bab2..54d4034 100644
--- a/client/device.c
+++ b/client/device.c
@@ -1,5 +1,5 @@
 /*
- *  $Id: device.c,v 1.18 2008/04/07 14:50:32 schmirl Exp $
+ *  $Id: device.c,v 1.19 2008/04/08 14:18:16 schmirl Exp $
  */
  
 #include "client/device.h"
@@ -190,16 +190,11 @@ void cStreamdevDevice::CloseDvrInt(void) {
 	}
 
 	Dprintf("cStreamdevDevice::CloseDvrInt(): Closing DVR connection\n");
-#if VDRVERSNUM < 10500
-	DELETENULL(m_TSBuffer);
-	ClientSocket.CloseDvr();
-#else
 	// Hack for VDR 1.5.x clients (sometimes sending ABRT after TUNE)
 	// TODO: Find a clean solution to fix this
 	ClientSocket.SetChannelDevice(m_Channel);
 	ClientSocket.CloseDvr();
 	DELETENULL(m_TSBuffer);
-#endif
 }
 
 void cStreamdevDevice::CloseDvr(void) {
diff --git a/client/setup.c b/client/setup.c
index 5c04c61..6336154 100644
--- a/client/setup.c
+++ b/client/setup.c
@@ -1,12 +1,11 @@
 /*
- *  $Id: setup.c,v 1.5 2008/04/07 14:50:32 schmirl Exp $
+ *  $Id: setup.c,v 1.6 2008/04/08 14:18:16 schmirl Exp $
  */
  
 #include <vdr/menuitems.h>
 
 #include "client/setup.h"
 #include "client/device.h"
-#include "i18n.h"
 
 cStreamdevClientSetup StreamdevClientSetup;
 
diff --git a/client/socket.c b/client/socket.c
index 569fd43..02f501d 100644
--- a/client/socket.c
+++ b/client/socket.c
@@ -1,5 +1,5 @@
 /*
- *  $Id: socket.c,v 1.11 2008/04/07 14:40:40 schmirl Exp $
+ *  $Id: socket.c,v 1.12 2008/04/08 14:18:16 schmirl Exp $
  */
  
 #include <tools/select.h>
@@ -14,7 +14,6 @@
 #include "client/socket.h"
 #include "client/setup.h"
 #include "common.h"
-#include "i18n.h"
 
 cClientSocket ClientSocket;
 
-- 
cgit v1.2.3