summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CONTRIBUTORS1
-rw-r--r--HISTORY1
-rw-r--r--MANUAL1
-rw-r--r--i18n.c24
-rw-r--r--keys.c3
-rw-r--r--keys.h3
-rw-r--r--vdr.c3
7 files changed, 32 insertions, 4 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 810670b9..62b82483 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1478,6 +1478,7 @@ Darren Salt <linux@youmustbejoking.demon.co.uk>
for fixing format string handling
for suggesting to add NULL checks to some strdup() calls in menuitems.c
for reporting a missing "Key$" in skincurses.c
+ for a patch that was used to implement kChanPrev
Sean Carlos <seanc@libero.it>
for translating OSD texts to the Italian language
diff --git a/HISTORY b/HISTORY
index 6802484e..a664af0d 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4536,3 +4536,4 @@ Video Disk Recorder Revision History
plugins' Makefiles. Thanks to Marco Schlüßler for pointing out this problem.
- Implemented kNext and kPrev keys (based on a patch from Peter Juszack).
See MANUAL for details.
+- Implemented kChanPrev (from a patch from Darren Salt).
diff --git a/MANUAL b/MANUAL
index f1fffbc8..609cafdc 100644
--- a/MANUAL
+++ b/MANUAL
@@ -50,6 +50,7 @@ Version 1.3
Channel+ channel up
Channel- channel down
+ PrevChannel previous channel
Power shutdown
diff --git a/i18n.c b/i18n.c
index 3d92a1a6..b9770e18 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: i18n.c 1.259 2006/04/15 13:39:35 kls Exp $
+ * $Id: i18n.c 1.260 2006/04/15 13:53:23 kls Exp $
*
* Translations provided by:
*
@@ -5399,6 +5399,28 @@ const tI18nPhrase Phrases[] = {
"Kanal-",
"Kanál-",
},
+ { "Key$PrevChannel",
+ "Vorheriger Kanal",
+ "",// TODO
+ "",// TODO
+ "",// TODO
+ "",// TODO
+ "",// TODO
+ "",// TODO
+ "",// TODO
+ "",// TODO
+ "",// TODO
+ "",// TODO
+ "",// TODO
+ "",// TODO
+ "",// TODO
+ "",// TODO
+ "",// TODO
+ "",// TODO
+ "",// TODO
+ "",// TODO
+ "",// TODO
+ },
{ "Key$Volume+",
"Lautstärke+",
"Glasnost+",
diff --git a/keys.c b/keys.c
index 42967001..6ebdbfea 100644
--- a/keys.c
+++ b/keys.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: keys.c 1.12 2006/04/15 13:35:07 kls Exp $
+ * $Id: keys.c 1.13 2006/04/15 13:50:43 kls Exp $
*/
#include "keys.h"
@@ -44,6 +44,7 @@ static tKey keyTable[] = { // "Up" and "Down" must be the first two keys!
{ kPower, "Power" },
{ kChanUp, "Channel+" },
{ kChanDn, "Channel-" },
+ { kChanPrev, "PrevChannel"},
{ kVolUp, "Volume+" },
{ kVolDn, "Volume-" },
{ kMute, "Mute" },
diff --git a/keys.h b/keys.h
index 542b0f49..4fa13372 100644
--- a/keys.h
+++ b/keys.h
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: keys.h 1.8 2006/04/15 13:34:08 kls Exp $
+ * $Id: keys.h 1.9 2006/04/15 13:56:03 kls Exp $
*/
#ifndef __KEYS_H
@@ -38,6 +38,7 @@ enum eKeys { // "Up" and "Down" must be the first two keys!
kPower,
kChanUp,
kChanDn,
+ kChanPrev,
kVolUp,
kVolDn,
kMute,
diff --git a/vdr.c b/vdr.c
index c3059d49..ea1d0580 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
*
* The project's page is at http://www.cadsoft.de/vdr
*
- * $Id: vdr.c 1.259 2006/04/15 13:35:40 kls Exp $
+ * $Id: vdr.c 1.260 2006/04/15 13:51:52 kls Exp $
*/
#include <getopt.h>
@@ -1053,6 +1053,7 @@ int main(int argc, char *argv[])
}
switch (key) {
// Toggle channels:
+ case kChanPrev:
case k0: {
if (PreviousChannel[PreviousChannelIndex ^ 1] == LastChannel || LastChannel != PreviousChannel[0] && LastChannel != PreviousChannel[1])
PreviousChannelIndex ^= 1;