From a4c59199a79c07c4a47699f1c6d885c2078a1433 Mon Sep 17 00:00:00 2001 From: svenhoefer Date: Wed, 3 Nov 2021 11:23:58 +0100 Subject: [PATCH] - remove RC_HW_TRIPLEDRAGON Signed-off-by: Thilo Graf --- data/locale/deutsch.locale | 1 - data/locale/english.locale | 1 - data/locale/nederlands.locale | 1 - data/locale/slovak.locale | 1 - src/driver/rcinput.cpp | 11 ----------- src/driver/rcinput.h | 13 +------------ src/drivertool.c | 3 +-- src/gui/hdd_menu.cpp | 1 - src/gui/keybind_setup.cpp | 8 +++----- src/rcsim.c | 17 +---------------- src/system/locals.h | 1 - src/system/locals_intern.h | 1 - 12 files changed, 6 insertions(+), 53 deletions(-) diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 4a370274f..0c884c38c 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -1081,7 +1081,6 @@ keybindingmenu.remotecontrol_hardware_msg_part1 Die Fernbedienung wurde von ' keybindingmenu.remotecontrol_hardware_msg_part2 ' auf ' keybindingmenu.remotecontrol_hardware_msg_part3 ' geändert.\nIst dies korrekt?\nBitte die Auswahl innerhalb 15 Sekunden mit der neuen Fernbedienung\nbestätigen. Ansonsten wird die Auswahl zurückgesetzt. keybindingmenu.remotecontrol_hardware_philips Philips -keybindingmenu.remotecontrol_hardware_tripledragon Triple Dragon keybindingmenu.repeatblock Anfangsverzögerung keybindingmenu.repeatblockgeneric Wiederholungsverzögerung keybindingmenu.sort Sortierreihenfolge ändern diff --git a/data/locale/english.locale b/data/locale/english.locale index c04dda991..1a0ec2758 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -1081,7 +1081,6 @@ keybindingmenu.remotecontrol_hardware_msg_part1 The remote control has been chan keybindingmenu.remotecontrol_hardware_msg_part2 ' to ' keybindingmenu.remotecontrol_hardware_msg_part3 ' \nIs this correct?\nPlease confirm the selection within 15 seconds by using the new remote control.\nOtherwise the selection will be reverted. keybindingmenu.remotecontrol_hardware_philips Philips -keybindingmenu.remotecontrol_hardware_tripledragon Triple Dragon keybindingmenu.repeatblock Generic delay keybindingmenu.repeatblockgeneric Repeat delay keybindingmenu.sort Change sort order diff --git a/data/locale/nederlands.locale b/data/locale/nederlands.locale index 0e61cafd9..0ed7b73c1 100644 --- a/data/locale/nederlands.locale +++ b/data/locale/nederlands.locale @@ -781,7 +781,6 @@ keybindingmenu.remotecontrol_hardware_msg_part1 De afstandsbediening is verander keybindingmenu.remotecontrol_hardware_msg_part2 ' naar ' keybindingmenu.remotecontrol_hardware_msg_part3 ' \nIs dit correct?\n Bevestig uw selectie binnen 15 seconden door uw nieuwe afstandsbediening te gebruiken.\n Anders wordt uw selectie wordt ongedaan gemaakt. keybindingmenu.remotecontrol_hardware_philips Philips -keybindingmenu.remotecontrol_hardware_tripledragon Triple Dragon keybindingmenu.repeatblock Algemene vertraging keybindingmenu.repeatblockgeneric Herhaal vertraging keybindingmenu.sort Wijzig sorteer orde diff --git a/data/locale/slovak.locale b/data/locale/slovak.locale index 8af7e0fa0..b9cb3be24 100644 --- a/data/locale/slovak.locale +++ b/data/locale/slovak.locale @@ -1004,7 +1004,6 @@ keybindingmenu.remotecontrol_hardware_msg_part1 Diaľkové ovládanie bolo zmene keybindingmenu.remotecontrol_hardware_msg_part2 ' na ' keybindingmenu.remotecontrol_hardware_msg_part3 \nJe to správne ?\nPotvrďte prosím tento výber do 15 sekúnd použitím nového ovládača,\ninak bude výber zrušený. keybindingmenu.remotecontrol_hardware_philips Philips -keybindingmenu.remotecontrol_hardware_tripledragon Triple Dragon keybindingmenu.repeatblock Základné oneskorenie keybindingmenu.repeatblockgeneric Oneskorenie opakovania keybindingmenu.sort Zmena poradia triedenia diff --git a/src/driver/rcinput.cpp b/src/driver/rcinput.cpp index b1d21c2bc..1418d3d8f 100644 --- a/src/driver/rcinput.cpp +++ b/src/driver/rcinput.cpp @@ -1894,17 +1894,6 @@ void CRCInput::set_rc_hw(void) ir_protocol = IR_PROTOCOL_RC5; ir_address = 0x000A; break; - case RC_HW_TRIPLEDRAGON: - ir_protocol = IR_PROTOCOL_RMAP_E; - ir_address = 0x000A; // with device id 0 -// ir_address = 0x100A; // with device id 1 -// ir_address = 0x200A; // with device id 2 -// ir_address = 0x300A; // with device id 3 -// ir_address = 0x400A; // with device id 4 -// ir_address = 0x500A; // with device id 5 -// ir_address = 0x600A; // with device id 6 -// ir_address = 0x700A; // with device id 7 - break; default: ir_protocol = IR_PROTOCOL_NECE; ir_address = 0xFF80; diff --git a/src/driver/rcinput.h b/src/driver/rcinput.h index 8845529aa..1ee621002 100644 --- a/src/driver/rcinput.h +++ b/src/driver/rcinput.h @@ -268,16 +268,6 @@ class CRCInput RC_analog_on = KEY_ANALOGON, RC_analog_off = KEY_ANALOGOFF, - /* tripledragon keys */ - RC_eject = KEY_EJECTCD, - RC_aux = KEY_AUX, /* 0x186 */ - RC_timer = KEY_TIME, - RC_tttv = KEY_TTTV, - RC_ttzoom = KEY_TTZOOM, - RC_ttreveal = KEY_REVEAL, - RC_zoomin = KEY_ZOOMIN, - RC_zoomout = KEY_ZOOMOUT, - RC_timeout = 0xFFFFFFFF, RC_nokey = RC_NOKEY }; @@ -287,8 +277,7 @@ class CRCInput { RC_HW_COOLSTREAM = 0, RC_HW_DBOX = 1, - RC_HW_PHILIPS = 2, - RC_HW_TRIPLEDRAGON = 3 + RC_HW_PHILIPS = 2 }; void set_rc_hw(void); diff --git a/src/drivertool.c b/src/drivertool.c index cf3060a72..a7338cee4 100644 --- a/src/drivertool.c +++ b/src/drivertool.c @@ -173,8 +173,7 @@ void usage(void) printf("\t%-20s %s\n", n[i++].text, arg); } printf("\n"); - printf("shortcuts:\n\t-c\tswitch primary remote to coolstream\n" - "\t-t \tswitch primary remote to Tripledragon addr \n\n"); + printf("shortcuts:\n\t-c\tswitch primary remote to coolstream\n\n"); exit(0); } diff --git a/src/gui/hdd_menu.cpp b/src/gui/hdd_menu.cpp index 3573d547f..c8cafd68a 100644 --- a/src/gui/hdd_menu.cpp +++ b/src/gui/hdd_menu.cpp @@ -734,7 +734,6 @@ bool CHDDMenuHandler::scanDevices() strcpy(vendor, ""); } - /* the Tripledragon only has kernel 2.6.12 available.... :-( */ if (oldkernel) snprintf(str, sizeof(str), "/proc/ide/%s/model", namelist[i]->d_name); else diff --git a/src/gui/keybind_setup.cpp b/src/gui/keybind_setup.cpp index 5d40e6796..e433b333f 100644 --- a/src/gui/keybind_setup.cpp +++ b/src/gui/keybind_setup.cpp @@ -142,13 +142,12 @@ int CKeybindSetup::exec(CMenuTarget* parent, const std::string &actionKey) return res; } -#define KEYBINDINGMENU_REMOTECONTROL_HARDWARE_OPTION_COUNT 4 +#define KEYBINDINGMENU_REMOTECONTROL_HARDWARE_OPTION_COUNT 3 const CMenuOptionChooser::keyval KEYBINDINGMENU_REMOTECONTROL_HARDWARE_OPTIONS[KEYBINDINGMENU_REMOTECONTROL_HARDWARE_OPTION_COUNT] = { { CRCInput::RC_HW_COOLSTREAM, LOCALE_KEYBINDINGMENU_REMOTECONTROL_HARDWARE_COOLSTREAM }, { CRCInput::RC_HW_DBOX, LOCALE_KEYBINDINGMENU_REMOTECONTROL_HARDWARE_DBOX }, - { CRCInput::RC_HW_PHILIPS, LOCALE_KEYBINDINGMENU_REMOTECONTROL_HARDWARE_PHILIPS }, - { CRCInput::RC_HW_TRIPLEDRAGON, LOCALE_KEYBINDINGMENU_REMOTECONTROL_HARDWARE_TRIPLEDRAGON } + { CRCInput::RC_HW_PHILIPS, LOCALE_KEYBINDINGMENU_REMOTECONTROL_HARDWARE_PHILIPS } }; #define KEYBINDINGMENU_MODE_LEFT_RIGHT_KEY_TV_COUNT 4 @@ -249,11 +248,10 @@ int CKeybindSetup::showKeySetup() { //save original rc hardware selection and initialize text strings int org_remote_control_hardware = g_settings.remote_control_hardware; - char RC_HW_str[4][32]; + char RC_HW_str[3][32]; snprintf(RC_HW_str[CRCInput::RC_HW_COOLSTREAM], sizeof(RC_HW_str[CRCInput::RC_HW_COOLSTREAM])-1, "%s", g_Locale->getText(LOCALE_KEYBINDINGMENU_REMOTECONTROL_HARDWARE_COOLSTREAM)); snprintf(RC_HW_str[CRCInput::RC_HW_DBOX], sizeof(RC_HW_str[CRCInput::RC_HW_DBOX])-1, "%s", g_Locale->getText(LOCALE_KEYBINDINGMENU_REMOTECONTROL_HARDWARE_DBOX)); snprintf(RC_HW_str[CRCInput::RC_HW_PHILIPS], sizeof(RC_HW_str[CRCInput::RC_HW_PHILIPS])-1, "%s", g_Locale->getText(LOCALE_KEYBINDINGMENU_REMOTECONTROL_HARDWARE_PHILIPS)); - snprintf(RC_HW_str[CRCInput::RC_HW_TRIPLEDRAGON], sizeof(RC_HW_str[CRCInput::RC_HW_TRIPLEDRAGON])-1, "%s", g_Locale->getText(LOCALE_KEYBINDINGMENU_REMOTECONTROL_HARDWARE_TRIPLEDRAGON)); char RC_HW_msg[256]; snprintf(RC_HW_msg, sizeof(RC_HW_msg)-1, "%s", g_Locale->getText(LOCALE_KEYBINDINGMENU_REMOTECONTROL_HARDWARE_MSG_PART1)); diff --git a/src/rcsim.c b/src/rcsim.c index 84d013368..fabd727e2 100644 --- a/src/rcsim.c +++ b/src/rcsim.c @@ -4,8 +4,7 @@ * simulates the remote control, sends the requested key * * (c) 2003 Carsten Juttner (carjay@gmx.net) - * (c) 2009 Stefan Seyfried, add code to use the neutrino socket instead - * of the input subsystem for dreambox / tripledragon + * (c) 2009 Stefan Seyfried, add code to use the neutrino socket * (c) 2011 Stefan Seyfried, convert driver/rcinput.h via script to * rcsim.h for automated import of new keys * @@ -36,19 +35,6 @@ #include #include -#if 0 -/* if you want use HAVE_XX_HARDWARE, better include config.h :-) */ -#include "config.h" - -#if defined(HAVE_DBOX_HARDWARE) -#define EVENTDEV "/dev/input/event0" -#elif defined (HAVE_CST_HARDWARE) -#define EVENTDEV "/dev/input/input0" -#else -#endif -#else -/* dreambox and tripledragon do not use a "normal" input device, so we cannot - (ab-)use the event repeating function of it. use the neutrino socket instead. */ #include #include #define NEUTRINO_SOCKET "/tmp/neutrino.sock" @@ -71,7 +57,6 @@ enum initiators INITID_NEUTRINO, INITID_GENERIC_INPUT_EVENT_PROVIDER }; -#endif #include "rcsim.h" diff --git a/src/system/locals.h b/src/system/locals.h index caa187509..24beb39af 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -1108,7 +1108,6 @@ typedef enum LOCALE_KEYBINDINGMENU_REMOTECONTROL_HARDWARE_MSG_PART2, LOCALE_KEYBINDINGMENU_REMOTECONTROL_HARDWARE_MSG_PART3, LOCALE_KEYBINDINGMENU_REMOTECONTROL_HARDWARE_PHILIPS, - LOCALE_KEYBINDINGMENU_REMOTECONTROL_HARDWARE_TRIPLEDRAGON, LOCALE_KEYBINDINGMENU_REPEATBLOCK, LOCALE_KEYBINDINGMENU_REPEATBLOCKGENERIC, LOCALE_KEYBINDINGMENU_SORT, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index 554074ba7..59b306e34 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -1108,7 +1108,6 @@ const char * locale_real_names[] = "keybindingmenu.remotecontrol_hardware_msg_part2", "keybindingmenu.remotecontrol_hardware_msg_part3", "keybindingmenu.remotecontrol_hardware_philips", - "keybindingmenu.remotecontrol_hardware_tripledragon", "keybindingmenu.repeatblock", "keybindingmenu.repeatblockgeneric", "keybindingmenu.sort",