Commit d782267d authored by etobi's avatar etobi

Updated to the latest upstream development version release

* Updated/Removed debian/patches/*
* Setting default SVDRP port to 6419 (this was already changed by upstrem)
* Added BIDI define to 81_Make_config.dpatch
* Added libfribidi-dev to Build-Depends
* Added Make.global to vdr-dev.install and 81_Make_config.dpatch
* Removed BUILDVDR define
* Added include links via debian/vdr-dev.links to make the include structure
  compatible to vdr standards
* Removed 03_cmdsubmenu.dpatch (command submenus now integrated in upstream)
* Removed installation of the sky plugin
* Added installation of the dvbsddevice plugin
* Added option LIRC to /etc/default/vdr, which allows to change the LIRC device
  or disabling it by setting it to /dev/null
parent bc4576da
debian/patches/81_Make_config.dpatch:dcff6a00ef9474bca19d955d19574009
debian/patches/99_ncursesw-include.dpatch:90810d58108ff8d9afd768fec67be904
debian/patches/81_Make_config.dpatch:da281b9af48273bcbd19f3052ee993fd
debian/patches/12_osdbase-maxitems.dpatch:e45d1b62f7d66c3e5d279e3561034107
debian/patches/20_gcc44_ftbfs.dpatch:310f84b8c27541f3ecec0ce416c21a73
debian/patches/10_dd-record-option.dpatch:58c3a3dbcd9a3ec4b0ee1814f71d1e88
debian/patches/11_sortrecordings.dpatch:9ed4cd1e144ee59dab34d4df4aa9af51
debian/patches/99_vdr-workaround-broken-sys-capability.dpatch:19d9edf94b745d972761cbcec9f442f2
debian/patches/19_dvb-api-v5.dpatch:6714266c10537521d2440cfa4d50b3f0
debian/patches/04_newplugin.dpatch:e99f8d21734a19b3eb93d9e3f11b680a
debian/patches/14_cap-memsize.dpatch:7beb9bcecb1bdce4a03c1729acfbbdb3
debian/patches/16_channels.conf.terr-fix.dpatch:72595733d0b46aa4093a640708d19226
debian/patches/06_default_svdrp_port_0.dpatch:b49237a9ee246acfa01ee7ec92ad0a52
debian/patches/17_vdr-maintenance-1.6.0-1.dpatch:386821878ee431af1b104a2f3a4f3746
debian/patches/03_cmdsubmenu.dpatch:abff754a3d760764796f06cdf1cf5105
debian/patches/09_sort_options.dpatch:3b561fcd7645b216b4dab989d7786fda
debian/patches/18_vdr-maintenance-1.6.0-2.dpatch:703dc617afcbf87cde443ed0df4642da
debian/patches/82_valgrind.dpatch:46960921b989f2f4dab829a51622ed85
debian/patches/15_dvbplayer.dpatch:d1f31f0687c917dea48bc0ba26b7f3bb
debian/patches/06_default_svdrp_port_0.dpatch:653e14e8ab093c456f9bbd8faa5e1ff7
debian/patches/99_ncursesw-include.dpatch:90810d58108ff8d9afd768fec67be904
debian/patches/82_valgrind.dpatch:503ddba49c243fff798a36a1c12bb5ae
debian/patches/opt-52_hard_link_cutter.dpatch:898b721991e948611ba0402af2f163a5
debian/patches/opt-52_hard_link_cutter.dpatch:a5283660d5fdb97ff905f288f45b2b80
debian/patches/opt-43-x_recordshowfree.dpatch:66152f345b03259d28e89135cda42310
debian/patches/12_osdbase-maxitems.dpatch:e45d1b62f7d66c3e5d279e3561034107
debian/patches/11_sortrecordings.dpatch:9ed4cd1e144ee59dab34d4df4aa9af51
debian/patches/opt-53_dvbsetup.dpatch:dbb3417b0b33548728b43fd8613f7c73
debian/patches/opt-50_graphtft.dpatch:aeba283cc500591fa0b6d112c063fadf
debian/patches/opt-50_graphtft.dpatch:f77f3d81b37e89c448dbb15c9e4f475d
debian/patches/16_channels.conf.terr-fix.dpatch:72595733d0b46aa4093a640708d19226
debian/patches/06_default_svdrp_port_0.dpatch:b49237a9ee246acfa01ee7ec92ad0a52
debian/patches/18_vdr-maintenance-1.6.0-2.dpatch:703dc617afcbf87cde443ed0df4642da
debian/patches/82_valgrind.dpatch:46960921b989f2f4dab829a51622ed85
debian/patches/06_default_svdrp_port_0.dpatch:653e14e8ab093c456f9bbd8faa5e1ff7
debian/patches/82_valgrind.dpatch:503ddba49c243fff798a36a1c12bb5ae
debian/patches/opt-42-x_MainMenuHooks.dpatch:1c4c782b5c88c4f0408890a5f50b217b
debian/patches/opt-44_rotor.dpatch:bbcc27512e0a0b610efadcde8fa67d02
debian/patches/opt-41-x_timer-info.dpatch:92ee6cdf60b795d9fbcf4fdcafe401b4
debian/patches/opt-20_liemikuutio.dpatch:b75777c886ae836a8d499a0628ae091f
debian/patches/10_dd-record-option.dpatch:58c3a3dbcd9a3ec4b0ee1814f71d1e88
debian/patches/opt-21_internal-cam-devices.dpatch:a883c0b09e67b679436b7df1e9807fc8
debian/patches/09_sort_options.dpatch:3b561fcd7645b216b4dab989d7786fda
debian/patches/opt-44_rotor.dpatch:76a5f215302c5dbf8c8713c092c8c6a2
debian/patches/99_vdr-workaround-broken-sys-capability.dpatch:19d9edf94b745d972761cbcec9f442f2
debian/patches/opt-24_jumpplay.dpatch:1ff8f1a90e02b11a42218ffba18b5f26
debian/patches/opt-30-x_analogtv.dpatch:3789ff68d9dc9a2482f78519634b27b6
debian/patches/17_vdr-maintenance-1.6.0-1.dpatch:386821878ee431af1b104a2f3a4f3746
debian/patches/03_cmdsubmenu.dpatch:abff754a3d760764796f06cdf1cf5105
debian/patches/19_dvb-api-v5.dpatch:6714266c10537521d2440cfa4d50b3f0
debian/patches/opt-28_audioindexer.dpatch:eab872310fd03a175b3b93a90d22d5db
debian/patches/opt-20_liemikuutio.dpatch:d359ce2c3e0b58c8a859d4865371ae95
debian/patches/opt-21_internal-cam-devices.dpatch:a883c0b09e67b679436b7df1e9807fc8
debian/patches/opt-41-x_timer-info.dpatch:04511ae02243eb1bab94f3f45b59e574
debian/patches/opt-24_jumpplay.dpatch:cfa5a357bd499978dd87c0167a538cd0
debian/patches/opt-50_graphtft-liemikuutio.dpatch:f82320b9c64e17d06b5d0dbbddf50e8f
debian/patches/opt-31-x_reelchannelscan.dpatch:f8c06ac51888248f68badcab8533c2be
debian/patches/81_Make_config.dpatch:dcff6a00ef9474bca19d955d19574009
debian/patches/opt-51_cuttime.dpatch:cfbf0a7934f109148fef4e385c3eb465
debian/patches/20_gcc44_ftbfs.dpatch:310f84b8c27541f3ecec0ce416c21a73
debian/patches/opt-40_pluginparam.dpatch:9dc3baf2532c9df6e715f0d6c9f7df06
debian/patches/14_cap-memsize.dpatch:7beb9bcecb1bdce4a03c1729acfbbdb3
debian/patches/opt-48-x_pin.dpatch:77abed7c39fda93fbcdb7140d49f9566
debian/patches/opt-47_sourcecaps.dpatch:626ed6d141802b9cae8c4b6cab97311e
debian/patches/81_Make_config.dpatch:da281b9af48273bcbd19f3052ee993fd
debian/patches/opt-51_cuttime.dpatch:5459582bf3c6d95895d7e0ca18b52213
debian/patches/opt-48-x_pin.dpatch:3dd524fa2c484cd03fa2f46194ceff18
debian/patches/opt-37-x_menuorg.dpatch:9fb02cc8bd848add50b3866b6f476644
debian/patches/opt-45_yaepg.dpatch:351c08a687755050e1140766b56dc27b
debian/patches/opt-27_ttxtsubs.dpatch:c0b18cf05be89d87b0dff02ddeb14f05
debian/patches/opt-45_yaepg.dpatch:fbac27f726253a228d7fe15c1cdabeb2
debian/patches/opt-27_ttxtsubs.dpatch:af553c89b0f4cb7f75fb38768c0ab72a
debian/patches/99_ncursesw-include.dpatch:90810d58108ff8d9afd768fec67be904
debian/patches/opt-39_noepg.dpatch:424391fa1176800ec3a13ec608fafcd7
debian/patches/opt-54_deltimeshiftrec.dpatch:5ed1505172adbdb45a583a69dfe19763
debian/patches/opt-49-x_pvrinput.dpatch:213c07a003000b6b93f1a8d004787220
debian/patches/opt-39_noepg.dpatch:8e479efb77a9a7635a78e21832a56101
debian/patches/opt-91_ext-graphtft.dpatch:afbe9ba764e67d293de8024f8093b014
debian/patches/04_newplugin.dpatch:e99f8d21734a19b3eb93d9e3f11b680a
debian/patches/opt-38_disableDoubleEpgEntrys.dpatch:7a09fa581f95613497b718b5c4a4a875
debian/patches/opt-29_syncearly-audioindexer.dpatch:4093d09329d441bd25703a4892633efb
debian/patches/15_dvbplayer.dpatch:d1f31f0687c917dea48bc0ba26b7f3bb
debian/patches/opt-22-x_edit_marks.dpatch:d6b10d4000a85dbf0e42664c349fc5c9
......@@ -62,7 +62,7 @@ SHUTDOWNCMD="<COMMAND>"
SVDRP_PORT=<PORT>
Default: 2001
Default: 6419
Default port for SVDRP (Simple Video Disk Recorder Protocol), the telnet
like interface to control VDR.
......
TODO: Make runvdr more equal to official Debian version
TODO: When plugin could not be loaded, log stderr output somewhere
TODO: Manpage for pic2mpg
TODO: Remove | libcap-dev build dep, if Etch gets uninteresting
TODO: Add option USE_LIRC=yes|no (see http://www.vdr-portal.de/board/thread.php?postid=829057#post829057)
TODO: Get rid of bash in init script, debugvdr and vdrleaktest
TODO: The runvdr module (re)loading stuff is weird - it was introduced to workaround driver bugs and can probably be removed
TODO: Recommend vdr-plugin-dvbsddevice?
vdr-abi-1.6.0-debian
vdr-abi-1.7.16-debian
vdr-abi-1.6.0-multipatch-2009-05-03
vdr-abi-1.7.16-multipatch
vdr (1.7.16-1) UNRELEASED; urgency=low
[ Thomas Günther, Tobias Grimm ]
* Updated to the latest upstream development version release
* Updated/Removed debian/patches/*
* Setting default SVDRP port to 6419 (this was already changed by upstrem)
* Added BIDI define to 81_Make_config.dpatch
* Added libfribidi-dev to Build-Depends
* Added Make.global to vdr-dev.install and 81_Make_config.dpatch
* Removed BUILDVDR define
* Added include links via debian/vdr-dev.links to make the include structure
compatible to vdr standards
* Removed 03_cmdsubmenu.dpatch (command submenus now integrated in upstream)
* Removed installation of the sky plugin
* Added installation of the dvbsddevice plugin
* Added option LIRC to /etc/default/vdr, which allows to change the LIRC device
or disabling it by setting it to /dev/null
-- Tobias Grimm <etobi@debian.org> Sun, 28 Nov 2010 18:48:25 +0100
vdr (1.6.0-19.1) unstable; urgency=low
* debian/vdrleaktest
......
......@@ -7,7 +7,7 @@
# The format of a command entry is: <title> : <command>
# <title> is the menu text shown on the OSD and <command> is the command to
# be executed. Everything that <command> writes to stdout will be displayed
# on the OSD. i.e.:
# on the OSD, e.g.:
#
# Open fortune cookie: /usr/games/fortune
#
......@@ -15,15 +15,16 @@
# command menu entry, called "Open fortune cookie", that will show you a
# random epigram. ( you may need an "apt-get install fortune" first! )
#
# If you are using the reccmd-patch, you can even divide your commands into
# submenus. To do so, prefix all sub menu items with a "-". i.e.:
#
# Fortune Cookies ... : echo "sub menu, no command"
# -Long Dictum : /usr/games/fortune -l
# -Short Apothegms : /usr/games/fortune -s
# -Special Topics ... : echo "sub-sub menu, no command"
# --Literature : /usr/games/fortune literature
# --Riddles : /usr/games/fortune riddles
# You can divide your commands into submenus, e.g.:
#
# Fortune Cookies {
# Long Dictum : /usr/games/fortune -l
# Short Apothegms : /usr/games/fortune -s
# Special Topics {
# Literature : /usr/games/fortune literature
# Riddles : /usr/games/fortune riddles
# }
# }
#
# Again, just uncomment the above lines and restart vdr to see for your self,
# how this looks like on the OSD.
......
......@@ -37,7 +37,7 @@ EPG_FILE=/var/cache/vdr/epg.data
USER=vdr
# Default port for SVDRP
SVDRP_PORT=2001
SVDRP_PORT=6419
# Enable / Disable vdr daemon
ENABLED=0
......
......@@ -5,7 +5,7 @@ Maintainer: Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>
Uploaders: Thomas Schmidt <tschmidt@debian.org>, Tobias Grimm <etobi@debian.org>, Thomas Günther <tom@toms-cafe.de>
Build-Depends: debhelper (>= 5), dpatch, libjpeg62-dev, libcap2-dev | libcap-dev,
libncursesw5-dev, libfreetype6-dev, libfontconfig-dev, gettext,
txt2man, python, linux-libc-dev
txt2man, python, linux-libc-dev (>= 2.6.29), libfribidi-dev
Standards-Version: 3.9.1
Vcs-Svn: svn://svn.debian.org/pkg-vdr-dvb/vdr/vdr/trunk/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/
......@@ -24,7 +24,7 @@ Description: Video Disk Recorder for DVB cards
as well as output the stream to TV. It is also possible to watch DVDs
(hardware accelerated) with some comfort and use an IR remote control.
.
This package contains the vdr main program which is controlled via the
This package contains the VDR main program which is controlled via the
PC keyboard or a IR remote control.
.
NOTE: You should install compatible DVB drivers before using these
......@@ -34,7 +34,7 @@ Description: Video Disk Recorder for DVB cards
Package: vdr-dev
Architecture: all
Depends: ${misc:Depends}, debhelper, linux-libc-dev
Depends: ${misc:Depends}, debhelper, dvb-s2api-liplianin-headers | linux-libc-dev (>= 2.6.29)
Suggests: dh-make
Description: Video Disk Recorder for DVB cards
Video Disk Recorder (VDR) is a digital sat-receiver program using
......@@ -48,28 +48,27 @@ Description: Video Disk Recorder for DVB cards
Package: vdr-dbg
Section: debug
Priority: extra
Architecture: any
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, vdr (= ${binary:Version}), gdb
Suggests: valgrind
Description: Debuggable version of the VDR Video Disk Recorder
This package installs an unoptimized vdr binary with debugging symbols as well
This package installs an unoptimized VDR binary with debugging symbols as well
as some helper scripts to debug VDR and its plugins.
Package: vdr-plugin-sky
Architecture: any
Package: vdr-plugin-dvbsddevice
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, vdr (= ${binary:Version})
Description: Plugin for using a Sky Digibox with vdr
Description: Plugin that adds support for full featured DVB cards to VDR
Video Disk Recorder (VDR) is a digital sat-receiver program using
Linux and DVB technologies. It allows one to record MPEG2 streams,
as well as output the stream to TV.
.
This package contains the sky-plugin, which allows you to connect
the analog a/v output of a Sky Digibox to VDR, so that you can
enjoy the full recording flexibility of VDR with your Sky
subscription.
This package contains the dvbsddevice-plugin, which implements the
output device for the "Full Featured" DVB cards based on the
TechnoTrend/Fujitsu-Siemens design.
Package: vdr-plugin-examples
Architecture: any
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, vdr (= ${binary:Version})
Description: Plugins for vdr to show some possible features
Video Disk Recorder (VDR) is a digital sat-receiver program using
......
......@@ -26,7 +26,7 @@ Debian Maintainers:
Thomas Schmidt <tschmidt@debian.org>
Copyright:
(C) 2000 - 2008 Klaus Schmidinger
(C) 2000 - 2010 Klaus Schmidinger
(C) 2001 - 2002 Andreas Schultz (SPU decoder for DVB devices)
(C) 2003 Marcel Wiesweg, Rolf Hakenes (libsi)
......
03_cmdsubmenu
04_newplugin
06_default_svdrp_port_0
09_sort_options
10_dd-record-option
11_sortrecordings
12_osdbase-maxitems
14_cap-memsize
15_dvbplayer
16_channels.conf.terr-fix
17_vdr-maintenance-1.6.0-1
18_vdr-maintenance-1.6.0-2
19_dvb-api-v5
20_gcc44_ftbfs
81_Make_config
82_valgrind
......@@ -36,15 +27,8 @@
# Patch needed for the ttxtsubs plugin.
# opt-27_ttxtsubs
# Fixes length calculation for radio recordings
# opt-28_audioindexer
# Speed up zapping channels.
# opt-29_syncearly
# opt-29_syncearly-audioindexer
# Patch needed for the analogtv plugin.
# opt-30-x_analogtv
# Makes VDR aware of the reelchannelscan plugin
# opt-31-x_reelchannelscan
......@@ -61,9 +45,6 @@
# Patch to disable normal epg update for specified channels.
# opt-39_noepg
# Patch required by the IPTV and other plugins
# opt-40_pluginparam
# Patch to show an info, if it is possible to record an event in the timer-info.
# opt-41-x_timer-info
......@@ -80,17 +61,13 @@
# Patch needed for the yaepg plugin.
# opt-45_yaepg
# Patch for assigning special satellites to one dvb card.
# opt-47_sourcecaps
# Patch for the PIN plugin
# opt-48-x_pin
# Patch for the pvrinput plugin
# opt-49-x_pvrinput
# Patch required for the GraphTFT plugin
# opt-50_graphtft
# opt-50_graphtft-liemikuutio
# opt-91_ext-graphtft
# Modifies the start time of recordings to the first cutting mark
# (disabled by default - enable in VDR's recording setup)
......@@ -101,6 +78,3 @@
# Setup for AC3 transfer, QAM_256, disable primary tuner
# opt-53_dvbsetup
# Offers the choice to delete timeshift recordings
# opt-54_deltimeshiftrec
03_cmdsubmenu
04_newplugin
06_default_svdrp_port_0
09_sort_options
10_dd-record-option
11_sortrecordings
12_osdbase-maxitems
14_cap-memsize
15_dvbplayer
16_channels.conf.terr-fix
17_vdr-maintenance-1.6.0-1
18_vdr-maintenance-1.6.0-2
19_dvb-api-v5
20_gcc44_ftbfs
81_Make_config
82_valgrind
......@@ -28,7 +19,7 @@ opt-21_internal-cam-devices
# Easy editing of cutting marks
# (Requires opt-20_liemikuutio!)
# opt-22-x_edit_marks
opt-22-x_edit_marks
# The Jump patch allows automatic jumping over cutting marks.
opt-24_jumpplay
......@@ -36,15 +27,8 @@ opt-24_jumpplay
# Patch needed for the ttxtsubs plugin.
opt-27_ttxtsubs
# Fixes length calculation for radio recordings
opt-28_audioindexer
# Speed up zapping channels.
# opt-29_syncearly
opt-29_syncearly-audioindexer
# Patch needed for the analogtv plugin.
opt-30-x_analogtv
# Makes VDR aware of the reelchannelscan plugin
opt-31-x_reelchannelscan
......@@ -61,9 +45,6 @@ opt-38_disableDoubleEpgEntrys
# Patch to disable normal epg update for specified channels.
opt-39_noepg
# Patch required by the IPTV and other plugins
opt-40_pluginparam
# Patch to show an info, if it is possible to record an event in the timer-info.
opt-41-x_timer-info
......@@ -80,17 +61,13 @@ opt-44_rotor
# Patch needed for the yaepg plugin.
opt-45_yaepg
# Patch for assigning special satellites to one dvb card.
opt-47_sourcecaps
# Patch for the PIN plugin
opt-48-x_pin
# Patch for the pvrinput plugin
opt-49-x_pvrinput
# Patch required for the GraphTFT plugin
opt-50_graphtft
opt-50_graphtft-liemikuutio
opt-91_ext-graphtft
# Modifies the start time of recordings to the first cutting mark
# (disabled by default - enable in VDR's recording setup)
......@@ -100,7 +77,4 @@ opt-51_cuttime
opt-52_hard_link_cutter
# Setup for AC3 transfer, QAM_256, disable primary tuner
opt-53_dvbsetup
# Offers the choice to delete timeshift recordings
opt-54_deltimeshiftrec
# opt-53_dvbsetup
#! /bin/sh /usr/share/dpatch/dpatch-run
## 03_cmdsubmenu.dpatch by Albu at vdrportal.de
## http://toms-cafe.de/vdr/download/vdr-cmdsubmenu-0.7-1.5.15.diff
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Adds submenus within the commands and recording commands menu.
## DP: To create a submenu entry, prefix the name by one ore more "-".
@DPATCH@
diff -urNad vdr-1.5.15~/README.cmdsubmenu vdr-1.5.15/README.cmdsubmenu
--- vdr-1.5.15~/README.cmdsubmenu 1970-01-01 01:00:00.000000000 +0100
+++ vdr-1.5.15/README.cmdsubmenu 2008-02-17 21:01:18.000000000 +0100
@@ -0,0 +1,58 @@
+CmdSubmenu patch for VDR
+------------------------
+
+With this patch the commands and recording commands menus can be organised
+hierarchically. To create a submenu entry, prefix the name by one ore more "-".
+
+
+Standard:
+
+description_1 : cmd_1
+description_2 : cmd_2
+
+
+A submenu with two entries:
+
+Submenu title ... : echo "submenu"
+-description_1 : cmd_1
+-description_2 : cmd_2
+
+The dummy command in the title row is necessary.
+
+
+* History
+
+ 2003-10-08: Version 0.1 - Albu at vdrportal.de
+ http://vdrportal.de/board/thread.php?threadid=6319
+
+ 2003-10-09: Version 0.2 - Tobias Grimm <tg@e-tobi.net>
+ - Added Define CMD_SUBMENUS in Makefile
+
+ 2004-05-28: Version 0.3 - Thomas Gnther <tom@toms-cafe.de>
+ - Fixed compilation with gcc-3.3.3
+ - Added new virtual method AddConfig in cConfig
+ - Redefining of method Add in cListBase to virtual no longer necessary
+ - Improved code in menu.c
+ http://toms-cafe.de/vdr/download/vdr-cmdsubmenu-0.3.diff
+
+ 2004-12-20: Version 0.4 - Thomas Gnther <tom@toms-cafe.de>
+ - Solved conflict with jumpplay patch 0.6
+ http://toms-cafe.de/vdr/download/vdr-cmdsubmenu-0.4.diff
+
+ 2006-04-22: Version 0.5 - Thomas Gnther <tom@toms-cafe.de>
+ - Added version define CMDSUBMENUVERSNUM
+ - Reformated to VDR style indentions
+ - Added description in README.cmdsubmenu
+ http://toms-cafe.de/vdr/download/vdr-cmdsubmenu-0.5-1.3.47.diff
+
+ 2006-04-23: Version 0.6 - Thomas Gnther <tom@toms-cafe.de>
+ - Fixed menus with more than one level
+ http://toms-cafe.de/vdr/download/vdr-cmdsubmenu-0.6-1.3.47.diff
+
+ 2006-05-15: Version 0.7 - Thomas Gnther <tom@toms-cafe.de>
+ - Fixed build with G++ 4.1 (extra qualification)
+ http://toms-cafe.de/vdr/download/vdr-cmdsubmenu-0.7-1.4.0.diff
+
+ 2007-02-17: - Tobias Grimm <tg@e-tobi.net>
+ - Adapted to vdr-1.5.15
+ http://toms-cafe.de/vdr/download/vdr-cmdsubmenu-0.7-1.5.15.diff
diff -urNad vdr-1.5.15~/config.c vdr-1.5.15/config.c
--- vdr-1.5.15~/config.c 2008-02-17 14:39:00.000000000 +0100
+++ vdr-1.5.15/config.c 2008-02-17 21:03:48.000000000 +0100
@@ -28,18 +28,26 @@
{
title = command = NULL;
confirm = false;
+ nIndent = 0;
+ childs = NULL;
}
cCommand::~cCommand()
{
free(title);
free(command);
+ delete childs;
}
bool cCommand::Parse(const char *s)
{
const char *p = strchr(s, ':');
if (p) {
+ nIndent = 0;
+ while (*s == '-') {
+ nIndent++;
+ s++;
+ }
int l = p - s;
if (l > 0) {
title = MALLOC(char, l + 1);
@@ -85,6 +93,18 @@
return result;
}
+int cCommand::getChildCount(void)
+{
+ return childs ? childs->Count() : 0;
+}
+
+void cCommand::addChild(cCommand *newChild)
+{
+ if (!childs)
+ childs = new cCommands();
+ childs->AddConfig(newChild);
+}
+
// --- cSVDRPhost ------------------------------------------------------------
cSVDRPhost::cSVDRPhost(void)
@@ -126,6 +146,21 @@
cCommands Commands;
cCommands RecordingCommands;
+void cCommands::AddConfig(cCommand *Object)
+{
+ if (!Object)
+ return;
+ //isyslog ("Indent %d %s\n", Object->getIndent(), Object->Title());
+ for (int index = Count() - 1; index >= 0; index--) {
+ cCommand *parent = Get(index);
+ if (parent->getIndent() < Object->getIndent()) {
+ parent->addChild(Object);
+ return;
+ }
+ }
+ cConfig<cCommand>::Add(Object);
+}
+
// --- cSVDRPhosts -----------------------------------------------------------
cSVDRPhosts SVDRPhosts;
diff -urNad vdr-1.5.15~/config.h vdr-1.5.15/config.h
--- vdr-1.5.15~/config.h 2008-02-05 16:35:11.000000000 +0100
+++ vdr-1.5.15/config.h 2008-02-17 21:01:18.000000000 +0100
@@ -36,6 +36,8 @@
// plugins to work with newer versions of the core VDR as long as no
// VDR header files have changed.
+#define CMDSUBMENUVERSNUM 7
+
#define MAXPRIORITY 99
#define MAXLIFETIME 99
@@ -48,11 +50,15 @@
#define MaxSkinName 16
#define MaxThemeName 16
+class cCommands;
+
class cCommand : public cListObject {
private:
char *title;
char *command;
bool confirm;
+ int nIndent;
+ cCommands *childs;
static char *result;
public:
cCommand(void);
@@ -61,6 +67,12 @@
const char *Title(void) { return title; }
bool Confirm(void) { return confirm; }
const char *Execute(const char *Parameters = NULL);
+ int getIndent(void) { return nIndent; }
+ void setIndent(int nNewIndent) { nIndent = nNewIndent; }
+ cCommands *getChilds(void) { return childs; }
+ int getChildCount(void);
+ bool hasChilds(void) { return getChildCount() > 0; }
+ void addChild(cCommand *newChild);
};
typedef uint32_t in_addr_t; //XXX from /usr/include/netinet/in.h (apparently this is not defined on systems with glibc < 2.2)
@@ -88,6 +100,7 @@
public:
cConfig(void) { fileName = NULL; }
virtual ~cConfig() { free(fileName); }
+ virtual void AddConfig(T *Object) { cList<T>::Add(Object); }
const char *FileName(void) { return fileName; }
bool Load(const char *FileName = NULL, bool AllowComments = false, bool MustExist = false)
{
@@ -117,7 +130,7 @@
if (!isempty(s)) {
T *l = new T;
if (l->Parse(s))
- Add(l);
+ AddConfig(l);
else {
esyslog("ERROR: error in %s, line %d", fileName, line);
delete l;
@@ -159,7 +172,10 @@
}
};
-class cCommands : public cConfig<cCommand> {};
+class cCommands : public cConfig<cCommand> {
+public:
+ virtual void AddConfig(cCommand *Object);
+ };
class cSVDRPhosts : public cConfig<cSVDRPhost> {
public:
diff -urNad vdr-1.5.15~/menu.c vdr-1.5.15/menu.c
--- vdr-1.5.15~/menu.c 2008-02-16 14:53:26.000000000 +0100
+++ vdr-1.5.15/menu.c 2008-02-17 21:04:33.000000000 +0100
@@ -1579,6 +1579,10 @@
cCommand *command = commands->Get(Current());
if (command) {
bool confirmed = true;
+ if (command->hasChilds()) {
+ AddSubMenu(new cMenuCommands(command->Title(), command->getChilds(), parameters));
+ return osContinue;
+ }
if (command->Confirm())
confirmed = Interface->Confirm(cString::sprintf("%s?", command->Title()));
if (confirmed) {
#! /bin/sh /usr/share/dpatch/dpatch-run
## 06_default_svdrp_port_0.dpatch by Thomas Schmidt <tschmidt@debian.org>
##
## Thomas Günther <tom@toms-cafe.de>:
## - adapted to VDR-1.7.15
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: This sets the default svdrp-port to 0, which means that
## DP: SVDRP is disabled by default unless someone specifies
## DP: another port with the --port option when starting vdr
@DPATCH@
diff -urNad vdr-1.3.39/vdr.c /tmp/dpep.zhqxZj/vdr-1.3.39/vdr.c
--- vdr-1.3.39/vdr.c 2006-01-17 21:24:47.597411250 +0100
+++ /tmp/dpep.zhqxZj/vdr-1.3.39/vdr.c 2006-01-17 21:25:18.987672000 +0100
@@ -157,7 +157,7 @@
--- vdr-1.7.15/vdr.c
+++ vdr-1.7.15/vdr.c
@@ -177,7 +177,7 @@
// Command line options:
-#define DEFAULTSVDRPPORT 2001
-#define DEFAULTSVDRPPORT 6419
+#define DEFAULTSVDRPPORT 0
#define DEFAULTWATCHDOG 0 // seconds
#define DEFAULTCONFDIR CONFDIR
#define DEFAULTPLUGINDIR PLUGINDIR
#define DEFAULTEPGDATAFILENAME "epg.data"
#! /bin/sh /usr/share/dpatch/dpatch-run
## 10_dd-record-option.dpatch by Thomas Schmidt <tschmidt@debian.org>
##
## Thomas Gnther <tom@toms-cafe.de>:
## - adapted to VDR-1.5.0
## - fixed i18n texts for replay
## - adapted to VDR-1.5.7
## http://toms-cafe.de/vdr/download/vdr-dd-record-option-1.5.7.diff
## - added French language texts (thanks to Michal Nival)
## http://toms-cafe.de/vdr/download/vdr-dd-record-option-1.6.0.diff
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Allows to choose if to record and to replay Dolby Digital
## DP: independently (to work around some audio issues with the
## DP: dvd-plugin)
@DPATCH@
--- vdr-1.6.0/config.c
+++ vdr-1.6.0/config.c
@@ -259,6 +259,7 @@ cSetup::cSetup(void)
VideoDisplayFormat = 1;
VideoFormat = 0;
UpdateChannels = 5;
+ RecordDolbyDigital = 1;
UseDolbyDigital = 1;
ChannelInfoPos = 0;
ChannelInfoTime = 5;
@@ -432,6 +433,7 @@ bool cSetup::Parse(const char *Name, con
else if (!strcasecmp(Name, "VideoDisplayFormat")) VideoDisplayFormat = atoi(Value);
else if (!strcasecmp(Name, "VideoFormat")) VideoFormat = atoi(Value);
else if (!strcasecmp(Name, "UpdateChannels")) UpdateChannels = atoi(Value);
+ else if (!strcasecmp(Name, "RecordDolbyDigital")) RecordDolbyDigital = atoi(Value);
else if (!strcasecmp(Name, "UseDolbyDigital")) UseDolbyDigital = atoi(Value);
else if (!strcasecmp(Name, "ChannelInfoPos")) ChannelInfoPos = atoi(Value);
else if (!strcasecmp(Name, "ChannelInfoTime")) ChannelInfoTime = atoi(Value);
@@ -515,6 +517,7 @@ bool cSetup::Save(void)
Store("VideoDisplayFormat", VideoDisplayFormat);
Store("VideoFormat", VideoFormat);
Store("UpdateChannels", UpdateChannels);
+ Store("RecordDolbyDigital", RecordDolbyDigital);
Store("UseDolbyDigital", UseDolbyDigital);
Store("ChannelInfoPos", ChannelInfoPos);
Store("ChannelInfoTime", ChannelInfoTime);
--- vdr-1.6.0/config.h
+++ vdr-1.6.0/config.h
@@ -241,6 +241,7 @@ public:
int VideoDisplayFormat;
int VideoFormat;
int UpdateChannels;
+ int RecordDolbyDigital;
int UseDolbyDigital;
int ChannelInfoPos;
int ChannelInfoTime;
--- vdr-1.6.0/menu.c
+++ vdr-1.6.0/menu.c
@@ -2488,7 +2488,8 @@ void cMenuSetupDVB::Setup(void)
Add(new cMenuEditBoolItem(tr("Setup.DVB$Video format"), &data.VideoFormat, "4:3", "16:9"));
if (data.VideoFormat == 0)
Add(new cMenuEditStraItem(tr("Setup.DVB$Video display format"), &data.VideoDisplayFormat, 3, videoDisplayFormatTexts));
- Add(new cMenuEditBoolItem(tr("Setup.DVB$Use Dolby Digital"), &data.UseDolbyDigital));
+ Add(new cMenuEditBoolItem(tr("Setup.DVB$Record Dolby Digital"), &data.RecordDolbyDigital));
+ Add(new cMenuEditBoolItem(tr("Setup.DVB$Replay Dolby Digital"), &data.UseDolbyDigital));
Add(new cMenuEditStraItem(tr("Setup.DVB$Update channels"), &data.UpdateChannels, 6, updateChannelsTexts));
Add(new cMenuEditIntItem( tr("Setup.DVB$Audio languages"), &numAudioLanguages, 0, I18nLanguages()->Size()));
for (int i = 0; i < numAudioLanguages; i++)
--- vdr-1.6.0/po/de_DE.po
+++ vdr-1.6.0/po/de_DE.po
@@ -620,8 +620,11 @@ msgstr "Videoformat"
msgid "Setup.DVB$Video display format"
msgstr "Video-Anzeigeformat"
-msgid "Setup.DVB$Use Dolby Digital"
-msgstr "Dolby-Digital-Ton benutzen"
+msgid "Setup.DVB$Record Dolby Digital"
+msgstr "Dolby-Digital-Ton aufzeichnen"
+
+msgid "Setup.DVB$Replay Dolby Digital"
+msgstr "Dolby-Digital-Ton wiedergeben"
msgid "Setup.DVB$Update channels"
msgstr "Kanle aktualisieren"
--- vdr-1.6.0/po/fr_FR.po
+++ vdr-1.6.0/po/fr_FR.po
@@ -626,8 +626,11 @@ msgstr "Format vido"
msgid "Setup.DVB$Video display format"
msgstr "Format d'affichage"
-msgid "Setup.DVB$Use Dolby Digital"
-msgstr "Utiliser le Dolby Digital"
+msgid "Setup.DVB$Record Dolby Digital"
+msgstr "Enregistrer le Dolby Digi