mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-01 01:41:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

modify autocreate HD _and_ UHD channels as seperate lists

Browse Source 
Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
TangoCash
2017-10-20 08:02:09 +02:00
committed by Thilo Graf
parent 1138784282
commit 9c12ce65aa
7 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
data/locale/deutsch.locale
View File

@@ -226,6 +226,7 @@ bouquetname.hdtv HD-Kanäle
bouquetname.new Neue Kanäle
bouquetname.other Unbekannter Provider
bouquetname.removed Gelöschte Kanäle
bouquetname.uhdtv UHD-Kanäle
bouquetname.webtv WebTV-Kanäle
buildinfo.compiled_on Build Host
buildinfo.compiled_with Compiler Version
@@ -258,7 +259,7 @@ channellist.head Alle Kanäle
channellist.history Verlauf
channellist.history_clear Verlauf löschen
channellist.keep_numbers Dauerhafte Kanalnummern
channellist.make_hdlist Erzeuge Bouquet mit HD-Kanälen
channellist.make_hdlist Erzeuge Bouquets mit HD und UHD Kanälen
channellist.make_newlist Erzeuge Bouquet mit neuen Kanälen
channellist.make_removedlist Erzeuge Bouquet mit gelöschten Kanälen
channellist.make_webtvlist Erzeuge Bouquet mit WebTV-Kanälen
@@ -1165,7 +1166,7 @@ menu.hint_leds_tv Definiert den Status der Power-LEDs im TV-Modus
menu.hint_load Laden der Einstellungen aus einer Datei
menu.hint_longkeypress_duration Tasten, die länger als die angegebene Zeit betätigt werden, werden als "langer Tastendruck" behandelt.
menu.hint_lua Plugins ausführen
menu.hint_make_hdlist Bei aktiver Option wird ein Bouquet namens 'HD' erzeugt, in dem alle HD-Sender zusammengefasst sind
menu.hint_make_hdlist Bei aktiver Option werden Bouquets namens 'HD' und 'UHD' erzeugt, in denen alle HD bzw UHD-Sender zusammengefasst sind
menu.hint_make_newlist Nach einer Kanalsuche wird ein Bouquet namens 'neue Kanäle' erzeugt
menu.hint_make_removedlist Nach einer Kanalsuche wird ein Bouquet namens 'gelöschte Kanäle' erzeugt
menu.hint_make_webtvlist Bei aktiver Option wird ein Bouquet namens 'WebTV' erzeugt, in dem alle WebTV-Sender zusammengefasst sind

5
data/locale/english.locale
View File

@@ -226,6 +226,7 @@ bouquetname.hdtv HD channels
bouquetname.new New channels
bouquetname.other Unknown provider
bouquetname.removed Removed channels
bouquetname.uhdtv UHD channels
bouquetname.webtv WebTV channels
buildinfo.compiled_on Build Host
buildinfo.compiled_with Compiler version
@@ -258,7 +259,7 @@ channellist.head All Services
channellist.history History
channellist.history_clear Clear History
channellist.keep_numbers Persistent Channel Numbers
channellist.make_hdlist Create list of HD channels
channellist.make_hdlist Create lists of HD and UHD channels
channellist.make_newlist Create list of new channels
channellist.make_removedlist Create list of removed channels
channellist.make_webtvlist Create list of WebTV channels
@@ -1165,7 +1166,7 @@ menu.hint_leds_tv Working LEDs state
menu.hint_load Load GUI settings from file
menu.hint_longkeypress_duration A key press will be considered as "long key press" if it's pressed longer than the specified time.
menu.hint_lua Run Lua Plugins
menu.hint_make_hdlist Auto-create HD channel list based on\nchannel type and name
menu.hint_make_hdlist Auto-create HD and UHD channel lists based on\nchannel type and name
menu.hint_make_newlist Create list of recently added channels
menu.hint_make_removedlist Create list of recently removed channels
menu.hint_make_webtvlist Auto-create WebTV channel list based on\nchannel type and name

6
src/neutrino.cpp
View File

@@ -1696,6 +1696,12 @@ void CNeutrinoApp::channelsInit(bool bOnly)
TVallList->Bouquets.push_back(hdBouquet);
printf("[neutrino] got %d HD channels\n", (int)zapitList.size()); fflush(stdout);
}
if (CServiceManager::getInstance()->GetAllUHDChannels(zapitList)) {
CBouquet* uhdBouquet = new CBouquet(0, g_Locale->getText(LOCALE_BOUQUETNAME_UHDTV), false, true);
uhdBouquet->channelList->SetChannelList(&zapitList);
TVallList->Bouquets.push_back(uhdBouquet);
printf("[neutrino] got %d UHD channels\n", (int)zapitList.size()); fflush(stdout);
}
}
/* new channels */
if (g_settings.make_new_list) {

1
src/system/locals.h
View File

@@ -253,6 +253,7 @@ typedef enum
LOCALE_BOUQUETNAME_NEW,
LOCALE_BOUQUETNAME_OTHER,
LOCALE_BOUQUETNAME_REMOVED,
LOCALE_BOUQUETNAME_UHDTV,
LOCALE_BOUQUETNAME_WEBTV,
LOCALE_BUILDINFO_COMPILED_ON,
LOCALE_BUILDINFO_COMPILED_WITH,

1
src/system/locals_intern.h
View File

@@ -253,6 +253,7 @@ const char * locale_real_names[] =
"bouquetname.new",
"bouquetname.other",
"bouquetname.removed",
"bouquetname.uhdtv",
"bouquetname.webtv",
"buildinfo.compiled_on",
"buildinfo.compiled_with",

1
src/zapit/include/zapit/getservices.h
View File

@@ -140,6 +140,7 @@ class CServiceManager
bool GetAllRadioChannels(ZapitChannelList &list, int flags = CZapitChannel::PRESENT);
bool GetAllTvChannels(ZapitChannelList &list, int flags = CZapitChannel::PRESENT);
bool GetAllHDChannels(ZapitChannelList &list, int flags = CZapitChannel::PRESENT);
bool GetAllUHDChannels(ZapitChannelList &list, int flags = CZapitChannel::PRESENT);
bool GetAllWebTVChannels(ZapitChannelList &list, int flags = CZapitChannel::PRESENT);
bool GetAllSatelliteChannels(ZapitChannelList &list, t_satellite_position position, int flags = CZapitChannel::PRESENT);
bool GetAllTransponderChannels(ZapitChannelList &list, transponder_id_t tpid, int flags = CZapitChannel::PRESENT);

10
src/zapit/src/getservices.cpp
View File

@@ -294,6 +294,16 @@ bool CServiceManager::GetAllHDChannels(ZapitChannelList &list, int flags)
return (!list.empty());
}
bool CServiceManager::GetAllUHDChannels(ZapitChannelList &list, int flags)
{
list.clear();
for (channel_map_iterator_t it = allchans.begin(); it != allchans.end(); ++it) {
if ((it->second.flags & flags) && it->second.isUHD())
list.push_back(&(it->second));
}
return (!list.empty());
}
bool CServiceManager::GetAllWebTVChannels(ZapitChannelList &list, int flags)
{
list.clear();