frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/vdr-projects/vdr.git synced 2025-03-01 10:50:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Version 1.3.49

Browse Source 
- Fixed initializing 'noapiv' in the Makefile (reported by Ronny Kornexl).
- Fixed extracting APIVERSION to work with older versions of 'sed' (reported by
  Oliver Endriss; thanks also to Udo Richter for a shorter version of the 'sed'
  expression).
- Fixed broken APIVERSION extraction line in 'newplugin' (thanks to Oliver Endriss).
- Fixed entering '0' in a cMenuEditIntItem (reported by Mirko Dölle).
- Updated the Italian OSD texts (thanks to Nino Gerbino).
- Added a note about adding 'INCLUDES += -I$(DVBDIR)/include' to an existing
  Make.config (problem reported by Markus Ehrnsperger).
- Fixed handling the cPluginManager::Active() result when pressing the "Power" key
  (reported by Werner Färber).
- Added a hint about commenting out the line '#define USE_FADVISE' in tools.c in
  case of problems with replaying in fast forward mode if the video directory is
  mounted via a Samba share (reported by Andy Grobb).
- Changed the "Really restart?" prompt in the call to cPluginManager::Active() in
  menu.c to "restart anyway?" (suggested by Rolf Ahrenberg).
- Removed the obsolete "'1' for encrypted radio channels" part from the description
  of the VPID in vdr.5 (reported by Alexander Hans).
- Fixed tuning to the channel of a VPS timer if the device is the actual device.
This commit is contained in:
Klaus Schmidinger 2006-04-28 18:00:00 +02:00
parent 880c3ddb94
commit 56e5836b54
21 changed files with 193 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
CONTRIBUTORS
View File

@ -334,6 +334,8 @@ Andy Grobb <Charly98@01019freenet.de>
for completing storing the current audio volume in the setup.conf file for completing storing the current audio volume in the setup.conf file
for fixing the EPG display in case Setup.ShowInfoOnChSwitch is set to "no" for fixing the EPG display in case Setup.ShowInfoOnChSwitch is set to "no"
for reporting a bug in handling min/max borders when entering integer values for reporting a bug in handling min/max borders when entering integer values
for reporting a problem with replaying in fast forward mode if the video directory
is mounted via a Samba share
Thomas Heiligenmann <thomas@heiligenmann.de> Thomas Heiligenmann <thomas@heiligenmann.de>
for implementing the SVDRP commands LSTR and DELR for implementing the SVDRP commands LSTR and DELR
@ -439,6 +441,7 @@ Mirko D
for reporting a problem with inconsistent channel and timer lists for reporting a problem with inconsistent channel and timer lists
for making the "Play" key in live viewing mode resume a previous replay session for making the "Play" key in live viewing mode resume a previous replay session
for suggesting to allow defining key macros for all non-modeless keys for suggesting to allow defining key macros for all non-modeless keys
for reporting a bug in entering '0' in a cMenuEditIntItem
Michael Rakowski <mrak@gmx.de> Michael Rakowski <mrak@gmx.de>
for translating OSD texts to the Polish language for translating OSD texts to the Polish language
@ -614,6 +617,8 @@ Oliver Endriss <o.endriss@gmx.de>
display in the ST:TNG skin's channel display display in the ST:TNG skin's channel display
for suggesting to make CharArray::DataOwnData::assign() in 'libsi' more robust for suggesting to make CharArray::DataOwnData::assign() in 'libsi' more robust
against invalid data against invalid data
for reporting a problem in extracting APIVERSION with older versions of 'sed'
for fixing broken APIVERSION extraction line in 'newplugin'
Reinhard Walter Buchner <rw.buchner@freenet.de> Reinhard Walter Buchner <rw.buchner@freenet.de>
for adding some satellites to 'sources.conf' for adding some satellites to 'sources.conf'
@ -976,6 +981,8 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
for reporting a bug in handling the color button texts when switching from the for reporting a bug in handling the color button texts when switching from the
'Schedule' menu of a channel without EPG info to the 'What's on now' menu 'Schedule' menu of a channel without EPG info to the 'What's on now' menu
for reporting a bug in handling empty titles in cEvent::FixEpgBugs() for reporting a bug in handling empty titles in cEvent::FixEpgBugs()
for suggesting to replace the "Really restart?" prompt in the call to
cPluginManager::Active() in menu.c to "restart anyway?"
Ralf Klueber <ralf.klueber@vodafone.com> Ralf Klueber <ralf.klueber@vodafone.com>
for reporting a bug in cutting a recording if there is only a single editing mark for reporting a bug in cutting a recording if there is only a single editing mark
@ -1412,6 +1419,7 @@ Udo Richter <udo_richter@gmx.de>
--help or --version option --help or --version option
for suggesting to add a warning about plugins that don't honor APIVERSION in their for suggesting to add a warning about plugins that don't honor APIVERSION in their
Makefile Makefile
for providing a shorter version of the 'sed' expression for extracting APIVERSION
Sven Kreiensen <svenk@kammer.uni-hannover.de> Sven Kreiensen <svenk@kammer.uni-hannover.de>
for his help in keeping 'channels.conf.terr' up to date for his help in keeping 'channels.conf.terr' up to date
@ -1802,6 +1810,8 @@ Alexander Hans <cleditor@arcor.de>
doesn't have any EPG data doesn't have any EPG data
for giving the DrawBitmap() function a new parameter 'Overlay' that allows a bitmap for giving the DrawBitmap() function a new parameter 'Overlay' that allows a bitmap
to be drawn with a transparent background to be drawn with a transparent background
for reporting that the "'1' for encrypted radio channels" part in the description
of the VPID in vdr.5 is obsolete
Daniel Karsubka <dkar@gmx.de> Daniel Karsubka <dkar@gmx.de>
for suggesting to write the epg.data file when VDR exits for suggesting to write the epg.data file when VDR exits
@ -1814,6 +1824,7 @@ Ronny Kornexl <ronny.kornexl@online.de>
for reporting a problem with setting "No title" for broken event data for reporting a problem with setting "No title" for broken event data
for suggesting to make the "Use small font" setup option *always* use the small for suggesting to make the "Use small font" setup option *always* use the small
font if set to '3' - even if it would have been a fixed font font if set to '3' - even if it would have been a fixed font
for reporting a bug in initializing 'noapiv' in the Makefile
Bárta Vladimír <vladimir.barta@k2atmitec.cz> Bárta Vladimír <vladimir.barta@k2atmitec.cz>
for translating OSD texts to the Czech language for translating OSD texts to the Czech language
@ -1864,3 +1875,14 @@ Pierre Briec <pbriec@free.fr>
Werner Schweer <ws@seh.de> Werner Schweer <ws@seh.de>
for pointing out that the 'z' printf modifier should be used for 'size_t' type for pointing out that the 'z' printf modifier should be used for 'size_t' type
arguments arguments
Nino Gerbino <ngerb@interfree.it>
for translating OSD texts to the Italian language
Markus Ehrnsperger <markus.ehrnsperger@googlemail.com>
for reporting a problem with missing 'INCLUDES += -I$(DVBDIR)/include' in an existing
Make.config
Werner Färber <w.faerber@gmx.de>
for reporting a bug in handling the cPluginManager::Active() result when pressing
the "Power" key

35
HISTORY
View File

@ -4532,8 +4532,15 @@ Video Disk Recorder Revision History
files as VDR itself, the definition of DVBDIR has been removed from the VDR files as VDR itself, the definition of DVBDIR has been removed from the VDR
Makefile. If you are using a driver version that has its header files at a location Makefile. If you are using a driver version that has its header files at a location
other than /usr/include/linux/dvb, you can define DVBDIR in the Make.config other than /usr/include/linux/dvb, you can define DVBDIR in the Make.config
file (see also INSTALL). Any reference to DVBDIR should be removed from all file (see also INSTALL). Note that if you already have a Make.config file of your
plugins' Makefiles, like this: own, you should add the lines
ifdef DVBDIR
INCLUDES += -I$(DVBDIR)/include
endif
to its end, as in the new Make.config.template.
Any reference to DVBDIR should be removed from all plugins' Makefiles, like this:
------------------------------------------------------------ ------------------------------------------------------------
--- PLUGINS/src/hello/Makefile 2005/11/11 13:20:14 1.10 --- PLUGINS/src/hello/Makefile 2005/11/11 13:20:14 1.10
@ -4580,7 +4587,7 @@ Video Disk Recorder Revision History
+### The version number of VDR's plugin API (taken from VDR's "config.h"): +### The version number of VDR's plugin API (taken from VDR's "config.h"):
-VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g') -VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
+APIVERSION = $(shell grep 'define APIVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g') +APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
### The name of the distribution archive: ### The name of the distribution archive:
@ -4648,3 +4655,25 @@ Video Disk Recorder Revision History
that the 'z' modifier should be used here). that the 'z' modifier should be used here).
- Ignoring k_Repeat when deciding whether the same key has been pressed in string - Ignoring k_Repeat when deciding whether the same key has been pressed in string
input fields (based on a patch from Marko Mäkelä). input fields (based on a patch from Marko Mäkelä).
2006-04-28: Version 1.3.49
- Fixed initializing 'noapiv' in the Makefile (reported by Ronny Kornexl).
- Fixed extracting APIVERSION to work with older versions of 'sed' (reported by
Oliver Endriss; thanks also to Udo Richter for a shorter version of the 'sed'
expression).
- Fixed broken APIVERSION extraction line in 'newplugin' (thanks to Oliver Endriss).
- Fixed entering '0' in a cMenuEditIntItem (reported by Mirko Dölle).
- Updated the Italian OSD texts (thanks to Nino Gerbino).
- Added a note about adding 'INCLUDES += -I$(DVBDIR)/include' to an existing
Make.config (problem reported by Markus Ehrnsperger).
- Fixed handling the cPluginManager::Active() result when pressing the "Power" key
(reported by Werner Färber).
- Added a hint about commenting out the line '#define USE_FADVISE' in tools.c in
case of problems with replaying in fast forward mode if the video directory is
mounted via a Samba share (reported by Andy Grobb).
- Changed the "Really restart?" prompt in the call to cPluginManager::Active() in
menu.c to "restart anyway?" (suggested by Rolf Ahrenberg).
- Removed the obsolete "'1' for encrypted radio channels" part from the description
of the VPID in vdr.5 (reported by Alexander Hans).
- Fixed tuning to the channel of a VPS timer if the device is the actual device.

