mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 16:31:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

gui/streaminfo2: fix DVB-T label

Browse Source 
Conflicts:
	data/locale/deutsch.locale


Origin commit data
------------------
Commit: aee3647fef
Author: martii <m4rtii@gmx.de>
Date: 2013-06-01 (Sat, 01 Jun 2013)
This commit is contained in:
martii
2013-06-01 15:06:34 +02:00
committed by [CST] Focus
parent 02fc993e74
commit 3de17ab0fe
6 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
data/locale/deutsch.locale
View File

@@ -1879,7 +1879,8 @@ stringinput.clear Alles löschen
subtitles.charset Zeichensatz
subtitles.head Untertitel
subtitles.stop Untertitel aus
terrestrialsetup.provider DVB-T Region
terrestrialsetup.area Region
terrestrialsetup.provider DVB-T Versorgungsbereich
timer.eventrecord.msg Die Sendung wurde zur Aufnahme vorgemerkt.
timer.eventrecord.title Aufnahme vormerken
timer.eventtimed.msg Die Sendung wurde vorgemerkt.

1
data/locale/english.locale
View File

@@ -1879,6 +1879,7 @@ stringinput.clear clear all
subtitles.charset Charset
subtitles.head Subtitles
subtitles.stop Stop subtitles
terrestrialsetup.area Area
terrestrialsetup.provider Terrestrial Provider
timer.eventrecord.msg The event is scheduled for recording.\nTo edit the schedule open the timer list.
timer.eventrecord.title Schedule Record

4
src/gui/streaminfo2.cpp
View File

@@ -559,6 +559,10 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
sprintf (buf, "%s:",g_Locale->getText (LOCALE_SATSETUP_SATELLITE));//swiped locale
else if(t.deltype == FE_QAM)
sprintf (buf, "%s:",g_Locale->getText (LOCALE_CHANNELLIST_PROVS));
#ifdef MARTII
else
snprintf (buf, sizeof(buf), "%s:",g_Locale->getText (LOCALE_TERRESTRIALSETUP_AREA));
#endif
g_Font[font_info]->RenderString(xpos, ypos, box_width, buf, COL_INFOBAR_TEXT, 0, true); // UTF-8

1
src/system/locals.h
View File

@@ -1906,6 +1906,7 @@ typedef enum
LOCALE_SUBTITLES_CHARSET,
LOCALE_SUBTITLES_HEAD,
LOCALE_SUBTITLES_STOP,
LOCALE_TERRESTRIALSETUP_AREA,
LOCALE_TERRESTRIALSETUP_PROVIDER,
LOCALE_TIMER_EVENTRECORD_MSG,
LOCALE_TIMER_EVENTRECORD_TITLE,

1
src/system/locals_intern.h
View File

@@ -1906,6 +1906,7 @@ const char * locale_real_names[] =
"subtitles.charset",
"subtitles.head",
"subtitles.stop",
"terrestrialsetup.area",
"terrestrialsetup.provider",
"timer.eventrecord.msg",
"timer.eventrecord.title",

18
src/zapit/src/transponder.cpp
View File

