mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 16:01:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

-add zapto time correction option

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1281 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
satbaby
2011-03-10 14:54:57 +00:00
parent 476702df26
commit 74d2f2ee76
10 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
data/locale/deutsch.locale
View File

@@ -773,6 +773,7 @@ miscsettings.shutdown_real_rcdelay Verzögertes Ausschalten
miscsettings.sleeptimer Ausschalten nach Inaktivität
miscsettings.sptsmode SPTS-Mode Treiber laden
miscsettings.virtual_zap_mode Virtual Zap
miscsettings.zapto_pre_time Umschaltstart-Korrektur
motorcontrol.calc_positions Positionen (Neu)-Berechne(n))
motorcontrol.disable_limit Deaktiviere (soft) Limit
motorcontrol.drive_mode Fahr-Modus

1
data/locale/english.locale
View File

@@ -773,6 +773,7 @@ miscsettings.shutdown_real_rcdelay Delayed shutdown
miscsettings.sleeptimer Inactivity shutdown timer
miscsettings.sptsmode use spts mode
miscsettings.virtual_zap_mode Virtual zap
miscsettings.zapto_pre_time Zapto Start Time Correction
motorcontrol.calc_positions (Re)-Calculate Positions
motorcontrol.disable_limit Disable (soft) Limits
motorcontrol.drive_mode Drive Mode

2
src/gui/epgplus.cpp
View File

