summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorphintuka <phintuka>2007-06-26 14:56:13 +0000
committerphintuka <phintuka>2007-06-26 14:56:13 +0000
commit0714184529e716be347effdb6e307ec212ac53af (patch)
tree2f3d30c0ddd558bbee44a1f25b42a050c2eeab86
parente81657ff930cdb6c3f6bca72b89012287fff2c58 (diff)
downloadxineliboutput-0714184529e716be347effdb6e307ec212ac53af.tar.gz
xineliboutput-0714184529e716be347effdb6e307ec212ac53af.tar.bz2
Move DVD image file unescaping to right place ...
-rw-r--r--xine_input_vdr.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/xine_input_vdr.c b/xine_input_vdr.c
index 99e84de9..de6912cd 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.88 2007-06-26 10:50:27 phintuka Exp $
+ * $Id: xine_input_vdr.c,v 1.89 2007-06-26 14:56:13 phintuka Exp $
*
*/
@@ -2730,10 +2730,6 @@ static int handle_control_playfile(vdr_input_plugin_t *this, const char *cmd)
}
if(!strcmp(filename,"dvd:/")) {
- /* DVD plugin 'bug': unescaping is not implemented ... */
- char *mrl = unescape_filename(filename);
- strn0cpy(filename, mrl, sizeof(filename));
- free(mrl);
#if 0
/* input/media_helper.c */
eject_media(0); /* DVD tray in */
@@ -2745,6 +2741,12 @@ static int handle_control_playfile(vdr_input_plugin_t *this, const char *cmd)
dvd_set_speed(device.str_value, 2700);
#endif
}
+ else if(!strncmp(filename,"dvd:/", 5)) {
+ /* DVD plugin 'bug': unescaping is not implemented ... */
+ char *mrl = unescape_filename(filename);
+ strn0cpy(filename, mrl, sizeof(filename));
+ free(mrl);
+ }
if(!this->slave_stream) {
this->slave_stream = xine_stream_new(this->stream->xine,