summaryrefslogtreecommitdiff
path: root/osdbase.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2007-01-07 14:46:14 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2007-01-07 14:46:14 +0100
commit87dd5139ff6666d64e7e343bcff632b342c4c814 (patch)
treec2b8f2f437a09e1ad2f740adc574f3f1833d8fe3 /osdbase.c
parentb4cab10eca558f6d90fa25a2a6e7fc3d90fac508 (diff)
downloadvdr-87dd5139ff6666d64e7e343bcff632b342c4c814.tar.gz
vdr-87dd5139ff6666d64e7e343bcff632b342c4c814.tar.bz2
CAM handling refactored; multiple recordings with one CAM; automatic CAM selection1.5.0
Diffstat (limited to 'osdbase.c')
-rw-r--r--osdbase.c23
1 files changed, 19 insertions, 4 deletions
diff --git a/osdbase.c b/osdbase.c
index 65b66cb8..343ed395 100644
--- a/osdbase.c
+++ b/osdbase.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: osdbase.c 1.29 2006/02/05 14:37:03 kls Exp $
+ * $Id: osdbase.c 1.30 2007/01/07 14:41:16 kls Exp $
*/
#include "osdbase.h"
@@ -127,9 +127,9 @@ void cOsdMenu::SetCols(int c0, int c1, int c2, int c3, int c4)
cols[4] = c4;
}
-void cOsdMenu::SetHasHotkeys(void)
+void cOsdMenu::SetHasHotkeys(bool HasHotkeys)
{
- hasHotkeys = true;
+ hasHotkeys = HasHotkeys;
digit = 0;
}
@@ -256,6 +256,20 @@ void cOsdMenu::DisplayCurrent(bool Current)
}
}
+void cOsdMenu::DisplayItem(cOsdItem *Item)
+{
+ if (Item) {
+ int Index = Item->Index();
+ int Offset = Index - first;
+ if (Offset >= 0 && Offset < first + displayMenuItems) {
+ bool Current = Index == current;
+ displayMenu->SetItem(Item->Text(), Offset, Current && Item->Selectable(), Item->Selectable());
+ if (Current && Item->Selectable())
+ cStatus::MsgOsdCurrentItem(Item->Text());
+ }
+ }
+}
+
void cOsdMenu::Clear(void)
{
if (marked >= 0)
@@ -432,6 +446,8 @@ eOSState cOsdMenu::HotKey(eKeys Key)
if (s && (s = skipspace(s)) != NULL) {
if (*s == Key - k1 + '1') {
current = item->Index();
+ RefreshCurrent();
+ Display();
cRemote::Put(kOk, true);
break;
}
@@ -499,4 +515,3 @@ eOSState cOsdMenu::ProcessKey(eKeys Key)
}
return osContinue;
}
-