From cc9fd5a8fd36e2a8ef29718163a1b119768ac950 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Thu, 26 Apr 2012 23:50:01 +0300 Subject: [PATCH] vdr-addon: add control plugin --- .../addons/service/multimedia/vdr-addon/addon | 2 ++ .../multimedia/vdr-addon/changelog.txt | 1 + .../vdr-addon/config.plugins/remote.conf | 31 +++++++++++++++++++ .../multimedia/vdr-addon/config/settings.xml | 2 ++ .../addons/service/multimedia/vdr-addon/meta | 2 +- .../multimedia/vdr-addon/source/bin/vdr.start | 3 ++ .../resources/language/English/strings.xml | 2 ++ .../vdr-addon/source/resources/settings.xml | 2 ++ 8 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 packages/addons/service/multimedia/vdr-addon/config.plugins/remote.conf diff --git a/packages/addons/service/multimedia/vdr-addon/addon b/packages/addons/service/multimedia/vdr-addon/addon index 43f5c08dbb..bd2a7a6c53 100755 --- a/packages/addons/service/multimedia/vdr-addon/addon +++ b/packages/addons/service/multimedia/vdr-addon/addon @@ -36,6 +36,7 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/live cp -PR $BUILD/vdr-live-*/live/* $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/live cp $BUILD/rotorng-[0-9]*/examples/rotorng.conf $ADDON_BUILD/$PKG_ADDON_ID/config + cp $PKG_DIR/config.plugins/remote.conf $ADDON_BUILD/$PKG_ADDON_ID/config mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/plugin cp -PR $BUILD/vdr-plugin-xvdr-*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin @@ -49,6 +50,7 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/plugin cp -PR $BUILD/vdr-plugin-streamdev-*/client/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin cp -PR $BUILD/vdr-live-*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin cp -PR $BUILD/rotorng-*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin + cp -PR $BUILD/vdr-control-*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin # ENABLED_PLUGINS="cardclient constcw sc-conax sc-cryptoworks sc-irdeto sc-nagra sc-seca sc-viaccess sc-videoguard2" # for plugin in $ENABLED_PLUGINS; do diff --git a/packages/addons/service/multimedia/vdr-addon/changelog.txt b/packages/addons/service/multimedia/vdr-addon/changelog.txt index c6881845da..bdb28c540f 100644 --- a/packages/addons/service/multimedia/vdr-addon/changelog.txt +++ b/packages/addons/service/multimedia/vdr-addon/changelog.txt @@ -1,6 +1,7 @@ 2.1.4 - added live plugin - added rotorng plugin +- added control plugin 2.1.3 - adjust for fontconfig 2.9.0 diff --git a/packages/addons/service/multimedia/vdr-addon/config.plugins/remote.conf b/packages/addons/service/multimedia/vdr-addon/config.plugins/remote.conf new file mode 100644 index 0000000000..97a2c6068f --- /dev/null +++ b/packages/addons/service/multimedia/vdr-addon/config.plugins/remote.conf @@ -0,0 +1,31 @@ +KBD.Up 00000000001B5B41 +KBD.Down 00000000001B5B42 +KBD.Menu 000000000000006D +KBD.Ok 000000000000000D +KBD.Back 000000000000007F +KBD.Left 00000000001B5B44 +KBD.Right 00000000001B5B43 +KBD.Red 000000001B5B5B41 +KBD.Green 000000001B5B5B42 +KBD.Yellow 000000001B5B5B43 +KBD.Blue 000000001B5B5B44 +KBD.0 0000000000000030 +KBD.1 0000000000000031 +KBD.2 0000000000000032 +KBD.3 0000000000000033 +KBD.4 0000000000000034 +KBD.5 0000000000000035 +KBD.6 0000000000000036 +KBD.7 0000000000000037 +KBD.8 0000000000000038 +KBD.9 0000000000000039 +KBD.Info 0000000000000069 +KBD.FastFwd 0000001B5B31377E +KBD.FastRew 000000001B5B5B45 +KBD.Power 0000000000000070 +KBD.Volume+ 0000001B5B32347E +KBD.Volume- 0000001B5B32337E +KBD.Mute 0000001B5B32317E +KBD.User7 0000001B5B31387E +KBD.User8 0000001B5B31397E +KBD.User9 0000001B5B32307E diff --git a/packages/addons/service/multimedia/vdr-addon/config/settings.xml b/packages/addons/service/multimedia/vdr-addon/config/settings.xml index e43d403d96..12687d3c6c 100644 --- a/packages/addons/service/multimedia/vdr-addon/config/settings.xml +++ b/packages/addons/service/multimedia/vdr-addon/config/settings.xml @@ -10,6 +10,8 @@ + + diff --git a/packages/addons/service/multimedia/vdr-addon/meta b/packages/addons/service/multimedia/vdr-addon/meta index 909673fd33..544d58b8a5 100755 --- a/packages/addons/service/multimedia/vdr-addon/meta +++ b/packages/addons/service/multimedia/vdr-addon/meta @@ -27,7 +27,7 @@ PKG_LICENSE="GPL" PKG_SITE="http://www.openelec.tv" PKG_URL="" PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain attr libcap vdr vdr-plugin-xvdr vdr-iptv vdr-wirbelscan vdr-sc vdr-plugin-dvbapi vdr-dynamite vdr-plugin-streamdev vdr-live rotorng" +PKG_BUILD_DEPENDS="toolchain attr libcap vdr vdr-plugin-xvdr vdr-iptv vdr-wirbelscan vdr-sc vdr-plugin-dvbapi vdr-dynamite vdr-plugin-streamdev vdr-live rotorng vdr-control" PKG_PRIORITY="optional" PKG_SECTION="service.multimedia" PKG_SHORTDESC="vdr: A powerful DVB TV application" diff --git a/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start b/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start index 8f4958241a..7ae8c27a39 100755 --- a/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start +++ b/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start @@ -72,6 +72,9 @@ fi if [ "$ENABLE_ROTORNG" == "true" ] ; then VDR_ARG="$VDR_ARG -P rotorng" fi +if [ "$ENABLE_CONTROL" == "true" ] ; then + VDR_ARG="$VDR_ARG -P 'control -p $CONTROL_PORT'" +fi # dynamite must be LAST loaded plugin if [ "$ENABLE_DYNAMITE" == "true" ] ; then VDR_ARG="$VDR_ARG -P dynamite" diff --git a/packages/addons/service/multimedia/vdr-addon/source/resources/language/English/strings.xml b/packages/addons/service/multimedia/vdr-addon/source/resources/language/English/strings.xml index 841cfb087e..f3a7b071d5 100644 --- a/packages/addons/service/multimedia/vdr-addon/source/resources/language/English/strings.xml +++ b/packages/addons/service/multimedia/vdr-addon/source/resources/language/English/strings.xml @@ -13,6 +13,8 @@ Enable plugin: live live: listen on ip live: listen on port + Enable plugin: control + control: listen on port Enable plugin: rotorng Enable plugin: dynamite Enable softcam diff --git a/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml b/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml index 572b7b32f4..a5f5213173 100644 --- a/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml +++ b/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml @@ -16,6 +16,8 @@ + +