remove RC_HW_TRIPLEDRAGON

Origin commit data
------------------
Branch: ni/coolstream
Commit: 36a0af3ab4
Author: vanhofen <vanhofen@gmx.de>
Date: 2021-11-02 (Tue, 02 Nov 2021)

Origin message was:
------------------
- remove RC_HW_TRIPLEDRAGON

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2021-11-02 00:08:00 +01:00
parent 4d5b46ef6d
commit b70d0e16ee
12 changed files with 6 additions and 53 deletions

View File

@@ -1161,7 +1161,6 @@ keybindingmenu.remotecontrol_hardware_msg_part1 Die Fernbedienung wurde von '
keybindingmenu.remotecontrol_hardware_msg_part2 ' auf ' 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_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_philips Philips
keybindingmenu.remotecontrol_hardware_tripledragon Triple Dragon
keybindingmenu.repeatblock Anfangsverzögerung keybindingmenu.repeatblock Anfangsverzögerung
keybindingmenu.repeatblockgeneric Wiederholungsverzögerung keybindingmenu.repeatblockgeneric Wiederholungsverzögerung
keybindingmenu.sort Sortierreihenfolge ändern keybindingmenu.sort Sortierreihenfolge ändern

View File

@@ -1161,7 +1161,6 @@ keybindingmenu.remotecontrol_hardware_msg_part1 The remote control has been chan
keybindingmenu.remotecontrol_hardware_msg_part2 ' to ' 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_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_philips Philips
keybindingmenu.remotecontrol_hardware_tripledragon Triple Dragon
keybindingmenu.repeatblock Generic delay keybindingmenu.repeatblock Generic delay
keybindingmenu.repeatblockgeneric Repeat delay keybindingmenu.repeatblockgeneric Repeat delay
keybindingmenu.sort Change sort order keybindingmenu.sort Change sort order

View File

@@ -780,7 +780,6 @@ keybindingmenu.remotecontrol_hardware_msg_part1 De afstandsbediening is verander
keybindingmenu.remotecontrol_hardware_msg_part2 ' naar ' 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_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_philips Philips
keybindingmenu.remotecontrol_hardware_tripledragon Triple Dragon
keybindingmenu.repeatblock Algemene vertraging keybindingmenu.repeatblock Algemene vertraging
keybindingmenu.repeatblockgeneric Herhaal vertraging keybindingmenu.repeatblockgeneric Herhaal vertraging
keybindingmenu.sort Wijzig sorteer orde keybindingmenu.sort Wijzig sorteer orde

View File

@@ -1151,7 +1151,6 @@ keybindingmenu.remotecontrol_hardware_msg_part1 Diaľkové ovládanie bolo zmene
keybindingmenu.remotecontrol_hardware_msg_part2 ' na ' 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_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_philips Philips
keybindingmenu.remotecontrol_hardware_tripledragon Triple Dragon
keybindingmenu.repeatblock Základné oneskorenie keybindingmenu.repeatblock Základné oneskorenie
keybindingmenu.repeatblockgeneric Oneskorenie opakovania keybindingmenu.repeatblockgeneric Oneskorenie opakovania
keybindingmenu.sort Zmena poradia triedenia keybindingmenu.sort Zmena poradia triedenia

View File

@@ -1907,17 +1907,6 @@ void CRCInput::set_rc_hw(void)
ir_protocol = IR_PROTOCOL_RC5; ir_protocol = IR_PROTOCOL_RC5;
ir_address = 0x000A; ir_address = 0x000A;
break; 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: default:
ir_protocol = IR_PROTOCOL_NECE; ir_protocol = IR_PROTOCOL_NECE;
ir_address = 0xFF80; ir_address = 0xFF80;

View File

@@ -268,16 +268,6 @@ class CRCInput
RC_analog_on = KEY_ANALOGON, RC_analog_on = KEY_ANALOGON,
RC_analog_off = KEY_ANALOGOFF, 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_timeout = 0xFFFFFFFF,
RC_nokey = RC_NOKEY RC_nokey = RC_NOKEY
}; };
@@ -287,8 +277,7 @@ class CRCInput
{ {
RC_HW_COOLSTREAM = 0, RC_HW_COOLSTREAM = 0,
RC_HW_DBOX = 1, RC_HW_DBOX = 1,
RC_HW_PHILIPS = 2, RC_HW_PHILIPS = 2
RC_HW_TRIPLEDRAGON = 3
}; };
void set_rc_hw(void); void set_rc_hw(void);

View File

@@ -173,8 +173,7 @@ void usage(void)
printf("\t%-20s %s\n", n[i++].text, arg); printf("\t%-20s %s\n", n[i++].text, arg);
} }
printf("\n"); printf("\n");
printf("shortcuts:\n\t-c\tswitch primary remote to coolstream\n" printf("shortcuts:\n\t-c\tswitch primary remote to coolstream\n\n");
"\t-t <n>\tswitch primary remote to Tripledragon addr <n>\n\n");
exit(0); exit(0);
} }

View File

@@ -739,7 +739,6 @@ bool CHDDMenuHandler::scanDevices()
strcpy(vendor, ""); strcpy(vendor, "");
} }
/* the Tripledragon only has kernel 2.6.12 available.... :-( */
if (oldkernel) if (oldkernel)
snprintf(str, sizeof(str), "/proc/ide/%s/model", namelist[i]->d_name); snprintf(str, sizeof(str), "/proc/ide/%s/model", namelist[i]->d_name);
else else

View File

