diff options
| author | louis <louis.braun@gmx.de> | 2014-01-17 16:11:12 +0100 |
|---|---|---|
| committer | louis <louis.braun@gmx.de> | 2014-01-17 16:11:12 +0100 |
| commit | 662a17df88a607e0179b2bb63cd984fafcc5d784 (patch) | |
| tree | fdadf1aa85b4d3a9d4a7e8f14c5013f68500b75e /recmenumanager.c | |
| parent | 497f95aa6f06d41496de23ad4ddf5229d33dbbe5 (diff) | |
| download | vdr-plugin-tvguide-662a17df88a607e0179b2bb63cd984fafcc5d784.tar.gz vdr-plugin-tvguide-662a17df88a607e0179b2bb63cd984fafcc5d784.tar.bz2 | |
Added possibility to create timer from favorites results
Diffstat (limited to 'recmenumanager.c')
| -rw-r--r-- | recmenumanager.c | 33 |
1 files changed, 30 insertions, 3 deletions
diff --git a/recmenumanager.c b/recmenumanager.c index da6af92..4a8d119 100644 --- a/recmenumanager.c +++ b/recmenumanager.c @@ -9,6 +9,7 @@ cRecMenuManager::cRecMenuManager(void) { active = false;
activeMenu = NULL;
activeMenuBuffer = NULL;
+ activeMenuBuffer2 = NULL;
recManager = new cRecManager();
recManager->SetEPGSearchPlugin();
timerConflicts = NULL;
@@ -315,6 +316,7 @@ eOSState cRecMenuManager::StateMachine(eRecMenuState nextState) { //caller: cRecMenuSearchTimerEdit, cRecMenuSearchTimerTemplatesCreate, cRecMenuSearchTimers, cRecMenuFavorites
//show results of currently choosen search timer
cTVGuideSearchTimer searchTimer;
+ bool showRecIcon = false;
if (cRecMenuSearchTimerEdit *menu = dynamic_cast<cRecMenuSearchTimerEdit*>(activeMenu)) {
searchTimer = menu->GetSearchTimer();
} else if (cRecMenuSearchTimers *menu = dynamic_cast<cRecMenuSearchTimers*>(activeMenu)) {
@@ -326,6 +328,7 @@ eOSState cRecMenuManager::StateMachine(eRecMenuState nextState) { searchTimer.Parse(true);
} else if (cRecMenuFavorites *menu = dynamic_cast<cRecMenuFavorites*>(activeMenu)) {
searchTimer = menu->GetFavorite();
+ showRecIcon = true;
} else break;
int numSearchResults = 0;
std::string searchString = searchTimer.BuildSearchString();
@@ -333,7 +336,7 @@ eOSState cRecMenuManager::StateMachine(eRecMenuState nextState) { if (numSearchResults) {
activeMenuBuffer = activeMenu;
activeMenuBuffer->Hide();
- activeMenu = new cRecMenuSearchTimerResults(searchTimer.SearchString(), searchResult, numSearchResults);
+ activeMenu = new cRecMenuSearchTimerResults(searchTimer.SearchString(), searchResult, numSearchResults, "", showRecIcon?rmsFavoritesRecord:rmsDisabled);
activeMenu->Display();
} else {
activeMenuBuffer = activeMenu;
@@ -531,10 +534,10 @@ eOSState cRecMenuManager::StateMachine(eRecMenuState nextState) { } else break;
if (!ev)
break;
- cTimer *timer = recManager->createTimer(ev, "");
+ recManager->createTimer(ev, "");
activeMenuBuffer = activeMenu;
activeMenuBuffer->Hide();
- activeMenu = new cRecMenuSearchConfirmTimer(ev);
+ activeMenu = new cRecMenuSearchConfirmTimer(ev, rmsSearchRecordConfirm);
activeMenu->Display();
break;}
case rmsSearchRecordConfirm:
@@ -695,6 +698,30 @@ eOSState cRecMenuManager::StateMachine(eRecMenuState nextState) { activeMenu->Display();
break; }
/**********************************************************************************************
+ * FAVORITES
+ *********************************************************************************************/
+ case rmsFavoritesRecord: {
+ //caller: cRecMenuSearchTimerResults
+ const cEvent *ev = NULL;
+ if (cRecMenuSearchTimerResults *menu = dynamic_cast<cRecMenuSearchTimerResults*>(activeMenu)) {
+ ev = menu->GetEvent();
+ } else break;
+ if (!ev)
+ break;
+ recManager->createTimer(ev, "");
+ activeMenuBuffer2 = activeMenu;
+ activeMenuBuffer2->Hide();
+ activeMenu = new cRecMenuSearchConfirmTimer(ev, rmsFavoritesRecordConfirm);
+ activeMenu->Display();
+ break;}
+ case rmsFavoritesRecordConfirm:
+ delete activeMenu;
+ activeMenu = activeMenuBuffer2;
+ activeMenuBuffer2 = NULL;
+ activeMenu->Show();
+ break;
+
+ /**********************************************************************************************
* COMMON
*********************************************************************************************/
case rmsClose: {
|