summaryrefslogtreecommitdiff
path: root/remux
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 /remux
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 'remux')
-rw-r--r--remux/extern.c4
-rw-r--r--remux/extern.h2
2 files changed, 1 insertions, 5 deletions
diff --git a/remux/extern.c b/remux/extern.c
index cebaa2c..7d6307b 100644
--- a/remux/extern.c
+++ b/remux/extern.c
@@ -7,8 +7,6 @@
#include <signal.h>
#include <unistd.h>
-const char *g_ExternRemux = EXTERNREMUXPATH;
-
class cTSExt: public cThread {
private:
cRingBufferLinear *m_ResultBuffer;
@@ -68,7 +66,7 @@ cTSExt::cTSExt(cRingBufferLinear *ResultBuffer, std::string Parameter):
for (int i = STDERR_FILENO + 1; i < MaxPossibleFileDescriptors; i++)
close(i); //close all dup'ed filedescriptors
- std::string cmd = std::string(g_ExternRemux) + " " + Parameter;
+ std::string cmd = std::string(opt_remux) + " " + Parameter;
execl("/bin/sh", "sh", "-c", cmd.c_str(), NULL);
_exit(-1);
}
diff --git a/remux/extern.h b/remux/extern.h
index 7a44852..aa6acf7 100644
--- a/remux/extern.h
+++ b/remux/extern.h
@@ -5,8 +5,6 @@
#include <vdr/ringbuffer.h>
#include <string>
-extern const char *g_ExternRemux;
-
class cTSExt;
class cExternRemux: public cTSRemux {