From dbdb84c2d3f95188cf6d4cf93e49a9b62dbfa51e Mon Sep 17 00:00:00 2001 From: "Reynaldo H. Verdejo Pinochet" Date: Fri, 14 Oct 2016 14:41:42 -0700 Subject: [PATCH] dvbsrc: fix 'delivery system'-related messages * Rephrase tune error to be delsys-neutral * Refer to the actual check in the 'missing sanity check' warnings * Use "Delivery system" instead of 'delsys'. The latter is OK as a shorthand in the code but not even a real word --- sys/dvb/gstdvbsrc.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sys/dvb/gstdvbsrc.c b/sys/dvb/gstdvbsrc.c index 9842d47cce..872c38544c 100644 --- a/sys/dvb/gstdvbsrc.c +++ b/sys/dvb/gstdvbsrc.c @@ -1984,7 +1984,7 @@ gst_dvbsrc_start (GstBaseSrc * bsrc) return FALSE; } if (!gst_dvbsrc_tune (src)) { - GST_ERROR_OBJECT (src, "Not able to lock on to the dvb channel"); + GST_ERROR_OBJECT (src, "Not able to lock on channel"); goto fail; } if (!gst_dvbsrc_open_dvr (src)) { @@ -2078,8 +2078,8 @@ gst_dvbsrc_is_valid_trans_mode (guint delsys, guint mode) break; #endif default: - GST_FIXME ("No delsys/transmission-mode sanity checks implemented for " - "this delivery system"); + GST_FIXME ("No transmission-mode sanity checks implemented for this " + "delivery system"); return TRUE; } return FALSE; @@ -2108,8 +2108,8 @@ gst_dvbsrc_is_valid_modulation (guint delsys, guint mod) return TRUE; break; default: - GST_FIXME ("No delsys/modulation sanity checks implemented for this " - "delivery system"); + GST_FIXME ("No modulation sanity checks implemented for this delivery " + "system"); return TRUE; } return FALSE; @@ -2318,12 +2318,12 @@ gst_dvbsrc_tune_fe (GstDvbSrc * object) /* If set, confirm the choosen delivery system is actually * supported by the hardware */ if (object->delsys != SYS_UNDEFINED) { - GST_DEBUG_OBJECT (object, "Confirming delsys '%u' is supported", + GST_DEBUG_OBJECT (object, "Confirming delivery system '%u' is supported", object->delsys); if (!g_list_find (object->supported_delsys, GINT_TO_POINTER (object->delsys))) { - GST_WARNING_OBJECT (object, "Adapter does not support delsys '%u'", - object->delsys); + GST_WARNING_OBJECT (object, "Adapter does not support delivery system " + "'%u'", object->delsys); return FALSE; } }