dvbbasebin: make sure we have an error in case of parsing failure

Drop a redundant comment and rellocate another one while at it.
This commit is contained in:
Reynaldo H. Verdejo Pinochet 2016-06-24 18:14:06 -07:00
parent 219d4c132c
commit 756e785f39

View File

@ -1173,14 +1173,13 @@ dvb_base_bin_uri_set_uri (GstURIHandler * handler, const gchar * uri,
if (location == NULL) if (location == NULL)
goto no_location; goto no_location;
/* FIXME: here is where we parse channels.conf */
if (!set_properties_for_channel (GST_ELEMENT (dvbbasebin), location, &err)) if (!set_properties_for_channel (GST_ELEMENT (dvbbasebin), location, &err))
goto set_properties_failed; goto set_properties_failed;
/* FIXME: here is where we parse channels.conf */
g_free (location); g_free (location);
return TRUE; return TRUE;
/* ERRORS */
post_error_and_exit: post_error_and_exit:
{ {
gst_element_message_full (GST_ELEMENT (dvbbasebin), GST_MESSAGE_ERROR, gst_element_message_full (GST_ELEMENT (dvbbasebin), GST_MESSAGE_ERROR,
@ -1198,6 +1197,9 @@ no_location:
set_properties_failed: set_properties_failed:
{ {
g_free (location); g_free (location);
if (!err)
g_set_error (&err, GST_URI_ERROR, GST_URI_ERROR_BAD_REFERENCE,
"Could not find information for channel");
goto post_error_and_exit; goto post_error_and_exit;
} }
} }