mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-09-02 02:11:04 +02:00
Merge branch 'check/next-cc'
Compiles on most platforms, starts. Not really tested.
Conflicts:
acinclude.m4
lib/libdvbsub/Makefile.am
lib/libtriple/Makefile.am
lib/libtuxtxt/Makefile.am
src/Makefile.am
src/create_rcsim_h.sh
src/daemonc/Makefile.am
src/driver/Makefile.am
src/driver/audiodec/Makefile.am
src/driver/pictureviewer/Makefile.am
src/eitd/Makefile.am
src/gui/Makefile.am
src/gui/bouquetlist.cpp
src/gui/channellist.cpp
src/gui/scan_setup.cpp
src/gui/streaminfo2.cpp
src/gui/streaminfo2.h
src/gui/update.cpp
src/gui/widget/Makefile.am
src/gui/widget/listbox.cpp
src/neutrino.cpp
src/nhttpd/tuxboxapi/coolstream/Makefile.am
src/rcsim.c
src/system/Makefile.am
src/zapit/src/Makefile.am
src/zapit/src/frontend.cpp
src/zapit/src/zapit.cpp
Origin commit data
------------------
Commit: d244a5991a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-10-21 (Mon, 21 Oct 2013)
This commit is contained in:
@@ -7,6 +7,8 @@
|
||||
# usage: sh ./create_rcsim_h.sh > rcsim.h
|
||||
|
||||
cat << EOF
|
||||
// rcsim.h - automatically created from driver/rcinput.h
|
||||
|
||||
#ifndef KEY_GAMES
|
||||
#define KEY_GAMES 0x1a1 /* Media Select Games */
|
||||
#endif
|
||||
@@ -42,15 +44,25 @@ sed -n '/^[[:space:]]*RC_0/,/^[[:space:]]*RC_analog_off/s/^[[:space:]]*/ /p' dri
|
||||
cat << EOF
|
||||
};
|
||||
|
||||
enum { // not defined in input.h but used like that, at least in 2.4.22
|
||||
KEY_RELEASED = 0,
|
||||
KEY_PRESSED,
|
||||
KEY_AUTOREPEAT
|
||||
};
|
||||
|
||||
struct key{
|
||||
char *name;
|
||||
unsigned long code;
|
||||
const char *name;
|
||||
const unsigned long code;
|
||||
};
|
||||
|
||||
static const struct key keyname[] = {
|
||||
EOF
|
||||
sed -n '/^[[:space:]]*RC_0/,/^[[:space:]]*RC_analog_off/ s/^.*=[[:space:]]*\(KEY_.*\),.*/ { "\1", \1 },/p' driver/rcinput.h
|
||||
cat << EOF
|
||||
/* to stay backward compatible */
|
||||
{ "KEY_SETUP", KEY_MENU },
|
||||
{ "KEY_HOME", KEY_EXIT },
|
||||
};
|
||||
|
||||
EOF
|
||||
|
||||
|
Reference in New Issue
Block a user