dropped "Synchronize EPG" feature

Modified Files:
	HISTORY README streamdev-client.c streamdev-client.h
	client/device.c client/setup.c client/setup.h client/socket.c
	client/socket.h po/de_DE.po po/fi_FI.po po/fr_FR.po
	po/it_IT.po po/lt_LT.po po/ru_RU.po po/sk_SK.po

16 files changed, 9 insertions, 98 deletions

diff --git a/HISTORY b/HISTORY
index 44a59e2..252a171 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,6 +1,8 @@
 VDR Plugin 'streamdev' Revision History
 ---------------------------------------
 
+- dropped "Synchronize EPG" feature. Please use epgsync-plugin instead
+  (available from http://vdr.schmirler.de)
 - proper tsplay-0.2 patch detection. tsplay-0.1 is no longer recognized
   (thanks to Udo Richter)
 - added compatibility with VDR 1.6 tsplay-0.1 patch
diff --git a/README b/README
index 8909653..ce95d63 100644
--- a/README
+++ b/README
@@ -337,15 +337,6 @@ With "Filter Streaming" enabled, the client will receive meta information like
 EPG data and service information, just as if the client had its own DVB card.
 Link channels and even a client-side EPG scan have been reported to work.
 
-The next parameter, "Synchronize EPG", will have the client synchronize it's 
-program table with the server every now and then, but not regularly. This 
-happens when starting the client, and everytime VDR does its housekeeping 
-tasks. The only thing that's guaranteed is, that there will be a minimum 
-interval of ten seconds between each EPG synchronization. With "Filter
-Streaming" this option has been obsoleted. If you still need to synchronize
-EPG as additional information is available from the server, you should use the
-epgsync-plugin instead (http://vdr.schmirler.de).
-
 Finally with the maximum and minimum priority, you can keep VDR from considering
 streamdev in certain cases. If for instance you have a streamdev client with its
 own DVB card, VDR would normally use streamdev for recording. If this is not
diff --git a/client/device.c b/client/device.c
index 551d7c2..d53bde1 100644
--- a/client/device.c
+++ b/client/device.c
@@ -1,5 +1,5 @@
 /*
- *  $Id: device.c,v 1.25 2010/02/17 12:39:03 schmirl Exp $
+ *  $Id: device.c,v 1.26 2010/06/08 05:55:17 schmirl Exp $
  */
  
 #include "client/device.h"
@@ -33,9 +33,6 @@ cStreamdevDevice::cStreamdevDevice(void) {
 	m_Device = this;
 	m_Pids = 0;
 	m_DvrClosed = true;
-
-	if (StreamdevClientSetup.SyncEPG)	
-		ClientSocket.SynchronizeEPG();
 }
 
 cStreamdevDevice::~cStreamdevDevice() {
diff --git a/client/setup.c b/client/setup.c
index 2ac359f..dd337c8 100644
--- a/client/setup.c
+++ b/client/setup.c
@@ -1,5 +1,5 @@
 /*
- *  $Id: setup.c,v 1.9 2009/09/18 10:43:26 schmirl Exp $
+ *  $Id: setup.c,v 1.10 2010/06/08 05:55:17 schmirl Exp $
  */
  
 #include <vdr/menuitems.h>
@@ -13,7 +13,6 @@ cStreamdevClientSetup::cStreamdevClientSetup(void) {
 	StartClient   = false;
 	RemotePort    = 2004;
 	StreamFilters = false;
-	SyncEPG       = false;
 	HideMenuEntry = false;
 	MinPriority   = -1;
 	MaxPriority   = MAXPRIORITY;
@@ -30,7 +29,6 @@ bool cStreamdevClientSetup::SetupParse(const char *Name, const char *Value) {
 	}
 	else if (strcmp(Name, "RemotePort") == 0)    RemotePort = atoi(Value);
 	else if (strcmp(Name, "StreamFilters") == 0) StreamFilters = atoi(Value);
-	else if (strcmp(Name, "SyncEPG") == 0)       SyncEPG = atoi(Value);
 	else if (strcmp(Name, "HideMenuEntry") == 0) HideMenuEntry = atoi(Value);
 	else if (strcmp(Name, "MinPriority") == 0)   MinPriority = atoi(Value);
 	else if (strcmp(Name, "MaxPriority") == 0)   MaxPriority = atoi(Value);
@@ -46,7 +44,6 @@ cStreamdevClientMenuSetupPage::cStreamdevClientMenuSetupPage(void) {
 	Add(new cMenuEditIpItem  (tr("Remote IP"),            m_NewSetup.RemoteIp));
 	Add(new cMenuEditIntItem (tr("Remote Port"),         &m_NewSetup.RemotePort, 0, 65535));
 	Add(new cMenuEditBoolItem(tr("Filter Streaming"),    &m_NewSetup.StreamFilters));
-	Add(new cMenuEditBoolItem(tr("Synchronize EPG"),     &m_NewSetup.SyncEPG));
 	Add(new cMenuEditIntItem (tr("Minimum Priority"),    &m_NewSetup.MinPriority, -1, MAXPRIORITY));
 	Add(new cMenuEditIntItem (tr("Maximum Priority"),    &m_NewSetup.MaxPriority, -1, MAXPRIORITY));
 	SetCurrent(Get(0));
@@ -68,7 +65,6 @@ void cStreamdevClientMenuSetupPage::Store(void) {
 		SetupStore("RemoteIp",    m_NewSetup.RemoteIp);
 	SetupStore("RemotePort",    m_NewSetup.RemotePort);
 	SetupStore("StreamFilters", m_NewSetup.StreamFilters);
-	SetupStore("SyncEPG",       m_NewSetup.SyncEPG);
 	SetupStore("HideMenuEntry", m_NewSetup.HideMenuEntry);
 	SetupStore("MinPriority",   m_NewSetup.MinPriority);
 	SetupStore("MaxPriority",   m_NewSetup.MaxPriority);
diff --git a/client/setup.h b/client/setup.h
index f7cba08..6049967 100644
--- a/client/setup.h
+++ b/client/setup.h
@@ -1,5 +1,5 @@
 /*
- *  $Id: setup.h,v 1.6 2009/09/18 10:43:26 schmirl Exp $
+ *  $Id: setup.h,v 1.7 2010/06/08 05:55:17 schmirl Exp $
  */
  
 #ifndef VDR_STREAMDEV_SETUPCLIENT_H
@@ -16,7 +16,6 @@ struct cStreamdevClientSetup {
 	char RemoteIp[20];
 	int  RemotePort;
 	int  StreamFilters;
-	int  SyncEPG;
 	int  HideMenuEntry;
 	int  MinPriority;
 	int  MaxPriority;
diff --git a/client/socket.c b/client/socket.c
index 02f501d..bd2f9ba 100644
--- a/client/socket.c
+++ b/client/socket.c
@@ -1,5 +1,5 @@
 /*
- *  $Id: socket.c,v 1.12 2008/04/08 14:18:16 schmirl Exp $
+ *  $Id: socket.c,v 1.13 2010/06/08 05:55:17 schmirl Exp $
  */
  
 #include <tools/select.h>
@@ -300,52 +300,6 @@ bool cClientSocket::CloseDvr(void) {
 	return true;
 }
 
-bool cClientSocket::SynchronizeEPG(void) {
-	std::string buffer;
-	bool result;
-	FILE *epgfd;
-
-	if (!CheckConnection()) return false;
-
-	isyslog("Streamdev: Synchronizing EPG from server\n");
-
-	CMD_LOCK;
-
-	if (!Command("LSTE"))
-		return false;
-
-	if ((epgfd = tmpfile()) == NULL) {
-		esyslog("ERROR: Streamdev: Error while processing EPG data: %s", 
-				strerror(errno));
-		return false;
-	}
-
-	while ((result = Expect(215, &buffer))) {
-		if (buffer[3] == ' ') break;
-		fputs(buffer.c_str() + 4, epgfd);
-		fputc('\n', epgfd);
-	}
-
-	if (!result) {
-		if (errno == 0)
-			esyslog("ERROR: Streamdev: Couldn't fetch EPG data from %s:%d",
-			        RemoteIp().c_str(), RemotePort());
-		fclose(epgfd);
-		return false;
-	}
-
-	rewind(epgfd);
-	if (cSchedules::Read(epgfd))
-		cSchedules::Cleanup(true);
-	else {
-		esyslog("ERROR: Streamdev: Parsing EPG data failed");
-		fclose(epgfd);
-		return false;
-	}
-	fclose(epgfd);
-	return true;
-}
-
 bool cClientSocket::Quit(void) {
 	bool res;
 
diff --git a/client/socket.h b/client/socket.h
index a0400e6..7ad9a80 100644
--- a/client/socket.h
+++ b/client/socket.h
@@ -1,5 +1,5 @@
 /*
- *  $Id: socket.h,v 1.6 2008/04/07 14:40:40 schmirl Exp $
+ *  $Id: socket.h,v 1.7 2010/06/08 05:55:17 schmirl Exp $
  */
  
 #ifndef VDR_STREAMDEV_CLIENT_CONNECTION_H
@@ -48,7 +48,6 @@ public:
 	bool SetPid(int Pid, bool On);
 	bool SetFilter(ushort Pid, uchar Tid, uchar Mask, bool On);
 	bool CloseDvr(void);
-	bool SynchronizeEPG(void);
 	bool SuspendServer(void);
 	bool Quit(void);
 
diff --git a/po/de_DE.po b/po/de_DE.po
index 82fa808..1ee072f 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -42,9 +42,6 @@ msgstr "Port der Gegenseite"
 msgid "Filter Streaming"
 msgstr "Filter-Daten streamen"
 
-msgid "Synchronize EPG"
-msgstr "EPG synchronisieren"
-
 msgid "Minimum Priority"
 msgstr "Minimale Priorität"
 
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 1cd5566..7cd8a61 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -42,9 +42,6 @@ msgstr "Etäkoneen portti"
 msgid "Filter Streaming"
 msgstr "Suodatetun tiedon suoratoisto"
 
-msgid "Synchronize EPG"
-msgstr "Päivitä ohjelmaopas"
-
 msgid "Minimum Priority"
 msgstr "Pienin prioriteetti"
 
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 3ba78c0..4f6625f 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -42,9 +42,6 @@ msgstr "Port du serveur"
 msgid "Filter Streaming"
 msgstr "Filtre streaming"
 
-msgid "Synchronize EPG"
-msgstr "Synchroniser l'EPG"
-
 msgid "Minimum Priority"
 msgstr ""
 
diff --git a/po/it_IT.po b/po/it_IT.po
index 4db80ed..7ef7262 100755
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -44,9 +44,6 @@ msgstr "Porta Server Remoto"
 msgid "Filter Streaming"
 msgstr "Filtra trasmissione"
 
-msgid "Synchronize EPG"
-msgstr "Sincronizza EPG"
-
 msgid "Minimum Priority"
 msgstr ""
 
diff --git a/po/lt_LT.po b/po/lt_LT.po
index 7ba3b5c..857f7df 100644
--- a/po/lt_LT.po
+++ b/po/lt_LT.po
@@ -42,9 +42,6 @@ msgstr "Nuotolinis portas"
 msgid "Filter Streaming"
 msgstr "Filtruoti transliavimÄ…"
 
-msgid "Synchronize EPG"
-msgstr "Sinchronizuoti EPG"
-
 msgid "Minimum Priority"
 msgstr "Minimalus prioritetas"
 
diff --git a/po/ru_RU.po b/po/ru_RU.po
index b80fcd3..44ca1fb 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -42,9 +42,6 @@ msgstr "ÃÔÐÛÕÝÝëÙ ßÞàâ"
 msgid "Filter Streaming"
 msgstr "ÄØÛìâà ßÞâÞÚÐ"
 
-msgid "Synchronize EPG"
-msgstr "ÁØÝåàÞÝØ×ÐæØï EPG"
-
 msgid "Minimum Priority"
 msgstr ""
 
diff --git a/po/sk_SK.po b/po/sk_SK.po
index 9a7102e..15effa5 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -44,9 +44,6 @@ msgstr "Vzdialený port"
 msgid "Filter Streaming"
 msgstr "filtrova» prúdy"
 
-msgid "Synchronize EPG"
-msgstr "zosúladi» EPG"
-
 msgid "Minimum Priority"
 msgstr "minimálna priorita"
 
diff --git a/streamdev-client.c b/streamdev-client.c
index bc9403c..9a6b4a7 100644
--- a/streamdev-client.c
+++ b/streamdev-client.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: streamdev-client.c,v 1.6 2008/04/08 14:18:15 schmirl Exp $
+ * $Id: streamdev-client.c,v 1.7 2010/06/08 05:55:16 schmirl Exp $
  */
 
 #include "streamdev-client.h"
@@ -32,11 +32,6 @@ bool cPluginStreamdevClient::Start(void) {
 	return true;
 }
 
-void cPluginStreamdevClient::Housekeeping(void) {
-	if (StreamdevClientSetup.StartClient && StreamdevClientSetup.SyncEPG)
-		ClientSocket.SynchronizeEPG();
-}
-
 const char *cPluginStreamdevClient::MainMenuEntry(void) {
 	return StreamdevClientSetup.StartClient && !StreamdevClientSetup.HideMenuEntry ? tr("Suspend Server") : NULL;
 }
diff --git a/streamdev-client.h b/streamdev-client.h
index ecf4579..97af4dd 100644
--- a/streamdev-client.h
+++ b/streamdev-client.h
@@ -1,5 +1,5 @@
 /*
- *  $Id: streamdev-client.h,v 1.1 2004/12/30 22:43:59 lordjaxom Exp $
+ *  $Id: streamdev-client.h,v 1.2 2010/06/08 05:55:16 schmirl Exp $
  */
  
 #ifndef VDR_STREAMDEVCLIENT_H
@@ -19,7 +19,6 @@ public:
   virtual const char *Version(void) { return VERSION; }
   virtual const char *Description(void);
   virtual bool Start(void);
-  virtual void Housekeeping(void);
   virtual const char *MainMenuEntry(void);
   virtual cOsdObject *MainMenuAction(void);
   virtual cMenuSetupPage *SetupMenu(void);