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

Disable scan start if recording running

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1612 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
focus
2011-08-02 09:38:40 +00:00
parent f4638daf6f
commit c5cd73c141
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/gui/scan_setup.cpp
View File

@@ -47,6 +47,7 @@
#include <driver/screen_max.h> #include <driver/screen_max.h>
#include <driver/framebuffer.h> #include <driver/framebuffer.h>
#include <driver/record.h>
#include <system/debug.h> #include <system/debug.h>
#include <zapit/frontend_c.h> #include <zapit/frontend_c.h>
@@ -324,6 +325,8 @@ void CScanSetup::showScanMenu()
CMenuOptionChooser *ojDiseqc = NULL;//diseqc modes CMenuOptionChooser *ojDiseqc = NULL;//diseqc modes
CMenuOptionNumberChooser *ojDiseqcRepeats = NULL;//diseqc repeats CMenuOptionNumberChooser *ojDiseqcRepeats = NULL;//diseqc repeats
allow_start = !CRecordManager::getInstance()->RecordingStatus() || CRecordManager::getInstance()->TimeshiftOnly();
satNotify = new CSatelliteSetupNotifier(); satNotify = new CSatelliteSetupNotifier();
usalsNotify = new CAllUsalsNotifier(); usalsNotify = new CAllUsalsNotifier();
@@ -627,8 +630,8 @@ void CScanSetup::addScanMenuManualScan(CMenuWidget *manual_Scan)
//---------------------------------------------------------------------- //----------------------------------------------------------------------
manual_Scan->addItem(GenericMenuSeparatorLine); manual_Scan->addItem(GenericMenuSeparatorLine);
manual_Scan->addItem(new CMenuForwarder(LOCALE_SCANTS_TEST, true, NULL, this, "test", CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW)); manual_Scan->addItem(new CMenuForwarder(LOCALE_SCANTS_TEST, allow_start, NULL, this, "test", CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW));
manual_Scan->addItem(new CMenuForwarder(LOCALE_SCANTS_STARTNOW, true, NULL, this, "manual", CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE)); manual_Scan->addItem(new CMenuForwarder(LOCALE_SCANTS_STARTNOW, allow_start, NULL, this, "manual", CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE));
} }
//init auto scan all menu //init auto scan all menu
@@ -659,7 +662,7 @@ void CScanSetup::addScanMenuAutoScanAll(CMenuWidget *auto_ScanAll)
addListFlagsItems(auto_ScanAll, 1); addListFlagsItems(auto_ScanAll, 1);
//---------------------------------------------------------------------- //----------------------------------------------------------------------
auto_ScanAll->addItem(GenericMenuSeparatorLine); auto_ScanAll->addItem(GenericMenuSeparatorLine);
auto_ScanAll->addItem(new CMenuForwarder(LOCALE_SCANTS_STARTNOW, true, NULL, this, "all", CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN)); auto_ScanAll->addItem(new CMenuForwarder(LOCALE_SCANTS_STARTNOW, allow_start, NULL, this, "all", CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN));
} }
#ifdef ENABLE_FASTSCAN #ifdef ENABLE_FASTSCAN
@@ -677,7 +680,7 @@ void CScanSetup::addScanMenuFastScan(CMenuWidget *fast_ScanMenu)
fast_ScanMenu->addItem(fastType); fast_ScanMenu->addItem(fastType);
//---------------------------------------------------------------------- //----------------------------------------------------------------------
fast_ScanMenu->addItem(GenericMenuSeparatorLine); fast_ScanMenu->addItem(GenericMenuSeparatorLine);
fast_ScanMenu->addItem(new CMenuForwarder(LOCALE_SCANTS_STARTNOW, true, NULL, this, "fast", CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW)); fast_ScanMenu->addItem(new CMenuForwarder(LOCALE_SCANTS_STARTNOW, allow_start, NULL, this, "fast", CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW));
} }
#endif /*ENABLE_FASTSCAN*/ #endif /*ENABLE_FASTSCAN*/
@@ -693,7 +696,7 @@ void CScanSetup::addScanMenuAutoScan(CMenuWidget *auto_Scan)
addListFlagsItems(auto_Scan, 1); addListFlagsItems(auto_Scan, 1);
//---------------------------------------------------------------------- //----------------------------------------------------------------------
auto_Scan->addItem(GenericMenuSeparatorLine); auto_Scan->addItem(GenericMenuSeparatorLine);
auto_Scan->addItem(new CMenuForwarder(LOCALE_SCANTS_STARTNOW, true, NULL, this, "auto", CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN)); auto_Scan->addItem(new CMenuForwarder(LOCALE_SCANTS_STARTNOW, allow_start, NULL, this, "auto", CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN));
} }

1
src/gui/scan_setup.h
View File

@@ -62,6 +62,7 @@ class CScanSetup : public CMenuTarget
int fec_count; int fec_count;
int freq_length; int freq_length;
int r_system; int r_system;
bool allow_start;
neutrino_locale_t satprov_locale; neutrino_locale_t satprov_locale;