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

epgplus: signalize zap tries while movie playback

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: b913a04f40
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-07-23 (Mon, 23 Jul 2018)

Origin message was:
------------------
- epgplus: signalize zap tries while movie playback

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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2018-07-23 19:48:47 +02:00
parent 10b094b452
commit fc2e407816
6 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/locale/deutsch.locale
View File

@@ -299,7 +299,6 @@ 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
channellist.movieplayer_zap Umschalten während der Film-Wiedergabe nicht möglich
channellist.new_zap_mode Quickzap in Liste
channellist.new_zap_mode_active aktiv
channellist.new_zap_mode_allow erlauben
@@ -2089,6 +2088,7 @@ movieplayer.titles Titel
movieplayer.toomanybookmarks Sie haben bereits zu viele Lesezeichen angelegt.\nEs muß erst ein anderes gelöscht werden.
movieplayer.tsplayback TS Abspielen
movieplayer.ytplayback YouTube-Feed Wiedergabe
movieplayer.zap Umschalten während der Film-Wiedergabe nicht möglich
mpkey.audio Tonspuren
mpkey.bookmark Markierungen
mpkey.forward Vorlauf

2
data/locale/english.locale
View File

@@ -299,7 +299,6 @@ 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
channellist.movieplayer_zap Zap not possible while movie playback
channellist.new_zap_mode Quickzap in list
channellist.new_zap_mode_active active
channellist.new_zap_mode_allow allow
@@ -2089,6 +2088,7 @@ movieplayer.titles Titles
movieplayer.toomanybookmarks There are too many bookmarks.\nYou need to delete one of them first.
movieplayer.tsplayback Play TS
movieplayer.ytplayback YouTube videoplayer
movieplayer.zap Zap not possible while movie playback
mpkey.audio Audiotracks
mpkey.bookmark Bookmarks
mpkey.forward Forward

2
src/gui/channellist.cpp
View File

@@ -779,7 +779,7 @@ int CChannelList::show()
oldselected = selected;
paintBody(); // refresh zapped vs selected
} else if (CNeutrinoApp::getInstance()->getMode() == NeutrinoModes::mode_ts) {
ShowHint(LOCALE_MESSAGEBOX_INFO, LOCALE_CHANNELLIST_MOVIEPLAYER_ZAP);
ShowHint(LOCALE_MESSAGEBOX_INFO, LOCALE_MOVIEPLAYER_ZAP);
} else if(SameTP()) {
zapOnExit = true;
loop=false;

5
src/gui/epgplus.cpp
View File

@@ -1080,7 +1080,12 @@ int EpgPlus::exec(CChannelList * pchannelList, int selectedChannelIndex, CBouque
else if (msg == CRCInput::RC_ok)
{
if (selectedChannelEntry)
{
if (CNeutrinoApp::getInstance()->getMode() == NeutrinoModes::mode_ts)
ShowHint(LOCALE_MESSAGEBOX_INFO, LOCALE_MOVIEPLAYER_ZAP);
else
CNeutrinoApp::getInstance()->channelList->zapTo_ChannelID(selectedChannelEntry->channel->getChannelID());
}
current_bouquet = bouquetList->getActiveBouquetNumber();
}
else if (CRCInput::isNumeric(msg))

2
src/system/locals.h
View File

@@ -326,7 +326,6 @@ typedef enum
LOCALE_CHANNELLIST_MAKE_NEWLIST,
LOCALE_CHANNELLIST_MAKE_REMOVEDLIST,
LOCALE_CHANNELLIST_MAKE_WEBTVLIST,
LOCALE_CHANNELLIST_MOVIEPLAYER_ZAP,
LOCALE_CHANNELLIST_NEW_ZAP_MODE,
LOCALE_CHANNELLIST_NEW_ZAP_MODE_ACTIVE,
LOCALE_CHANNELLIST_NEW_ZAP_MODE_ALLOW,
@@ -2116,6 +2115,7 @@ typedef enum
LOCALE_MOVIEPLAYER_TOOMANYBOOKMARKS,
LOCALE_MOVIEPLAYER_TSPLAYBACK,
LOCALE_MOVIEPLAYER_YTPLAYBACK,
LOCALE_MOVIEPLAYER_ZAP,
LOCALE_MPKEY_AUDIO,
LOCALE_MPKEY_BOOKMARK,
LOCALE_MPKEY_FORWARD,

2
src/system/locals_intern.h
View File

@@ -326,7 +326,6 @@ const char * locale_real_names[] =
"channellist.make_newlist",
"channellist.make_removedlist",
"channellist.make_webtvlist",
"channellist.movieplayer_zap",
"channellist.new_zap_mode",
"channellist.new_zap_mode_active",
"channellist.new_zap_mode_allow",
@@ -2116,6 +2115,7 @@ const char * locale_real_names[] =
"movieplayer.toomanybookmarks",
"movieplayer.tsplayback",
"movieplayer.ytplayback",
"movieplayer.zap",
"mpkey.audio",
"mpkey.bookmark",
"mpkey.forward",