mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 16:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'check/cst-next-fixed'

Browse Source 
Conflicts:
	src/gui/hdd_menu.cpp
	src/gui/osdlang_setup.cpp
This commit is contained in:
Stefan Seyfried
2015-02-19 13:59:13 +01:00
parent 2d4c6eedad 7043d230f6
commit 51bbb756e8
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/gui/osdlang_setup.cpp
View File

@@ -178,7 +178,6 @@ void COsdLangSetup::showLanguageSetup(CMenuWidget *osdl_setup)
{
struct dirent **namelist;
int n;
// printf("scanning locale dir now....(perhaps)\n");
const char *pfad[] = {DATADIR "/neutrino/locale", CONFIGDIR "/locale"};
osdl_setup->addIntroItems();

10
src/rcsim.c
View File

@@ -39,8 +39,10 @@
/* if you want use HAVE_XX_HARDWARE, better include config.h :-) */
#include "config.h"
#ifdef HAVE_DBOX_HARDWARE
#if defined(HAVE_DBOX_HARDWARE)
#define EVENTDEV "/dev/input/event0"
#elif defined (HAVE_COOL_HARDWARE)
#define EVENTDEV "/dev/input/input0"
#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. */
@@ -73,7 +75,7 @@ enum initiators
void usage(char *n){
unsigned int keynum = sizeof(keyname)/sizeof(struct key);
unsigned int i;
#ifdef HAVE_DBOX_HARDWARE
#if defined (EVENTDEV)
printf ("rcsim v1.1\nUsage: %s <keyname> [<time>] [<repeat>]\n"
" <keyname> is an excerpt of the 'KEY_FOO'-names in <driver/rcinput.h>,\n"
" <time> is how long a code is repeatedly sent,\n"
@@ -102,7 +104,7 @@ void usage(char *n){
/* we could also use the neutrino socket on the dbox, but this needs more testing.
so leave it as is for now */
#ifdef HAVE_DBOX_HARDWARE
#if defined (EVENTDEV)
int push(int ev, unsigned int code, unsigned int value)
{
struct input_event iev;
@@ -214,7 +216,7 @@ int main (int argc, char **argv){
rctime=(atol (argv[2])*1000)/reptime;
}
#ifdef HAVE_DBOX_HARDWARE
#if defined (EVENTDEV)
evd=open (EVENTDEV,O_RDWR);
if (evd<0){
perror ("opening event0 failed");