Don't send 'Hey! You gave me a NULL pointer yo naughty person' as error message when we can't open the DVD device; se...

Original commit message from CVS:
Don't send 'Hey! You gave me a NULL pointer yo naughty person' as error message when we can't open the DVD device; send something more useful instead (fixes #167117)
This commit is contained in:
Tim-Philipp Müller 2005-02-12 17:37:38 +00:00
parent 8524580bc4
commit 2610c64064
2 changed files with 14 additions and 2 deletions

View file

@ -1,3 +1,11 @@
2005-02-12 Tim-Philipp Müller <tim at centricular dot net>
* ext/dvdnav/dvdnavsrc.c: (dvdnavsrc_open):
Don't send "Hey! You gave me a NULL pointer you naughty person" as
error message when we can't open the DVD device (when dvdnav_open()
fails, src->dvdnav is NULL, so dvdnav_err_to_string() will return
the above). Send something more useful instead (fixes #167117).
2005-02-11 Julien MOUTTE <julien@moutte.net>
* sys/xvimage/xvimagesink.c: (gst_xvimagesink_xvimage_put),

View file

@ -1527,8 +1527,12 @@ dvdnavsrc_open (DVDNavSrc * src)
g_return_val_if_fail (!dvdnavsrc_is_open (src), FALSE);
g_return_val_if_fail (src->location != NULL, FALSE);
DVDNAV_CALLVAL (dvdnav_open,
(&src->dvdnav, (char *) src->location), src, FALSE);
if (dvdnav_open (&src->dvdnav, (char *) src->location) != DVDNAV_STATUS_OK) {
GST_ELEMENT_ERROR (src, LIBRARY, FAILED,
(_("Failed to open DVD device '%s'."), src->location),
GST_ERROR_SYSTEM);
return FALSE;
}
GST_FLAG_SET (src, DVDNAVSRC_OPEN);