9
INSTALL
View File

@ -1,7 +1,7 @@
Installation of the Video Disk Recorder Installation of the Video Disk Recorder
--------------------------------------- ---------------------------------------
Version 1.3 Version 1.4
----------- -----------
IMPORTANT NOTES: IMPORTANT NOTES:
@ -324,6 +324,13 @@ since this might cause a lot of unnecessary disk access when VDR cleans up those
directories and there is a large number of files and/or subdirectories in directories and there is a large number of files and/or subdirectories in
there. there.
If your video directory is mounted via a Samba share, and you are experiencing
problems with replaying in fast forward mode, you can comment out the line
#define USE_FADVISE
in the file tools.c, which may lead to better results.
Configuration files: Configuration files:
-------------------- --------------------

2
MANUAL
View File

@ -1,7 +1,7 @@
Video Disk Recorder User's Manual Video Disk Recorder User's Manual
--------------------------------- ---------------------------------
Version 1.3 Version 1.4
----------- -----------
* Remote Control Keys * Remote Control Keys

8
Makefile
View File

@ -4,7 +4,7 @@
# See the main source file 'vdr.c' for copyright information and # See the main source file 'vdr.c' for copyright information and
# how to reach the author. # how to reach the author.
# #
# $Id: Makefile 1.89 2006/04/23 09:01:17 kls Exp $ # $Id: Makefile 1.91 2006/04/24 17:18:06 kls Exp $
.DELETE_ON_ERROR: .DELETE_ON_ERROR:
@ -81,8 +81,8 @@ DEFINES += -DPLUGINDIR=\"$(PLUGINLIBDIR)\"
# The version numbers of VDR and the plugin API (taken from VDR's "config.h"): # The version numbers of VDR and the plugin API (taken from VDR's "config.h"):
VDRVERSION = $(shell sed -ne '/define VDRVERSION/ { s/^.*"\(.*\)".*$$/\1/; p }' config.h) VDRVERSION = $(shell sed -ne '/define VDRVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h)
APIVERSION = $(shell sed -ne '/define APIVERSION/ { s/^.*"\(.*\)".*$$/\1/; p }' config.h) APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h)
ifdef VFAT ifdef VFAT
# for people who want their video directory on a VFAT partition # for people who want their video directory on a VFAT partition
@ -176,7 +176,7 @@ include-dir:
plugins: include-dir plugins: include-dir
@failed="";\ @failed="";\
@noapiv="";\ noapiv="";\
for i in `ls $(PLUGINDIR)/src | grep -v '[^a-z0-9]'`; do\ for i in `ls $(PLUGINDIR)/src | grep -v '[^a-z0-9]'`; do\
echo "Plugin $$i:";\ echo "Plugin $$i:";\
if ! grep -q "\$$(LIBDIR)/.*\$$(APIVERSION)" "$(PLUGINDIR)/src/$$i/Makefile" ; then\ if ! grep -q "\$$(LIBDIR)/.*\$$(APIVERSION)" "$(PLUGINDIR)/src/$$i/Makefile" ; then\

32
PLUGINS.html
View File

