From 685f43c6ec1cbe59b52e008744bb86dd7c048544 Mon Sep 17 00:00:00 2001
From: schmirl <schmirl>
Date: Tue, 29 Apr 2008 07:00:53 +0000
Subject: - Fixed assignment of externremux.sh's default location

cPlugin::ConfigDirectory() cannot be used directly after the plugin has
been loaded. The return value of AddDirectory() must be allocated.
---
 server/server.c | 3 ++-
 server/server.h | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'server')

diff --git a/server/server.c b/server/server.c
index 5db895e..481e041 100644
--- a/server/server.c
+++ b/server/server.c
@@ -1,5 +1,5 @@
 /*
- *  $Id: server.c,v 1.5 2007/04/02 10:32:34 schmirl Exp $
+ *  $Id: server.c,v 1.6 2008/04/29 07:00:54 schmirl Exp $
  */
 
 #include "server/server.h"
@@ -13,6 +13,7 @@
 #include <errno.h>
 
 cSVDRPhosts StreamdevHosts;
+char *opt_remux = NULL;
 
 cStreamdevServer         *cStreamdevServer::m_Instance = NULL;
 cList<cServerComponent>   cStreamdevServer::m_Servers;
diff --git a/server/server.h b/server/server.h
index be74d51..c32fe09 100644
--- a/server/server.h
+++ b/server/server.h
@@ -1,5 +1,5 @@
 /*
- *  $Id: server.h,v 1.3 2008/04/07 14:50:33 schmirl Exp $
+ *  $Id: server.h,v 1.4 2008/04/29 07:00:54 schmirl Exp $
  */
  
 #ifndef VDR_STREAMDEV_SERVER_H
@@ -10,9 +10,11 @@
 #include "server/component.h"
 #include "server/connection.h"
 
-#define EXTERNREMUXPATH (*AddDirectory(cPlugin::ConfigDirectory(PLUGIN_NAME_I18N), "externremux.sh"))
+#define DEFAULT_EXTERNREMUX (*AddDirectory(cPlugin::ConfigDirectory(PLUGIN_NAME_I18N), "externremux.sh"))
 #define STREAMDEVHOSTSPATH (*AddDirectory(cPlugin::ConfigDirectory(PLUGIN_NAME_I18N), "streamdevhosts.conf"))
 
+extern char *opt_remux;
+
 class cStreamdevServer: public cThread {
 private:
 	bool m_Active;
-- 
cgit v1.2.3