From e0f8ee466905b622f59ce0c3b79b947cfe80d678 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 11 Nov 2014 12:15:15 +0100 Subject: [PATCH] dvb: add MHz to display mux name, fixes #2466 --- src/input/mpegts/mpegts_mux_dvb.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/input/mpegts/mpegts_mux_dvb.c b/src/input/mpegts/mpegts_mux_dvb.c index 675c0060..0c6074f4 100644 --- a/src/input/mpegts/mpegts_mux_dvb.c +++ b/src/input/mpegts/mpegts_mux_dvb.c @@ -575,21 +575,23 @@ dvb_mux_display_name ( mpegts_mux_t *mm, char *buf, size_t len ) dvb_mux_t *lm = (dvb_mux_t*)mm; dvb_network_t *ln = (dvb_network_t*)mm->mm_network; uint32_t freq = lm->lm_tuning.dmc_fe_freq, freq2; - char pol[2] = { 0 }; + char extra[8]; if (ln->ln_type == DVB_TYPE_S) { const char *s = dvb_pol2str(lm->lm_tuning.u.dmc_fe_qpsk.polarisation); - if (s) pol[0] = *s; + if (s) extra[0] = *s; + extra[1] = '\0'; } else { freq /= 1000; + strcpy(extra, "MHz"); } freq2 = freq % 1000; freq /= 1000; while (freq2 && (freq2 % 10) == 0) freq2 /= 10; if (freq2) - snprintf(buf, len, "%d.%d%s", freq, freq2, pol); + snprintf(buf, len, "%d.%d%s", freq, freq2, extra); else - snprintf(buf, len, "%d%s", freq, pol); + snprintf(buf, len, "%d%s", freq, extra); } static void