summaryrefslogtreecommitdiff
path: root/server/server.h
diff options
context:
space:
mode:
authorschmirl <schmirl>2008-04-29 07:00:57 +0000
committerschmirl <schmirl>2008-04-29 07:00:57 +0000
commit90ae93701868f86ed51cd6a2155f3a24ee126d36 (patch)
tree3a1ee18e95f5d551842fc3db818c4e5934047f37 /server/server.h
parent9e46f86686853cca3dec168f2e57d59f8703e9b0 (diff)
downloadvdr-plugin-streamdev-90ae93701868f86ed51cd6a2155f3a24ee126d36.tar.gz
vdr-plugin-streamdev-90ae93701868f86ed51cd6a2155f3a24ee126d36.tar.bz2
- 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.
Diffstat (limited to 'server/server.h')
-rw-r--r--server/server.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/server/server.h b/server/server.h
index be74d51..cfbc92c 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.3.2.1 2008/04/29 07:01:00 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;