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

Merge branch 'check/next-cc'

Browse Source 
it compiles, but is not really tested...

Conflicts:
	src/driver/netfile.cpp
	src/driver/volume.cpp
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/bedit/bouqueteditor_bouquets.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bookmarkmanager.cpp
	src/gui/bouquetlist.cpp
	src/gui/eventlist.cpp
	src/gui/movieplayer.cpp
	src/gui/pictureviewer.cpp
	src/gui/scan.cpp
	src/gui/test_menu.h
	src/gui/timerlist.cpp
	src/gui/update.cpp
	src/gui/widget/listbox.cpp
	src/neutrino.cpp
	src/system/flashtool.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/femanager.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: d5d5a60261
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-06-16 (Sun, 16 Jun 2013)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2013-06-16 21:22:14 +02:00
parent 0b7367ec22 7969ca5696
commit 4c3c21152b
160 changed files with 6251 additions and 2072 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/eitd/SIevents.cpp
View File

@@ -357,7 +357,22 @@ char SIevent::getFSK() const
return (it->rating + 3); // 0x01 to 0x0F minimum age = rating + 3 years
else
return (it->rating == 0 ? 0 : 18); // return FSK 18 for : 0x10 to 0xFF defined by the broadcaster
}else if( it->countryCode == "FRA" && it->rating == 0x10)// workaround for ITA ESP FRA fsk.
{
return 0;
}else if(it->countryCode == "ITA" && it->rating == 1)
{
return 0;
}else if( it->countryCode == "ESP" )
{
if(it->rating == 0x10 || it->rating == 0x11)
return 0;
else if(it->rating == 0x12)
return 18;
else
return (it->rating + 1);
}
}
if (!ratings.empty())
{