add webradio; first steps

Conflicts:
	data/Makefile.am
	data/scripts/backup.sh
	src/neutrino.cpp
	src/zapit/include/zapit/zapit.h

Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 3fd544737a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- add webradio; first steps

 Conflicts:
	data/Makefile.am
	data/scripts/backup.sh
	src/neutrino.cpp
	src/zapit/include/zapit/zapit.h

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
vanhofen
2017-11-03 09:36:19 +01:00
committed by Thilo Graf
parent d34a956722
commit ba98bb87f5
26 changed files with 149 additions and 44 deletions

View File

@@ -794,7 +794,8 @@ void CInfoViewer::showTitle(CZapitChannel * channel, const bool calledFromNumZap
//fprintf(stderr, "after showchannellogo, mode = %d ret = %d logo_ok = %d\n",g_settings.infobar_show_channellogo, ChannelLogoMode, logo_ok);
if (g_settings.infobar_sat_display) {
std::string name = (IS_WEBTV(current_channel_id))? "WebTV" : CServiceManager::getInstance()->GetSatelliteName(satellitePosition);
// TODO split into WebTV/WebRadio
std::string name = (IS_WEBTV(current_channel_id))? "Web-Channel" : CServiceManager::getInstance()->GetSatelliteName(satellitePosition);
int satNameWidth = g_SignalFont->getRenderWidth (name);
std::string satname_tmp = name;
if (satNameWidth > (ChanWidth - numbox_offset*2)) {