r6746 - in /vdr/vdr/trunk/debian: ./ patches/
tiber-guest at users.alioth.debian.org
tiber-guest at users.alioth.debian.org
Sun Apr 13 16:43:52 UTC 2008
Author: tiber-guest
Date: Sun Apr 13 16:43:52 2008
New Revision: 6746
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=6746
Log:
* Added 17_vdr-maintenance-1.6.0-1.dpatch
* Updated opt-20_liemikuutio.dpatch
* Updated opt-48-x_pin.dpatch
* Upgraded opt-37-x_menuorg.dpatch to version 0.4.2
* Upgraded opt-50_graphtft-0.1.dpatch to current version 0.1.7~alpha of the
GraphTFT plug-in (taken from the Zulu Extensions Patch 56) and renamed it
to opt-50_graphtft.dpatch (deleted old opt-50_graphtft.dpatch)
Added:
vdr/vdr/trunk/debian/patches/17_vdr-maintenance-1.6.0-1.dpatch
Removed:
vdr/vdr/trunk/debian/patches/00list.extension-patch
vdr/vdr/trunk/debian/patches/opt-50_graphtft-0.1.dpatch
Modified:
vdr/vdr/trunk/debian/changelog
vdr/vdr/trunk/debian/patches/00list
vdr/vdr/trunk/debian/patches/opt-20_liemikuutio.dpatch
vdr/vdr/trunk/debian/patches/opt-37-x_menuorg.dpatch
vdr/vdr/trunk/debian/patches/opt-48-x_pin.dpatch
vdr/vdr/trunk/debian/patches/opt-50_graphtft.dpatch
vdr/vdr/trunk/debian/patches/patchtest
Modified: vdr/vdr/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/changelog?rev=6746&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/changelog (original)
+++ vdr/vdr/trunk/debian/changelog Sun Apr 13 16:43:52 2008
@@ -17,6 +17,13 @@
(see also Debian Policy 3.7.3.0 section 10.1)
* Added caching to plugin-loader.sh to speed up the initial startup of vdr
(Patch provided by Michael Burian <michael.burian at sbg.at>)
+ * Added 17_vdr-maintenance-1.6.0-1.dpatch
+ * Updated opt-20_liemikuutio.dpatch
+ * Updated opt-48-x_pin.dpatch
+ * Upgraded opt-37-x_menuorg.dpatch to version 0.4.2
+ * Upgraded opt-50_graphtft-0.1.dpatch to current version 0.1.7~alpha of the
+ GraphTFT plug-in (taken from the Zulu Extensions Patch 56) and renamed it
+ to opt-50_graphtft.dpatch (deleted old opt-50_graphtft.dpatch)
[ Thomas Günther ]
* Upgraded make-special-vdr.sh to version 0.8
Modified: vdr/vdr/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/patches/00list?rev=6746&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/patches/00list (original)
+++ vdr/vdr/trunk/debian/patches/00list Sun Apr 13 16:43:52 2008
@@ -9,12 +9,12 @@
14_cap-memsize
15_dvbplayer
16_channels.conf.terr-fix
+17_vdr-maintenance-1.6.0-1
81_Make_config
82_valgrind
99_ncursesw-include
-# 99_dvb-api-wrapper
# Patch collection (replaces enAIO).
# opt-20_liemikuutio
@@ -81,9 +81,6 @@
# Patch required for the GraphTFT plugin
# opt-50_graphtft
-# Patch required for the GraphTFT plugin >= 0.1
-# opt-50_graphtft-0.1
-
# Modifies the start time of recordings to the first cutting mark
# (disabled by default - enable in VDR's recording setup)
# opt-51_cuttime
Added: vdr/vdr/trunk/debian/patches/17_vdr-maintenance-1.6.0-1.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/patches/17_vdr-maintenance-1.6.0-1.dpatch?rev=6746&op=file
==============================================================================
--- vdr/vdr/trunk/debian/patches/17_vdr-maintenance-1.6.0-1.dpatch (added)
+++ vdr/vdr/trunk/debian/patches/17_vdr-maintenance-1.6.0-1.dpatch Sun Apr 13 16:43:52 2008
@@ -1,0 +1,179 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 17_vdr-maintenance-1.6.0-1.dpatch by Klaus Schmidinger <kls at cadsoft.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: VDR 1.6.0 maintenance patch #1
+
+ at DPATCH@
+diff -ruN vdr-1.6.0/CONTRIBUTORS vdr-1.6.0-1/CONTRIBUTORS
+--- vdr-1.6.0/CONTRIBUTORS 2008-03-18 18:34:00.000000000 +0100
++++ vdr-1.6.0-1/CONTRIBUTORS 2008-04-13 15:34:03.000000000 +0200
+@@ -595,6 +595,8 @@
+ not two hex digits after the '#'
+ for suggesting to suppress the automatic shutdown if the remote control is
+ currently disabled
++ for suggesting to improve logging system time changes to avoid problems on slow
++ systems under heavy load
+
+ Jeremy Hall <jhall at UU.NET>
+ for fixing an incomplete initialization of the filter parameters in eit.c
+@@ -958,6 +960,7 @@
+ for making the SVDRP command LSTC list the channels with group separators if the
+ option ':groups' is given
+ for fixing handling 3 and 4 byte UTF-8 symbols in Utf8CharGet()
++ for fixing initializing the timer's flags in the cTimer copy constructor
+
+ Olivier Jacques <jacquesolivier at hotmail.com>)
+ for translating OSD texts to the French language
+@@ -1174,6 +1177,7 @@
+ for reporting an invalid access in the section handler when ending VDR
+ for pointing out that cDevice::Transferring() doesn't return the right value in the
+ early stage of channel switching
++ for fixing handling the counter in detection of pre 1.3.19 PS data
+
+ Richard Robson <richard_robson at beeb.net>
+ for reporting freezing replay if a timer starts while in Transfer Mode from the
+@@ -1506,6 +1510,7 @@
+ for translating OSD texts to the Estonian language
+ for fixing a missing ',' in the Greek OSD texts
+ for fixing a missing ',' in the Swedish OSD texts
++ for reporting problems with CAMs when checking the CAM status too frequently
+
+ Milos Kapoun <m.kapoun at cra.cz>
+ for suggesting to skip code table info in SI data
+diff -ruN vdr-1.6.0/HISTORY vdr-1.6.0-1/HISTORY
+--- vdr-1.6.0/HISTORY 2008-03-23 11:26:08.000000000 +0100
++++ vdr-1.6.0-1/HISTORY 2008-04-13 15:33:46.000000000 +0200
+@@ -5729,3 +5729,14 @@
+ - Added Chinese language texts (thanks to Nan Feng).
+ - Updated the Portuguese language texts.
+ - Added a note about VDR_CHARSET_OVERRIDE to the INSTALL file.
++
++2008-04-13: Version 1.6.0-1
++
++- Fixed handling the counter in detection of pre 1.3.19 PS data (thanks to Reinhard
++ Nissl).
++- Improved logging system time changes to avoid problems on slow systems under
++ heavy load (suggested by Helmut Auer).
++- Fixed initializing the timer's flags in the cTimer copy constructor (thanks to
++ Andreas Mair).
++- Increased the time between checking the CAM status to 500ms to avoid problems
++ with some CAMs (reported by Arthur Konovalov).
+diff -ruN vdr-1.6.0/ci.c vdr-1.6.0-1/ci.c
+--- vdr-1.6.0/ci.c 2007-04-30 15:02:49.000000000 +0200
++++ vdr-1.6.0-1/ci.c 2008-04-13 15:33:32.000000000 +0200
+@@ -4,7 +4,7 @@
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+- * $Id: ci.c 1.48 2007/04/30 13:02:49 kls Exp $
++ * $Id: ci.c 1.48.1.1 2008/04/13 13:33:32 kls Exp $
+ */
+
+ #include "ci.h"
+@@ -1525,7 +1525,7 @@
+
+ cCamSlots CamSlots;
+
+-#define MODULE_CHECK_INTERVAL 100 // ms
++#define MODULE_CHECK_INTERVAL 500 // ms
+ #define MODULE_RESET_TIMEOUT 2 // s
+
+ cCamSlot::cCamSlot(cCiAdapter *CiAdapter)
+diff -ruN vdr-1.6.0/config.h vdr-1.6.0-1/config.h
+--- vdr-1.6.0/config.h 2008-03-23 11:26:10.000000000 +0100
++++ vdr-1.6.0-1/config.h 2008-04-13 13:09:42.000000000 +0200
+@@ -4,7 +4,7 @@
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+- * $Id: config.h 1.310 2008/03/23 10:26:10 kls Exp $
++ * $Id: config.h 1.310.1.1 2008/04/13 11:09:42 kls Exp $
+ */
+
+ #ifndef __CONFIG_H
+@@ -22,7 +22,7 @@
+
+ // VDR's own version number:
+
+-#define VDRVERSION "1.6.0"
++#define VDRVERSION "1.6.0-1"
+ #define VDRVERSNUM 10600 // Version * 10000 + Major * 100 + Minor
+
+ // The plugin API's version number:
+diff -ruN vdr-1.6.0/device.c vdr-1.6.0-1/device.c
+--- vdr-1.6.0/device.c 2008-03-09 11:03:34.000000000 +0100
++++ vdr-1.6.0-1/device.c 2008-04-13 13:16:00.000000000 +0200
+@@ -4,7 +4,7 @@
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+- * $Id: device.c 1.157 2008/03/09 10:03:34 kls Exp $
++ * $Id: device.c 1.157.1.1 2008/04/13 11:16:00 kls Exp $
+ */
+
+ #include "device.h"
+@@ -1273,7 +1273,7 @@
+ uchar SubStreamIndex = SubStreamId & 0x1F;
+
+ // Compatibility mode for old VDR recordings, where 0xBD was only AC3:
+-pre_1_3_19_PrivateStreamDeteced:
++pre_1_3_19_PrivateStreamDetected:
+ if (pre_1_3_19_PrivateStream > MIN_PRE_1_3_19_PRIVATESTREAM) {
+ SubStreamId = c;
+ SubStreamType = 0x80;
+@@ -1314,7 +1314,8 @@
+ if (pre_1_3_19_PrivateStream > MIN_PRE_1_3_19_PRIVATESTREAM) {
+ dsyslog("switching to pre 1.3.19 Dolby Digital compatibility mode - substream id = %02X", SubStreamId);
+ ClrAvailableTracks();
+- goto pre_1_3_19_PrivateStreamDeteced;
++ pre_1_3_19_PrivateStream = MIN_PRE_1_3_19_PRIVATESTREAM + 1;
++ goto pre_1_3_19_PrivateStreamDetected;
+ }
+ }
+ }
+diff -ruN vdr-1.6.0/eit.c vdr-1.6.0-1/eit.c
+--- vdr-1.6.0/eit.c 2007-08-26 12:56:33.000000000 +0200
++++ vdr-1.6.0-1/eit.c 2008-04-13 13:46:38.000000000 +0200
+@@ -8,7 +8,7 @@
+ * Robert Schneider <Robert.Schneider at web.de> and Rolf Hakenes <hakenes at hippomi.de>.
+ * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg at gmx.de>.
+ *
+- * $Id: eit.c 1.126 2007/08/26 10:56:33 kls Exp $
++ * $Id: eit.c 1.126.1.1 2008/04/13 11:46:38 kls Exp $
+ */
+
+ #include "eit.h"
+@@ -300,9 +300,9 @@
+ if (diff > 2) {
+ mutex.Lock();
+ if (abs(diff - lastDiff) < 3) {
+- isyslog("System Time = %s (%ld)", *TimeToString(loctim), loctim);
+- isyslog("Local Time = %s (%ld)", *TimeToString(sattim), sattim);
+- if (stime(&sattim) < 0)
++ if (stime(&sattim) == 0)
++ isyslog("system time changed from %s (%ld) to %s (%ld)", *TimeToString(loctim), loctim, *TimeToString(sattim), sattim);
++ else
+ esyslog("ERROR while setting system time: %m");
+ }
+ lastDiff = diff;
+diff -ruN vdr-1.6.0/timers.c vdr-1.6.0-1/timers.c
+--- vdr-1.6.0/timers.c 2008-02-16 15:47:40.000000000 +0100
++++ vdr-1.6.0-1/timers.c 2008-04-13 14:47:12.000000000 +0200
+@@ -4,7 +4,7 @@
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+- * $Id: timers.c 1.73 2008/02/16 14:47:40 kls Exp $
++ * $Id: timers.c 1.73.1.1 2008/04/13 12:47:12 kls Exp $
+ */
+
+ #include "timers.h"
+@@ -92,6 +92,7 @@
+ channel = NULL;
+ aux = NULL;
+ event = NULL;
++ flags = tfNone;
+ *this = Timer;
+ }
+
Modified: vdr/vdr/trunk/debian/patches/opt-20_liemikuutio.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/patches/opt-20_liemikuutio.dpatch?rev=6746&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/patches/opt-20_liemikuutio.dpatch (original)
+++ vdr/vdr/trunk/debian/patches/opt-20_liemikuutio.dpatch Sun Apr 13 16:43:52 2008
@@ -1,14 +1,14 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## opt-20_liemikuutio.dpatch by Rolf Ahrenberg <Rolf.Ahrenberg AT sci.fi>
-## http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.5.17-liemikuutio-1.19.diff.gz
+## http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.6.0-liemikuutio-1.19.diff.gz
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Patch collection - see HISTORY-liemikuutio for details.
@DPATCH@
-diff -Nru vdr-1.5.17-vanilla/HISTORY-liemikuutio vdr-1.5.17-liemikuutio/HISTORY-liemikuutio
---- vdr-1.5.17-vanilla/HISTORY-liemikuutio 1970-01-01 02:00:00.000000000 +0200
-+++ vdr-1.5.17-liemikuutio/HISTORY-liemikuutio 2008-03-02 22:25:16.000000000 +0200
+diff -Nru vdr-1.6.0-vanilla/HISTORY-liemikuutio vdr-1.6.0-liemikuutio/HISTORY-liemikuutio
+--- vdr-1.6.0-vanilla/HISTORY-liemikuutio 1970-01-01 02:00:00.000000000 +0200
++++ vdr-1.6.0-liemikuutio/HISTORY-liemikuutio 2008-03-27 21:47:57.000000000 +0200
@@ -0,0 +1,97 @@
+-----------------------------------
+Liemikuutio for Video Disc Recorder
@@ -107,9 +107,9 @@
+- Modified binary skip to use kPrev and kNext keys and the skip is now
+ always shortened after a direction change (Thanks to Timo Eskola).
+- Readded k1_k3_jumps_20s patch.
-diff -Nru vdr-1.5.17-vanilla/config.c vdr-1.5.17-liemikuutio/config.c
---- vdr-1.5.17-vanilla/config.c 2008-03-02 19:09:57.000000000 +0200
-+++ vdr-1.5.17-liemikuutio/config.c 2008-03-02 19:10:40.000000000 +0200
+diff -Nru vdr-1.6.0-vanilla/config.c vdr-1.6.0-liemikuutio/config.c
+--- vdr-1.6.0-vanilla/config.c 2008-03-27 21:43:25.000000000 +0200
++++ vdr-1.6.0-liemikuutio/config.c 2008-03-27 21:47:57.000000000 +0200
@@ -289,6 +289,11 @@
InitialChannel = 0;
InitialVolume = -1;
@@ -146,9 +146,9 @@
Sort();
-diff -Nru vdr-1.5.17-vanilla/config.h vdr-1.5.17-liemikuutio/config.h
---- vdr-1.5.17-vanilla/config.h 2008-03-02 19:09:57.000000000 +0200
-+++ vdr-1.5.17-liemikuutio/config.h 2008-03-02 22:10:34.000000000 +0200
+diff -Nru vdr-1.6.0-vanilla/config.h vdr-1.6.0-liemikuutio/config.h
+--- vdr-1.6.0-vanilla/config.h 2008-03-27 21:43:25.000000000 +0200
++++ vdr-1.6.0-liemikuutio/config.h 2008-03-27 21:47:57.000000000 +0200
@@ -36,6 +36,8 @@
// plugins to work with newer versions of the core VDR as long as no
// VDR header files have changed.
@@ -166,9 +166,9 @@
int __EndData__;
cSetup(void);
cSetup& operator= (const cSetup &s);
-diff -Nru vdr-1.5.17-vanilla/menu.c vdr-1.5.17-liemikuutio/menu.c
---- vdr-1.5.17-vanilla/menu.c 2008-03-02 19:09:57.000000000 +0200
-+++ vdr-1.5.17-liemikuutio/menu.c 2008-03-02 22:08:14.000000000 +0200
+diff -Nru vdr-1.6.0-vanilla/menu.c vdr-1.6.0-liemikuutio/menu.c
+--- vdr-1.6.0-vanilla/menu.c 2008-03-27 21:43:25.000000000 +0200
++++ vdr-1.6.0-liemikuutio/menu.c 2008-03-27 21:47:57.000000000 +0200
@@ -13,6 +13,7 @@
#include <stdio.h>
#include <stdlib.h>
@@ -483,7 +483,7 @@
Add(item);
if (!stopRecordingItem)
stopRecordingItem = item;
-@@ -4056,6 +4223,10 @@
+@@ -4059,6 +4226,10 @@
// --- cReplayControl --------------------------------------------------------
@@ -494,7 +494,7 @@
cReplayControl *cReplayControl::currentReplayControl = NULL;
char *cReplayControl::fileName = NULL;
char *cReplayControl::title = NULL;
-@@ -4069,6 +4240,9 @@
+@@ -4072,6 +4243,9 @@
lastCurrent = lastTotal = -1;
lastPlay = lastForward = false;
lastSpeed = -2; // an invalid value
@@ -504,7 +504,7 @@
timeoutShow = 0;
timeSearchActive = false;
marks.Load(fileName);
-@@ -4432,6 +4606,32 @@
+@@ -4435,6 +4609,32 @@
case kGreen: SkipSeconds(-60); break;
case kYellow|k_Repeat:
case kYellow: SkipSeconds( 60); break;
@@ -537,7 +537,7 @@
case kStop:
case kBlue: Hide();
Stop();
-@@ -4441,12 +4641,8 @@
+@@ -4444,12 +4644,8 @@
switch (Key) {
// Editing:
case kMarkToggle: MarkToggle(); break;
@@ -550,9 +550,9 @@
case kMarkJumpForward|k_Repeat:
case kMarkJumpForward: MarkJump(true); break;
case kMarkMoveBack|k_Repeat:
-diff -Nru vdr-1.5.17-vanilla/menu.h vdr-1.5.17-liemikuutio/menu.h
---- vdr-1.5.17-vanilla/menu.h 2008-03-02 19:09:57.000000000 +0200
-+++ vdr-1.5.17-liemikuutio/menu.h 2008-03-02 19:10:40.000000000 +0200
+diff -Nru vdr-1.6.0-vanilla/menu.h vdr-1.6.0-liemikuutio/menu.h
+--- vdr-1.6.0-vanilla/menu.h 2008-03-27 21:43:25.000000000 +0200
++++ vdr-1.6.0-liemikuutio/menu.h 2008-03-27 21:47:56.000000000 +0200
@@ -35,6 +35,7 @@
private:
cTimer *timer;
@@ -579,9 +579,9 @@
time_t timeoutShow;
bool timeSearchActive, timeSearchHide;
int timeSearchTime, timeSearchPos;
-diff -Nru vdr-1.5.17-vanilla/osdbase.c vdr-1.5.17-liemikuutio/osdbase.c
---- vdr-1.5.17-vanilla/osdbase.c 2008-03-02 19:09:57.000000000 +0200
-+++ vdr-1.5.17-liemikuutio/osdbase.c 2008-03-02 19:10:40.000000000 +0200
+diff -Nru vdr-1.6.0-vanilla/osdbase.c vdr-1.6.0-liemikuutio/osdbase.c
+--- vdr-1.6.0-vanilla/osdbase.c 2008-03-27 21:43:25.000000000 +0200
++++ vdr-1.6.0-liemikuutio/osdbase.c 2008-03-27 21:47:56.000000000 +0200
@@ -77,6 +77,7 @@
{
isMenu = true;
@@ -676,9 +676,9 @@
case kUp|k_Repeat:
case kUp: CursorUp(); break;
case kDown|k_Repeat:
-diff -Nru vdr-1.5.17-vanilla/osdbase.h vdr-1.5.17-liemikuutio/osdbase.h
---- vdr-1.5.17-vanilla/osdbase.h 2008-03-02 19:09:57.000000000 +0200
-+++ vdr-1.5.17-liemikuutio/osdbase.h 2008-03-02 19:10:40.000000000 +0200
+diff -Nru vdr-1.6.0-vanilla/osdbase.h vdr-1.6.0-liemikuutio/osdbase.h
+--- vdr-1.6.0-vanilla/osdbase.h 2008-03-27 21:43:25.000000000 +0200
++++ vdr-1.6.0-liemikuutio/osdbase.h 2008-03-27 21:47:56.000000000 +0200
@@ -95,6 +95,8 @@
char *status;
int digit;
@@ -688,9 +688,9 @@
protected:
void SetDisplayMenu(void);
cSkinDisplayMenu *DisplayMenu(void) { return displayMenu; }
-diff -Nru vdr-1.5.17-vanilla/po/de_DE.po vdr-1.5.17-liemikuutio/po/de_DE.po
---- vdr-1.5.17-vanilla/po/de_DE.po 2008-03-02 19:09:57.000000000 +0200
-+++ vdr-1.5.17-liemikuutio/po/de_DE.po 2008-03-02 19:10:40.000000000 +0200
+diff -Nru vdr-1.6.0-vanilla/po/de_DE.po vdr-1.6.0-liemikuutio/po/de_DE.po
+--- vdr-1.6.0-vanilla/po/de_DE.po 2008-03-27 21:43:25.000000000 +0200
++++ vdr-1.6.0-liemikuutio/po/de_DE.po 2008-03-27 21:47:57.000000000 +0200
@@ -998,3 +998,36 @@
#, c-format
msgid "VDR will shut down in %s minutes"
@@ -728,9 +728,9 @@
+
+msgid "Setup.Recording$Show length"
+msgstr "Länge der Aufnahme anzeigen"
-diff -Nru vdr-1.5.17-vanilla/po/et_EE.po vdr-1.5.17-liemikuutio/po/et_EE.po
---- vdr-1.5.17-vanilla/po/et_EE.po 2008-03-02 19:09:57.000000000 +0200
-+++ vdr-1.5.17-liemikuutio/po/et_EE.po 2008-03-02 19:10:40.000000000 +0200
+diff -Nru vdr-1.6.0-vanilla/po/et_EE.po vdr-1.6.0-liemikuutio/po/et_EE.po
+--- vdr-1.6.0-vanilla/po/et_EE.po 2008-03-27 21:43:25.000000000 +0200
++++ vdr-1.6.0-liemikuutio/po/et_EE.po 2008-03-27 21:47:57.000000000 +0200
@@ -998,3 +998,36 @@
#, c-format
msgid "VDR will shut down in %s minutes"
@@ -768,9 +768,9 @@
+
+msgid "Setup.Recording$Show length"
+msgstr "Salvestuse pikkus"
-diff -Nru vdr-1.5.17-vanilla/po/fi_FI.po vdr-1.5.17-liemikuutio/po/fi_FI.po
---- vdr-1.5.17-vanilla/po/fi_FI.po 2008-03-02 19:09:57.000000000 +0200
-+++ vdr-1.5.17-liemikuutio/po/fi_FI.po 2008-03-02 19:10:40.000000000 +0200
+diff -Nru vdr-1.6.0-vanilla/po/fi_FI.po vdr-1.6.0-liemikuutio/po/fi_FI.po
+--- vdr-1.6.0-vanilla/po/fi_FI.po 2008-03-27 21:43:25.000000000 +0200
++++ vdr-1.6.0-liemikuutio/po/fi_FI.po 2008-03-27 21:47:57.000000000 +0200
@@ -1001,3 +1001,36 @@
#, c-format
msgid "VDR will shut down in %s minutes"
@@ -808,9 +808,9 @@
+
+msgid "Setup.Recording$Show length"
+msgstr "Näytä tallenteen kesto"
-diff -Nru vdr-1.5.17-vanilla/po/fr_FR.po vdr-1.5.17-liemikuutio/po/fr_FR.po
---- vdr-1.5.17-vanilla/po/fr_FR.po 2008-03-02 19:09:57.000000000 +0200
-+++ vdr-1.5.17-liemikuutio/po/fr_FR.po 2008-03-02 19:10:40.000000000 +0200
+diff -Nru vdr-1.6.0-vanilla/po/fr_FR.po vdr-1.6.0-liemikuutio/po/fr_FR.po
+--- vdr-1.6.0-vanilla/po/fr_FR.po 2008-03-27 21:43:25.000000000 +0200
++++ vdr-1.6.0-liemikuutio/po/fr_FR.po 2008-03-27 21:47:57.000000000 +0200
@@ -1004,3 +1004,36 @@
#, c-format
msgid "VDR will shut down in %s minutes"
@@ -848,9 +848,9 @@
+
+msgid "Setup.Recording$Show length"
+msgstr "Monter la longueur de l'enregistrement"
-diff -Nru vdr-1.5.17-vanilla/po/ru_RU.po vdr-1.5.17-liemikuutio/po/ru_RU.po
---- vdr-1.5.17-vanilla/po/ru_RU.po 2008-03-02 19:09:57.000000000 +0200
-+++ vdr-1.5.17-liemikuutio/po/ru_RU.po 2008-03-02 19:10:40.000000000 +0200
+diff -Nru vdr-1.6.0-vanilla/po/ru_RU.po vdr-1.6.0-liemikuutio/po/ru_RU.po
+--- vdr-1.6.0-vanilla/po/ru_RU.po 2008-03-27 21:43:25.000000000 +0200
++++ vdr-1.6.0-liemikuutio/po/ru_RU.po 2008-03-27 21:47:57.000000000 +0200
@@ -999,3 +999,36 @@
#, c-format
msgid "VDR will shut down in %s minutes"
@@ -888,9 +888,9 @@
+
+msgid "Setup.Recording$Show length"
+msgstr "¿ÞÚÐ×ëÒÐâì ßàÞÔÞÛÖØâÕÛìÝÞáâì ×ÐßØáØ"
-diff -Nru vdr-1.5.17-vanilla/recording.c vdr-1.5.17-liemikuutio/recording.c
---- vdr-1.5.17-vanilla/recording.c 2008-03-02 19:09:57.000000000 +0200
-+++ vdr-1.5.17-liemikuutio/recording.c 2008-03-02 19:10:40.000000000 +0200
+diff -Nru vdr-1.6.0-vanilla/recording.c vdr-1.6.0-liemikuutio/recording.c
+--- vdr-1.6.0-vanilla/recording.c 2008-03-27 21:43:25.000000000 +0200
++++ vdr-1.6.0-liemikuutio/recording.c 2008-03-27 21:47:56.000000000 +0200
@@ -46,6 +46,7 @@
#endif
#define INFOFILESUFFIX "/info.vdr"
@@ -1024,9 +1024,9 @@
// The number of frames to stay off the end in case of time shift:
#define INDEXSAFETYLIMIT 150 // frames
-diff -Nru vdr-1.5.17-vanilla/recording.h vdr-1.5.17-liemikuutio/recording.h
---- vdr-1.5.17-vanilla/recording.h 2008-03-02 19:09:57.000000000 +0200
-+++ vdr-1.5.17-liemikuutio/recording.h 2008-03-02 19:10:40.000000000 +0200
+diff -Nru vdr-1.6.0-vanilla/recording.h vdr-1.6.0-liemikuutio/recording.h
+--- vdr-1.6.0-vanilla/recording.h 2008-03-27 21:43:25.000000000 +0200
++++ vdr-1.6.0-liemikuutio/recording.h 2008-03-27 21:47:57.000000000 +0200
@@ -19,6 +19,7 @@
#include "tools.h"
@@ -1054,9 +1054,9 @@
};
class cRecordings : public cList<cRecording>, public cThread {
-diff -Nru vdr-1.5.17-vanilla/svdrp.c vdr-1.5.17-liemikuutio/svdrp.c
---- vdr-1.5.17-vanilla/svdrp.c 2008-03-02 19:09:57.000000000 +0200
-+++ vdr-1.5.17-liemikuutio/svdrp.c 2008-03-02 19:10:40.000000000 +0200
+diff -Nru vdr-1.6.0-vanilla/svdrp.c vdr-1.6.0-liemikuutio/svdrp.c
+--- vdr-1.6.0-vanilla/svdrp.c 2008-03-27 21:43:25.000000000 +0200
++++ vdr-1.6.0-liemikuutio/svdrp.c 2008-03-27 21:47:56.000000000 +0200
@@ -296,6 +296,8 @@
"REMO [ on | off ]\n"
" Turns the remote control on or off. Without a parameter, the current\n"
@@ -1113,9 +1113,9 @@
else if (CMD("SCAN")) CmdSCAN(s);
else if (CMD("STAT")) CmdSTAT(s);
else if (CMD("UPDT")) CmdUPDT(s);
-diff -Nru vdr-1.5.17-vanilla/svdrp.h vdr-1.5.17-liemikuutio/svdrp.h
---- vdr-1.5.17-vanilla/svdrp.h 2008-03-02 19:09:57.000000000 +0200
-+++ vdr-1.5.17-liemikuutio/svdrp.h 2008-03-02 19:10:40.000000000 +0200
+diff -Nru vdr-1.6.0-vanilla/svdrp.h vdr-1.6.0-liemikuutio/svdrp.h
+--- vdr-1.6.0-vanilla/svdrp.h 2008-03-27 21:43:25.000000000 +0200
++++ vdr-1.6.0-liemikuutio/svdrp.h 2008-03-27 21:47:56.000000000 +0200
@@ -79,6 +79,7 @@
void CmdPLUG(const char *Option);
void CmdPUTE(const char *Option);
Modified: vdr/vdr/trunk/debian/patches/opt-37-x_menuorg.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/patches/opt-37-x_menuorg.dpatch?rev=6746&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/patches/opt-37-x_menuorg.dpatch (original)
+++ vdr/vdr/trunk/debian/patches/opt-37-x_menuorg.dpatch Sun Apr 13 16:43:52 2008
@@ -6,31 +6,32 @@
## DP: interface, that can be implemented by plugins to reorganize
## DP: VDR's main menu entries with the ability to create custom sub
## DP: menus.
+## DP: This is version 0.4.s of the patch
@DPATCH@
-diff -urNad vdr-1.4.7~/mainmenuitemsprovider.h vdr-1.4.7/mainmenuitemsprovider.h
---- vdr-1.4.7~/mainmenuitemsprovider.h 1970-01-01 01:00:00.000000000 +0100
-+++ vdr-1.4.7/mainmenuitemsprovider.h 2007-08-22 21:30:20.000000000 +0200
-@@ -0,0 +1,57 @@
+diff -Nur vdr-1.5.18.orig/mainmenuitemsprovider.h vdr-1.5.18/mainmenuitemsprovider.h
+--- vdr-1.5.18.orig/mainmenuitemsprovider.h 1970-01-01 01:00:00.000000000 +0100
++++ vdr-1.5.18/mainmenuitemsprovider.h 2008-03-25 21:17:28.000000000 +0100
+@@ -0,0 +1,60 @@
+/*
+ * vdr-menuorg - A plugin for the Linux Video Disk Recorder
-+ * Copyright (C) 2007 Thomas Creutz, Tobias Grimm
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
++ * Copyright (c) 2007 - 2008 Tobias Grimm <vdr at e-tobi.net>
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License as published by the
++ * Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ *
-+ * $Id:$
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
++ * details.
++ *
++ * You should have received a copy of the GNU General Public License along with
++ * this program; if not, write to the Free Software Foundation, Inc.,
++ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
++ *
++ * $Id$
+ *
+ */
+
@@ -48,19 +49,22 @@
+ virtual ~IMenuItemDefinition() {};
+ virtual bool IsCustomOsdItem() = 0;
+ virtual bool IsPluginItem() = 0;
++ virtual bool IsSeparatorItem() = 0;
+ virtual cOsdItem* CustomOsdItem() = 0;
+ virtual const char* PluginMenuEntry() = 0;
++ virtual bool IsSelected() = 0;
+ virtual int PluginIndex() = 0;
+};
+
+typedef std::vector<IMenuItemDefinition*> MenuItemDefinitions;
+
-+#define MENU_ITEMS_PROVIDER_SERVICE_ID "MenuOrgPatch-v0.1::MainMenuItemsProvider"
++#define MENU_ITEMS_PROVIDER_SERVICE_ID "MenuOrgPatch-v0.4.2::MainMenuItemsProvider"
+
+class IMainMenuItemsProvider
+{
+ public:
+ virtual ~IMainMenuItemsProvider() {};
++ virtual bool IsCustomMenuAvailable() = 0;
+ virtual MenuItemDefinitions* MainMenuItems() = 0;
+ virtual void EnterRootMenu() = 0;
+ virtual void EnterSubMenu(cOsdItem* item) = 0;
@@ -69,18 +73,18 @@
+};
+
+#endif //__MAINMENUITEMSPROVIDER_H
-diff -urNad vdr-1.4.7~/menu.c vdr-1.4.7/menu.c
---- vdr-1.4.7~/menu.c 2007-08-22 21:30:20.000000000 +0200
-+++ vdr-1.4.7/menu.c 2007-08-22 21:30:20.000000000 +0200
-@@ -14,6 +14,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <math.h>
+diff -Nur vdr-1.5.18.orig/menu.c vdr-1.5.18/menu.c
+--- vdr-1.5.18.orig/menu.c 2008-03-16 12:15:28.000000000 +0100
++++ vdr-1.5.18/menu.c 2008-03-25 21:17:28.000000000 +0100
+@@ -29,6 +29,7 @@
+ #include "timers.h"
+ #include "transfer.h"
+ #include "videodir.h"
+#include "menuorgpatch.h"
- #include "channels.h"
- #include "config.h"
- #include "cutter.h"
-@@ -3057,6 +3058,9 @@
+
+ #define MAXWAIT4EPGINFO 3 // seconds
+ #define MODETIMEOUT 3 // seconds
+@@ -2969,6 +2970,9 @@
cancelEditingItem = NULL;
stopRecordingItem = NULL;
recordControlsState = 0;
@@ -90,33 +94,37 @@
Set();
// Initial submenus:
-@@ -3084,6 +3088,25 @@
- Clear();
+@@ -2997,6 +3001,29 @@
SetTitle("VDR");
SetHasHotkeys();
-+
+
+ if (MenuOrgPatch::IsCustomMenuAvailable()) {
-+ MenuItemDefinitions* menuItems = MenuOrgPatch::MainMenuItems();
-+ for (MenuItemDefinitions::iterator i = menuItems->begin(); i != menuItems->end(); i++) {
-+ if ((*i)->IsCustomOsdItem()) {
-+ cOsdItem* osdItem = (*i)->CustomOsdItem();
-+ if (osdItem) {
-+ osdItem->SetText(hk(osdItem->Text()));
-+ Add(osdItem);
-+ }
-+ }
-+ else if ((*i)->IsPluginItem()) {
-+ const char *item = (*i)->PluginMenuEntry();
-+ if (item)
-+ Add(new cMenuPluginItem(hk(item), (*i)->PluginIndex()));
-+ }
-+ }
-+ }
++ MenuItemDefinitions* menuItems = MenuOrgPatch::MainMenuItems();
++ for (MenuItemDefinitions::iterator i = menuItems->begin(); i != menuItems->end(); i++) {
++ cOsdItem* osdItem = NULL;
++ if ((*i)->IsCustomOsdItem()) {
++ osdItem = (*i)->CustomOsdItem();
++ if (osdItem && !(*i)->IsSeparatorItem())
++ osdItem->SetText(hk(osdItem->Text()));
++ }
++ else if ((*i)->IsPluginItem()) {
++ const char *item = (*i)->PluginMenuEntry();
++ if (item)
++ osdItem = new cMenuPluginItem(hk(item), (*i)->PluginIndex());
++ }
++ if (osdItem) {
++ Add(osdItem);
++ if ((*i)->IsSelected())
++ SetCurrent(osdItem);
++ }
++ }
++ }
+ else {
-
++
// Basic menu items:
-@@ -3111,6 +3134,8 @@
+ Add(new cOsdItem(hk(tr("Schedule")), osSchedule));
+@@ -3023,6 +3050,8 @@
if (Commands.Count())
Add(new cOsdItem(hk(tr("Commands")), osCommands));
@@ -125,7 +133,7 @@
Update(true);
Display();
-@@ -3238,6 +3263,41 @@
+@@ -3135,6 +3164,41 @@
state = osEnd;
}
break;
@@ -167,29 +175,29 @@
default: switch (Key) {
case kRecord:
case kRed: if (!HadSubMenu)
-diff -urNad vdr-1.4.7~/menuorgpatch.h vdr-1.4.7/menuorgpatch.h
---- vdr-1.4.7~/menuorgpatch.h 1970-01-01 01:00:00.000000000 +0100
-+++ vdr-1.4.7/menuorgpatch.h 2007-08-22 21:31:33.000000000 +0200
-@@ -0,0 +1,101 @@
+diff -Nur vdr-1.5.18.orig/menuorgpatch.h vdr-1.5.18/menuorgpatch.h
+--- vdr-1.5.18.orig/menuorgpatch.h 1970-01-01 01:00:00.000000000 +0100
++++ vdr-1.5.18/menuorgpatch.h 2008-03-25 21:17:28.000000000 +0100
+@@ -0,0 +1,100 @@
+/*
+ * vdr-menuorg - A plugin for the Linux Video Disk Recorder
-+ * Copyright (C) 2007 Thomas Creutz, Tobias Grimm
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
++ * Copyright (c) 2007 - 2008 Tobias Grimm <vdr at e-tobi.net>
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License as published by the
++ * Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ *
-+ * $Id:$
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
++ * details.
++ *
++ * You should have received a copy of the GNU General Public License along with
++ * this program; if not, write to the Free Software Foundation, Inc.,
++ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
++ *
++ * $Id$
+ *
+ */
+
@@ -197,7 +205,6 @@
+#define __MENUORGPATCH_H
+
+#include "mainmenuitemsprovider.h"
-+#include "plugin.h"
+
+class MenuOrgPatch
+{
@@ -210,7 +217,7 @@
+ if (!_mainMenuItemsProvider)
+ {
+ IMainMenuItemsProvider* mainMenuItemsProvider;
-+
++
+ if (cPluginManager::CallFirstService(MENU_ITEMS_PROVIDER_SERVICE_ID, &mainMenuItemsProvider))
+ {
+ _mainMenuItemsProvider = mainMenuItemsProvider;
@@ -222,9 +229,9 @@
+ public:
+ static bool IsCustomMenuAvailable()
+ {
-+ return (MainMenuItemsProvider() != NULL);
-+ }
-+
++ return (MainMenuItemsProvider() != NULL) && (MainMenuItemsProvider()->IsCustomMenuAvailable());
++ }
++
+ static void EnterRootMenu()
+ {
+ if (MainMenuItemsProvider())
@@ -241,7 +248,7 @@
+ }
+ return false;
+ }
-+
++
+ static void EnterSubMenu(cOsdItem* item)
+ {
+ if (MainMenuItemsProvider())
@@ -249,7 +256,7 @@
+ MainMenuItemsProvider()->EnterSubMenu(item);
+ }
+ }
-+
++
+ static MenuItemDefinitions* MainMenuItems()
+ {
+ if (MainMenuItemsProvider())
@@ -258,7 +265,7 @@
+ }
+ return NULL;
+ }
-+
++
+ static cOsdMenu* Execute(cOsdItem* item)
+ {
+ if (MainMenuItemsProvider())
Modified: vdr/vdr/trunk/debian/patches/opt-48-x_pin.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/patches/opt-48-x_pin.dpatch?rev=6746&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/patches/opt-48-x_pin.dpatch (original)
+++ vdr/vdr/trunk/debian/patches/opt-48-x_pin.dpatch Sun Apr 13 16:43:52 2008
@@ -12,9 +12,9 @@
## (vdr-1.4.5.diff)
@DPATCH@
-diff -urNad vdr-1.5.15~/Makefile vdr-1.5.15/Makefile
---- vdr-1.5.15~/Makefile 2008-02-17 22:13:55.000000000 +0100
-+++ vdr-1.5.15/Makefile 2008-02-17 22:13:56.000000000 +0100
+diff -urNad vdr-1.6.0~/Makefile vdr-1.6.0/Makefile
+--- vdr-1.6.0~/Makefile 2008-03-23 13:52:42.000000000 +0100
++++ vdr-1.6.0/Makefile 2008-03-23 13:52:42.000000000 +0100
@@ -45,6 +45,8 @@
OBJS += vdrttxtsubshooks.o
@@ -24,9 +24,9 @@
ifndef NO_KBD
DEFINES += -DREMOTE_KBD
endif
-diff -urNad vdr-1.5.15~/childlock.c vdr-1.5.15/childlock.c
---- vdr-1.5.15~/childlock.c 1970-01-01 01:00:00.000000000 +0100
-+++ vdr-1.5.15/childlock.c 2008-02-17 22:13:56.000000000 +0100
+diff -urNad vdr-1.6.0~/childlock.c vdr-1.6.0/childlock.c
+--- vdr-1.6.0~/childlock.c 1970-01-01 01:00:00.000000000 +0100
++++ vdr-1.6.0/childlock.c 2008-03-23 13:52:42.000000000 +0100
@@ -0,0 +1,166 @@
+#include "childlock.h"
+#include "childlockservice.h"
@@ -194,9 +194,9 @@
+ notificationService->NotifyUserAction(key, Interact);
+ }
+}
-diff -urNad vdr-1.5.15~/childlock.h vdr-1.5.15/childlock.h
---- vdr-1.5.15~/childlock.h 1970-01-01 01:00:00.000000000 +0100
-+++ vdr-1.5.15/childlock.h 2008-02-17 22:13:56.000000000 +0100
+diff -urNad vdr-1.6.0~/childlock.h vdr-1.6.0/childlock.h
+--- vdr-1.6.0~/childlock.h 1970-01-01 01:00:00.000000000 +0100
++++ vdr-1.6.0/childlock.h 2008-03-23 13:52:42.000000000 +0100
@@ -0,0 +1,47 @@
+#ifndef __CHILDLOCK_H
+#define __CHILDLOCK_H
@@ -245,9 +245,9 @@
+
+};
+#endif
-diff -urNad vdr-1.5.15~/childlockservice.h vdr-1.5.15/childlockservice.h
---- vdr-1.5.15~/childlockservice.h 1970-01-01 01:00:00.000000000 +0100
-+++ vdr-1.5.15/childlockservice.h 2008-02-17 22:13:56.000000000 +0100
+diff -urNad vdr-1.6.0~/childlockservice.h vdr-1.6.0/childlockservice.h
+--- vdr-1.6.0~/childlockservice.h 1970-01-01 01:00:00.000000000 +0100
++++ vdr-1.6.0/childlockservice.h 2008-03-23 13:52:42.000000000 +0100
@@ -0,0 +1,46 @@
+#ifndef __CHILDLOCKSERVICE_H
+#define __CHILDLOCKSERVICE_H
@@ -295,9 +295,9 @@
+
+};
+#endif
-diff -urNad vdr-1.5.15~/device.c vdr-1.5.15/device.c
---- vdr-1.5.15~/device.c 2008-02-17 22:13:55.000000000 +0100
-+++ vdr-1.5.15/device.c 2008-02-17 22:13:56.000000000 +0100
+diff -urNad vdr-1.6.0~/device.c vdr-1.6.0/device.c
+--- vdr-1.6.0~/device.c 2008-03-23 13:52:42.000000000 +0100
++++ vdr-1.6.0/device.c 2008-03-23 13:52:42.000000000 +0100
@@ -18,6 +18,7 @@
#include "receiver.h"
#include "status.h"
@@ -306,7 +306,7 @@
// --- cLiveSubtitle ---------------------------------------------------------
-@@ -761,6 +762,7 @@
+@@ -766,6 +767,7 @@
cChannel *channel;
while ((channel = Channels.GetByNumber(n, Direction)) != NULL) {
// try only channels which are currently available
@@ -314,7 +314,7 @@
if (GetDevice(channel, 0, true))
break;
n = channel->Number() + Direction;
-@@ -782,6 +784,9 @@
+@@ -787,6 +789,9 @@
eSetChannelResult cDevice::SetChannel(const cChannel *Channel, bool LiveView)
{
@@ -324,13 +324,13 @@
if (LiveView) {
StopReplay();
DELETENULL(liveSubtitle);
-diff -urNad vdr-1.5.15~/menu.c vdr-1.5.15/menu.c
---- vdr-1.5.15~/menu.c 2008-02-17 22:13:55.000000000 +0100
-+++ vdr-1.5.15/menu.c 2008-02-17 22:13:56.000000000 +0100
+diff -urNad vdr-1.6.0~/menu.c vdr-1.6.0/menu.c
+--- vdr-1.6.0~/menu.c 2008-03-23 13:52:42.000000000 +0100
++++ vdr-1.6.0/menu.c 2008-03-23 13:54:32.000000000 +0100
@@ -32,6 +32,7 @@
- #include "transfer.h"
#include "vdrttxtsubshooks.h"
#include "videodir.h"
+ #include "menuorgpatch.h"
+#include "childlock.h"
#define MAXWAIT4EPGINFO 3 // seconds
@@ -346,7 +346,7 @@
Add(new cMenuEditStrItem( tr("File"), data.file, sizeof(data.file)));
SetFirstDayItem();
}
-@@ -2300,7 +2305,8 @@
+@@ -2301,7 +2306,8 @@
for (cRecording *recording = Recordings.First(); recording; recording = Recordings.Next(recording)) {
if (!base || (strstr(recording->Name(), base) == recording->Name() && recording->Name()[strlen(base)] == '~')) {
cMenuRecordingItem *Item = new cMenuRecordingItem(recording, level);
@@ -356,7 +356,7 @@
Add(Item);
LastItem = Item;
free(LastItemText);
-@@ -2363,6 +2369,9 @@
+@@ -2364,6 +2370,9 @@
{
cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current());
if (ri) {
@@ -367,15 +367,15 @@
Open();
else {
@@ -3396,6 +3405,8 @@
- }
- else if ((*i)->IsPluginItem()) {
- const char *item = (*i)->PluginMenuEntry();
-+ cPlugin *plugin = cPluginManager::GetPlugin((*i)->PluginIndex());
-+ if (!PinPatch::ChildLock::IsPluginHidden(plugin))
- if (item)
- Add(new cMenuPluginItem(hk(item), (*i)->PluginIndex()));
- }
-@@ -3405,9 +3416,13 @@
+ }
+ else if ((*i)->IsPluginItem()) {
+ const char *item = (*i)->PluginMenuEntry();
++ cPlugin *plugin = cPluginManager::GetPlugin((*i)->PluginIndex());
++ if (!PinPatch::ChildLock::IsPluginHidden(plugin))
+ if (item)
+ osdItem = new cMenuPluginItem(hk(item), (*i)->PluginIndex());
+ }
+@@ -3410,9 +3421,13 @@
// Basic menu items:
@@ -389,7 +389,7 @@
Add(new cOsdItem(hk(tr("Recordings")), osRecordings));
// Plugins:
-@@ -3415,18 +3430,22 @@
+@@ -3420,18 +3435,22 @@
for (int i = 0; ; i++) {
cPlugin *p = cPluginManager::GetPlugin(i);
if (p) {
@@ -412,7 +412,7 @@
Add(new cOsdItem(hk(tr("Commands")), osCommands));
}
-@@ -3507,6 +3526,11 @@
+@@ -3512,6 +3531,11 @@
eOSState state = cOsdMenu::ProcessKey(Key);
HadSubMenu |= HasSubMenu();
@@ -424,7 +424,7 @@
cOsdMenu *menu = NULL;
switch (state) {
case osSchedule:
-@@ -3553,6 +3577,7 @@
+@@ -3558,6 +3582,7 @@
if (item) {
cPlugin *p = cPluginManager::GetPlugin(item->PluginIndex());
if (p) {
@@ -432,7 +432,7 @@
cOsdObject *menu = p->MainMenuAction();
if (menu) {
if (menu->IsMenu())
-@@ -3564,6 +3589,7 @@
+@@ -3569,6 +3594,7 @@
}
}
}
@@ -440,7 +440,7 @@
state = osEnd;
}
break;
-@@ -3766,6 +3792,7 @@
+@@ -3771,6 +3797,7 @@
if (Direction) {
while (Channel) {
Channel = Direction > 0 ? Channels.Next(Channel) : Channels.Prev(Channel);
@@ -448,7 +448,7 @@
if (Channel && !Channel->GroupSep() && cDevice::GetDevice(Channel, 0, true))
return Channel;
}
-@@ -4397,6 +4424,7 @@
+@@ -4405,6 +4432,7 @@
for (int i = 0; i < MAXRECORDCONTROLS; i++) {
if (!RecordControls[i]) {
RecordControls[i] = new cRecordControl(device, Timer, Pause);
@@ -456,9 +456,9 @@
return RecordControls[i]->Process(time(NULL));
}
}
-diff -urNad vdr-1.5.15~/po/de_DE.po vdr-1.5.15/po/de_DE.po
---- vdr-1.5.15~/po/de_DE.po 2008-02-17 22:13:55.000000000 +0100
-+++ vdr-1.5.15/po/de_DE.po 2008-02-17 22:13:56.000000000 +0100
+diff -urNad vdr-1.6.0~/po/de_DE.po vdr-1.6.0/po/de_DE.po
+--- vdr-1.6.0~/po/de_DE.po 2008-03-23 13:52:42.000000000 +0100
++++ vdr-1.6.0/po/de_DE.po 2008-03-23 13:52:42.000000000 +0100
@@ -360,6 +360,9 @@
msgid "Lifetime"
msgstr "Lebensdauer"
@@ -469,9 +469,9 @@
msgid "File"
msgstr "Datei"
-diff -urNad vdr-1.5.15~/po/fr_FR.po vdr-1.5.15/po/fr_FR.po
---- vdr-1.5.15~/po/fr_FR.po 2008-02-17 22:13:55.000000000 +0100
-+++ vdr-1.5.15/po/fr_FR.po 2008-02-17 22:13:56.000000000 +0100
+diff -urNad vdr-1.6.0~/po/fr_FR.po vdr-1.6.0/po/fr_FR.po
+--- vdr-1.6.0~/po/fr_FR.po 2008-03-23 13:52:42.000000000 +0100
++++ vdr-1.6.0/po/fr_FR.po 2008-03-23 13:52:42.000000000 +0100
@@ -366,6 +366,9 @@
msgid "Lifetime"
msgstr "Durée de vie"
@@ -482,9 +482,9 @@
msgid "File"
msgstr "Fichier"
-diff -urNad vdr-1.5.15~/timers.c vdr-1.5.15/timers.c
---- vdr-1.5.15~/timers.c 2008-02-16 15:47:40.000000000 +0100
-+++ vdr-1.5.15/timers.c 2008-02-17 22:14:19.000000000 +0100
+diff -urNad vdr-1.6.0~/timers.c vdr-1.6.0/timers.c
+--- vdr-1.6.0~/timers.c 2008-02-16 15:47:40.000000000 +0100
++++ vdr-1.6.0/timers.c 2008-03-23 13:52:42.000000000 +0100
@@ -16,6 +16,7 @@
#include "recording.h"
#include "remote.h"
@@ -572,9 +572,9 @@
}
void cTimer::ClrFlags(uint Flags)
-diff -urNad vdr-1.5.15~/timers.h vdr-1.5.15/timers.h
---- vdr-1.5.15~/timers.h 2008-02-16 15:33:23.000000000 +0100
-+++ vdr-1.5.15/timers.h 2008-02-17 22:13:56.000000000 +0100
+diff -urNad vdr-1.6.0~/timers.h vdr-1.6.0/timers.h
+--- vdr-1.6.0~/timers.h 2008-02-16 15:33:23.000000000 +0100
++++ vdr-1.6.0/timers.h 2008-03-23 13:52:42.000000000 +0100
@@ -20,6 +20,7 @@
tfInstant = 0x0002,
tfVps = 0x0004,
@@ -583,9 +583,9 @@
tfAll = 0xFFFF,
};
enum eTimerMatch { tmNone, tmPartial, tmFull };
-diff -urNad vdr-1.5.15~/vdr.c vdr-1.5.15/vdr.c
---- vdr-1.5.15~/vdr.c 2008-02-17 22:13:55.000000000 +0100
-+++ vdr-1.5.15/vdr.c 2008-02-17 22:13:56.000000000 +0100
+diff -urNad vdr-1.6.0~/vdr.c vdr-1.6.0/vdr.c
+--- vdr-1.6.0~/vdr.c 2008-03-23 13:52:42.000000000 +0100
++++ vdr-1.6.0/vdr.c 2008-03-23 13:52:42.000000000 +0100
@@ -64,6 +64,7 @@
#include "tools.h"
#include "transfer.h"
@@ -594,7 +594,7 @@
#define MINCHANNELWAIT 10 // seconds to wait between failed channel switchings
#define ACTIVITYTIMEOUT 60 // seconds before starting housekeeping
-@@ -919,6 +920,7 @@
+@@ -923,6 +924,7 @@
cOsdObject *Interact = Menu ? Menu : cControl::Control();
eKeys key = Interface->GetKey(!Interact || !Interact->NeedsFastResponse());
if (ISREALKEY(key)) {
@@ -602,7 +602,7 @@
EITScanner.Activity();
// Cancel shutdown countdown:
if (ShutdownHandler.countdown)
-@@ -991,10 +993,12 @@
+@@ -995,10 +997,12 @@
cControl::Control()->Hide();
cPlugin *plugin = cPluginManager::GetPlugin(PluginName);
if (plugin) {
@@ -615,7 +615,7 @@
else
esyslog("ERROR: unknown plugin '%s'", PluginName);
}
-@@ -1203,9 +1207,11 @@
+@@ -1208,9 +1212,11 @@
// Instant resume of the last viewed recording:
case kPlay:
if (cReplayControl::LastReplayed()) {
Modified: vdr/vdr/trunk/debian/patches/opt-50_graphtft.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/patches/opt-50_graphtft.dpatch?rev=6746&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/patches/opt-50_graphtft.dpatch (original)
+++ vdr/vdr/trunk/debian/patches/opt-50_graphtft.dpatch Sun Apr 13 16:43:52 2008
@@ -1,140 +1,219 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
-## opt-50_graphtft.dpatch by Jörg Wendel (Horchi)
+## opt-50_graphtft-0.1.dpatch by Jörg Wendel (Horchi)
##
## Thomas Günther <tom at toms-cafe.de>:
-## - adapted to VDR-1.5.0
## - adapted to pin patch
##
## All lines beginning with `## DP:' are a description of the patch.
-## DP: Patch from the Graphtft plugin version 0.0.15
+## DP: Patch from the Graphtft plugin version 0.1.6.alpha
## DP: http://www.jwendel.de/vdr/
@DPATCH@
-diff -urNad vdr-1.4.6~/menu.c vdr-1.4.6/menu.c
---- vdr-1.4.6~/menu.c 2007-03-10 21:46:00.000000000 +0100
-+++ vdr-1.4.6/menu.c 2007-03-10 21:46:01.000000000 +0100
-@@ -226,6 +226,7 @@
+diff -urNad vdr-1.6.0~/menu.c vdr-1.6.0/menu.c
+--- vdr-1.6.0~/menu.c 2008-04-04 17:17:26.000000000 +0200
++++ vdr-1.6.0/menu.c 2008-04-04 17:19:44.000000000 +0200
+@@ -262,6 +262,7 @@
public:
cMenuEditChannel(cChannel *Channel, bool New = false);
virtual eOSState ProcessKey(eKeys Key);
-+ virtual eOsdMenuKind MenuKind() { return omEditChannel; }
++ virtual const char* MenuKind() { return "MenuEditChannel"; }
};
cMenuEditChannel::cMenuEditChannel(cChannel *Channel, bool New)
-@@ -451,6 +452,7 @@
+@@ -484,6 +485,7 @@
cMenuChannels(void);
~cMenuChannels();
virtual eOSState ProcessKey(eKeys Key);
-+ virtual eOsdMenuKind MenuKind() { return omChannels; }
++ virtual const char* MenuKind() { return "MenuChannels"; }
};
cMenuChannels::cMenuChannels(void)
-@@ -949,6 +951,7 @@
+@@ -955,6 +957,7 @@
virtual ~cMenuTimers();
virtual void Display(void);
virtual eOSState ProcessKey(eKeys Key);
-+ virtual eOsdMenuKind MenuKind() { return omTimers; }
++ virtual const char* MenuKind() { return "MenuTimers"; }
};
cMenuTimers::cMenuTimers(void)
-@@ -1479,6 +1482,7 @@
+@@ -1181,6 +1184,7 @@
+ {
+ cOsdMenu::Display();
+ DisplayMenu()->SetEvent(event);
++ cStatus::MsgOsdSetEvent(event);
+ if (event->Description())
+ cStatus::MsgOsdTextItem(event->Description());
+ }
+@@ -1323,6 +1327,7 @@
+ static void SetCurrentChannel(int ChannelNr) { currentChannel = ChannelNr; }
+ static const cEvent *ScheduleEvent(void);
+ virtual eOSState ProcessKey(eKeys Key);
++ virtual const char* MenuKind() { return now ? "MenuWhatsOnNow" : "MenuWhatsOnNext"; }
+ };
+
+ int cMenuWhatsOn::currentChannel = 0;
+@@ -1490,6 +1495,7 @@
cMenuSchedule(void);
virtual ~cMenuSchedule();
virtual eOSState ProcessKey(eKeys Key);
-+ virtual eOsdMenuKind MenuKind() { return omSchedule; }
++ virtual const char* MenuKind() { return "MenuSchedule"; }
};
cMenuSchedule::cMenuSchedule(void)
-@@ -1751,6 +1755,7 @@
+@@ -1757,6 +1763,7 @@
cMenuCommands(const char *Title, cCommands *Commands, const char *Parameters = NULL);
virtual ~cMenuCommands();
virtual eOSState ProcessKey(eKeys Key);
-+ virtual eOsdMenuKind MenuKind() { return omCommands; }
++ virtual const char* MenuKind() { return "MenuCommands"; }
};
cMenuCommands::cMenuCommands(const char *Title, cCommands *Commands, const char *Parameters)
-@@ -1986,6 +1991,7 @@
+@@ -1833,6 +1840,7 @@
+ cMenuCam(cCamSlot *CamSlot);
+ virtual ~cMenuCam();
+ virtual eOSState ProcessKey(eKeys Key);
++ virtual const char* MenuKind() { return "MenuCam"; }
+ };
+
+ cMenuCam::cMenuCam(cCamSlot *CamSlot)
+@@ -2012,6 +2020,7 @@
cMenuRecording(const cRecording *Recording, bool WithButtons = false);
virtual void Display(void);
virtual eOSState ProcessKey(eKeys Key);
-+ virtual eOsdMenuKind MenuKind() { return omRecording; }
++ virtual const char* MenuKind() { return "MenuRecording"; }
};
cMenuRecording::cMenuRecording(const cRecording *Recording, bool WithButtons)
-@@ -3097,6 +3103,7 @@
+@@ -2027,6 +2036,7 @@
+ {
+ cOsdMenu::Display();
+ DisplayMenu()->SetRecording(recording);
++ cStatus::MsgOsdSetRecording(recording);
+ if (recording->Info()->Description())
+ cStatus::MsgOsdTextItem(recording->Info()->Description());
+ }
+@@ -2133,6 +2143,7 @@
+ public:
+ cMenuRenameRecording(cRecording *Recording);
+ virtual eOSState ProcessKey(eKeys Key);
++ virtual const char* MenuKind() { return "MenuRenameRecording"; }
+ };
+
+ cMenuRenameRecording::cMenuRenameRecording(cRecording *Recording)
+@@ -2573,6 +2584,7 @@
+ cMenuSetupOSD(void);
+ virtual ~cMenuSetupOSD();
+ virtual eOSState ProcessKey(eKeys Key);
++ virtual const char* MenuKind() { return "MenuSetupOsd"; }
+ };
+
+ cMenuSetupOSD::cMenuSetupOSD(void)
+@@ -2720,6 +2732,7 @@
+ public:
+ cMenuSetupEPG(void);
+ virtual eOSState ProcessKey(eKeys Key);
++ virtual const char* MenuKind() { return "MenuSetupEpg"; }
+ };
+
+ cMenuSetupEPG::cMenuSetupEPG(void)
+@@ -2824,6 +2837,7 @@
+ public:
+ cMenuSetupDVB(void);
+ virtual eOSState ProcessKey(eKeys Key);
++ virtual const char* MenuKind() { return "MenuSetupDvb"; }
+ };
+
+ cMenuSetupDVB::cMenuSetupDVB(void)
+@@ -2955,6 +2969,7 @@
+ public:
+ cMenuSetupLNB(void);
+ virtual eOSState ProcessKey(eKeys Key);
++ virtual const char* MenuKind() { return "MenuSetupLnb"; }
+ };
+
+ cMenuSetupLNB::cMenuSetupLNB(void)
+@@ -3035,6 +3050,7 @@
+ public:
+ cMenuSetupCAM(void);
+ virtual eOSState ProcessKey(eKeys Key);
++ virtual const char* MenuKind() { return "MenuSetupCam"; }
+ };
+
+ cMenuSetupCAM::cMenuSetupCAM(void)
+@@ -3205,6 +3221,7 @@
public:
cMenuSetupPlugins(void);
virtual eOSState ProcessKey(eKeys Key);
-+ virtual eOsdMenuKind MenuKind() { return omSetupPage; }
++ virtual const char* MenuKind() { return "MenuSetupPlugins"; }
};
cMenuSetupPlugins::cMenuSetupPlugins(void)
-@@ -3150,6 +3157,7 @@
+@@ -3254,6 +3271,7 @@
public:
cMenuSetup(void);
virtual eOSState ProcessKey(eKeys Key);
-+ virtual eOsdMenuKind MenuKind() { return omSetup; }
++ virtual const char* MenuKind() { return "MenuSetup"; }
};
cMenuSetup::cMenuSetup(void)
-diff -urNad vdr-1.4.6~/menu.h vdr-1.4.6/menu.h
---- vdr-1.4.6~/menu.h 2007-03-10 21:46:00.000000000 +0100
-+++ vdr-1.4.6/menu.h 2007-03-10 21:46:01.000000000 +0100
-@@ -30,6 +30,7 @@
+diff -urNad vdr-1.6.0~/menu.h vdr-1.6.0/menu.h
+--- vdr-1.6.0~/menu.h 2008-04-04 17:17:25.000000000 +0200
++++ vdr-1.6.0/menu.h 2008-04-04 17:20:43.000000000 +0200
+@@ -29,6 +29,7 @@
void SetText(const char *Text);
virtual void Display(void);
virtual eOSState ProcessKey(eKeys Key);
-+ virtual eOsdMenuKind MenuKind() { return omText; }
++ virtual const char* MenuKind() { return "MenuText"; }
};
class cMenuEditTimer : public cOsdMenu {
-@@ -46,6 +47,7 @@
+@@ -44,6 +45,7 @@
cMenuEditTimer(cTimer *Timer, bool New = false);
virtual ~cMenuEditTimer();
virtual eOSState ProcessKey(eKeys Key);
-+ virtual eOsdMenuKind MenuKind() { return omTimerEdit; }
++ virtual const char* MenuKind() { return "MenuTimerEdit"; }
};
class cMenuEvent : public cOsdMenu {
-@@ -55,6 +57,7 @@
+@@ -53,6 +55,7 @@
cMenuEvent(const cEvent *Event, bool CanSwitch = false, bool Buttons = false);
virtual void Display(void);
virtual eOSState ProcessKey(eKeys Key);
-+ virtual eOsdMenuKind MenuKind() { return omEvent; }
++ virtual const char* MenuKind() { return "MenuEvent"; }
};
class cMenuMain : public cOsdMenu {
-@@ -74,6 +77,7 @@
+@@ -69,6 +72,7 @@
cMenuMain(eOSState State = osUnknown);
virtual eOSState ProcessKey(eKeys Key);
static cOsdObject *PluginOsdObject(void);
-+ virtual eOsdMenuKind MenuKind() { return omMain; }
++ virtual const char* MenuKind() { return "MenuMain"; }
};
class cDisplayChannel : public cOsdObject {
-@@ -182,6 +188,7 @@
+@@ -171,6 +175,7 @@
cMenuRecordings(const char *Base = NULL, int Level = 0, bool OpenSubMenus = false);
~cMenuRecordings();
virtual eOSState ProcessKey(eKeys Key);
-+ virtual eOsdMenuKind MenuKind() { return omRecordings; }
++ virtual const char* MenuKind() { return "MenuRecordings"; }
};
class cRecordControl {
-diff -urNad vdr-1.4.6~/menuitems.h vdr-1.4.6/menuitems.h
---- vdr-1.4.6~/menuitems.h 2007-03-10 21:45:57.000000000 +0100
-+++ vdr-1.4.6/menuitems.h 2007-03-10 21:46:01.000000000 +0100
-@@ -179,6 +179,7 @@
+diff -urNad vdr-1.6.0~/menuitems.h vdr-1.6.0/menuitems.h
+--- vdr-1.6.0~/menuitems.h 2008-02-16 17:09:58.000000000 +0100
++++ vdr-1.6.0/menuitems.h 2008-04-04 17:17:53.000000000 +0200
+@@ -174,6 +174,7 @@
cMenuSetupPage(void);
virtual eOSState ProcessKey(eKeys Key);
void SetPlugin(cPlugin *Plugin);
-+ eOsdMenuKind MenuKind() { return omSetupPage; }
++ const char* MenuKind() { return "MenuSetupPage"; }
};
#endif //__MENUITEMS_H
-diff -urNad vdr-1.4.6~/osdbase.c vdr-1.4.6/osdbase.c
---- vdr-1.4.6~/osdbase.c 2007-03-10 21:45:57.000000000 +0100
-+++ vdr-1.4.6/osdbase.c 2007-03-10 21:46:01.000000000 +0100
-@@ -100,6 +100,7 @@
+diff -urNad vdr-1.6.0~/osdbase.c vdr-1.6.0/osdbase.c
+--- vdr-1.6.0~/osdbase.c 2008-04-04 17:17:25.000000000 +0200
++++ vdr-1.6.0/osdbase.c 2008-04-04 17:18:05.000000000 +0200
+@@ -98,6 +98,7 @@
free(status);
displayMenu->Clear();
cStatus::MsgOsdClear();
@@ -142,7 +221,7 @@
if (!--displayMenuCount)
DELETENULL(displayMenu);
}
-@@ -195,6 +196,7 @@
+@@ -203,6 +204,7 @@
displayMenu->SetMessage(mtStatus, NULL);
displayMenu->Clear();
cStatus::MsgOsdClear();
@@ -150,95 +229,85 @@
displayMenu->SetTabs(cols[0], cols[1], cols[2], cols[3], cols[4]);//XXX
displayMenu->SetTitle(title);
cStatus::MsgOsdTitle(title);
-@@ -510,6 +512,7 @@
- eOSState state = subMenu->ProcessKey(Key);
- if (state == osBack)
- return CloseSubMenu();
-+
- return state;
- }
-
-diff -urNad vdr-1.4.6~/osdbase.h vdr-1.4.6/osdbase.h
---- vdr-1.4.6~/osdbase.h 2007-03-10 21:45:57.000000000 +0100
-+++ vdr-1.4.6/osdbase.h 2007-03-10 21:46:01.000000000 +0100
-@@ -46,6 +46,30 @@
- osUser10,
- };
-
-+enum eOsdMenuKind { omUnknown,
-+ omMain,
-+ omText,
-+ omTimerEdit,
-+ omEvent,
-+ omCam,
-+ omCamEnquiry,
-+ omSetupPage,
-+ omEditChannel,
-+ omChannels,
-+ omCommands,
-+ omTimers,
-+ omWhatsOn,
-+ omWhatsOnElse = omWhatsOn,
-+ omWhatsOnNow,
-+ omWhatsOnNext,
-+ omSchedule,
-+ omRecording,
-+ omRecordings,
-+ omRenameRecording,
-+ omSetup
-+ };
-+
-+
- class cOsdItem : public cListObject {
- private:
- char *text;
-@@ -127,6 +151,7 @@
+diff -urNad vdr-1.6.0~/osdbase.h vdr-1.6.0/osdbase.h
+--- vdr-1.6.0~/osdbase.h 2008-04-04 17:17:25.000000000 +0200
++++ vdr-1.6.0/osdbase.h 2008-04-04 17:18:11.000000000 +0200
+@@ -131,6 +131,7 @@
void Ins(cOsdItem *Item, bool Current = false, cOsdItem *Before = NULL);
virtual void Display(void);
virtual eOSState ProcessKey(eKeys Key);
-+ virtual eOsdMenuKind MenuKind() { return omUnknown; }
++ virtual const char* MenuKind() { return "MenuUnknown"; }
};
#endif //__OSDBASE_H
-diff -urNad vdr-1.4.6~/status.c vdr-1.4.6/status.c
---- vdr-1.4.6~/status.c 2007-03-10 21:46:00.000000000 +0100
-+++ vdr-1.4.6/status.c 2007-03-10 21:46:01.000000000 +0100
-@@ -164,3 +164,15 @@
- return true;
- return false;
+diff -urNad vdr-1.6.0~/recording.h vdr-1.6.0/recording.h
+--- vdr-1.6.0~/recording.h 2008-04-04 17:17:25.000000000 +0200
++++ vdr-1.6.0/recording.h 2008-04-04 17:19:50.000000000 +0200
+@@ -56,6 +56,7 @@
+ const char *ChannelName(void) const { return channelName; }
+ const char *Title(void) const { return event->Title(); }
+ const char *ShortText(void) const { return event->ShortText(); }
++ tEventID EventID(void) const { return event->EventID(); }
+ const char *Description(void) const { return event->Description(); }
+ const cComponents *Components(void) const { return event->Components(); }
+ const char *Aux(void) const { return aux; }
+diff -urNad vdr-1.6.0~/status.c vdr-1.6.0/status.c
+--- vdr-1.6.0~/status.c 2008-02-16 15:46:31.000000000 +0100
++++ vdr-1.6.0/status.c 2008-04-04 17:20:11.000000000 +0200
+@@ -124,3 +124,26 @@
+ for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm))
+ sm->OsdProgramme(PresentTime, PresentTitle, PresentSubtitle, FollowingTime, FollowingTitle, FollowingSubtitle);
}
-+
-+void cStatus::MsgOsdMenuDisplay(eOsdMenuKind kind)
++void cStatus::MsgOsdSetEvent(const cEvent* event)
+{
+ for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm))
-+ sm->OsdMenuDisplay(kind);
++ sm->OsdSetEvent(event);
++}
++
++void cStatus::MsgOsdSetRecording(const cRecording* recording)
++{
++ for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm))
++ sm->OsdSetRecording(recording);
++}
++
++void cStatus::MsgOsdMenuDisplay(const char* kind)
++{
++ for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm))
++ sm->OsdMenuDisplay(kind);
+}
+
+void cStatus::MsgOsdMenuDestroy()
+{
+ for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm))
-+ sm->OsdMenuDestroy();
++ sm->OsdMenuDestroy();
+}
-diff -urNad vdr-1.4.6~/status.h vdr-1.4.6/status.h
---- vdr-1.4.6~/status.h 2007-03-10 21:46:00.000000000 +0100
-+++ vdr-1.4.6/status.h 2007-03-10 21:48:17.000000000 +0100
-@@ -84,6 +84,10 @@
- // report user action
- virtual bool MenuItemProtected(const char* Name, int menuView = false) { return false; } // PIN PATCH
- // Checks if a menu entry is protected.
-+ virtual void OsdMenuDisplay(eOsdMenuKind kind) {}
+diff -urNad vdr-1.6.0~/status.h vdr-1.6.0/status.h
+--- vdr-1.6.0~/status.h 2008-02-16 16:00:33.000000000 +0100
++++ vdr-1.6.0/status.h 2008-04-04 17:20:03.000000000 +0200
+@@ -80,6 +80,15 @@
+ // The OSD displays the single line Text with the current channel information.
+ virtual void OsdProgramme(time_t PresentTime, const char *PresentTitle, const char *PresentSubtitle, time_t FollowingTime, const char *FollowingTitle, const char *FollowingSubtitle) {}
+ // The OSD displays the given programme information.
++ virtual void OsdSetRecording(const cRecording* recording) {}
++ // The OSD displays the recording information.
++ virtual void OsdSetEvent(const cEvent* event) {}
++ // The OSD displays the event information.
++ virtual void OsdMenuDisplay(const char* kind) {}
+ // report menu creation
+ virtual void OsdMenuDestroy() {}
+ // report menu destruvtion
-
-
- public:
-@@ -113,6 +117,8 @@
- static bool MsgPluginProtected(cPlugin* Plugin, int menuView = false); // PIN PATCH
- static void MsgUserAction(const eKeys key, const cOsdObject* Interact);
- static bool MsgMenuItemProtected(const char* Name, int menuView = false); // PIN PATCH
-+ static void MsgOsdMenuDisplay(const eOsdMenuKind kind);
++
+ public:
+ cStatus(void);
+ virtual ~cStatus();
+@@ -101,6 +110,10 @@
+ static void MsgOsdTextItem(const char *Text, bool Scroll = false);
+ static void MsgOsdChannel(const char *Text);
+ static void MsgOsdProgramme(time_t PresentTime, const char *PresentTitle, const char *PresentSubtitle, time_t FollowingTime, const char *FollowingTitle, const char *FollowingSubtitle);
++ static void MsgOsdSetEvent(const cEvent* event);
++ static void MsgOsdSetRecording(const cRecording* recording);
++ static void MsgOsdMenuDisplay(const char* kind);
+ static void MsgOsdMenuDestroy();
-
- };
-
+ };
+
+ #endif //__STATUS_H
Modified: vdr/vdr/trunk/debian/patches/patchtest
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/patches/patchtest?rev=6746&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/patches/patchtest (original)
+++ vdr/vdr/trunk/debian/patches/patchtest Sun Apr 13 16:43:52 2008
@@ -3,7 +3,6 @@
# Define some patch levels here: foo="patch1 patch2 ..."
#
standard="\
- 02_Makefile-CFGDIR \
03_cmdsubmenu \
04_newplugin \
06_default_svdrp_port_0 \
@@ -14,49 +13,50 @@
14_cap-memsize \
15_dvbplayer \
16_channels.conf.terr-fix \
- 17_epg-conv-iso6937"
+ 17_vdr-maintenance-1.6.0-1 \
+ 81_Make_config \
+ 82_valgrind \
+ 99_ncursesw-include"
multipatch="$standard \
opt-20_liemikuutio \
opt-24_jumpplay \
- opt-27_subtitles-ttxtsubs \
- opt-27-x_subtitles-ttxtsubs-volumebar-fix \
+ opt-27_ttxtsubs \
+ opt-28_audioindexer \
+ opt-29_syncearly-audioindexer \
opt-30-x_analogtv \
opt-31-x_reelchannelscan \
- opt-32_iptv \
opt-37-x_menuorg \
opt-38_disableDoubleEpgEntrys \
opt-39_noepg \
- opt-40_wareagle-icons \
+ opt-40_iptv \
+ opt-41-x_timer-info \
+ opt-42-x_MainMenuHooks \
+ opt-43-x_recordshowfree \
+ opt-44_rotor \
+ opt-45_yaepg \
+ opt-47_sourcecaps \
+ opt-48-x_pin \
+ opt-49-x_pvrinput \
+ opt-50_graphtft \
+ opt-51_cuttime"
+testpatch="$standard \
+ opt-20_liemikuutio \
+ opt-24_jumpplay \
+ opt-27_ttxtsubs \
+ opt-29_syncearly \
+ opt-30-x_analogtv \
+ opt-31-x_reelchannelscan \
+ opt-37-x_menuorg \
+ opt-38_disableDoubleEpgEntrys \
+ opt-39_noepg \
+ opt-40_iptv \
opt-41-x_timer-info \
opt-42-x_MainMenuHooks \
opt-44_rotor \
opt-45_yaepg \
- opt-47_sourcecaps \
opt-48-x_pin \
- opt-50_graphtft-0.1 \
- opt-51_cuttime"
-testpatch="$standard \
- opt-20_liemikuutio \
- opt-24_jumpplay \
- opt-27_subtitles-ttxtsubs \
- opt-27-x_subtitles-ttxtsubs-volumebar-fix \
- opt-30-x_analogtv \
- opt-31-x_reelchannelscan \
- opt-32_iptv \
- opt-36_CutterQueue-AutoDelete \
- opt-37-x_menuorg \
- opt-38_disableDoubleEpgEntrys \
- opt-39_noepg \
- opt-41-x_timer-info \
- opt-42-x_MainMenuHooks \
- opt-44_rotor \
- opt-45_yaepg \
- opt-46_dvdarchive \
- opt-46_dmh-dvd-archive \
- opt-46-x_dmh-dvd-archive-debian \
- opt-48-x_pin \
- opt-49_sharelnb \
- opt-50_graphtft-0.1"
+ opt-49-x_pvrinput \
+ opt-50_graphtft"
mustfail_patch="XX_patchtest-patch-error"
mustfail_compile="XX_patchtest-compile-error"
More information about the pkg-vdr-dvb-changes
mailing list