Author: tack
Date: Sun Jan 21 21:22:56 2007
New Revision: 2433

Modified:
   trunk/xine/src/drivers/kaa.c
   trunk/xine/src/stream.c

Log:
Don't crash when passthrough driver is 'none'; add a bit more info when
stream open fails.


Modified: trunk/xine/src/drivers/kaa.c
==============================================================================
--- trunk/xine/src/drivers/kaa.c        (original)
+++ trunk/xine/src/drivers/kaa.c        Sun Jan 21 21:22:56 2007
@@ -391,7 +391,8 @@
 
     passthrough_driver = _x_load_video_output_plugin(xine->xine, 
PyString_AsString(passthrough), 
                                                      passthrough_visual_type, 
passthrough_visual);
-    passthrough_driver_info->driver = passthrough_driver;
+    if (passthrough_driver_info)
+        passthrough_driver_info->driver = passthrough_driver;
 
     if (!passthrough_driver) {
         PyErr_Format(xine_error, "Failed to initialize passthrough driver: 
%s", PyString_AsString(passthrough));

Modified: trunk/xine/src/stream.c
==============================================================================
--- trunk/xine/src/stream.c     (original)
+++ trunk/xine/src/stream.c     Sun Jan 21 21:22:56 2007
@@ -136,7 +136,7 @@
 
     result = xine_open(self->stream, mrl);
     if (!result) {
-        PyErr_Format(xine_error, "Failed to open stream (FIXME: add useful 
error).");
+        PyErr_Format(xine_error, "Failed to open stream '%s' (FIXME: add 
useful error).", mrl);
         return NULL;
     }
 

-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog

Reply via email to