@@ -142,13 +142,12 @@ int CKeybindSetup::exec(CMenuTarget* parent, const std::string &actionKey)
return res; 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] = const CMenuOptionChooser::keyval KEYBINDINGMENU_REMOTECONTROL_HARDWARE_OPTIONS[KEYBINDINGMENU_REMOTECONTROL_HARDWARE_OPTION_COUNT] =
{ {
{ CRCInput::RC_HW_COOLSTREAM, LOCALE_KEYBINDINGMENU_REMOTECONTROL_HARDWARE_COOLSTREAM }, { CRCInput::RC_HW_COOLSTREAM, LOCALE_KEYBINDINGMENU_REMOTECONTROL_HARDWARE_COOLSTREAM },
{ CRCInput::RC_HW_DBOX, LOCALE_KEYBINDINGMENU_REMOTECONTROL_HARDWARE_DBOX }, { CRCInput::RC_HW_DBOX, LOCALE_KEYBINDINGMENU_REMOTECONTROL_HARDWARE_DBOX },
{ CRCInput::RC_HW_PHILIPS, LOCALE_KEYBINDINGMENU_REMOTECONTROL_HARDWARE_PHILIPS }, { CRCInput::RC_HW_PHILIPS, LOCALE_KEYBINDINGMENU_REMOTECONTROL_HARDWARE_PHILIPS }
{ CRCInput::RC_HW_TRIPLEDRAGON, LOCALE_KEYBINDINGMENU_REMOTECONTROL_HARDWARE_TRIPLEDRAGON }
}; };
#define KEYBINDINGMENU_MODE_LEFT_RIGHT_KEY_TV_COUNT 4 #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 //save original rc hardware selection and initialize text strings
int org_remote_control_hardware = g_settings.remote_control_hardware; 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_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_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_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]; char RC_HW_msg[256];
snprintf(RC_HW_msg, sizeof(RC_HW_msg)-1, "%s", g_Locale->getText(LOCALE_KEYBINDINGMENU_REMOTECONTROL_HARDWARE_MSG_PART1)); snprintf(RC_HW_msg, sizeof(RC_HW_msg)-1, "%s", g_Locale->getText(LOCALE_KEYBINDINGMENU_REMOTECONTROL_HARDWARE_MSG_PART1));

View File

@@ -4,8 +4,7 @@
* simulates the remote control, sends the requested key * simulates the remote control, sends the requested key
* *
* (c) 2003 Carsten Juttner (carjay@gmx.net) * (c) 2003 Carsten Juttner (carjay@gmx.net)
* (c) 2009 Stefan Seyfried, add code to use the neutrino socket instead * (c) 2009 Stefan Seyfried, add code to use the neutrino socket
* of the input subsystem for dreambox / tripledragon
* (c) 2011 Stefan Seyfried, convert driver/rcinput.h via script to * (c) 2011 Stefan Seyfried, convert driver/rcinput.h via script to
* rcsim.h for automated import of new keys * rcsim.h for automated import of new keys
* *
@@ -36,19 +35,6 @@
#include <linux/input.h> #include <linux/input.h>
#include <error.h> #include <error.h>
#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 <sys/socket.h> #include <sys/socket.h>
#include <sys/un.h> #include <sys/un.h>
#define NEUTRINO_SOCKET "/tmp/neutrino.sock" #define NEUTRINO_SOCKET "/tmp/neutrino.sock"
@@ -71,7 +57,6 @@ enum initiators
INITID_NEUTRINO, INITID_NEUTRINO,
INITID_GENERIC_INPUT_EVENT_PROVIDER INITID_GENERIC_INPUT_EVENT_PROVIDER
}; };
#endif
#include "rcsim.h" #include "rcsim.h"

View File

@@ -1188,7 +1188,6 @@ typedef enum
LOCALE_KEYBINDINGMENU_REMOTECONTROL_HARDWARE_MSG_PART2, LOCALE_KEYBINDINGMENU_REMOTECONTROL_HARDWARE_MSG_PART2,
LOCALE_KEYBINDINGMENU_REMOTECONTROL_HARDWARE_MSG_PART3, LOCALE_KEYBINDINGMENU_REMOTECONTROL_HARDWARE_MSG_PART3,
LOCALE_KEYBINDINGMENU_REMOTECONTROL_HARDWARE_PHILIPS, LOCALE_KEYBINDINGMENU_REMOTECONTROL_HARDWARE_PHILIPS,
LOCALE_KEYBINDINGMENU_REMOTECONTROL_HARDWARE_TRIPLEDRAGON,
LOCALE_KEYBINDINGMENU_REPEATBLOCK, LOCALE_KEYBINDINGMENU_REPEATBLOCK,
LOCALE_KEYBINDINGMENU_REPEATBLOCKGENERIC, LOCALE_KEYBINDINGMENU_REPEATBLOCKGENERIC,
LOCALE_KEYBINDINGMENU_SORT, LOCALE_KEYBINDINGMENU_SORT,

View File

@@ -1188,7 +1188,6 @@ const char * locale_real_names[] =
"keybindingmenu.remotecontrol_hardware_msg_part2", "keybindingmenu.remotecontrol_hardware_msg_part2",
"keybindingmenu.remotecontrol_hardware_msg_part3", "keybindingmenu.remotecontrol_hardware_msg_part3",
"keybindingmenu.remotecontrol_hardware_philips", "keybindingmenu.remotecontrol_hardware_philips",
"keybindingmenu.remotecontrol_hardware_tripledragon",
"keybindingmenu.repeatblock", "keybindingmenu.repeatblock",
"keybindingmenu.repeatblockgeneric", "keybindingmenu.repeatblockgeneric",
"keybindingmenu.sort", "keybindingmenu.sort",