@@ -1319,7 +1319,7 @@ int EpgPlus::MenuTargetAddReminder::exec (CMenuTarget * /*parent*/, const std::s
&& (!(*It)->channelEvent.description.empty())
) {
if (g_Timerd->isTimerdAvailable()) {
g_Timerd->addZaptoTimerEvent (this->epgPlus->selectedChannelEntry->channel->channel_id, (*It)->channelEvent.startTime, (*It)->channelEvent.startTime - ANNOUNCETIME, 0, (*It)->channelEvent.eventID, (*It)->channelEvent.startTime, 0);
g_Timerd->addZaptoTimerEvent (this->epgPlus->selectedChannelEntry->channel->channel_id, (*It)->channelEvent.startTime - (g_settings.zapto_pre_time * 60), (*It)->channelEvent.startTime - ANNOUNCETIME - (g_settings.zapto_pre_time * 60), 0, (*It)->channelEvent.eventID, (*It)->channelEvent.startTime, 0);
ShowMsgUTF (LOCALE_TIMER_EVENTTIMED_TITLE, g_Locale->getText (LOCALE_TIMER_EVENTTIMED_MSG)
, CMessageBox::mbrBack, CMessageBox::mbBack, NEUTRINO_ICON_INFO); // UTF-8

4
src/gui/epgview.cpp
View File

@@ -877,8 +877,8 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
if (g_Timerd->isTimerdAvailable())
{
g_Timerd->addZaptoTimerEvent(channel_id,
epgData.epg_times.startzeit,
epgData.epg_times.startzeit - ANNOUNCETIME, 0,
epgData.epg_times.startzeit - (g_settings.zapto_pre_time * 60),
epgData.epg_times.startzeit - ANNOUNCETIME - (g_settings.zapto_pre_time * 60), 0,
epgData.eventID, epgData.epg_times.startzeit, 0);
ShowLocalizedMessage(LOCALE_TIMER_EVENTTIMED_TITLE, LOCALE_TIMER_EVENTTIMED_MSG, CMessageBox::mbrBack, CMessageBox::mbBack, NEUTRINO_ICON_INFO);
timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_EPG]);

5
src/gui/eventlist.cpp
View File

@@ -526,9 +526,10 @@ int EventList::exec(const t_channel_id channel_id, const std::string& channelnam
continue;
}
// FIXME g_Timerd->addZaptoTimerEvent(evtlist[selected].sub ? GET_CHANNEL_ID_FROM_EVENT_ID(evtlist[selected].eventID) : channel_id,
g_Timerd->addZaptoTimerEvent(channel_id,
evtlist[selected].startTime,
evtlist[selected].startTime - ANNOUNCETIME, 0,
evtlist[selected].startTime - (g_settings.zapto_pre_time * 60),
evtlist[selected].startTime - ANNOUNCETIME - (g_settings.zapto_pre_time * 60), 0,
evtlist[selected].eventID, evtlist[selected].startTime, 0);
ShowLocalizedMessage(LOCALE_TIMER_EVENTTIMED_TITLE, LOCALE_TIMER_EVENTTIMED_MSG, CMessageBox::mbrBack, CMessageBox::mbBack, NEUTRINO_ICON_INFO);
timerlist.clear();

2
src/gui/miscsettings_menu.cpp
View File

@@ -234,7 +234,7 @@ void CMiscMenue::showMiscSettingsMenuGeneral(CMenuWidget *ms_general)
//standby after boot
ms_general->addItem(new CMenuOptionChooser(LOCALE_EXTRA_START_TOSTANDBY, &g_settings.power_standby, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true));
ms_general->addItem(new CMenuOptionChooser(LOCALE_EXTRA_CACHE_TXT, (int *)&g_settings.cacheTXT, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true));
ms_general->addItem(new CMenuOptionNumberChooser(LOCALE_MISCSETTINGS_ZAPTO_PRE_TIME, &g_settings.zapto_pre_time, true, 0, 10));
//fan speed
if (g_info.has_fan)
{

2
src/neutrino.cpp
View File

@@ -709,6 +709,7 @@ printf("***************************** rec dir %s timeshift dir %s\n", g_settings
g_settings.cacheTXT = configfile.getInt32( "cacheTXT", 0);
g_settings.minimode = configfile.getInt32( "minimode", 0);
g_settings.mode_clock = configfile.getInt32( "mode_clock", 0);
g_settings.zapto_pre_time = configfile.getInt32( "zapto_pre_time", 0);
g_settings.virtual_zap_mode = configfile.getBool("virtual_zap_mode" , false);
g_settings.spectrum = configfile.getBool("spectrum" , false);
g_settings.channellist_epgtext_align_right = configfile.getBool("channellist_epgtext_align_right" , false);
@@ -1238,6 +1239,7 @@ void CNeutrinoApp::saveSetup(const char * fname)
configfile.setInt32( "minimode", g_settings.minimode );
configfile.setInt32( "mode_clock", g_settings.mode_clock );
configfile.setBool("virtual_zap_mode", g_settings.virtual_zap_mode);
configfile.setInt32( "zapto_pre_time", g_settings.zapto_pre_time );
configfile.setBool("spectrum", g_settings.spectrum);
configfile.setBool("channellist_epgtext_align_right", g_settings.channellist_epgtext_align_right);
configfile.setBool("channellist_extended" , g_settings.channellist_extended);

1
src/system/locals.h
View File

@@ -800,6 +800,7 @@ typedef enum
LOCALE_MISCSETTINGS_SLEEPTIMER,
LOCALE_MISCSETTINGS_SPTSMODE,
LOCALE_MISCSETTINGS_VIRTUAL_ZAP_MODE,
LOCALE_MISCSETTINGS_ZAPTO_PRE_TIME,
LOCALE_MOTORCONTROL_CALC_POSITIONS,
LOCALE_MOTORCONTROL_DISABLE_LIMIT,
LOCALE_MOTORCONTROL_DRIVE_MODE,

1
src/system/locals_intern.h
View File

@@ -800,6 +800,7 @@ const char * locale_real_names[] =
"miscsettings.sleeptimer",
"miscsettings.sptsmode",
"miscsettings.virtual_zap_mode",
"miscsettings.zapto_pre_time",
"motorcontrol.calc_positions",
"motorcontrol.disable_limit",
"motorcontrol.drive_mode",

1
src/system/settings.h
View File

@@ -60,6 +60,7 @@ struct SNeutrinoSettings
char shutdown_min[4];
char record_safety_time_before[3];
char record_safety_time_after[3];
int zapto_pre_time;
int infobar_sat_display;
int infobar_subchan_disp_pos;
int misc_spts;