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

simple_display: show scrambled icon on scrambled channels

Browse Source 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 91098917e0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-17 (Fri, 17 Nov 2017)

Origin message was:
------------------
- simple_display: show scrambled icon on scrambled channels

Signed-off-by: Thilo Graf <dbt@novatux.de>


------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-11-17 22:18:07 +01:00
committed by Thilo Graf
parent a021de6e46
commit 0d894dfcad
4 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/driver/simple_display.cpp
View File

@@ -797,6 +797,7 @@ void CLCD::UpdateIcons()
{ {
ShowIcon(FP_ICON_HD,chan->isHD()); ShowIcon(FP_ICON_HD,chan->isHD());
ShowIcon(FP_ICON_LOCK,!chan->camap.empty()); ShowIcon(FP_ICON_LOCK,!chan->camap.empty());
ShowIcon(FP_ICON_SCRAMBLED, chan->scrambled);
if (chan->getAudioChannel() != NULL) if (chan->getAudioChannel() != NULL)
{ {
ShowIcon(FP_ICON_DD, chan->getAudioChannel()->audioChannelType == CZapitAudioChannel::AC3); ShowIcon(FP_ICON_DD, chan->getAudioChannel()->audioChannelType == CZapitAudioChannel::AC3);
@@ -874,6 +875,9 @@ void CLCD::ShowIcon(fp_icon i, bool on)
case FP_ICON_MUTE: case FP_ICON_MUTE:
proc_put("/proc/stb/lcd/symbol_mute", on); proc_put("/proc/stb/lcd/symbol_mute", on);
break; break;
case FP_ICON_SCRAMBLED:
proc_put("/proc/stb/lcd/symbol_scrambled", on);
break;
default: default:
break; break;
} }

1
src/driver/simple_display.h
View File

@@ -65,6 +65,7 @@ typedef enum
FP_ICON_FR, FP_ICON_FR,
FP_ICON_FF, FP_ICON_FF,
FP_ICON_DD, FP_ICON_DD,
FP_ICON_SCRAMBLED,
FP_ICON_LOCK FP_ICON_LOCK
} fp_icon; } fp_icon;

1
src/driver/vfd.h
View File

@@ -155,6 +155,7 @@ class CVFD
void Lock(); void Lock();
void Unlock(); void Unlock();
void Clear(); void Clear();
void UpdateIcons() { return; }
void ShowIcon(fp_icon icon, bool show); void ShowIcon(fp_icon icon, bool show);
void ShowText(const char *str); void ShowText(const char *str);
void ShowNumber(int number); void ShowNumber(int number);

3
src/neutrino.cpp
View File

@@ -2535,6 +2535,7 @@ void CNeutrinoApp::showMainMenu()
int old_mode = g_settings.epg_scan_mode; int old_mode = g_settings.epg_scan_mode;
int old_save_mode = g_settings.epg_save_mode; int old_save_mode = g_settings.epg_save_mode;
mainMenu->exec(NULL, ""); mainMenu->exec(NULL, "");
CVFD::getInstance()->UpdateIcons();
InfoClock->enableInfoClock(true); InfoClock->enableInfoClock(true);
StartSubtitles(); StartSubtitles();
saveSetup(NEUTRINO_SETTINGS_FILE); saveSetup(NEUTRINO_SETTINGS_FILE);
@@ -2853,6 +2854,7 @@ void CNeutrinoApp::RealRun()
//open moviebrowser via media player menu object //open moviebrowser via media player menu object
if (g_settings.recording_type != CNeutrinoApp::RECORDING_OFF) if (g_settings.recording_type != CNeutrinoApp::RECORDING_OFF)
CMediaPlayerMenu::getInstance()->exec(NULL, "moviebrowser"); CMediaPlayerMenu::getInstance()->exec(NULL, "moviebrowser");
CVFD::getInstance()->UpdateIcons();
} }
else if( ( msg == CRCInput::RC_help ) || ( msg == CRCInput::RC_info) || else if( ( msg == CRCInput::RC_help ) || ( msg == CRCInput::RC_info) ||
( msg == NeutrinoMessages::SHOW_INFOBAR ) ) ( msg == NeutrinoMessages::SHOW_INFOBAR ) )
@@ -3136,6 +3138,7 @@ int CNeutrinoApp::handleMsg(const neutrino_msg_t _msg, neutrino_msg_data_t data)
if(g_settings.audio_AnalogMode < 0 || g_settings.audio_AnalogMode > 2) if(g_settings.audio_AnalogMode < 0 || g_settings.audio_AnalogMode > 2)
g_settings.audio_AnalogMode = 0; g_settings.audio_AnalogMode = 0;
CVFD::getInstance()->UpdateIcons();
g_RCInput->killTimer(scrambled_timer); g_RCInput->killTimer(scrambled_timer);
if (mode != mode_webtv) { if (mode != mode_webtv) {
scrambled_timer = g_RCInput->addTimer(10*1000*1000, true); scrambled_timer = g_RCInput->addTimer(10*1000*1000, true);