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

code formatting of "add option to adzap: zap on timer activation"

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: d48072967e
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-04-28 (Sun, 28 Apr 2019)

Origin message was:
------------------
- code formatting of "add option to adzap: zap on timer activation"

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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2019-04-28 00:32:34 +02:00
parent 653c1004df
commit 1b9593b994
5 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
data/locale/deutsch.locale
View File

@@ -117,10 +117,10 @@ adzap.minutes Minuten
adzap.monitor Ein (dauerhaft) adzap.monitor Ein (dauerhaft)
adzap.switchback Zurückschalten nach adzap.switchback Zurückschalten nach
adzap.writedata Schreibe Status-Daten adzap.writedata Schreibe Status-Daten
adzap.zap Zap bei der Timer Aktivierung auf adzap.zap Zap bei der Timer-Aktivierung
adzap.zap_off nicht adzap.zap_off aus
adzap.zap_to_last_channel Letzter-Kanal adzap.zap_to_last_channel auf letzten Kanal
adzap.zap_to_start_channel Start-Kanal adzap.zap_to_start_channel auf Start-Kanal
apidselector.head Sprachauswahl apidselector.head Sprachauswahl
audio.srs_algo Art audio.srs_algo Art
audio.srs_algo_heavy stark audio.srs_algo_heavy stark
@@ -1156,7 +1156,7 @@ menu.hint_a_pic Konfigurieren Sie den Audioplayer und den Bildbetrachter
menu.hint_adzap Der Werbezapper schaltet nach der eingestellten Zeit wieder auf den ursprünglichen Kanal zurück menu.hint_adzap Der Werbezapper schaltet nach der eingestellten Zeit wieder auf den ursprünglichen Kanal zurück
menu.hint_adzap_active Der Werbezapper ist aktiv. Mit einem erneuten Aufruf wird er deaktiviert. menu.hint_adzap_active Der Werbezapper ist aktiv. Mit einem erneuten Aufruf wird er deaktiviert.
menu.hint_adzap_writedata Schreibe Daten über den Status des Werbezappers nach /tmp/adzap.data menu.hint_adzap_writedata Schreibe Daten über den Status des Werbezappers nach /tmp/adzap.data
menu.hint_adzap_zap Umschalten bei der Timer-Aktivierung auf Letzten oder Start Kanal menu.hint_adzap_zap Umschalten bei der Timer-Aktivierung auf den zuletzt gesehenen Kanal oder auf den Start-Kanal
menu.hint_aplay Audioplayer menu.hint_aplay Audioplayer
menu.hint_aplay_setup Ändern Sie Audioplayer-Einstellungen wie Titel-Anzeige, Startverzeichnis oder Bildschirmschoner. menu.hint_aplay_setup Ändern Sie Audioplayer-Einstellungen wie Titel-Anzeige, Startverzeichnis oder Bildschirmschoner.
menu.hint_audio Audio-Ausgang, Dolby Digital und SRS TruVolume Optionen usw. menu.hint_audio Audio-Ausgang, Dolby Digital und SRS TruVolume Optionen usw.

8
data/locale/english.locale
View File

@@ -117,10 +117,10 @@ adzap.minutes minutes
adzap.monitor On (durable) adzap.monitor On (durable)
adzap.switchback Switch back after adzap.switchback Switch back after
adzap.writedata Write status data adzap.writedata Write status data
adzap.zap zap on timer activation to adzap.zap Zap on timer activation
adzap.zap_off off adzap.zap_off off
adzap.zap_to_last_channel last-channel adzap.zap_to_last_channel to last channel
adzap.zap_to_start_channel start-channel adzap.zap_to_start_channel to start channel
apidselector.head Select language apidselector.head Select language
audio.srs_algo Type audio.srs_algo Type
audio.srs_algo_heavy Heavy audio.srs_algo_heavy Heavy
@@ -1156,7 +1156,7 @@ menu.hint_a_pic Configure audio player and picture viewer
menu.hint_adzap AdZap will switch back to the current channel when the selected time is up menu.hint_adzap AdZap will switch back to the current channel when the selected time is up
menu.hint_adzap_active AdZap is active. With a new call it will be deactivated. menu.hint_adzap_active AdZap is active. With a new call it will be deactivated.
menu.hint_adzap_writedata Write data according to adzap status to /tmp/adzap.data menu.hint_adzap_writedata Write data according to adzap status to /tmp/adzap.data
menu.hint_adzap_zap zap Switch to last or start channel during timer activation menu.hint_adzap_zap Zap to last viewed channel or to start channel during timer activation
menu.hint_aplay Audio player menu.hint_aplay Audio player
menu.hint_aplay_setup Change title display, start directory, screen saver etc. menu.hint_aplay_setup Change title display, start directory, screen saver etc.
menu.hint_audio Audio output, DD\nSRS True volume options menu.hint_audio Audio output, DD\nSRS True volume options

