diff options
| author | phintuka <phintuka> | 2008-01-03 20:06:27 +0000 |
|---|---|---|
| committer | phintuka <phintuka> | 2008-01-03 20:06:27 +0000 |
| commit | c39633b6fa53fadde73b1c3183db76c456492b96 (patch) | |
| tree | 948b41c967ca79b6e9b5845e45b3c7eaba465b43 /xine_input_vdr.c | |
| parent | 11d222ce6d4be6ee629ac348164cf232d2b28d3d (diff) | |
| download | xineliboutput-c39633b6fa53fadde73b1c3183db76c456492b96.tar.gz xineliboutput-c39633b6fa53fadde73b1c3183db76c456492b96.tar.bz2 | |
Change MRL syntax from xvdr[:proto]:// to xvdr[+proto]://
Diffstat (limited to 'xine_input_vdr.c')
| -rw-r--r-- | xine_input_vdr.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/xine_input_vdr.c b/xine_input_vdr.c index 6e57d7ad..0af61a59 100644 --- a/xine_input_vdr.c +++ b/xine_input_vdr.c @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: xine_input_vdr.c,v 1.106 2008-01-03 19:05:07 phintuka Exp $ + * $Id: xine_input_vdr.c,v 1.107 2008-01-03 20:06:27 phintuka Exp $ * */ @@ -1655,7 +1655,7 @@ static const char* fifo_get_mrl (input_plugin_t *this_gen) #else static char* fifo_get_mrl (input_plugin_t *this_gen) #endif -{ return "xvdr:slave:"; } +{ return "xvdr+slave:"; } #if XINE_VERSION_CODE < 10190 static off_t fifo_read (input_plugin_t *this_gen, char *buf, off_t len) @@ -5997,11 +5997,13 @@ static int vdr_plugin_open_net (input_plugin_t *this_gen) if(strchr(this->mrl, '#')) *strchr(this->mrl, '#') = 0; - - if((!strncasecmp(this->mrl, "xvdr:tcp://", 11) && (this->tcp=1)) || - (!strncasecmp(this->mrl, "xvdr:udp://", 11) && (this->udp=1)) || - (!strncasecmp(this->mrl, "xvdr:rtp://", 11) && (this->rtp=1)) || - (!strncasecmp(this->mrl, "xvdr://", 7))) { + if((!strncasecmp(this->mrl, "xvdr+tcp://", 11) && (this->tcp=1)) || + (!strncasecmp(this->mrl, "xvdr+udp://", 11) && (this->udp=1)) || + (!strncasecmp(this->mrl, "xvdr+rtp://", 11) && (this->rtp=1)) || + (!strncasecmp(this->mrl, "xvdr:tcp://", 11) && (this->tcp=1)) || + (!strncasecmp(this->mrl, "xvdr:udp://", 11) && (this->udp=1)) || + (!strncasecmp(this->mrl, "xvdr:rtp://", 11) && (this->rtp=1)) || + (!strncasecmp(this->mrl, "xvdr://", 7))) { char *phost = strdup(strstr(this->mrl, "//") + 2); char host[256]; @@ -6156,10 +6158,10 @@ static input_plugin_t *vdr_class_get_instance (input_class_t *class_gen, LOGDBG("vdr_class_get_instance"); - if (strncasecmp (mrl, "xvdr:",5)) + if (strncasecmp (mrl, "xvdr:",5) && strncasecmp (mrl, "xvdr+",5)) return NULL; - if(!strncasecmp(mrl, "xvdr:slave://0x", 15)) { + if(!strncasecmp(mrl, "xvdr+slave://0x", 15)) { LOGMSG("vdr_class_get_instance: slave stream requested"); return fifo_class_get_instance(class_gen, stream, data); } |