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

channellist: re-add list of recordable channels (while recording) to key_current_transponder

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: a84c0a14a7
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-03-22 (Thu, 22 Mar 2018)

Origin message was:
------------------
- channellist: re-add list of recordable channels (while recording) to key_current_transponder

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2018-03-22 00:44:46 +01:00
parent 0d3d142017
commit 9bbefa3e64
5 changed files with 33 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
data/locale/deutsch.locale
View File

@@ -305,6 +305,7 @@ channellist.new_zap_mode_off aus
channellist.nonefound Es wurden keine Kanäle gefunden!\nFühren Sie bitte eine Kanalsuche durch\n(MENU-Taste -> Service)
channellist.numeric_adjust Bei numerischem Zap Kanalliste nachführen
channellist.provs Anbieter
channellist.recordable_channels Aufnehmbare Sender
channellist.recording_not_possible Aufnahme nicht möglich!
channellist.remember Zuletzt verwendete
channellist.reset_all Entferne Markierung "Neu" für alle Kanäle

1
data/locale/english.locale
View File

@@ -305,6 +305,7 @@ channellist.new_zap_mode_off off
channellist.nonefound No channels were found!\nPlease execute a scan\n(MENU-key -> service)
channellist.numeric_adjust Numeric zap adjust
channellist.provs Providers
channellist.recordable_channels Recordable channels
channellist.recording_not_possible Recording not possible!
channellist.remember Last used
channellist.reset_all Reset 'new' flag for all channels

46
src/gui/channellist.cpp
View File

@@ -1248,8 +1248,8 @@ int CChannelList::showLiveBouquet(int key)
{
if (this->lastChList.size() > 1)
{
CChannelList * channelList = new CChannelList(g_Locale->getText(LOCALE_CHANNELLIST_HISTORY), true, true);
channelList->setLiveBouquet();
CChannelList * liveList = new CChannelList(g_Locale->getText(LOCALE_CHANNELLIST_HISTORY), true, true);
liveList->setLiveBouquet();
for (unsigned int i = 1; i < this->lastChList.size(); ++i)
{
@@ -1258,16 +1258,16 @@ int CChannelList::showLiveBouquet(int key)
{
CZapitChannel* channel = getChannel(channel_id);
if (channel)
channelList->addChannel(channel);
liveList->addChannel(channel);
}
}
if (!channelList->isEmpty())
if (!liveList->isEmpty())
{
this->frameBuffer->paintBackground();
res = channelList->exec();
res = liveList->exec();
CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO);
}
delete channelList;
delete liveList;
}
else
ShowHint(LOCALE_MESSAGEBOX_INFO, LOCALE_CHANNELLIST_HISTORY_EMPTY);
@@ -1278,24 +1278,36 @@ int CChannelList::showLiveBouquet(int key)
// current transponder bouquet
if (key == g_settings.key_current_transponder)
{
CChannelList * orgList = CNeutrinoApp::getInstance()->channelList;
CChannelList * channelList = new CChannelList(g_Locale->getText(LOCALE_CHANNELLIST_CURRENT_TP), false, true);
channelList->setLiveBouquet();
t_channel_id recid = (*chanlist)[selected]->getChannelID() >> 16;
bool isRecord = (!autoshift && CNeutrinoApp::getInstance()->recordingstatus);
CChannelList * origList = CNeutrinoApp::getInstance()->channelList;
CChannelList * liveList = new CChannelList(isRecord ? g_Locale->getText(LOCALE_CHANNELLIST_RECORDABLE_CHANNELS) : g_Locale->getText(LOCALE_CHANNELLIST_CURRENT_TP), false, true);
liveList->setLiveBouquet();
for (unsigned int i = 0; i < (*orgList->chanlist).size(); i++)
if (isRecord)
{
if (((*orgList->chanlist)[i]->getChannelID() >> 16) == recid)
channelList->addChannel((*orgList->chanlist)[i]);
for (unsigned int i = 0 ; i < (*origList->chanlist).size(); i++)
{
if (SameTP((*origList->chanlist)[i]))
liveList->addChannel((*origList->chanlist)[i]);
}
if (!channelList->isEmpty())
}
else
{
channelList->adjustToChannelID(orgList->getActiveChannel_ChannelID());
t_channel_id recid = (*chanlist)[selected]->getChannelID() >> 16;
for (unsigned int i = 0; i < (*origList->chanlist).size(); i++)
{
if (((*origList->chanlist)[i]->getChannelID() >> 16) == recid)
liveList->addChannel((*origList->chanlist)[i]);
}
}
if (!liveList->isEmpty())
{
liveList->adjustToChannelID(origList->getActiveChannel_ChannelID());
this->frameBuffer->paintBackground();
res = channelList->exec();
res = liveList->exec();
CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO);
}
delete channelList;
delete liveList;
return res;
}

1
src/system/locals.h
View File

@@ -332,6 +332,7 @@ typedef enum
LOCALE_CHANNELLIST_NONEFOUND,
LOCALE_CHANNELLIST_NUMERIC_ADJUST,
LOCALE_CHANNELLIST_PROVS,
LOCALE_CHANNELLIST_RECORDABLE_CHANNELS,
LOCALE_CHANNELLIST_RECORDING_NOT_POSSIBLE,
LOCALE_CHANNELLIST_REMEMBER,
LOCALE_CHANNELLIST_RESET_ALL,

1
src/system/locals_intern.h
View File

@@ -332,6 +332,7 @@ const char * locale_real_names[] =
"channellist.nonefound",
"channellist.numeric_adjust",
"channellist.provs",
"channellist.recordable_channels",
"channellist.recording_not_possible",
"channellist.remember",
"channellist.reset_all",