6
src/gui/adzap.cpp
View File

@@ -321,9 +321,9 @@ void CAdZapMenu::ShowMenu()
#define ADZAP_ZAP_OPTION_COUNT 3 #define ADZAP_ZAP_OPTION_COUNT 3
const CMenuOptionChooser::keyval ADZAP_ZAP_OPTIONS[ADZAP_ZAP_OPTION_COUNT] = const CMenuOptionChooser::keyval ADZAP_ZAP_OPTIONS[ADZAP_ZAP_OPTION_COUNT] =
{ {
{ SNeutrinoSettings::ADZAP_ZAP_OFF,LOCALE_ADZAP_ZAP_OFF}, { SNeutrinoSettings::ADZAP_ZAP_OFF, LOCALE_ADZAP_ZAP_OFF },
{ SNeutrinoSettings::ADZAP_ZAP_TO_LAST,LOCALE_ADZAP_ZAP_TO_LAST_CHANNEL}, { SNeutrinoSettings::ADZAP_ZAP_TO_LAST, LOCALE_ADZAP_ZAP_TO_LAST_CHANNEL },
{ SNeutrinoSettings::ADZAP_ZAP_TO_START,LOCALE_ADZAP_ZAP_TO_START_CHANNEL}, { SNeutrinoSettings::ADZAP_ZAP_TO_START, LOCALE_ADZAP_ZAP_TO_START_CHANNEL },
}; };
bool show_monitor = monitorLifeTime.tv_sec; bool show_monitor = monitorLifeTime.tv_sec;

21
src/gui/epgview.cpp
View File

@@ -1278,16 +1278,19 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
tmp_msg += g_Locale->getText(LOCALE_UNIT_SHORT_MINUTE); tmp_msg += g_Locale->getText(LOCALE_UNIT_SHORT_MINUTE);
ShowMsg(LOCALE_ADZAP, tmp_msg, CMsgBox::mbrBack, CMsgBox::mbBack, NEUTRINO_ICON_INFO); ShowMsg(LOCALE_ADZAP, tmp_msg, CMsgBox::mbrBack, CMsgBox::mbBack, NEUTRINO_ICON_INFO);
if(g_settings.adzap_zapOnActivation == SNeutrinoSettings::ADZAP_ZAP_TO_LAST) if (g_settings.adzap_zapOnActivation == SNeutrinoSettings::ADZAP_ZAP_TO_LAST)
{
CNeutrinoApp::getInstance()->channelList->numericZap(g_settings.key_lastchannel); CNeutrinoApp::getInstance()->channelList->numericZap(g_settings.key_lastchannel);
else if(g_settings.adzap_zapOnActivation == SNeutrinoSettings::ADZAP_ZAP_TO_START){ }
int mode = CNeutrinoApp::getInstance()->getMode(); else if (g_settings.adzap_zapOnActivation == SNeutrinoSettings::ADZAP_ZAP_TO_START)
bool isRadioMode = (mode == NeutrinoModes::mode_radio || mode == NeutrinoModes::mode_webradio); {
const t_channel_id cur_channel_id = isRadioMode ? g_settings.startchannelradio_id : g_settings.startchanneltv_id; int mode = CNeutrinoApp::getInstance()->getMode();
if(cur_channel_id != channel_id) bool isRadioMode = (mode == NeutrinoModes::mode_radio || mode == NeutrinoModes::mode_webradio);
CNeutrinoApp::getInstance()->channelList->zapTo_ChannelID(cur_channel_id, true); const t_channel_id cur_channel_id = isRadioMode ? g_settings.startchannelradio_id : g_settings.startchanneltv_id;
else if (cur_channel_id != channel_id)
CNeutrinoApp::getInstance()->channelList->numericZap(g_settings.key_lastchannel); CNeutrinoApp::getInstance()->channelList->zapTo_ChannelID(cur_channel_id, true);
else
CNeutrinoApp::getInstance()->channelList->numericZap(g_settings.key_lastchannel);
} }
} }
//CTimerdClient timerdclient; //CTimerdClient timerdclient;

2
src/system/settings.h
View File

@@ -880,7 +880,7 @@ struct SNeutrinoSettings
int adzap_zapBackPeriod; int adzap_zapBackPeriod;
int adzap_writeData; int adzap_writeData;
int adzap_zapOnActivation; int adzap_zapOnActivation;
enum{ADZAP_ZAP_OFF,ADZAP_ZAP_TO_LAST,ADZAP_ZAP_TO_START}; enum { ADZAP_ZAP_OFF, ADZAP_ZAP_TO_LAST, ADZAP_ZAP_TO_START };
int power_standby; int power_standby;
int hdd_sleep; int hdd_sleep;