- 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.
This commit is contained in:
schmirl
2008-04-29 07:00:53 +00:00
parent b2bea54b34
commit 685f43c6ec
6 changed files with 15 additions and 10 deletions

View File

@@ -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;

View File

@@ -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;