summaryrefslogtreecommitdiff
path: root/server
diff options
context:
space:
mode:
Diffstat (limited to 'server')
-rw-r--r--server/server.c3
-rw-r--r--server/server.h6
2 files changed, 6 insertions, 3 deletions
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;