@ -6,7 +6,7 @@
<center><h1>The VDR Plugin System</h1></center> <center><h1>The VDR Plugin System</h1></center>
<center><b>Version 1.3</b></center> <center><b>Version 1.4</b></center>
<p> <p>
<center> <center>
Copyright &copy; 2006 Klaus Schmidinger<br> Copyright &copy; 2006 Klaus Schmidinger<br>
@ -14,19 +14,6 @@ Copyright &copy; 2006 Klaus Schmidinger<br>
<a href="http://www.cadsoft.de/vdr">www.cadsoft.de/vdr</a> <a href="http://www.cadsoft.de/vdr">www.cadsoft.de/vdr</a>
</center> </center>
<p> <p>
<!--X1.3.31--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
Important modifications introduced in version 1.3.31 are marked like this.
<!--X1.3.31--></td></tr></table>
<!--X1.3.37--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
Important modifications introduced in version 1.3.37 are marked like this.
<!--X1.3.37--></td></tr></table>
<!--X1.3.38--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
Important modifications introduced in version 1.3.38 are marked like this.
<!--X1.3.38--></td></tr></table>
<!--X1.3.47--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
Important modifications introduced in version 1.3.46 are marked like this.
<!--X1.3.47--></td></tr></table>
<p>
VDR provides an easy to use plugin interface that allows additional functionality VDR provides an easy to use plugin interface that allows additional functionality
to be added to the program by implementing a dynamically loadable library file. to be added to the program by implementing a dynamically loadable library file.
This interface allows programmers to develop additional functionality for VDR completely This interface allows programmers to develop additional functionality for VDR completely
@ -62,18 +49,14 @@ structures and allows it to hook itself into specific areas to perform special a
<li><a href="#Main menu entry">Main menu entry</a> <li><a href="#Main menu entry">Main menu entry</a>
<li><a href="#User interaction">User interaction</a> <li><a href="#User interaction">User interaction</a>
<li><a href="#Housekeeping">Housekeeping</a> <li><a href="#Housekeeping">Housekeeping</a>
<!--X1.3.47--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
<li><a href="#Main thread hook">Main thread hook</a> <li><a href="#Main thread hook">Main thread hook</a>
<li><a href="#Activity">Activity</a> <li><a href="#Activity">Activity</a>
<!--X1.3.47--></td></tr></table>
<li><a href="#Setup parameters">Setup parameters</a> <li><a href="#Setup parameters">Setup parameters</a>
<li><a href="#The Setup menu">The Setup menu</a> <li><a href="#The Setup menu">The Setup menu</a>
<li><a href="#Configuration files">Configuration files</a> <li><a href="#Configuration files">Configuration files</a>
<li><a href="#Internationalization">Internationalization</a> <li><a href="#Internationalization">Internationalization</a>
<li><a href="#Custom services">Custom services</a> <li><a href="#Custom services">Custom services</a>
<!--X1.3.31--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
<li><a href="#SVDRP commands">SVDRP commands</a> <li><a href="#SVDRP commands">SVDRP commands</a>
<!--X1.3.31--></td></tr></table>
<li><a href="#Loading plugins into VDR">Loading plugins into VDR</a> <li><a href="#Loading plugins into VDR">Loading plugins into VDR</a>
<li><a href="#Building the distribution package">Building the distribution package</a> <li><a href="#Building the distribution package">Building the distribution package</a>
</ul> </ul>
@ -166,7 +149,6 @@ loadable library file for that plugin (we'll get to the details later).
The <tt>lib</tt> directory contains the dynamically loadable libraries of all The <tt>lib</tt> directory contains the dynamically loadable libraries of all
available plugins. Note that the names of these files are created by concatenating available plugins. Note that the names of these files are created by concatenating
<p> <p>
<!--X1.3.47--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
<table border=2> <table border=2>
<tr><td align=center><b><tt>libvdr-</tt></b></td><td align=center><b><tt>hello</tt></b></td><td align=center><b><tt>.so.</tt></b></td><td align=center><b><tt>1.1.0</tt></b></td></tr> <tr><td align=center><b><tt>libvdr-</tt></b></td><td align=center><b><tt>hello</tt></b></td><td align=center><b><tt>.so.</tt></b></td><td align=center><b><tt>1.1.0</tt></b></td></tr>
<tr><td align=center><font size=-1>VDR plugin<br>library prefix</font></td><td align=center><font size=-1>name of<br>the plugin</font></td><td align=center><font size=-1>shared object<br>indicator</font></td><td align=center><font size=-1>API version number<br>this plugin was<br>compiled for</font></td></tr> <tr><td align=center><font size=-1>VDR plugin<br>library prefix</font></td><td align=center><font size=-1>name of<br>the plugin</font></td><td align=center><font size=-1>shared object<br>indicator</font></td><td align=center><font size=-1>API version number<br>this plugin was<br>compiled for</font></td></tr>
@ -178,7 +160,6 @@ of VDR as long as their plugin API version number is still the same as that of
the current VDR version. That way minor fixes to VDR, that don't require changes the current VDR version. That way minor fixes to VDR, that don't require changes
to the VDR header files, can be made without requiring all plugins to be to the VDR header files, can be made without requiring all plugins to be
recompiled. recompiled.
<!--X1.3.47--></td></tr></table>
<p> <p>
The plugin library files can be stored in any directory. If the default organization The plugin library files can be stored in any directory. If the default organization
is not used, the path to the plugin directory has be be given to VDR through the is not used, the path to the plugin directory has be be given to VDR through the
@ -620,7 +601,6 @@ interaction is possible. If a specific action takes longer than a few seconds,
the plugin should launch a separate thread to do this. the plugin should launch a separate thread to do this.
</b> </b>
<!--X1.3.47--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
<a name="Main thread hook"><hr><h2>Main thread hook</h2> <a name="Main thread hook"><hr><h2>Main thread hook</h2>
<center><i><b>Pushing in...</b></i></center><p> <center><i><b>Pushing in...</b></i></center><p>
@ -677,7 +657,6 @@ the prompt by pressing the "Ok" button, the rest of the plugins will also
be queried, and further prompts may show up. If all prompts have been confirmed, be queried, and further prompts may show up. If all prompts have been confirmed,
the shutdown will take place. As soon as one prompt is not confirmed, no the shutdown will take place. As soon as one prompt is not confirmed, no
further plugins will be queried and no shutdown will be done. further plugins will be queried and no shutdown will be done.
<!--X1.3.47--></td></tr></table>
<a name="Setup parameters"><hr><h2>Setup parameters</h2> <a name="Setup parameters"><hr><h2>Setup parameters</h2>
@ -1002,7 +981,6 @@ To send a message to all plugins, a plugin can call the function
<tt>cPluginManager::CallAllServices()</tt>. This function returns <tt>true</tt> if <tt>cPluginManager::CallAllServices()</tt>. This function returns <tt>true</tt> if
any plugin handled the request, or <tt>false</tt> if no plugin handled the request. any plugin handled the request, or <tt>false</tt> if no plugin handled the request.
<!--X1.3.31--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
<a name="SVDRP commands"><hr><h2>SVDRP commands</h2> <a name="SVDRP commands"><hr><h2>SVDRP commands</h2>
<center><i><b>Infinite Diversity in Infinite Combinations</b></i></center><p> <center><i><b>Infinite Diversity in Infinite Combinations</b></i></center><p>
@ -1094,8 +1072,6 @@ The returned string may consist of several lines, separated by the newline chara
when presenting them to the caller, and the continuation character ('<tt>-</tt>') when presenting them to the caller, and the continuation character ('<tt>-</tt>')
will be set for all but the last one. will be set for all but the last one.
<!--X1.3.31--></td></tr></table>
<a name="Loading plugins into VDR"><hr><h2>Loading plugins into VDR</h2> <a name="Loading plugins into VDR"><hr><h2>Loading plugins into VDR</h2>
<center><i><b>Saddling up!</b></i></center><p> <center><i><b>Saddling up!</b></i></center><p>
@ -1329,9 +1305,7 @@ public:
cMyControl(void); cMyControl(void);
virtual ~cMyControl(); virtual ~cMyControl();
virtual void Hide(void); virtual void Hide(void);
<!--X1.3.38--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
virtual cOsdObject *GetInfo(void); virtual cOsdObject *GetInfo(void);
<!--X1.3.38--></td></tr></table>
virtual eOSState ProcessKey(eKeys Key); virtual eOSState ProcessKey(eKeys Key);
}; };
</pre></td></tr></table><p> </pre></td></tr></table><p>
@ -1361,13 +1335,11 @@ A derived <tt>cControl</tt> <b>must</b> implement the <tt>Hide()</tt> function,
it has to hide itself from the OSD, in case it uses it. <tt>Hide()</tt> may be called at it has to hide itself from the OSD, in case it uses it. <tt>Hide()</tt> may be called at
any time, and it may be called even if the <tt>cControl</tt> is not visible at the moment. any time, and it may be called even if the <tt>cControl</tt> is not visible at the moment.
<p> <p>
<!--X1.3.38--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
The <tt>GetInfo()</tt> function is called when the user presses the <tt>Info</tt> button, The <tt>GetInfo()</tt> function is called when the user presses the <tt>Info</tt> button,
and shall return a pointer to a <tt>cOsdObject</tt> that contains information and shall return a pointer to a <tt>cOsdObject</tt> that contains information
about the currently played programme. The caller takes ownership of the returned about the currently played programme. The caller takes ownership of the returned
pointer and will delete it when it is no longer used. If no information is available, pointer and will delete it when it is no longer used. If no information is available,
<tt>NULL</tt> shall be returned. <tt>NULL</tt> shall be returned.
<!--X1.3.38--></td></tr></table>
<p> <p>
Finally, to get things going, a plugin that implements a player (and the surrounding Finally, to get things going, a plugin that implements a player (and the surrounding
infrastructure like displaying a list of playable stuff etc) simply has to call the infrastructure like displaying a list of playable stuff etc) simply has to call the
@ -1589,7 +1561,6 @@ with the full required resolution. Only if this fails shall it use alternate
areas. Drawing areas are always rectangular and may not overlap (but do not need areas. Drawing areas are always rectangular and may not overlap (but do not need
to be adjacent). to be adjacent).
<!--X1.3.37--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
<p> <p>
Directly accessing the OSD is only allowed from the foreground thread, which Directly accessing the OSD is only allowed from the foreground thread, which
restricts this to a <tt>cOsdObject</tt> returned from the plugin's <tt>MainMenuAction()</tt> restricts this to a <tt>cOsdObject</tt> returned from the plugin's <tt>MainMenuAction()</tt>
@ -1603,7 +1574,6 @@ int cSkins::QueueMessage(eMessageType Type, const char *s, int Seconds = 0, int
</pre></td></tr></table><p> </pre></td></tr></table><p>
to queue that message for display. See <tt>VDR/skins.h</tt> for details. to queue that message for display. See <tt>VDR/skins.h</tt> for details.
<!--X1.3.37--></td></tr></table>
<a name="Skins"><hr><h2>Skins</h2> <a name="Skins"><hr><h2>Skins</h2>

4
PLUGINS/src/hello/Makefile
View File

@ -1,7 +1,7 @@
# #
# Makefile for a Video Disk Recorder plugin # Makefile for a Video Disk Recorder plugin
# #
# $Id: Makefile 1.13 2006/04/22 09:59:44 kls Exp $ # $Id: Makefile 1.14 2006/04/24 17:20:58 kls Exp $
# The official name of this plugin. # The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the plugin. # This name will be used in the '-P...' option of VDR to load the plugin.
@ -30,7 +30,7 @@ TMPDIR = /tmp
### The version number of VDR's plugin API (taken from VDR's "config.h"): ### The version number of VDR's plugin API (taken from VDR's "config.h"):
APIVERSION = $(shell sed -ne '/define APIVERSION/ { s/^.*"\(.*\)".*$$/\1/; p }' $(VDRDIR)/config.h) APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
### The name of the distribution archive: ### The name of the distribution archive:

4
PLUGINS/src/osddemo/Makefile
View File

@ -1,7 +1,7 @@
# #
# Makefile for a Video Disk Recorder plugin # Makefile for a Video Disk Recorder plugin
# #
# $Id: Makefile 1.7 2006/04/22 09:59:49 kls Exp $ # $Id: Makefile 1.8 2006/04/24 17:21:00 kls Exp $
# The official name of this plugin. # The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the plugin. # This name will be used in the '-P...' option of VDR to load the plugin.
@ -30,7 +30,7 @@ TMPDIR = /tmp
### The version number of VDR's plugin API (taken from VDR's "config.h"): ### The version number of VDR's plugin API (taken from VDR's "config.h"):
APIVERSION = $(shell sed -ne '/define APIVERSION/ { s/^.*"\(.*\)".*$$/\1/; p }' $(VDRDIR)/config.h) APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
### The name of the distribution archive: ### The name of the distribution archive:

4
PLUGINS/src/servicedemo/Makefile
View File

@ -1,7 +1,7 @@
# #
# Makefile for a Video Disk Recorder plugin # Makefile for a Video Disk Recorder plugin
# #
# $Id: Makefile 1.5 2006/04/22 09:59:55 kls Exp $ # $Id: Makefile 1.6 2006/04/24 17:21:01 kls Exp $
# The official name of this plugin. # The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the plugin. # This name will be used in the '-P...' option of VDR to load the plugin.
@ -31,7 +31,7 @@ TMPDIR = /tmp
### The version number of VDR's plugin API (taken from VDR's "config.h"): ### The version number of VDR's plugin API (taken from VDR's "config.h"):
APIVERSION = $(shell sed -ne '/define APIVERSION/ { s/^.*"\(.*\)".*$$/\1/; p }' $(VDRDIR)/config.h) APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
### The name of the distribution archive: ### The name of the distribution archive:

4
PLUGINS/src/skincurses/Makefile
View File

@ -1,7 +1,7 @@
# #
# Makefile for a Video Disk Recorder plugin # Makefile for a Video Disk Recorder plugin
# #
# $Id: Makefile 1.5 2006/04/22 10:00:03 kls Exp $ # $Id: Makefile 1.6 2006/04/24 17:21:02 kls Exp $
# The official name of this plugin. # The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the plugin. # This name will be used in the '-P...' option of VDR to load the plugin.
@ -30,7 +30,7 @@ TMPDIR = /tmp
### The version number of VDR's plugin API (taken from VDR's "config.h"): ### The version number of VDR's plugin API (taken from VDR's "config.h"):
APIVERSION = $(shell sed -ne '/define APIVERSION/ { s/^.*"\(.*\)".*$$/\1/; p }' $(VDRDIR)/config.h) APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
### The name of the distribution archive: ### The name of the distribution archive:

4
PLUGINS/src/sky/Makefile
View File

@ -1,7 +1,7 @@
# #
# Makefile for a Video Disk Recorder plugin # Makefile for a Video Disk Recorder plugin
# #
# $Id: Makefile 1.7 2006/04/22 10:00:17 kls Exp $ # $Id: Makefile 1.8 2006/04/24 17:21:03 kls Exp $
# The official name of this plugin. # The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the plugin. # This name will be used in the '-P...' option of VDR to load the plugin.
@ -30,7 +30,7 @@ TMPDIR = /tmp
### The version number of VDR's plugin API (taken from VDR's "config.h"): ### The version number of VDR's plugin API (taken from VDR's "config.h"):
APIVERSION = $(shell sed -ne '/define APIVERSION/ { s/^.*"\(.*\)".*$$/\1/; p }' $(VDRDIR)/config.h) APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
### The name of the distribution archive: ### The name of the distribution archive:

4
PLUGINS/src/status/Makefile
View File

@ -1,7 +1,7 @@
# #
# Makefile for a Video Disk Recorder plugin # Makefile for a Video Disk Recorder plugin
# #
# $Id: Makefile 1.11 2006/04/22 10:00:24 kls Exp $ # $Id: Makefile 1.12 2006/04/24 17:21:04 kls Exp $
# The official name of this plugin. # The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the plugin. # This name will be used in the '-P...' option of VDR to load the plugin.
@ -30,7 +30,7 @@ TMPDIR = /tmp
### The version number of VDR's plugin API (taken from VDR's "config.h"): ### The version number of VDR's plugin API (taken from VDR's "config.h"):
APIVERSION = $(shell sed -ne '/define APIVERSION/ { s/^.*"\(.*\)".*$$/\1/; p }' $(VDRDIR)/config.h) APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
### The name of the distribution archive: ### The name of the distribution archive:

4
PLUGINS/src/svdrpdemo/Makefile
View File

@ -1,7 +1,7 @@
# #
# Makefile for a Video Disk Recorder plugin # Makefile for a Video Disk Recorder plugin
# #
# $Id: Makefile 1.5 2006/04/22 10:00:32 kls Exp $ # $Id: Makefile 1.6 2006/04/24 17:21:06 kls Exp $
# The official name of this plugin. # The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the plugin. # This name will be used in the '-P...' option of VDR to load the plugin.
@ -30,7 +30,7 @@ TMPDIR = /tmp
### The version number of VDR's plugin API (taken from VDR's "config.h"): ### The version number of VDR's plugin API (taken from VDR's "config.h"):
APIVERSION = $(shell sed -ne '/define APIVERSION/ { s/^.*"\(.*\)".*$$/\1/; p }' $(VDRDIR)/config.h) APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
### The name of the distribution archive: ### The name of the distribution archive:

6
config.h
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: config.h 1.252 2006/04/21 14:53:26 kls Exp $ * $Id: config.h 1.254 2006/04/28 12:33:13 kls Exp $
*/ */
#ifndef __CONFIG_H #ifndef __CONFIG_H
@ -21,8 +21,8 @@
// VDR's own version number: // VDR's own version number:
#define VDRVERSION "1.3.48" #define VDRVERSION "1.3.49"
#define VDRVERSNUM 10348 // Version * 10000 + Major * 100 + Minor #define VDRVERSNUM 10349 // Version * 10000 + Major * 100 + Minor
// The plugin API's version number: // The plugin API's version number:

162
i18n.c
View File

@ -4,12 +4,12 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: i18n.c 1.273 2006/04/23 08:39:00 kls Exp $ * $Id: i18n.c 1.275 2006/04/28 12:50:04 kls Exp $
* *
* Translations provided by: * Translations provided by:
* *
* Slovenian Miha Setina <mihasetina@softhome.net>, Matjaz Thaler <matjaz.thaler@guest.arnes.si> * Slovenian Miha Setina <mihasetina@softhome.net>, Matjaz Thaler <matjaz.thaler@guest.arnes.si>
* Italian Alberto Carraro <bertocar@tin.it>, Antonio Ospite <ospite@studenti.unina.it>, Sean Carlos <seanc@libero.it> * Italian Alberto Carraro <bertocar@tin.it>, Antonio Ospite <ospite@studenti.unina.it>, Sean Carlos <seanc@libero.it>, Nino Gerbino <ngerb@interfree.it>
* Dutch Arnold Niessen <niessen@iae.nl> <arnold.niessen@philips.com>, Hans Dingemans <hans.dingemans@tacticalops.nl>, Maarten Wisse <Maarten.Wisse@urz.uni-hd.de> * Dutch Arnold Niessen <niessen@iae.nl> <arnold.niessen@philips.com>, Hans Dingemans <hans.dingemans@tacticalops.nl>, Maarten Wisse <Maarten.Wisse@urz.uni-hd.de>
* Portuguese Paulo Lopes <pmml@netvita.pt> * Portuguese Paulo Lopes <pmml@netvita.pt>
* French Jean-Claude Repetto <jc@repetto.org>, Olivier Jacques <jacquesolivier@hotmail.com>, Gregoire Favre <greg@magma.unil.ch>, Nicolas Huillard <nhuillard@e-dition.fr>, Pierre Briec <pbriec@free.fr> * French Jean-Claude Repetto <jc@repetto.org>, Olivier Jacques <jacquesolivier@hotmail.com>, Gregoire Favre <greg@magma.unil.ch>, Nicolas Huillard <nhuillard@e-dition.fr>, Pierre Briec <pbriec@free.fr>
@ -264,7 +264,7 @@ const tI18nPhrase Phrases[] = {
{ "Recording info", { "Recording info",
"Aufzeichnung", "Aufzeichnung",
"Podatki o snemanju", "Podatki o snemanju",
"",// TODO "Info Registrazione",
"Opname info", "Opname info",
"",// TODO "",// TODO
"Infos sur l'enregistrement", "Infos sur l'enregistrement",
@ -418,7 +418,7 @@ const tI18nPhrase Phrases[] = {
{ "Info", { "Info",
"Info", "Info",
"Info", "Info",
"",//TODO "Info",
"Info", "Info",
"",//TODO "",//TODO
"Info", "Info",
@ -462,7 +462,7 @@ const tI18nPhrase Phrases[] = {
{ "This event - %s", { "This event - %s",
"Diese Sendung - %s", "Diese Sendung - %s",
"Ta oddaja - %s", "Ta oddaja - %s",
"",//TODO "Quest'evento - %s",
"",//TODO "",//TODO
"",//TODO "",//TODO
"Cet événement", "Cet événement",
@ -484,7 +484,7 @@ const tI18nPhrase Phrases[] = {
{ "This event - all channels", { "This event - all channels",
"Diese Sendung - alle Kanäle", "Diese Sendung - alle Kanäle",
"Ta oddaja - vsi kanali", "Ta oddaja - vsi kanali",
"",//TODO "Quest'evento - tutti i canali",
"",//TODO "",//TODO
"",//TODO "",//TODO
"Cet événement - toutes les chaînes", "Cet événement - toutes les chaînes",
@ -506,7 +506,7 @@ const tI18nPhrase Phrases[] = {
{ "All events - all channels", { "All events - all channels",
"Alle Sendungen - alle Kanäle", "Alle Sendungen - alle Kanäle",
"Vse oddaje - vsi kanali", "Vse oddaje - vsi kanali",
"",//TODO "Tutti gli eventi - tutti i canali",
"",//TODO "",//TODO
"",//TODO "",//TODO
"Tous les événements - toutes chaînes", "Tous les événements - toutes chaînes",
@ -683,7 +683,7 @@ const tI18nPhrase Phrases[] = {
{ "Button$Timer", { "Button$Timer",
"Timer", "Timer",
"Termini", "Termini",
"",// TODO "Timer",
"",// TODO "",// TODO
"",// TODO "",// TODO
"Programmation", "Programmation",
@ -727,7 +727,7 @@ const tI18nPhrase Phrases[] = {
{ "Button$Info", { "Button$Info",
"Info", "Info",
"Info", "Info",
"",//TODO "Info",
"Info", "Info",
"",//TODO "",//TODO
"Info", "Info",
@ -793,7 +793,7 @@ const tI18nPhrase Phrases[] = {
{ "Button$Rewind", { "Button$Rewind",
"Anfang", "Anfang",
"Na zaèetek", "Na zaèetek",
"Da inizio", "Dall'inizio",
"Naar begin", "Naar begin",
"Rebobinar", "Rebobinar",
"Retour", "Retour",
@ -1035,7 +1035,7 @@ const tI18nPhrase Phrases[] = {
{ "Button$Menu", { "Button$Menu",
"Menü", "Menü",
"Meni", "Meni",
"Menù", "Menu",
"Menu", "Menu",
"Menu", "Menu",
"Menu", "Menu",
@ -1101,7 +1101,7 @@ const tI18nPhrase Phrases[] = {
{ "Button$Audio", { "Button$Audio",
"Audio", "Audio",
"Zvok", "Zvok",
"",// TODO "Audio",
"Audio", "Audio",
"",// TODO "",// TODO
"Audio", "Audio",
@ -1256,7 +1256,7 @@ const tI18nPhrase Phrases[] = {
{ "Really restart?", { "Really restart?",
"Wirklich neu starten?", "Wirklich neu starten?",
"Zares ponoven zagon?", "Zares ponoven zagon?",
"Eseguo un restart?", "Eseguo un riavvio?",
"Werkelijk opnieuw starten?", "Werkelijk opnieuw starten?",
"Tem a certeza que quer reiniciar?", "Tem a certeza que quer reiniciar?",
"Redémarrer?", "Redémarrer?",
@ -1275,6 +1275,28 @@ const tI18nPhrase Phrases[] = {
"Vil du virkelig genstarte?", "Vil du virkelig genstarte?",
"Opravdu restartovat?", "Opravdu restartovat?",
}, },
{ "restart anyway?",
"trotzdem neu starten?",
"zares ponoven zagon?",
"riavvio comunque?",
"toch opnieuw starten?",
"quer mesmo reiniciar?",
"redémarrer?",
"starte på nytt likevel?",
"käynnistetäänkö uudelleen?",
"zrestartowaæ mimo to?",
"¿reiniciar igualmente?",
"ÔåëéêÜ íá ãßíåé åðáíåêêßíçóç?",
"vill du ändå starta om?",
"repornesc, totuºi?",
"mégis újraindítani?",
"Reiniciar de totes maneres?",
"ÔÕÙáâÒØâÕÛìÝÞ ßÕàÕ×ÐßãáâØâì?",
"svejedno restart sistema?",
"restart?",
"genstart alligevel?",
"pøesto restartovat?",
},
{ "shut down anyway?", { "shut down anyway?",
"trotzdem ausschalten?", "trotzdem ausschalten?",
"zares izklopi?", "zares izklopi?",
@ -1300,7 +1322,7 @@ const tI18nPhrase Phrases[] = {
{ "Recording - restart anyway?", { "Recording - restart anyway?",
"Aufnahme läuft - trotzdem neu starten?", "Aufnahme läuft - trotzdem neu starten?",
"Snemanje - zares ponoven zagon?", "Snemanje - zares ponoven zagon?",
"In registrazione - restart comunque?", "In registrazione - riavvio comunque?",
"Opname loopt - toch opnieuw starten?", "Opname loopt - toch opnieuw starten?",
"Em gravação - quer mesmo reiniciar?", "Em gravação - quer mesmo reiniciar?",
"Enregistrement en cours - redémarrer?", "Enregistrement en cours - redémarrer?",
@ -1366,7 +1388,7 @@ const tI18nPhrase Phrases[] = {
{ "Press any key to cancel shutdown", { "Press any key to cancel shutdown",
"Taste drücken, um Ausschalten abzubrechen", "Taste drücken, um Ausschalten abzubrechen",
"Pritisnite katerikoli gumb za preklic izklopa", "Pritisnite katerikoli gumb za preklic izklopa",
"Un tasto per annullare lo spegnimento", "Premere un tasto per annullare lo spegnimento",
"Druk een toets om shutdown af te breken", "Druk een toets om shutdown af te breken",
"Pressione qualquer tecla para cancelar", "Pressione qualquer tecla para cancelar",
"Appuyez sur une touche pour annuler l'arrêt", "Appuyez sur une touche pour annuler l'arrêt",
@ -1477,7 +1499,7 @@ const tI18nPhrase Phrases[] = {
{ "Srate", { "Srate",
"Srate", "Srate",
"Srate", "Srate",
"Srate", "SymbolRate",
"Srate", "Srate",
"Srate", "Srate",
"Fréq. Symbole", "Fréq. Symbole",
@ -1499,7 +1521,7 @@ const tI18nPhrase Phrases[] = {
{ "Vpid", { "Vpid",
"Vpid", "Vpid",
"Vpid", "Vpid",
"Vpid", "PID Video",
"Vpid", "Vpid",
"PID de Vídeo", "PID de Vídeo",
"PID Vidéo", "PID Vidéo",
@ -1521,7 +1543,7 @@ const tI18nPhrase Phrases[] = {
{ "Ppid", { "Ppid",
"Ppid", "Ppid",
"Ppid", "Ppid",
"Ppid", "PID Pcr",
"Ppid", "Ppid",
"Ppid", "Ppid",
"Ppid", "Ppid",
@ -1543,7 +1565,7 @@ const tI18nPhrase Phrases[] = {
{ "Apid1", { "Apid1",
"Apid1", "Apid1",
"Apid1", "Apid1",
"Apid1", "PID Audio (1)",
"Apid1", "Apid1",
"PID Áudio (1)", "PID Áudio (1)",
"PID Audio (1)", "PID Audio (1)",
@ -1565,7 +1587,7 @@ const tI18nPhrase Phrases[] = {
{ "Apid2", { "Apid2",
"Apid2", "Apid2",
"Apid2", "Apid2",
"Apid2", "PID Audio (2)",
"Apid2", "Apid2",
"Apid2", "Apid2",
"PID Audio (2)", "PID Audio (2)",
@ -1587,7 +1609,7 @@ const tI18nPhrase Phrases[] = {
{ "Dpid1", { "Dpid1",
"Dpid1", "Dpid1",
"Dpid1", "Dpid1",
"Dpid1", "PID AC3 (1)",
"Dpid1", "Dpid1",
"PID AC3 (1)", "PID AC3 (1)",
"PID AC3 (1)", "PID AC3 (1)",
@ -1609,7 +1631,7 @@ const tI18nPhrase Phrases[] = {
{ "Dpid2", { "Dpid2",
"Dpid2", "Dpid2",
"Dpid2", "Dpid2",
"Dpid2", "PID AC3 (2)",
"Dpid2", "Dpid2",
"PID AC3 (2)", "PID AC3 (2)",
"PID AC3 (2)", "PID AC3 (2)",
@ -1631,7 +1653,7 @@ const tI18nPhrase Phrases[] = {
{ "Tpid", { "Tpid",
"Tpid", "Tpid",
"Tpid", "Tpid",
"Tpid", "PID Teletext",
"Tpid", "Tpid",
"PID Teletexto", "PID Teletexto",
"PID Télétexte", "PID Télétexte",
@ -1675,7 +1697,7 @@ const tI18nPhrase Phrases[] = {
{ "Free To Air", { "Free To Air",
"frei empfangbar", "frei empfangbar",
"nekodiran", "nekodiran",
"",//TODO "in chiaro",
"",//TODO "",//TODO
"",//TODO "",//TODO
"Aucun cryptage", "Aucun cryptage",
@ -1697,7 +1719,7 @@ const tI18nPhrase Phrases[] = {
{ "encrypted", { "encrypted",
"verschlüsselt", "verschlüsselt",
"kodiran", "kodiran",
"",//TODO "criptato",
"",//TODO "",//TODO
"",//TODO "",//TODO
"Crypté", "Crypté",
@ -1763,7 +1785,7 @@ const tI18nPhrase Phrases[] = {
{ "Bandwidth", { "Bandwidth",
"Bandbreite", "Bandbreite",
"Pasovna ¹irina", "Pasovna ¹irina",
"Bandwidth", "Banda passante",
"Bandwidth", "Bandwidth",
"Bandwidth", "Bandwidth",
"Bande passante", "Bande passante",
@ -2183,7 +2205,7 @@ const tI18nPhrase Phrases[] = {
{ "Timer is recording!", { "Timer is recording!",
"Timer zeichnet gerade auf!", "Timer zeichnet gerade auf!",
"Snemanje po terminu!", "Snemanje po terminu!",
"Registrazione di un timer in corso!", "Registrazione da un timer in corso!",
"Timer is aan het opnemen!", "Timer is aan het opnemen!",
"Timer a gravar!", "Timer a gravar!",
"Enregistrement en cours!", "Enregistrement en cours!",
@ -2249,7 +2271,7 @@ const tI18nPhrase Phrases[] = {
{ "*** Invalid Channel ***", { "*** Invalid Channel ***",
"*** Ungültiger Kanal ***", "*** Ungültiger Kanal ***",
"*** Neznan kanal ***", "*** Neznan kanal ***",
"*** CANALE INVALIDO ***", "*** CANALE NON VALIDO ***",
"*** Ongeldig kanaal ***", "*** Ongeldig kanaal ***",
"*** Canal Inválido! ***", "*** Canal Inválido! ***",
"*** Chaîne invalide! ***", "*** Chaîne invalide! ***",
@ -2271,7 +2293,7 @@ const tI18nPhrase Phrases[] = {
{ "Upcoming VPS recording!", { "Upcoming VPS recording!",
"VPS-Aufnahme beginnt in Kürze!", "VPS-Aufnahme beginnt in Kürze!",
"Sledi VPS snemanje!", "Sledi VPS snemanje!",
"",//TODO "Registrazione VPS in esecuzione!",
"",//TODO "",//TODO
"",//TODO "",//TODO
"Enregistrement VPS commence prochaînement", "Enregistrement VPS commence prochaînement",
@ -2337,7 +2359,7 @@ const tI18nPhrase Phrases[] = {
{ "Channel settings are not unique!", { "Channel settings are not unique!",
"Kanaleinstellungen sind nicht eindeutig!", "Kanaleinstellungen sind nicht eindeutig!",
"Nastavitve kanala niso edinstvene!", "Nastavitve kanala niso edinstvene!",
"Paramentri Canale non unici!", "Parametri canale non univoci!",
"Kanaalinstellingen zijn niet uniek!", "Kanaalinstellingen zijn niet uniek!",
"",//TODO "",//TODO
"Caractéristiques des chaînes ne sont pas uniques", "Caractéristiques des chaînes ne sont pas uniques",
@ -2491,7 +2513,7 @@ const tI18nPhrase Phrases[] = {
{ "Not enough disk space to start recording!", { "Not enough disk space to start recording!",
"Nicht genügend Plattenplatz für Aufnahme!", "Nicht genügend Plattenplatz für Aufnahme!",
"Premalo prostora na disku za snemanje!", "Premalo prostora na disku za snemanje!",
"",//TODO "Spazio su disco insufficiente per registrare!",
"",//TODO "",//TODO
"",//TODO "",//TODO
"Espace disque insuffisant pour démarrer l'enregistrement!", "Espace disque insuffisant pour démarrer l'enregistrement!",
@ -2535,7 +2557,7 @@ const tI18nPhrase Phrases[] = {
{ "Opening CAM menu...", { "Opening CAM menu...",
"CAM-Menü wird geöffnet...", "CAM-Menü wird geöffnet...",
"Odpiram CAM meni...", "Odpiram CAM meni...",
"",//TODO "Apertura menu CAM...",
"CAM-menu wordt geopend...", "CAM-menu wordt geopend...",
"",//TODO "",//TODO
"Ouverture du menu CAM", "Ouverture du menu CAM",
@ -2579,7 +2601,7 @@ const tI18nPhrase Phrases[] = {
{ "Resetting CAM...", { "Resetting CAM...",
"CAM wird zurückgesetzt...", "CAM wird zurückgesetzt...",
"Resetiram CAM...", "Resetiram CAM...",
"",//TODO "CAM reimpostato...",
"CAM wordt herstart...", "CAM wordt herstart...",
"",//TODO "",//TODO
"Réinitialisation du CAM", "Réinitialisation du CAM",
@ -2645,7 +2667,7 @@ const tI18nPhrase Phrases[] = {
{ "Please enter %d digits!", { "Please enter %d digits!",
"Bitte geben Sie %d Ziffern ein!", "Bitte geben Sie %d Ziffern ein!",
"Prosim vnesite %d ¹tevilk!", "Prosim vnesite %d ¹tevilk!",
"",//TODO "Inserisci %d digits!",
"Vul %d cijfers in!", "Vul %d cijfers in!",
"",//TODO "",//TODO
"Veuillez entrer %d chiffres!", "Veuillez entrer %d chiffres!",
@ -2667,7 +2689,7 @@ const tI18nPhrase Phrases[] = {
{ "No audio available!", { "No audio available!",
"Kein Audio verfügbar!", "Kein Audio verfügbar!",
"Zvok ni dosegljiv!", "Zvok ni dosegljiv!",
"",//TODO "Nessun audio disponibile!",
"Geen audio beschikbaar!", "Geen audio beschikbaar!",
"",//TODO "",//TODO
"",//TODO "",//TODO
@ -2822,7 +2844,7 @@ const tI18nPhrase Phrases[] = {
{ "Replay", { "Replay",
"Wiedergabe", "Wiedergabe",
"Predvajanje", "Predvajanje",
"Replay", "Riproduzione",
"Afspelen", "Afspelen",
"Replay", "Replay",
"Lecture", "Lecture",
@ -2955,7 +2977,7 @@ const tI18nPhrase Phrases[] = {
{ "Setup.OSD$Skin", { "Setup.OSD$Skin",
"Oberfläche", "Oberfläche",
"Preobleka", "Preobleka",
"Superficie Skin", "Skin",
"Skin", "Skin",
"",// TODO "",// TODO
"Skin", "Skin",
@ -3021,7 +3043,7 @@ const tI18nPhrase Phrases[] = {
{ "Setup.OSD$Top", { "Setup.OSD$Top",
"Oben", "Oben",
"Zgoraj", "Zgoraj",
"Cima", "Alto",
"Boven", "Boven",
"",// TODO "",// TODO
"Haut", "Haut",
@ -3153,7 +3175,7 @@ const tI18nPhrase Phrases[] = {
{ "skin dependent", { "skin dependent",
"je nach Oberfläche", "je nach Oberfläche",
"odvisno od preobleke", "odvisno od preobleke",
"in base alla superficie", "in base allo skin",
"skin afhankelijk", "skin afhankelijk",
"",// TODO "",// TODO
"dépend du skin", "dépend du skin",
@ -3219,7 +3241,7 @@ const tI18nPhrase Phrases[] = {
{ "Setup.OSD$Channel info time (s)", { "Setup.OSD$Channel info time (s)",
"Anzeigedauer für Kanalinfo (s)", "Anzeigedauer für Kanalinfo (s)",
"Èas prikaza podatka o kanalu (s)", "Èas prikaza podatka o kanalu (s)",
"",// TODO "Info orario canale (s)",
"Duur tonen kanaal-informatie (s)", "Duur tonen kanaal-informatie (s)",
"",// TODO "",// TODO
"Durée affichage infos chaînes (s)", "Durée affichage infos chaînes (s)",
@ -3263,7 +3285,7 @@ const tI18nPhrase Phrases[] = {
{ "Setup.OSD$Timeout requested channel info", { "Setup.OSD$Timeout requested channel info",
"Angeforderte Kanalinfo schließen", "Angeforderte Kanalinfo schließen",
"Èas prikaza informacije o kanalu", "Èas prikaza informacije o kanalu",
"", // TODO "Richiesta timeout info canale",
"", // TODO "", // TODO
"", // TODO "", // TODO
"Demande d'infos de chaîne terminée", "Demande d'infos de chaîne terminée",
@ -3307,7 +3329,7 @@ const tI18nPhrase Phrases[] = {
{ "Setup.OSD$Scroll wraps", { "Setup.OSD$Scroll wraps",
"Rundum scrollen", "Rundum scrollen",
"Iz konca skoèi na zaèetek", "Iz konca skoèi na zaèetek",
"",// TODO "Scrolling testo menu OSD",
"Rondom scrollen", "Rondom scrollen",
"",// TODO "",// TODO
"Défilement rotatif", "Défilement rotatif",
@ -3329,7 +3351,7 @@ const tI18nPhrase Phrases[] = {
{ "Setup.OSD$Menu button closes", { "Setup.OSD$Menu button closes",
"Menu-Taste schließt", "Menu-Taste schließt",
"Meni gumb zapre meni", "Meni gumb zapre meni",
"",// TODO "Bottone menu bloccato",
"",// TODO "",// TODO
"",// TODO "",// TODO
"Menu bouton fermé", "Menu bouton fermé",
@ -3373,7 +3395,7 @@ const tI18nPhrase Phrases[] = {
{ "Setup.EPG$EPG scan timeout (h)", { "Setup.EPG$EPG scan timeout (h)",
"Zeit bis zur EPG-Aktualisierung (h)", "Zeit bis zur EPG-Aktualisierung (h)",
"Èas do EPG pregleda (h)", "Èas do EPG pregleda (h)",
"Timeout scansione aggiornamento EPG (ore)", "Timeout scansione EPG (ore)",
"EPG-scan Timeout (h)", "EPG-scan Timeout (h)",
"Expirou o EPG (h)", "Expirou o EPG (h)",
"Inactivité avant rech. EPG (h)", "Inactivité avant rech. EPG (h)",
@ -3549,7 +3571,7 @@ const tI18nPhrase Phrases[] = {
{ "Setup.DVB$Video display format", { "Setup.DVB$Video display format",
"Video-Anzeigeformat", "Video-Anzeigeformat",
"Format video prikaza", "Format video prikaza",
"",//TODO "Formato display video",
"Video display formaat", "Video display formaat",
"",//TODO "",//TODO
"Format d'affichage", "Format d'affichage",
@ -3659,7 +3681,7 @@ const tI18nPhrase Phrases[] = {
{ "Setup.DVB$Use Dolby Digital", { "Setup.DVB$Use Dolby Digital",
"Dolby-Digital-Ton benutzen", "Dolby-Digital-Ton benutzen",
"Uporabljaj Dolby Digital", "Uporabljaj Dolby Digital",
"",//TODO "Usa Dolby Digital",
"Dolby Digital gebruiken", "Dolby Digital gebruiken",
"",//TODO "",//TODO
"Utiliser le Dolby Digital", "Utiliser le Dolby Digital",
@ -3725,7 +3747,7 @@ const tI18nPhrase Phrases[] = {
{ "PIDs only", { "PIDs only",
"nur PIDs", "nur PIDs",
"samo PIDe", "samo PIDe",
"",// TODO "solo PIDs",
"",// TODO "",// TODO
"",// TODO "",// TODO
"PIDs uniquement", "PIDs uniquement",
@ -3813,7 +3835,7 @@ const tI18nPhrase Phrases[] = {
{ "Setup.DVB$Audio languages", // note the plural { "Setup.DVB$Audio languages", // note the plural
"Audio-Sprachen", "Audio-Sprachen",
"Jeziki za zvok", "Jeziki za zvok",
"",//TODO "Lingue Audio",
"Audio talen", "Audio talen",
"",//TODO "",//TODO
"Langues audio", "Langues audio",
@ -3835,7 +3857,7 @@ const tI18nPhrase Phrases[] = {
{ "Setup.DVB$Audio language", // note the singular { "Setup.DVB$Audio language", // note the singular
"Audio-Sprache", "Audio-Sprache",
"Jezik za zvok", "Jezik za zvok",
"",//TODO "Lingua Audio",
"Audio taal", "Audio taal",
"",//TODO "",//TODO
"Langue audio", "Langue audio",
@ -4319,7 +4341,7 @@ const tI18nPhrase Phrases[] = {
{ "Setup.Replay$Show replay mode", { "Setup.Replay$Show replay mode",
"Wiedergabestatus anzeigen", "Wiedergabestatus anzeigen",
"Prika¾i re¾im predvajanja", "Prika¾i re¾im predvajanja",
"Modalita' di visualizz su replay", "Modalita' di visualizz. su replay",
"Weergave mode aangeven", "Weergave mode aangeven",
"Mostrar modo de replay", "Mostrar modo de replay",
"Affichage mode de lecture", "Affichage mode de lecture",
@ -4363,7 +4385,7 @@ const tI18nPhrase Phrases[] = {
{ "Setup.Miscellaneous$Min. event timeout (min)", { "Setup.Miscellaneous$Min. event timeout (min)",
"Brückenzeit zwischen Timern (min)", "Brückenzeit zwischen Timern (min)",
"Najmanj¹i èas dogodka (min)", "Najmanj¹i èas dogodka (min)",
"Spegnimento: controllo prossimo evento (m)", "Periodo minimo di pausa (min)",
"Minimale event time-out (min)", "Minimale event time-out (min)",
"Período mínimo de pausa (min)", "Período mínimo de pausa (min)",
"MinEventTimeout (min)", "MinEventTimeout (min)",
@ -4385,7 +4407,7 @@ const tI18nPhrase Phrases[] = {
{ "Setup.Miscellaneous$Min. user inactivity (min)", { "Setup.Miscellaneous$Min. user inactivity (min)",
"VDR ausschalten bei Inaktivität (min)", "VDR ausschalten bei Inaktivität (min)",
"Najmanj¹i èas neaktivnosti (min)", "Najmanj¹i èas neaktivnosti (min)",
"Spegnimento: tempo minimo di inattività (m)", "Periodo minimo d'inattivita' (min)",
"Minimum gebruikers inactiviteit (min)", "Minimum gebruikers inactiviteit (min)",
"Período mínimo de inactividade (min)", "Período mínimo de inactividade (min)",
"Durée minimale d'inact. (min)", "Durée minimale d'inact. (min)",
@ -4451,7 +4473,7 @@ const tI18nPhrase Phrases[] = {
{ "Setup.Miscellaneous$Initial channel", { "Setup.Miscellaneous$Initial channel",
"Kanal beim Einschalten", "Kanal beim Einschalten",
"Privzeti kanal", "Privzeti kanal",
"",// TODO "Canale iniziale",
"",// TODO "",// TODO
"",// TODO "",// TODO
"Chaîne initiale", "Chaîne initiale",
@ -4473,7 +4495,7 @@ const tI18nPhrase Phrases[] = {
{ "Setup.Miscellaneous$Initial volume", { "Setup.Miscellaneous$Initial volume",
"Lautstärke beim Einschalten", "Lautstärke beim Einschalten",
"Privzeta glasnost", "Privzeta glasnost",
"",// TODO "Volume iniziale",
"",// TODO "",// TODO
"",// TODO "",// TODO
"Volume initial", "Volume initial",
@ -4495,7 +4517,7 @@ const tI18nPhrase Phrases[] = {
{ "Setup.Miscellaneous$as before", { "Setup.Miscellaneous$as before",
"wie vorher", "wie vorher",
"kot prej", "kot prej",
"",// TODO "come prima",
"",// TODO "",// TODO
"",// TODO "",// TODO
"comme avant", "comme avant",
@ -4563,7 +4585,7 @@ const tI18nPhrase Phrases[] = {
{ " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@", { " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@",
" aäbcdefghijklmnoöpqrstuüvwxyz0123456789-.#~,/_@", " aäbcdefghijklmnoöpqrstuüvwxyz0123456789-.#~,/_@",
" abcèdefghijklmnopqrs¹tuvwxyz¾0123456789-.#~,/_@", " abcèdefghijklmnopqrs¹tuvwxyz¾0123456789-.#~,/_@",
" aàbcdeéèfghiîjklmnopqrstuùvwxyz0123456789-.#~,/_@", " aàbcdeéèfghiîjklmnoòpqrstuùvwxyz0123456789-.#~,/_@",
" abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@áäàïóöòúüù", " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@áäàïóöòúüù",
"",// TODO "",// TODO
" aàbcçdeéèêfghiîjklmnoôpqrstuùûvwxyz0123456789-.#~,/_@", " aàbcçdeéèêfghiîjklmnoôpqrstuùûvwxyz0123456789-.#~,/_@",
@ -4940,7 +4962,7 @@ const tI18nPhrase Phrases[] = {
{ "Key$Down", { "Key$Down",
"Ab", "Ab",
"Dol", "Dol",
"Giù", "Giu",
"Omlaag", "Omlaag",
"Baixo", "Baixo",
"Bas", "Bas",
@ -4962,7 +4984,7 @@ const tI18nPhrase Phrases[] = {
{ "Key$Menu", { "Key$Menu",
"Menü", "Menü",
"Meni", "Meni",
"Menù", "Menu",
"Menu", "Menu",
"Menu", "Menu",
"Menu", "Menu",
@ -5314,7 +5336,7 @@ const tI18nPhrase Phrases[] = {
{ "Key$Next", { "Key$Next",
"Vorwärts", "Vorwärts",
"Naprej", "Naprej",
"",// TODO "Prossimo",
"",// TODO "",// TODO
"",// TODO "",// TODO
"Suivant", "Suivant",
@ -5336,7 +5358,7 @@ const tI18nPhrase Phrases[] = {
{ "Key$Prev", { "Key$Prev",
"Zurück", "Zurück",
"Nazaj", "Nazaj",
"",// TODO "Precedente",
"",// TODO "",// TODO
"",// TODO "",// TODO
"Précédent", "Précédent",
@ -5424,7 +5446,7 @@ const tI18nPhrase Phrases[] = {
{ "Key$PrevChannel", { "Key$PrevChannel",
"Vorheriger Kanal", "Vorheriger Kanal",
"Prej¹nji kanal", "Prej¹nji kanal",
"",// TODO "Canale Prec.",
"",// TODO "",// TODO
"",// TODO "",// TODO
"Chaîne précédente", "Chaîne précédente",
@ -5490,7 +5512,7 @@ const tI18nPhrase Phrases[] = {
{ "Key$Mute", { "Key$Mute",
"Stumm", "Stumm",
"Izklop zvoka", "Izklop zvoka",
"Mute", "Muto",
"Geluid onderbreken", "Geluid onderbreken",
"Sem som", "Sem som",
"Coupure du son", "Coupure du son",
@ -5512,7 +5534,7 @@ const tI18nPhrase Phrases[] = {
{ "Key$Audio", { "Key$Audio",
"Audio", "Audio",
"Zvok", "Zvok",
"",// TODO "Audio",
"Audio", "Audio",
"",// TODO "",// TODO
"Audio", "Audio",
@ -5645,7 +5667,7 @@ const tI18nPhrase Phrases[] = {
{ "top", { "top",
"oben", "oben",
"zgoraj", "zgoraj",
"limite sup", "limite sup.",
"boven", "boven",
"topo", "topo",
"haut", "haut",
@ -5667,7 +5689,7 @@ const tI18nPhrase Phrases[] = {
{ "bottom", { "bottom",
"unten", "unten",
"spodaj", "spodaj",
"limite inf", "limite inf.",
"onder", "onder",
"fundo", "fundo",
"bas", "bas",
@ -5865,7 +5887,7 @@ const tI18nPhrase Phrases[] = {
{ "Up/Dn for new location - OK to move", { "Up/Dn for new location - OK to move",
"Auf/Ab für neue Position - dann OK", "Auf/Ab für neue Position - dann OK",
"Gor/Dol za novo poz. - Ok za premik", "Gor/Dol za novo poz. - Ok za premik",
"Su/Giù per nuova posizione - OK per muovere", "Su/Giu per nuova posizione - OK per muovere",
"Gebruik Omhoog/Omlaag - daarna Ok", "Gebruik Omhoog/Omlaag - daarna Ok",
"Cima/Baixo para nova localização - Ok para mover", "Cima/Baixo para nova localização - Ok para mover",
"Haut/Bas -> nouvelle place - OK -> déplacer", "Haut/Bas -> nouvelle place - OK -> déplacer",
@ -5953,7 +5975,7 @@ const tI18nPhrase Phrases[] = {
{ "Recording started", { "Recording started",
"Aufzeichnung gestartet", "Aufzeichnung gestartet",
"Snemanje se je prièelo", "Snemanje se je prièelo",
"",//TODO "Registrazione iniziata",
"",//TODO "",//TODO
"",//TODO "",//TODO
"Enregistrement a commencé", "Enregistrement a commencé",
@ -5997,7 +6019,7 @@ const tI18nPhrase Phrases[] = {
{ "Starting EPG scan", { "Starting EPG scan",
"Aktualisiere EPG-Daten", "Aktualisiere EPG-Daten",
"Prièenjam EPG-scan", "Prièenjam EPG-scan",
"",// TODO "Scan EPG iniziato",
"Bezig met starten EPG scan", "Bezig met starten EPG scan",
"",// TODO "",// TODO
"Mise à jour du guide des programmes", "Mise à jour du guide des programmes",
@ -6063,7 +6085,7 @@ const tI18nPhrase Phrases[] = {
{ "ST:TNG Panels", { "ST:TNG Panels",
"ST:TNG-Konsolen", "ST:TNG-Konsolen",
"ST:TNG Konsola", "ST:TNG Konsola",
"Consolles ST:TNG", "Pannelli ST:TNG",
"ST:TNG Consoles", "ST:TNG Consoles",
"",// TODO "",// TODO
"Consoles ST:TNG", "Consoles ST:TNG",
@ -6085,7 +6107,7 @@ const tI18nPhrase Phrases[] = {
{ "No title", { "No title",
"Kein Titel", "Kein Titel",
"Brez naziva", "Brez naziva",
"",// TODO "Nessun titolo",
"Geen titel", "Geen titel",
"",// TODO "",// TODO
"Sans titre", "Sans titre",

4
menu.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: menu.c 1.434 2006/04/16 12:20:46 kls Exp $ * $Id: menu.c 1.435 2006/04/28 12:48:01 kls Exp $
*/ */
#include "menu.h" #include "menu.h"
@ -2704,7 +2704,7 @@ eOSState cMenuSetup::Restart(void)
{ {
if (Interface->Confirm(tr("Really restart?")) if (Interface->Confirm(tr("Really restart?"))
&& (!cRecordControls::Active() || Interface->Confirm(tr("Recording - restart anyway?"))) && (!cRecordControls::Active() || Interface->Confirm(tr("Recording - restart anyway?")))
&& !cPluginManager::Active(tr("Really restart?"))) { && !cPluginManager::Active(tr("restart anyway?"))) {
cThread::EmergencyExit(true); cThread::EmergencyExit(true);
return osEnd; return osEnd;
} }

6
menuitems.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: menuitems.c 1.43 2006/04/23 11:39:48 kls Exp $ * $Id: menuitems.c 1.44 2006/04/25 15:59:02 kls Exp $
*/ */
#include "menuitems.h" #include "menuitems.h"
@ -80,10 +80,10 @@ eOSState cMenuEditIntItem::ProcessKey(eKeys Key)
case kNone: break; case kNone: break;
case k0 ... k9: case k0 ... k9:
if (fresh) { if (fresh) {
*value = 0; newValue = 0;
fresh = false; fresh = false;
} }
newValue = *value * 10 + (Key - k0); newValue = newValue * 10 + (Key - k0);
break; break;
case kLeft: // TODO might want to increase the delta if repeated quickly? case kLeft: // TODO might want to increase the delta if repeated quickly?
newValue = *value - 1; newValue = *value - 1;

4
newplugin
View File

@ -12,7 +12,7 @@
# See the main source file 'vdr.c' for copyright information and # See the main source file 'vdr.c' for copyright information and
# how to reach the author. # how to reach the author.
# #
# $Id: newplugin 1.27 2006/04/22 10:04:10 kls Exp $ # $Id: newplugin 1.28 2006/04/24 17:18:41 kls Exp $
$PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin <name>\n"; $PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin <name>\n";
@ -85,7 +85,7 @@ TMPDIR = /tmp
### The version number of VDR's plugin API (taken from VDR's "config.h"): ### The version number of VDR's plugin API (taken from VDR's "config.h"):
APIVERSION = \$(shell sed -ne '/define VDRVERSION/ { s/^.*"\(.*\)".*\$\$/\\1/; p }' \$(VDRDIR)/config.h) APIVERSION = \$(shell sed -ne '/define APIVERSION/s/^.*"\\(.*\\)".*\$\$/\\1/p' \$(VDRDIR)/config.h)
### The name of the distribution archive: ### The name of the distribution archive:

4
vdr.1
View File

@ -8,9 +8,9 @@
.\" License as specified in the file COPYING that comes with the .\" License as specified in the file COPYING that comes with the
.\" vdr distribution. .\" vdr distribution.
.\" .\"
.\" $Id: vdr.1 1.23 2006/04/14 13:03:18 kls Exp $ .\" $Id: vdr.1 1.24 2006/04/28 13:06:35 kls Exp $
.\" .\"
.TH vdr 1 "14 Apr 2006" "1.3.47" "Video Disk Recorder" .TH vdr 1 "28 Apr 2006" "1.4.0" "Video Disk Recorder"
.SH NAME .SH NAME
vdr - the Video Disk Recorder vdr - the Video Disk Recorder
.SH SYNOPSIS .SH SYNOPSIS

6
vdr.5
View File

@ -8,9 +8,9 @@
.\" License as specified in the file COPYING that comes with the .\" License as specified in the file COPYING that comes with the
.\" vdr distribution. .\" vdr distribution.
.\" .\"
.\" $Id: vdr.5 1.56 2006/04/21 15:13:10 kls Exp $ .\" $Id: vdr.5 1.58 2006/04/28 13:06:54 kls Exp $
.\" .\"
.TH vdr 5 "26 Mar 2006" "1.3.45" "Video Disk Recorder Files" .TH vdr 5 "28 Apr 2006" "1.4.0" "Video Disk Recorder Files"
.SH NAME .SH NAME
vdr file formats - the Video Disk Recorder Files vdr file formats - the Video Disk Recorder Files
.SH DESCRIPTION .SH DESCRIPTION
@ -118,7 +118,7 @@ defined in \fIsources.conf\fR.
The symbol rate of this channel (DVB-S and DVB-C only). The symbol rate of this channel (DVB-S and DVB-C only).
.TP .TP
.B VPID .B VPID
The video PID (set to '0' for radio channels, '1' for encrypted radio channels). The video PID (set to '0' for radio channels).
If this channel uses a separate PCR PID, it follows the VPID, separated by a If this channel uses a separate PCR PID, it follows the VPID, separated by a
plus sign, as in plus sign, as in
.B ...:164+17:... .B ...:164+17:...

6
vdr.c
View File

@ -22,7 +22,7 @@
* *
* The project's page is at http://www.cadsoft.de/vdr * The project's page is at http://www.cadsoft.de/vdr
* *
* $Id: vdr.c 1.264 2006/04/22 11:26:04 kls Exp $ * $Id: vdr.c 1.266 2006/04/28 13:23:55 kls Exp $
*/ */
#include <getopt.h> #include <getopt.h>
@ -792,9 +792,9 @@ int main(int argc, char *argv[])
} }
// Switch the device to the transponder: // Switch the device to the transponder:
if (Device) { if (Device) {
if (!Device->IsTunedToTransponder(Timer->Channel())) {
if (Device == cDevice::ActualDevice() && !Device->IsPrimaryDevice()) if (Device == cDevice::ActualDevice() && !Device->IsPrimaryDevice())
cDevice::PrimaryDevice()->StopReplay(); // stop transfer mode cDevice::PrimaryDevice()->StopReplay(); // stop transfer mode
if (!Device->IsTunedToTransponder(Timer->Channel())) {
dsyslog("switching device %d to channel %d", Device->DeviceNumber() + 1, Timer->Channel()->Number()); dsyslog("switching device %d to channel %d", Device->DeviceNumber() + 1, Timer->Channel()->Number());
Device->SwitchChannel(Timer->Channel(), false); Device->SwitchChannel(Timer->Channel(), false);
DeviceUsed[Device->DeviceNumber()] = Now; DeviceUsed[Device->DeviceNumber()] = Now;
@ -980,7 +980,7 @@ int main(int argc, char *argv[])
if (Interface->Confirm(tr("Recording - shut down anyway?"))) if (Interface->Confirm(tr("Recording - shut down anyway?")))
ForceShutdown = true; ForceShutdown = true;
} }
if (cPluginManager::Active(tr("shut down anyway?"))) if (!cPluginManager::Active(tr("shut down anyway?")))
ForceShutdown = true; ForceShutdown = true;
LastActivity = 1; // not 0, see below! LastActivity = 1; // not 0, see below!
UserShutdown = true; UserShutdown = true;