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

- timeshift: unify config keywords and locales

Browse Source 
Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2019-01-15 23:39:10 +01:00
committed by Thilo Graf
parent d338be9526
commit 6e46005ca0
10 changed files with 63 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/driver/record.cpp
View File

@@ -185,7 +185,7 @@ record_error_msg_t CRecordInstance::Start(CZapitChannel * channel)
{
time_t msg_start_time = time(0);
CHintBox hintBox(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_RECORDING_START));
if ((!(autoshift && g_settings.auto_timeshift)) && g_settings.recording_startstop_msg)
if ((!(autoshift && g_settings.timeshift_auto)) && g_settings.recording_startstop_msg)
hintBox.paint();
wakeup_hdd(Directory.c_str());
@@ -306,7 +306,7 @@ bool CRecordInstance::Stop(bool remove_event)
recMovieInfo->length = (end_time - start_time + 30) / 60;
CHintBox hintBox(LOCALE_MESSAGEBOX_INFO, rec_stop_msg.c_str());
if ((!(autoshift && g_settings.auto_timeshift)) && g_settings.recording_startstop_msg)
if ((!(autoshift && g_settings.timeshift_auto)) && g_settings.recording_startstop_msg)
hintBox.paint();
printf("%s: channel %" PRIx64 " recording_id %d\n", __func__, channel_id, recording_id);
@@ -320,7 +320,7 @@ bool CRecordInstance::Stop(bool remove_event)
CCamManager::getInstance()->Stop(channel_id, CCamManager::RECORD);
if (autoshift && g_settings.auto_delete)
if (autoshift && g_settings.timeshift_delete)
CMoviePlayerGui::getInstance().deleteTimeshift();
if(recording_id && remove_event) {
@@ -1316,8 +1316,8 @@ int CRecordManager::handleMsg(const neutrino_msg_t msg, neutrino_msg_data_t data
{
if(msg == NeutrinoMessages::EVT_ZAP_COMPLETE) {
g_RCInput->killTimer (shift_timer);
if (g_settings.auto_timeshift) {
int delay = g_settings.auto_timeshift;
if (g_settings.timeshift_auto) {
int delay = g_settings.timeshift_auto;
shift_timer = g_RCInput->addTimer(delay*1000*1000, true);
g_InfoViewer->handleMsg(NeutrinoMessages::EVT_RECORDMODE, 1);
}
@@ -1363,7 +1363,7 @@ void CRecordManager::StartTimeshift()
t_channel_id live_channel_id = CZapit::getInstance()->GetCurrentChannelID();
// bool tstarted = false;
/* start temporary timeshift if enabled and not running, but dont start second record */
if (g_settings.temp_timeshift) {
if (g_settings.timeshift_temp) {
if (!FindTimeshift()) {
res = StartAutoRecord();
tmode = "timeshift"; // record just started
@@ -1383,7 +1383,7 @@ void CRecordManager::StartTimeshift()
ShowMenu() moved to movieplayer.cpp
Function is called when stop key is pressed.
*/
if(g_settings.temp_timeshift && tstarted && autoshift)
if(g_settings.timeshift_temp && tstarted && autoshift)
ShowMenu();
#endif
}
@@ -2028,7 +2028,7 @@ bool CStreamRec::Stop(bool remove_event)
time_t end_time = time_monotonic();
CHintBox hintBox(LOCALE_MESSAGEBOX_INFO, rec_stop_msg.c_str());
if ((!(autoshift && g_settings.auto_timeshift)) && g_settings.recording_startstop_msg)
if ((!(autoshift && g_settings.timeshift_auto)) && g_settings.recording_startstop_msg)
hintBox.paint();
printf("%s: Stopping...\n", __FUNCTION__);
@@ -2064,7 +2064,7 @@ record_error_msg_t CStreamRec::Record()
APIDList apid_list;
CHintBox hintBox(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_RECORDING_START));
if ((!(autoshift && g_settings.auto_timeshift)) && g_settings.recording_startstop_msg)
if ((!(autoshift && g_settings.timeshift_auto)) && g_settings.recording_startstop_msg)
hintBox.paint();
printf("%s: channel %" PRIx64 " recording_id %d\n", __func__, channel_id, recording_id);