summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--interface.h4
-rw-r--r--osm.c9
2 files changed, 8 insertions, 5 deletions
diff --git a/interface.h b/interface.h
index 1e5329d5..1707c46e 100644
--- a/interface.h
+++ b/interface.h
@@ -4,7 +4,7 @@
* See the main source file 'osm.c' for copyright information and
* how to reach the author.
*
- * $Id: interface.h 1.3 2000/03/19 14:03:28 kls Exp $
+ * $Id: interface.h 1.4 2000/04/22 09:55:52 kls Exp $
*/
#ifndef __INTERFACE_H
@@ -41,7 +41,7 @@ public:
bool Confirm(const char *s);
void Help(const char *Red, const char *Green = NULL, const char *Yellow = NULL, const char *Blue = NULL);
void LearnKeys(void);
- void DisplayChannel(int Number, const char *Name);
+ void DisplayChannel(int Number, const char *Name = NULL);
};
extern cInterface Interface;
diff --git a/osm.c b/osm.c
index db526d9c..021d71ac 100644
--- a/osm.c
+++ b/osm.c
@@ -22,7 +22,7 @@
*
* The project's page is at http://www.cadsoft.de/people/kls/vdr
*
- * $Id: osm.c 1.5 2000/04/16 15:50:21 kls Exp $
+ * $Id: osm.c 1.6 2000/04/22 09:56:33 kls Exp $
*/
#include <signal.h>
@@ -71,6 +71,7 @@ int main(int argc, char *argv[])
while (!Interrupted) {
// Direct Channel Select (action):
if (dcNumber) {
+ Interface.DisplayChannel(dcNumber);
if (time_ms() - dcTime > DIRECTCHANNELTIMEOUT) {
cChannel::SwitchTo(dcNumber - 1);
dcNumber = 0;
@@ -120,8 +121,10 @@ int main(int argc, char *argv[])
// Direct Channel Select (input):
case k0: case k1: case k2: case k3: case k4: case k5: case k6: case k7: case k8: case k9:
{
- dcNumber = dcNumber * 10 + key - k0;
- dcTime = time_ms();
+ if (!DvbApi.Recording()) {
+ dcNumber = dcNumber * 10 + key - k0;
+ dcTime = time_ms();
+ }
}
// Record/Replay Control:
case kBegin: DvbApi.Skip(-INT_MAX); break;