1 files changed, 35 insertions, 21 deletions

diff --git a/streamdev-server.c b/streamdev-server.c
index b09a85d..f0bfeac 100644
--- a/streamdev-server.c
+++ b/streamdev-server.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: streamdev-server.c,v 1.1 2004/12/30 22:43:59 lordjaxom Exp $
+ * $Id: streamdev-server.c,v 1.2 2005/05/09 20:22:29 lordjaxom Exp $
  */
 
 #include "streamdev-server.h"
@@ -14,59 +14,73 @@
 
 const char *cPluginStreamdevServer::DESCRIPTION = "VDR Streaming Server";
 
-cPluginStreamdevServer::cPluginStreamdevServer(void) {
+cPluginStreamdevServer::cPluginStreamdevServer(void) 
+{
 }
 
-cPluginStreamdevServer::~cPluginStreamdevServer() {
-	cStreamdevServer::Exit();
+cPluginStreamdevServer::~cPluginStreamdevServer() 
+{
 }
 
-const char *cPluginStreamdevServer::Description(void) {
+const char *cPluginStreamdevServer::Description(void) 
+{
 	return tr(DESCRIPTION);
 }
 
-bool cPluginStreamdevServer::Start(void) {
+bool cPluginStreamdevServer::Start(void) 
+{
 	i18n_name = Name();
 	RegisterI18n(Phrases);
 
-	if (!StreamdevHosts.Load(STREAMDEVHOSTS, true, true)) {
-		esyslog("streamdev-server: error while loading %s", STREAMDEVHOSTS);
+	if (!StreamdevHosts.Load(STREAMDEVHOSTSPATH, true, true)) {
+		esyslog("streamdev-server: error while loading %s", STREAMDEVHOSTSPATH);
 		fprintf(stderr, "streamdev-server: error while loading %s\n");
-		if (access(STREAMDEVHOSTS, F_OK) != 0)
+		if (access(STREAMDEVHOSTSPATH, F_OK) != 0) {
 			fprintf(stderr, "  Please install streamdevhosts.conf into the path "
 			                "printed above. Without it\n" 
-                      "  no client will be able to access your streaming-"
-                      "server. An example can be\n"
-                      "  found together with this plugin's sources.\n");
+			                "  no client will be able to access your streaming-"
+			                "server. An example can be\n"
+			                "  found together with this plugin's sources.\n");
+		}
 		return false;
 	}
 
-	cStreamdevServer::Init();
+	cStreamdevServer::Initialize();
 
-  return true;
+	return true;
 }
 
-bool cPluginStreamdevServer::Active(void) {
+void cPluginStreamdevServer::Stop(void) 
+{
+	cStreamdevServer::Destruct();
+}
+
+bool cPluginStreamdevServer::Active(void) 
+{
 	return cStreamdevServer::Active();
 }
 
-const char *cPluginStreamdevServer::MainMenuEntry(void) {
+const char *cPluginStreamdevServer::MainMenuEntry(void) 
+{
 	if (StreamdevServerSetup.SuspendMode == smOffer && !cSuspendCtl::IsActive())
 		return tr("Suspend Live TV");
 	return NULL;
 }
 
-cOsdObject *cPluginStreamdevServer::MainMenuAction(void) {
+cOsdObject *cPluginStreamdevServer::MainMenuAction(void) 
+{
 	cControl::Launch(new cSuspendCtl);
 	return NULL;
 }
 
-cMenuSetupPage *cPluginStreamdevServer::SetupMenu(void) {
-  return new cStreamdevServerMenuSetupPage;
+cMenuSetupPage *cPluginStreamdevServer::SetupMenu(void) 
+{
+	return new cStreamdevServerMenuSetupPage;
 }
 
-bool cPluginStreamdevServer::SetupParse(const char *Name, const char *Value) {
-  return StreamdevServerSetup.SetupParse(Name, Value);
+bool cPluginStreamdevServer::SetupParse(const char *Name, const char *Value) 
+{
+	return StreamdevServerSetup.SetupParse(Name, Value);
 }
 
 VDRPLUGINCREATOR(cPluginStreamdevServer); // Don't touch this!