diff options
| author | schmirl <schmirl> | 2008-04-29 07:00:57 +0000 |
|---|---|---|
| committer | schmirl <schmirl> | 2008-04-29 07:00:57 +0000 |
| commit | 90ae93701868f86ed51cd6a2155f3a24ee126d36 (patch) | |
| tree | 3a1ee18e95f5d551842fc3db818c4e5934047f37 /streamdev-server.c | |
| parent | 9e46f86686853cca3dec168f2e57d59f8703e9b0 (diff) | |
| download | vdr-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 'streamdev-server.c')
| -rw-r--r-- | streamdev-server.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/streamdev-server.c b/streamdev-server.c index 2faca73..f2c933a 100644 --- a/streamdev-server.c +++ b/streamdev-server.c @@ -3,7 +3,7 @@ * * See the README file for copyright information and how to reach the author. * - * $Id: streamdev-server.c,v 1.7 2008/04/07 14:27:27 schmirl Exp $ + * $Id: streamdev-server.c,v 1.7.2.1 2008/04/29 07:00:57 schmirl Exp $ */ #include <getopt.h> @@ -26,6 +26,7 @@ cPluginStreamdevServer::cPluginStreamdevServer(void) cPluginStreamdevServer::~cPluginStreamdevServer() { + free(opt_remux); } const char *cPluginStreamdevServer::Description(void) @@ -51,7 +52,9 @@ bool cPluginStreamdevServer::ProcessArgs(int argc, char *argv[]) while((c = getopt_long(argc, argv, "r:", long_options, NULL)) != -1) { switch (c) { case 'r': - g_ExternRemux = optarg; + if (opt_remux) + free(opt_remux); + opt_remux = strdup(optarg); break; default: return false; @@ -77,6 +80,8 @@ bool cPluginStreamdevServer::Start(void) } return false; } + if (!opt_remux) + opt_remux = strdup(DEFAULT_EXTERNREMUX); cStreamdevServer::Initialize(); |