@@ -53,7 +53,7 @@ transponder::transponder()
bool transponder::operator==(const transponder& t) const
{
if (type != FE_OFDM)
if (deltype != FE_OFDM)
return (
(satellitePosition == t.satellitePosition) &&
//(transport_stream_id == t.transport_stream_id) &&
@@ -84,14 +84,14 @@ bool transponder::compare(const transponder& t) const
(dvb_feparams1->u.qam.modulation == dvb_feparams2->u.qam.modulation ||
dvb_feparams1->u.qam.modulation == QAM_AUTO || dvb_feparams2->u.qam.modulation == QAM_AUTO)
);
} else if (type == FE_QPSK) {
} else if (deltype == FE_QPSK) {
ret = (
(t == (*this)) &&
(dvb_feparams1->u.qpsk.symbol_rate == dvb_feparams2->u.qpsk.symbol_rate) &&
(dvb_feparams1->u.qpsk.fec_inner == dvb_feparams2->u.qpsk.fec_inner ||
dvb_feparams1->u.qpsk.fec_inner == FEC_AUTO || dvb_feparams2->u.qpsk.fec_inner == FEC_AUTO)
);
} else if (type == FE_OFDM) {
} else if (deltype == FE_OFDM) {
ret = ( (t == (*this)) &&
(dvb_feparams1->u.ofdm.bandwidth == dvb_feparams2->u.ofdm.bandwidth) &&
(dvb_feparams1->u.ofdm.code_rate_HP == dvb_feparams2->u.ofdm.code_rate_HP ||
@@ -116,13 +116,13 @@ void transponder::dumpServiceXml(FILE * fd)
dvb_feparams->u.qam.symbol_rate, dvb_feparams->u.qam.fec_inner,
dvb_feparams->u.qam.modulation);
} else if (type == FE_QPSK) {
} else if (deltype == FE_QPSK) {
fprintf(fd, "\t\t<TS id=\"%04x\" on=\"%04x\" frq=\"%u\" inv=\"%hu\" sr=\"%u\" fec=\"%hu\" pol=\"%hu\">\n",
transport_stream_id, original_network_id,
dvb_feparams->frequency, dvb_feparams->inversion,
dvb_feparams->u.qpsk.symbol_rate, dvb_feparams->u.qpsk.fec_inner,
polarization);
} else if (type == FE_OFDM) {
} else if (deltype == FE_OFDM) {
fprintf(fd, "\t\t<TS id=\"%04x\" on=\"%04x\" frq=\"%u\" inv=\"%hu\" bw=\"%u\" hp=\"%hu\" lp=\"%hu\" con=\"%u\" tm=\"%u\" gi=\"%u\" hi=\"%u\">\n",
transport_stream_id, original_network_id,
dvb_feparams->frequency, dvb_feparams->inversion,
@@ -141,11 +141,11 @@ void transponder::dump(std::string label)
printf("%s tp-id %016" PRIx64 " freq %d rate %d fec %d mod %d\n", label.c_str(),
transponder_id, dvb_feparams->frequency, dvb_feparams->u.qam.symbol_rate,
dvb_feparams->u.qam.fec_inner, dvb_feparams->u.qam.modulation);
else if (type == FE_QPSK)
else if (deltype == FE_QPSK)
printf("%s tp-id %016" PRIx64 " freq %d rate %d fec %d pol %d\n", label.c_str(),
transponder_id, dvb_feparams->frequency, dvb_feparams->u.qpsk.symbol_rate,
dvb_feparams->u.qpsk.fec_inner, polarization);
else if (type == FE_OFDM)
else if (deltype == FE_OFDM)
printf("%s tp-id %016llx freq %d bw %d coderate %d\n", label.c_str(),
transponder_id, dvb_feparams->frequency, dvb_feparams->u.ofdm.bandwidth,
dvb_feparams->u.ofdm.code_rate_HP);
@@ -188,8 +188,8 @@ std::string transponder::description()
snprintf(buf, sizeof(buf), "%d %d %s %s %s ", dvb_feparams->frequency/1000, dvb_feparams->u.qam.symbol_rate/1000, f, s, m);
break;
case FE_OFDM:
CFrontend::getDelSys(type, dvb_feparams->u.ofdm.code_rate_HP, dvb_feparams->u.ofdm.constellation, f, s, m);
CFrontend::getDelSys(type, dvb_feparams->u.ofdm.code_rate_LP, dvb_feparams->u.ofdm.constellation, f2, s, m);
CFrontend::getDelSys(deltype, dvb_feparams->u.ofdm.code_rate_HP, dvb_feparams->u.ofdm.constellation, f, s, m);
CFrontend::getDelSys(deltype, dvb_feparams->u.ofdm.code_rate_LP, dvb_feparams->u.ofdm.constellation, f2, s, m);
b = dvb_feparams->u.ofdm.bandwidth;
if (b > 3)
b = 3;