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

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

data/locale/deutsch.locale

@@ -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

data/locale/english.locale

@@ -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

src/gui/channellist.cpp

@@ -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);
+			CChannelList * liveList = new CChannelList(g_Locale->getText(LOCALE_CHANNELLIST_HISTORY), true, true);
-			channelList->setLiveBouquet();
+			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;
+		bool isRecord = (!autoshift && CNeutrinoApp::getInstance()->recordingstatus);
-		CChannelList * channelList = new CChannelList(g_Locale->getText(LOCALE_CHANNELLIST_CURRENT_TP), false, true);
+		CChannelList * origList = CNeutrinoApp::getInstance()->channelList;
-		channelList->setLiveBouquet();
+		CChannelList * liveList = new CChannelList(isRecord ? g_Locale->getText(LOCALE_CHANNELLIST_RECORDABLE_CHANNELS) : g_Locale->getText(LOCALE_CHANNELLIST_CURRENT_TP), false, true);
-		t_channel_id recid = (*chanlist)[selected]->getChannelID() >> 16;
+		liveList->setLiveBouquet();
 
-		for (unsigned int i = 0; i < (*orgList->chanlist).size(); i++)
+		if (isRecord)
 		{
-			if (((*orgList->chanlist)[i]->getChannelID() >> 16) == recid)
+			for (unsigned int i = 0 ; i < (*origList->chanlist).size(); i++)
-				channelList->addChannel((*orgList->chanlist)[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;
 	}
 

src/system/locals.h

@@ -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,

src/system/locals_intern.h

@@ -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",