From 7a5d64a984a8bc4b700eb61d0b65fd362d27bec4 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Mon, 5 Apr 2010 10:14:19 +0200 Subject: [PATCH] Added user defined key kUser0 --- CONTRIBUTORS | 1 + HISTORY | 1 + keys.c | 3 ++- keys.h | 4 ++-- po/ca_ES.po | 3 +++ po/cs_CZ.po | 3 +++ po/da_DK.po | 3 +++ po/de_DE.po | 3 +++ po/el_GR.po | 3 +++ po/es_ES.po | 3 +++ po/et_EE.po | 3 +++ po/fi_FI.po | 3 +++ po/fr_FR.po | 3 +++ po/hr_HR.po | 3 +++ po/hu_HU.po | 3 +++ po/it_IT.po | 3 +++ po/lt_LT.po | 3 +++ po/mk_MK.po | 3 +++ po/nl_NL.po | 3 +++ po/nn_NO.po | 3 +++ po/pl_PL.po | 3 +++ po/pt_PT.po | 3 +++ po/ro_RO.po | 3 +++ po/ru_RU.po | 3 +++ po/sk_SK.po | 3 +++ po/sl_SI.po | 3 +++ po/sv_SE.po | 3 +++ po/tr_TR.po | 3 +++ po/uk_UA.po | 3 +++ po/zh_CN.po | 3 +++ vdr.c | 4 ++-- 31 files changed, 86 insertions(+), 5 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 4b9aec42..76d5865c 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -2337,6 +2337,7 @@ Boguslaw Juza Ulf Kiener for reporting a problem with audio track descriptions in the DVD plugin after a replay has been stopped + for suggesting to add user defined key kUser0 Jrg Wendel for reporting that cPlugin::Active() was called too often diff --git a/HISTORY b/HISTORY index 31781ca8..74ab6484 100644 --- a/HISTORY +++ b/HISTORY @@ -6425,3 +6425,4 @@ Video Disk Recorder Revision History - Fixed cFrameDetector::Analyze() in case part of the data has been processed and there is less than MIN_TS_PACKETS_FOR_FRAME_DETECTOR left (reported by Derek Kelly). - Added a note about not deleting cDeviceHook objects to device.h. +- Added user defined key kUser0 (suggested by Ulf Kiener). diff --git a/keys.c b/keys.c index 19e12e5e..3b7c27cc 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.17 2008/02/10 14:08:48 kls Exp $ + * $Id: keys.c 2.1 2010/04/05 10:05:58 kls Exp $ */ #include "keys.h" @@ -56,6 +56,7 @@ static tKey keyTable[] = { // "Up" and "Down" must be the first two keys! { kRecordings, trNOOP("Key$Recordings") }, { kSetup, trNOOP("Key$Setup") }, { kCommands, trNOOP("Key$Commands") }, + { kUser0, trNOOP("Key$User0") }, { kUser1, trNOOP("Key$User1") }, { kUser2, trNOOP("Key$User2") }, { kUser3, trNOOP("Key$User3") }, diff --git a/keys.h b/keys.h index b456c7ba..3cc4371a 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.14 2007/09/26 12:34:50 kls Exp $ + * $Id: keys.h 2.1 2010/04/05 10:06:04 kls Exp $ */ #ifndef __KEYS_H @@ -50,7 +50,7 @@ enum eKeys { // "Up" and "Down" must be the first two keys! kRecordings, kSetup, kCommands, - kUser1, kUser2, kUser3, kUser4, kUser5, kUser6, kUser7, kUser8, kUser9, + kUser0, kUser1, kUser2, kUser3, kUser4, kUser5, kUser6, kUser7, kUser8, kUser9, kNone, kKbd, // The following codes are used internally: diff --git a/po/ca_ES.po b/po/ca_ES.po index 1dd35e31..615a2dee 100644 --- a/po/ca_ES.po +++ b/po/ca_ES.po @@ -478,6 +478,9 @@ msgstr "Configuraci msgid "Key$Commands" msgstr "Ordres" +msgid "Key$User0" +msgstr "Usuari 0" + msgid "Key$User1" msgstr "Usuari 1" diff --git a/po/cs_CZ.po b/po/cs_CZ.po index e8c6687e..36c27b2c 100644 --- a/po/cs_CZ.po +++ b/po/cs_CZ.po @@ -476,6 +476,9 @@ msgstr "Nastaven msgid "Key$Commands" msgstr "Pkazy" +msgid "Key$User0" +msgstr "Uivatel0" + msgid "Key$User1" msgstr "Uivatel1" diff --git a/po/da_DK.po b/po/da_DK.po index 580d82af..aff86e03 100644 --- a/po/da_DK.po +++ b/po/da_DK.po @@ -475,6 +475,9 @@ msgstr "Indstillinger" msgid "Key$Commands" msgstr "Kommandoer" +msgid "Key$User0" +msgstr "Bruger0" + msgid "Key$User1" msgstr "Bruger1" diff --git a/po/de_DE.po b/po/de_DE.po index 42caadc2..a37dd941 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -475,6 +475,9 @@ msgstr "Einstellungen" msgid "Key$Commands" msgstr "Befehle" +msgid "Key$User0" +msgstr "Benutzer0" + msgid "Key$User1" msgstr "Benutzer1" diff --git a/po/el_GR.po b/po/el_GR.po index 344b641d..57d03dee 100644 --- a/po/el_GR.po +++ b/po/el_GR.po @@ -475,6 +475,9 @@ msgstr " msgid "Key$Commands" msgstr "" +msgid "Key$User0" +msgstr "" + msgid "Key$User1" msgstr "" diff --git a/po/es_ES.po b/po/es_ES.po index 4630a3ba..9d8205fd 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -476,6 +476,9 @@ msgstr "Configuraci msgid "Key$Commands" msgstr "rdenes" +msgid "Key$User0" +msgstr "Usuario 0" + msgid "Key$User1" msgstr "Usuario 1" diff --git a/po/et_EE.po b/po/et_EE.po index 437dfc71..5f70b800 100644 --- a/po/et_EE.po +++ b/po/et_EE.po @@ -475,6 +475,9 @@ msgstr "S msgid "Key$Commands" msgstr "Ksud" +msgid "Key$User0" +msgstr "Lisaklahv0" + msgid "Key$User1" msgstr "Lisaklahv1" diff --git a/po/fi_FI.po b/po/fi_FI.po index 7788ae01..dd8598fb 100644 --- a/po/fi_FI.po +++ b/po/fi_FI.po @@ -478,6 +478,9 @@ msgstr "Asetukset" msgid "Key$Commands" msgstr "Komennot" +msgid "Key$User0" +msgstr "Lisänäppäin 0" + msgid "Key$User1" msgstr "Lisänäppäin 1" diff --git a/po/fr_FR.po b/po/fr_FR.po index 74d8ceba..39d76344 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -481,6 +481,9 @@ msgstr "Configuration" msgid "Key$Commands" msgstr "Commandes" +msgid "Key$User0" +msgstr "Utilisateur0" + msgid "Key$User1" msgstr "Utilisateur1" diff --git a/po/hr_HR.po b/po/hr_HR.po index 55912e50..130f1db9 100644 --- a/po/hr_HR.po +++ b/po/hr_HR.po @@ -477,6 +477,9 @@ msgstr "Postavke" msgid "Key$Commands" msgstr "Naredbe" +msgid "Key$User0" +msgstr "Korisnik0" + msgid "Key$User1" msgstr "Korisnik1" diff --git a/po/hu_HU.po b/po/hu_HU.po index ccc10cc6..413517ed 100644 --- a/po/hu_HU.po +++ b/po/hu_HU.po @@ -478,6 +478,9 @@ msgstr "Be msgid "Key$Commands" msgstr "Parancsok" +msgid "Key$User0" +msgstr "Felhasznl0" + msgid "Key$User1" msgstr "Felhasznl1" diff --git a/po/it_IT.po b/po/it_IT.po index 3d72206b..c70abc4c 100644 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -482,6 +482,9 @@ msgstr "Opzioni" msgid "Key$Commands" msgstr "Comandi" +msgid "Key$User0" +msgstr "Utente0" + msgid "Key$User1" msgstr "Utente1" diff --git a/po/lt_LT.po b/po/lt_LT.po index d79f03fc..05755c03 100644 --- a/po/lt_LT.po +++ b/po/lt_LT.po @@ -475,6 +475,9 @@ msgstr "Nustatymai" msgid "Key$Commands" msgstr "Komandos" +msgid "Key$User0" +msgstr "Vartotojas0" + msgid "Key$User1" msgstr "Vartotojas1" diff --git a/po/mk_MK.po b/po/mk_MK.po index 836999c0..3ed14ae3 100644 --- a/po/mk_MK.po +++ b/po/mk_MK.po @@ -476,6 +476,9 @@ msgstr "Уредување" msgid "Key$Commands" msgstr "Наредби" +msgid "Key$User0" +msgstr "Корисник0" + msgid "Key$User1" msgstr "Корисник1" diff --git a/po/nl_NL.po b/po/nl_NL.po index f4d91207..ef916ad1 100644 --- a/po/nl_NL.po +++ b/po/nl_NL.po @@ -479,6 +479,9 @@ msgstr "Instellingen" msgid "Key$Commands" msgstr "Commando's" +msgid "Key$User0" +msgstr "Gebruiker0" + msgid "Key$User1" msgstr "Gebruiker1" diff --git a/po/nn_NO.po b/po/nn_NO.po index e739b35a..5438f5ae 100644 --- a/po/nn_NO.po +++ b/po/nn_NO.po @@ -476,6 +476,9 @@ msgstr "Konfigurasjon" msgid "Key$Commands" msgstr "Kommandoer" +msgid "Key$User0" +msgstr "" + msgid "Key$User1" msgstr "" diff --git a/po/pl_PL.po b/po/pl_PL.po index 9af02272..1a72c740 100644 --- a/po/pl_PL.po +++ b/po/pl_PL.po @@ -476,6 +476,9 @@ msgstr "Ustawienia" msgid "Key$Commands" msgstr "Polecenia" +msgid "Key$User0" +msgstr "Uytkownik 0" + msgid "Key$User1" msgstr "Uytkownik 1" diff --git a/po/pt_PT.po b/po/pt_PT.po index edea421f..32304262 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -475,6 +475,9 @@ msgstr "Configura msgid "Key$Commands" msgstr "Comandos" +msgid "Key$User0" +msgstr "Definida0" + msgid "Key$User1" msgstr "Definida1" diff --git a/po/ro_RO.po b/po/ro_RO.po index ffac7e9d..b57e4fdf 100644 --- a/po/ro_RO.po +++ b/po/ro_RO.po @@ -478,6 +478,9 @@ msgstr "Configura msgid "Key$Commands" msgstr "Comenzi" +msgid "Key$User0" +msgstr "Utilizator0" + msgid "Key$User1" msgstr "Utilizator1" diff --git a/po/ru_RU.po b/po/ru_RU.po index 44093944..f06b0533 100644 --- a/po/ru_RU.po +++ b/po/ru_RU.po @@ -476,6 +476,9 @@ msgstr " msgid "Key$Commands" msgstr "" +msgid "Key$User0" +msgstr "0" + msgid "Key$User1" msgstr "1" diff --git a/po/sk_SK.po b/po/sk_SK.po index bedb1338..87e617fc 100644 --- a/po/sk_SK.po +++ b/po/sk_SK.po @@ -476,6 +476,9 @@ msgstr "Nastavenie" msgid "Key$Commands" msgstr "Prkazy" +msgid "Key$User0" +msgstr "Uvate0" + msgid "Key$User1" msgstr "Uvate1" diff --git a/po/sl_SI.po b/po/sl_SI.po index 7f45b027..625761f7 100644 --- a/po/sl_SI.po +++ b/po/sl_SI.po @@ -476,6 +476,9 @@ msgstr "Nastavitve" msgid "Key$Commands" msgstr "Ukazi" +msgid "Key$User0" +msgstr "Uporabnik0" + msgid "Key$User1" msgstr "Uporabnik1" diff --git a/po/sv_SE.po b/po/sv_SE.po index 732e1798..6f376944 100644 --- a/po/sv_SE.po +++ b/po/sv_SE.po @@ -478,6 +478,9 @@ msgstr "Inst msgid "Key$Commands" msgstr "Kommandon" +msgid "Key$User0" +msgstr "Anvndare0" + msgid "Key$User1" msgstr "Anvndare1" diff --git a/po/tr_TR.po b/po/tr_TR.po index 1a3382cf..774f8ffc 100644 --- a/po/tr_TR.po +++ b/po/tr_TR.po @@ -475,6 +475,9 @@ msgstr "Ayarlar" msgid "Key$Commands" msgstr "Komutlar" +msgid "Key$User0" +msgstr "Kullanc0" + msgid "Key$User1" msgstr "Kullanc1" diff --git a/po/uk_UA.po b/po/uk_UA.po index a373fb59..bd99c788 100644 --- a/po/uk_UA.po +++ b/po/uk_UA.po @@ -475,6 +475,9 @@ msgstr "Налаштування" msgid "Key$Commands" msgstr "Команди" +msgid "Key$User0" +msgstr "Користувач0" + msgid "Key$User1" msgstr "Користувач1" diff --git a/po/zh_CN.po b/po/zh_CN.po index 48c4a384..397ba5a1 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -478,6 +478,9 @@ msgstr "设置" msgid "Key$Commands" msgstr "命令" +msgid "Key$User0" +msgstr "用户0" + msgid "Key$User1" msgstr "用户1" diff --git a/vdr.c b/vdr.c index 4b196fad..93f586a4 100644 --- a/vdr.c +++ b/vdr.c @@ -22,7 +22,7 @@ * * The project's page is at http://www.tvdr.de * - * $Id: vdr.c 2.18 2010/04/02 12:22:11 kls Exp $ + * $Id: vdr.c 2.19 2010/04/05 10:06:16 kls Exp $ */ #include @@ -992,7 +992,7 @@ int main(int argc, char *argv[]) case kRecordings: DirectMainFunction(osRecordings); break; case kSetup: DirectMainFunction(osSetup); break; case kCommands: DirectMainFunction(osCommands); break; - case kUser1 ... kUser9: cRemote::PutMacro(key); key = kNone; break; + case kUser0 ... kUser9: cRemote::PutMacro(key); key = kNone; break; case k_Plugin: { const char *PluginName = cRemote::GetPlugin(); if (PluginName) {