diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 5444ddd5..bd275cd0 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1,7 +1,8 @@ Tons of suggestions, bugreports, patches and other contributions have been -provided by the people on the 'linux-dvb' and 'vdr' mailing lists +provided by the people on the 'linux-dvb' and 'vdr' mailing lists, as well +as 'vdr-portal.de'. Special thanks go to the following individuals (if your name is missing here, -please send an email to kls@tvdr.de): +please send an email to vdr@tvdr.de): Carsten Koch for adding LIRC support @@ -615,6 +616,8 @@ Helmut Auer --genindex for suggesting to disable EPG processing for a while after a CLRE command for suggesting to read the epg.data file in a separate thread + for some improvements to allowing the parameters PATH and NAME to the --dirnames + command line option to be left empty to use the default values if only ENC shall be set Jeremy Hall for fixing an incomplete initialization of the filter parameters in eit.c @@ -2011,6 +2014,7 @@ Ville Skytt for reporting that some special characters are dropped by Doxygen and thus need to be escaped for changing the template for PLGCFG to $(CONFDIR)/plugins.mk + for updating the help and man page entry about the location of the epg.data file Steffen Beyer for fixing setting the colored button help after deleting a recording in case the next @@ -2735,6 +2739,7 @@ Johann Friedrichs for fixing a busy loop when moving editing marks for making cPalette::ClosestColor() treat fully transparent colors as "equal" for implementing scaling of SPU bitmaps + for fixing creating a new VPS timer with the SVDRP command NEWT Timo Helkio for reporting a hangup when replaying a TS recording with subtitles activated @@ -2787,6 +2792,8 @@ Manuel Reimer seconds during replay for suggesting to synchronize system time to the transponder time using adjtime() in order to avoid discontinuities + for setting the environment variables HOME, USER, LOGNAME and SHELL accordingly + when switching to a less privileged user id Rene van den Braken for reporting a bug in writing the PCR pid into the PMT in @@ -3112,3 +3119,7 @@ Dominique Plu Matti Lehtimäki for translating OSD texts to the Finnish language + +Siegfried Bosch + for fixing a possible "Channel not available" if a recording starts on a system with + bonded devices diff --git a/HISTORY b/HISTORY index 763140e2..0b9e6a2d 100644 --- a/HISTORY +++ b/HISTORY @@ -7729,3 +7729,30 @@ Video Disk Recorder Revision History - Changed the default values for the OSD size back to those before version 1.7.29, to avoid problems with SD-FF cards in case the user switches to the "ST:TNG" or "Classic" skin. + +2013-03-16: Version 1.7.41 + +- Updated the Hungarian OSD texts (thanks to István Füley). +- Updated the Russian OSD texts (thanks to Oleg Roitburd). +- Updated the Polish OSD texts (thanks to Marek Nazarko). +- Fixed using PATH_MAX and NAME_MAX (+/-1 because the first one includes the + terminating 0, while the latter doesn't). +- The 'plugins' target of the VDR Makefile now also copies files matching the wildcard + "lib$$i-*.so" (previously only "libvdr-*.so") and also descends into subdirectories + of the plugin source. +- The parameters PATH and NAME to the --dirnames command line option may now be left + empty to use the default values if only ENC shall be set (thanks to Helmut Auer for + some improvements to this change). +- Fixed a possible "Channel not available" if a recording starts on a system with + bonded devices (thanks to Siegfried Bosch). +- Fixed stopping an ongoing recording on a system with bonded devices, if a timer with + a higher priority requires a different band. +- Updated the introductory text of the vdr.1 man page. +- Added a note to the INSTALL file regarding multiple disk setup becoming deprecated + in a future version of VDR. +- When switching to a less privileged user id, VDR now sets the environment variables + HOME, USER, LOGNAME and SHELL accordingly (thanks to Manuel Reimer). +- Updated the help and man page entry about the location of the epg.data file (thanks + to Ville Skyttä). +- Fixed creating a new VPS timer with the SVDRP command NEWT (thanks to Johann + Friedrichs). diff --git a/INSTALL b/INSTALL index bc9193a4..dd0c999e 100644 --- a/INSTALL +++ b/INSTALL @@ -1,7 +1,7 @@ Installation of the Video Disk Recorder --------------------------------------- -Version 1.7 +Version 2.0 ----------- Compiling and running the program: @@ -351,7 +351,12 @@ would set up twelve disks (wow, what a machine that would be!). To use such a multi directory setup, you need to add the '-v' option with the name of the basic directory when running 'vdr': - vdr -v /video0 + vdr -v /srv/vdr/video0 + +WARNING: Using multiple disks to form one large video directory this way +is deprecated and will be removed from VDR in a future version! Either +use one of today's large terabyte disks (preferably with a backup disk +in a RAID-1 array), or use something like "mhddfs". Note that you should not copy any non-VDR files into the video directory, since this might cause a lot of unnecessary disk access when VDR cleans up those @@ -359,7 +364,7 @@ directories and there is a large number of files and/or subdirectories in there. If you have a large disk that you want to use for VDR's video data as well as other stuff, you may want to create a subdirectory for VDR, as in - /mydisk/video0 + /mydisk/video and put your other stuff into, say, diff --git a/MANUAL b/MANUAL index e1f79f85..cce2b0a5 100644 --- a/MANUAL +++ b/MANUAL @@ -1,7 +1,7 @@ Video Disk Recorder User's Manual --------------------------------- -Version 1.6 +Version 2.0 ----------- * Remote Control Keys diff --git a/Makefile b/Makefile index 913173b8..d24d08fd 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ # See the main source file 'vdr.c' for copyright information and # how to reach the author. # -# $Id: Makefile 2.53 2013/02/24 10:40:23 kls Exp $ +# $Id: Makefile 2.54 2013/03/11 15:01:01 kls Exp $ .DELETE_ON_ERROR: @@ -220,7 +220,7 @@ plugins: include-dir vdr.pc INCLUDES="-I$(CWD)/include"\ $(MAKE) --no-print-directory -C "$(PLUGINDIR)/src/$$i" VDRDIR="$(CWD)" || failed="$$failed $$i";\ if [ -n "$(LCLBLD)" ] ; then\ - (cd $(PLUGINDIR)/src/$$i; for l in libvdr-*.so; do install $$l $(LIBDIR)/$$l.$(APIVERSION); done);\ + (cd $(PLUGINDIR)/src/$$i; for l in `find -name 'libvdr-*.so' -o -name 'lib$$i-*.so'`; do install $$l $(LIBDIR)/`basename $$l`.$(APIVERSION); done);\ if [ -d $(PLUGINDIR)/src/$$i/po ]; then\ for l in `ls $(PLUGINDIR)/src/$$i/po/*.mo`; do\ install -D -m644 $$l $(LOCDIR)/`basename $$l | cut -d. -f1`/LC_MESSAGES/vdr-$$i.mo;\ diff --git a/PLUGINS.html b/PLUGINS.html index 30beced9..d864fe23 100644 --- a/PLUGINS.html +++ b/PLUGINS.html @@ -31,10 +31,10 @@ modified {

The VDR Plugin System

-Version 1.7 +Version 2.0

-Copyright © 2009 Klaus Schmidinger
-kls@tvdr.de
+Copyright © 2013 Klaus Schmidinger
+vdr@tvdr.de
www.tvdr.de

diff --git a/PLUGINS/src/epgtableid0/README b/PLUGINS/src/epgtableid0/README index 8c2436dd..28b98fea 100644 --- a/PLUGINS/src/epgtableid0/README +++ b/PLUGINS/src/epgtableid0/README @@ -1,6 +1,6 @@ This is a "plugin" for the Video Disk Recorder (VDR). -Written by: Klaus Schmidinger +Written by: Klaus Schmidinger Project's homepage: http://www.tvdr.de diff --git a/PLUGINS/src/hello/README b/PLUGINS/src/hello/README index e3c46a9d..90fec0f0 100644 --- a/PLUGINS/src/hello/README +++ b/PLUGINS/src/hello/README @@ -1,6 +1,6 @@ This is a "plugin" for the Video Disk Recorder (VDR). -Written by: Klaus Schmidinger +Written by: Klaus Schmidinger Project's homepage: http://www.tvdr.de diff --git a/PLUGINS/src/hello/po/ca_ES.po b/PLUGINS/src/hello/po/ca_ES.po index 8efe5318..e0088f2b 100644 --- a/PLUGINS/src/hello/po/ca_ES.po +++ b/PLUGINS/src/hello/po/ca_ES.po @@ -1,5 +1,5 @@ # VDR plugin language source file. -# Copyright (C) 2008 Klaus Schmidinger +# Copyright (C) 2013 Klaus Schmidinger # This file is distributed under the same license as the VDR package. # Marc Rovira Vall , 2003 # Ramon Roca , 2003 diff --git a/PLUGINS/src/hello/po/cs_CZ.po b/PLUGINS/src/hello/po/cs_CZ.po index f4fe8a51..0029fc3c 100644 --- a/PLUGINS/src/hello/po/cs_CZ.po +++ b/PLUGINS/src/hello/po/cs_CZ.po @@ -1,5 +1,5 @@ # VDR plugin language source file. -# Copyright (C) 2008 Klaus Schmidinger +# Copyright (C) 2013 Klaus Schmidinger # This file is distributed under the same license as the VDR package. # Vladimír Bárta , 2006 # diff --git a/PLUGINS/src/hello/po/da_DK.po b/PLUGINS/src/hello/po/da_DK.po index 1fda5d08..69d14097 100644 --- a/PLUGINS/src/hello/po/da_DK.po +++ b/PLUGINS/src/hello/po/da_DK.po @@ -1,5 +1,5 @@ # VDR plugin language source file. -# Copyright (C) 2008 Klaus Schmidinger +# Copyright (C) 2013 Klaus Schmidinger # This file is distributed under the same license as the VDR package. # Mogens Elneff , 2004 # diff --git a/PLUGINS/src/hello/po/de_DE.po b/PLUGINS/src/hello/po/de_DE.po index c3e35f6b..abed9b04 100644 --- a/PLUGINS/src/hello/po/de_DE.po +++ b/PLUGINS/src/hello/po/de_DE.po @@ -1,7 +1,7 @@ # VDR plugin language source file. -# Copyright (C) 2008 Klaus Schmidinger +# Copyright (C) 2013 Klaus Schmidinger # This file is distributed under the same license as the VDR package. -# Klaus Schmidinger , 2000 +# Klaus Schmidinger , 2000 # msgid "" msgstr "" @@ -9,7 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-12-18 14:04+0100\n" "PO-Revision-Date: 2007-08-11 12:34+0200\n" -"Last-Translator: Klaus Schmidinger \n" +"Last-Translator: Klaus Schmidinger \n" "Language-Team: German \n" "Language: de\n" "MIME-Version: 1.0\n" diff --git a/PLUGINS/src/hello/po/el_GR.po b/PLUGINS/src/hello/po/el_GR.po index 03bab929..e5f8066a 100644 --- a/PLUGINS/src/hello/po/el_GR.po +++ b/PLUGINS/src/hello/po/el_GR.po @@ -1,5 +1,5 @@ # VDR plugin language source file. -# Copyright (C) 2008 Klaus Schmidinger +# Copyright (C) 2013 Klaus Schmidinger # This file is distributed under the same license as the VDR package. # Dimitrios Dimitrakos , 2002 # diff --git a/PLUGINS/src/hello/po/es_ES.po b/PLUGINS/src/hello/po/es_ES.po index 1b87045b..ce7debae 100644 --- a/PLUGINS/src/hello/po/es_ES.po +++ b/PLUGINS/src/hello/po/es_ES.po @@ -1,5 +1,5 @@ # VDR plugin language source file. -# Copyright (C) 2008 Klaus Schmidinger +# Copyright (C) 2013 Klaus Schmidinger # This file is distributed under the same license as the VDR package. # Ruben Nunez Francisco , 2002 # diff --git a/PLUGINS/src/hello/po/et_EE.po b/PLUGINS/src/hello/po/et_EE.po index c3d9bda6..1c6c1835 100644 --- a/PLUGINS/src/hello/po/et_EE.po +++ b/PLUGINS/src/hello/po/et_EE.po @@ -1,5 +1,5 @@ # VDR plugin language source file. -# Copyright (C) 2008 Klaus Schmidinger +# Copyright (C) 2013 Klaus Schmidinger # This file is distributed under the same license as the VDR package. # Arthur Konovalov , 2004 # diff --git a/PLUGINS/src/hello/po/fi_FI.po b/PLUGINS/src/hello/po/fi_FI.po index b8256b54..a571922a 100644 --- a/PLUGINS/src/hello/po/fi_FI.po +++ b/PLUGINS/src/hello/po/fi_FI.po @@ -1,5 +1,5 @@ # VDR plugin language source file. -# Copyright (C) 2008 Klaus Schmidinger +# Copyright (C) 2013 Klaus Schmidinger # This file is distributed under the same license as the VDR package. # Hannu Savolainen , 2002 # Jaakko Hyvätti , 2002 diff --git a/PLUGINS/src/hello/po/fr_FR.po b/PLUGINS/src/hello/po/fr_FR.po index aed37e22..451ae905 100644 --- a/PLUGINS/src/hello/po/fr_FR.po +++ b/PLUGINS/src/hello/po/fr_FR.po @@ -1,5 +1,5 @@ # VDR plugin language source file. -# Copyright (C) 2008 Klaus Schmidinger +# Copyright (C) 2013 Klaus Schmidinger # This file is distributed under the same license as the VDR package. # Jean-Claude Repetto , 2001 # Olivier Jacques , 2003 diff --git a/PLUGINS/src/hello/po/hr_HR.po b/PLUGINS/src/hello/po/hr_HR.po index 40305de3..ba3b22de 100644 --- a/PLUGINS/src/hello/po/hr_HR.po +++ b/PLUGINS/src/hello/po/hr_HR.po @@ -1,5 +1,5 @@ # VDR plugin language source file. -# Copyright (C) 2008 Klaus Schmidinger +# Copyright (C) 2013 Klaus Schmidinger # This file is distributed under the same license as the VDR package. # Adrian Caval , 2008 # diff --git a/PLUGINS/src/hello/po/hu_HU.po b/PLUGINS/src/hello/po/hu_HU.po index ae344c11..bbfddd82 100644 --- a/PLUGINS/src/hello/po/hu_HU.po +++ b/PLUGINS/src/hello/po/hu_HU.po @@ -1,5 +1,5 @@ # VDR plugin language source file. -# Copyright (C) 2008 Klaus Schmidinger +# Copyright (C) 2013 Klaus Schmidinger # This file is distributed under the same license as the VDR package. # Istvan Koenigsberger , 2002 # Guido Josten , 2002 diff --git a/PLUGINS/src/hello/po/it_IT.po b/PLUGINS/src/hello/po/it_IT.po index e56e4999..7c52d984 100644 --- a/PLUGINS/src/hello/po/it_IT.po +++ b/PLUGINS/src/hello/po/it_IT.po @@ -1,5 +1,5 @@ # VDR plugin language source file. -# Copyright (C) 2008 Klaus Schmidinger +# Copyright (C) 2013 Klaus Schmidinger # This file is distributed under the same license as the VDR package. # Diego Pierotto , 2008 # diff --git a/PLUGINS/src/hello/po/lt_LT.po b/PLUGINS/src/hello/po/lt_LT.po index 773e14a8..27262069 100644 --- a/PLUGINS/src/hello/po/lt_LT.po +++ b/PLUGINS/src/hello/po/lt_LT.po @@ -1,5 +1,5 @@ # VDR plugin language source file. -# Copyright (C) 2008 Klaus Schmidinger +# Copyright (C) 2013 Klaus Schmidinger # This file is distributed under the same license as the VDR package. # Valdemaras Pipiras , 2009 # diff --git a/PLUGINS/src/hello/po/nl_NL.po b/PLUGINS/src/hello/po/nl_NL.po index 29b0dadf..514ea184 100644 --- a/PLUGINS/src/hello/po/nl_NL.po +++ b/PLUGINS/src/hello/po/nl_NL.po @@ -1,5 +1,5 @@ # VDR plugin language source file. -# Copyright (C) 2008 Klaus Schmidinger +# Copyright (C) 2013 Klaus Schmidinger # This file is distributed under the same license as the VDR package. # Arnold Niessen , 2001 # Hans Dingemans , 2003 diff --git a/PLUGINS/src/hello/po/nn_NO.po b/PLUGINS/src/hello/po/nn_NO.po index 0277104c..ebaafae3 100644 --- a/PLUGINS/src/hello/po/nn_NO.po +++ b/PLUGINS/src/hello/po/nn_NO.po @@ -1,5 +1,5 @@ # VDR plugin language source file. -# Copyright (C) 2008 Klaus Schmidinger +# Copyright (C) 2013 Klaus Schmidinger # This file is distributed under the same license as the VDR package. # Jørgen Tvedt , 2001 # Truls Slevigen , 2002 diff --git a/PLUGINS/src/hello/po/pl_PL.po b/PLUGINS/src/hello/po/pl_PL.po index 34d38de3..1dd27027 100644 --- a/PLUGINS/src/hello/po/pl_PL.po +++ b/PLUGINS/src/hello/po/pl_PL.po @@ -1,5 +1,5 @@ # VDR plugin language source file. -# Copyright (C) 2008 Klaus Schmidinger +# Copyright (C) 2013 Klaus Schmidinger # This file is distributed under the same license as the VDR package. # Michael Rakowski , 2002 # diff --git a/PLUGINS/src/hello/po/pt_PT.po b/PLUGINS/src/hello/po/pt_PT.po index fcefd52e..f22657f3 100644 --- a/PLUGINS/src/hello/po/pt_PT.po +++ b/PLUGINS/src/hello/po/pt_PT.po @@ -1,5 +1,5 @@ # VDR plugin language source file. -# Copyright (C) 2008 Klaus Schmidinger +# Copyright (C) 2013 Klaus Schmidinger # This file is distributed under the same license as the VDR package. # Paulo Lopes , 2001 # diff --git a/PLUGINS/src/hello/po/ro_RO.po b/PLUGINS/src/hello/po/ro_RO.po index 248e9c06..ad2737e3 100644 --- a/PLUGINS/src/hello/po/ro_RO.po +++ b/PLUGINS/src/hello/po/ro_RO.po @@ -1,5 +1,5 @@ # VDR plugin language source file. -# Copyright (C) 2008 Klaus Schmidinger +# Copyright (C) 2013 Klaus Schmidinger # This file is distributed under the same license as the VDR package. # Paul Lacatus , 2002 # Lucian Muresan , 2004 diff --git a/PLUGINS/src/hello/po/ru_RU.po b/PLUGINS/src/hello/po/ru_RU.po index 18dcd0f0..d8fc3235 100644 --- a/PLUGINS/src/hello/po/ru_RU.po +++ b/PLUGINS/src/hello/po/ru_RU.po @@ -1,5 +1,5 @@ # VDR plugin language source file. -# Copyright (C) 2008 Klaus Schmidinger +# Copyright (C) 2013 Klaus Schmidinger # This file is distributed under the same license as the VDR package. # Vyacheslav Dikonov , 2004 # diff --git a/PLUGINS/src/hello/po/sk_SK.po b/PLUGINS/src/hello/po/sk_SK.po index e3875aff..b0c2a893 100644 --- a/PLUGINS/src/hello/po/sk_SK.po +++ b/PLUGINS/src/hello/po/sk_SK.po @@ -1,5 +1,5 @@ # VDR plugin language source file. -# Copyright (C) 2008 Klaus Schmidinger +# Copyright (C) 2013 Klaus Schmidinger # This file is distributed under the same license as the VDR package. # Vladimír Bárta , 2006 # diff --git a/PLUGINS/src/hello/po/sl_SI.po b/PLUGINS/src/hello/po/sl_SI.po index 504586aa..6e6bcf18 100644 --- a/PLUGINS/src/hello/po/sl_SI.po +++ b/PLUGINS/src/hello/po/sl_SI.po @@ -1,5 +1,5 @@ # VDR plugin language source file. -# Copyright (C) 2008 Klaus Schmidinger +# Copyright (C) 2013 Klaus Schmidinger # This file is distributed under the same license as the VDR package. # Miha Setina , 2000 # Matjaz Thaler , 2003 diff --git a/PLUGINS/src/hello/po/sv_SE.po b/PLUGINS/src/hello/po/sv_SE.po index 3ccd4240..3ba8865a 100644 --- a/PLUGINS/src/hello/po/sv_SE.po +++ b/PLUGINS/src/hello/po/sv_SE.po @@ -1,5 +1,5 @@ # VDR plugin language source file. -# Copyright (C) 2008 Klaus Schmidinger +# Copyright (C) 2013 Klaus Schmidinger # This file is distributed under the same license as the VDR package. # Tomas Prybil , 2002 # Jan Ekholm , 2003 diff --git a/PLUGINS/src/hello/po/tr_TR.po b/PLUGINS/src/hello/po/tr_TR.po index 3215b1fb..ec121534 100644 --- a/PLUGINS/src/hello/po/tr_TR.po +++ b/PLUGINS/src/hello/po/tr_TR.po @@ -1,5 +1,5 @@ # VDR plugin language source file. -# Copyright (C) 2008 Klaus Schmidinger +# Copyright (C) 2013 Klaus Schmidinger # This file is distributed under the same license as the VDR package. # Oktay Yolgeçen , 2007 # diff --git a/PLUGINS/src/hello/po/zh_CN.po b/PLUGINS/src/hello/po/zh_CN.po index 6d7aa569..8baba906 100644 --- a/PLUGINS/src/hello/po/zh_CN.po +++ b/PLUGINS/src/hello/po/zh_CN.po @@ -1,5 +1,5 @@ # VDR plugin language source file. -# Copyright (C) 2008 Klaus Schmidinger +# Copyright (C) 2013 Klaus Schmidinger # This file is distributed under the same license as the VDR package. # Marc Rovira Vall , 2003 # Ramon Roca , 2003 diff --git a/PLUGINS/src/osddemo/README b/PLUGINS/src/osddemo/README index bd9aa8bf..094f43f7 100644 --- a/PLUGINS/src/osddemo/README +++ b/PLUGINS/src/osddemo/README @@ -1,6 +1,6 @@ This is a "plugin" for the Video Disk Recorder (VDR). -Written by: Klaus Schmidinger +Written by: Klaus Schmidinger Project's homepage: http://www.tvdr.de diff --git a/PLUGINS/src/pictures/README b/PLUGINS/src/pictures/README index bc21526b..42440dbf 100644 --- a/PLUGINS/src/pictures/README +++ b/PLUGINS/src/pictures/README @@ -1,6 +1,6 @@ This is a "plugin" for the Video Disk Recorder (VDR). -Written by: Klaus Schmidinger +Written by: Klaus Schmidinger Project's homepage: http://www.tvdr.de diff --git a/PLUGINS/src/pictures/po/de_DE.po b/PLUGINS/src/pictures/po/de_DE.po index 2f777727..f1bde13f 100644 --- a/PLUGINS/src/pictures/po/de_DE.po +++ b/PLUGINS/src/pictures/po/de_DE.po @@ -1,7 +1,7 @@ # VDR plugin language source file. -# Copyright (C) 2008 Klaus Schmidinger +# Copyright (C) 2013 Klaus Schmidinger # This file is distributed under the same license as the VDR package. -# Klaus Schmidinger , 2008 +# Klaus Schmidinger , 2008 # msgid "" msgstr "" @@ -9,7 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-12-18 12:57+0100\n" "PO-Revision-Date: 2008-01-12 17:41+0100\n" -"Last-Translator: Klaus Schmidinger \n" +"Last-Translator: Klaus Schmidinger \n" "Language-Team: German \n" "Language: de\n" "MIME-Version: 1.0\n" diff --git a/PLUGINS/src/pictures/po/fi_FI.po b/PLUGINS/src/pictures/po/fi_FI.po index 3ac5ed7d..7f99e2cc 100644 --- a/PLUGINS/src/pictures/po/fi_FI.po +++ b/PLUGINS/src/pictures/po/fi_FI.po @@ -1,5 +1,5 @@ # VDR plugin language source file. -# Copyright (C) 2008 Klaus Schmidinger +# Copyright (C) 2013 Klaus Schmidinger # This file is distributed under the same license as the VDR package. # Rolf Ahrenberg , 2008 # diff --git a/PLUGINS/src/pictures/po/fr_FR.po b/PLUGINS/src/pictures/po/fr_FR.po index 36bca8c5..4567c674 100644 --- a/PLUGINS/src/pictures/po/fr_FR.po +++ b/PLUGINS/src/pictures/po/fr_FR.po @@ -1,5 +1,5 @@ # VDR plugin language source file. -# Copyright (C) 2008 Klaus Schmidinger +# Copyright (C) 2013 Klaus Schmidinger # This file is distributed under the same license as the VDR package. # Patrice Staudt , 2008 # diff --git a/PLUGINS/src/pictures/po/it_IT.po b/PLUGINS/src/pictures/po/it_IT.po index 0eddf515..e5492884 100644 --- a/PLUGINS/src/pictures/po/it_IT.po +++ b/PLUGINS/src/pictures/po/it_IT.po @@ -1,5 +1,5 @@ # VDR plugin language source file. -# Copyright (C) 2008 Klaus Schmidinger +# Copyright (C) 2013 Klaus Schmidinger # This file is distributed under the same license as the VDR package. # Diego Pierotto , 2008 # diff --git a/PLUGINS/src/pictures/po/lt_LT.po b/PLUGINS/src/pictures/po/lt_LT.po index 26c244bb..73d4da2a 100644 --- a/PLUGINS/src/pictures/po/lt_LT.po +++ b/PLUGINS/src/pictures/po/lt_LT.po @@ -1,5 +1,5 @@ # VDR plugin language source file. -# Copyright (C) 2008 Klaus Schmidinger +# Copyright (C) 2013 Klaus Schmidinger # This file is distributed under the same license as the VDR package. # Valdemaras Pipiras , 2009 # diff --git a/PLUGINS/src/pictures/po/ru_RU.po b/PLUGINS/src/pictures/po/ru_RU.po index 869c91be..47681619 100644 --- a/PLUGINS/src/pictures/po/ru_RU.po +++ b/PLUGINS/src/pictures/po/ru_RU.po @@ -1,5 +1,5 @@ # VDR plugin language source file. -# Copyright (C) 2008 Klaus Schmidinger +# Copyright (C) 2013 Klaus Schmidinger # This file is distributed under the same license as the VDR package. # Alexander Gross , 2008 # diff --git a/PLUGINS/src/pictures/po/sk_SK.po b/PLUGINS/src/pictures/po/sk_SK.po index afc69a03..2b0cc58f 100644 --- a/PLUGINS/src/pictures/po/sk_SK.po +++ b/PLUGINS/src/pictures/po/sk_SK.po @@ -1,7 +1,7 @@ # VDR plugin language source file. -# Copyright (C) 2008 Klaus Schmidinger +# Copyright (C) 2013 Klaus Schmidinger # This file is distributed under the same license as the VDR package. -# Klaus Schmidinger , 2008 +# Klaus Schmidinger , 2008 # msgid "" msgstr "" diff --git a/PLUGINS/src/skincurses/README b/PLUGINS/src/skincurses/README index 20b56541..2339bd51 100644 --- a/PLUGINS/src/skincurses/README +++ b/PLUGINS/src/skincurses/README @@ -1,6 +1,6 @@ This is a "plugin" for the Video Disk Recorder (VDR). -Written by: Klaus Schmidinger +Written by: Klaus Schmidinger Project's homepage: http://www.tvdr.de diff --git a/PLUGINS/src/skincurses/po/de_DE.po b/PLUGINS/src/skincurses/po/de_DE.po index cecf74b5..6d84b1e2 100644 --- a/PLUGINS/src/skincurses/po/de_DE.po +++ b/PLUGINS/src/skincurses/po/de_DE.po @@ -1,7 +1,7 @@ # VDR plugin language source file. -# Copyright (C) 2008 Klaus Schmidinger +# Copyright (C) 2013 Klaus Schmidinger # This file is distributed under the same license as the VDR package. -# Klaus Schmidinger , 2007 +# Klaus Schmidinger , 2007 # msgid "" msgstr "" @@ -9,7 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-12-18 14:04+0100\n" "PO-Revision-Date: 2007-08-15 16:07+0200\n" -"Last-Translator: Klaus Schmidinger \n" +"Last-Translator: Klaus Schmidinger \n" "Language-Team: German \n" "Language: de\n" "MIME-Version: 1.0\n" diff --git a/PLUGINS/src/skincurses/po/fi_FI.po b/PLUGINS/src/skincurses/po/fi_FI.po index e8bb5c20..39afbbc8 100644 --- a/PLUGINS/src/skincurses/po/fi_FI.po +++ b/PLUGINS/src/skincurses/po/fi_FI.po @@ -1,5 +1,5 @@ # VDR plugin language source file. -# Copyright (C) 2008 Klaus Schmidinger +# Copyright (C) 2013 Klaus Schmidinger # This file is distributed under the same license as the VDR package. # Rolf Ahrenberg , 2007 # diff --git a/PLUGINS/src/skincurses/po/it_IT.po b/PLUGINS/src/skincurses/po/it_IT.po index b7a8e688..057e7a63 100644 --- a/PLUGINS/src/skincurses/po/it_IT.po +++ b/PLUGINS/src/skincurses/po/it_IT.po @@ -1,5 +1,5 @@ # VDR plugin language source file. -# Copyright (C) 2008 Klaus Schmidinger +# Copyright (C) 2013 Klaus Schmidinger # This file is distributed under the same license as the VDR package. # Diego Pierotto , 2008 # diff --git a/PLUGINS/src/skincurses/po/lt_LT.po b/PLUGINS/src/skincurses/po/lt_LT.po index 3b3e1e10..0f2237f0 100644 --- a/PLUGINS/src/skincurses/po/lt_LT.po +++ b/PLUGINS/src/skincurses/po/lt_LT.po @@ -1,5 +1,5 @@ # VDR plugin language source file. -# Copyright (C) 2008 Klaus Schmidinger +# Copyright (C) 2013 Klaus Schmidinger # This file is distributed under the same license as the VDR package. # Valdemaras Pipiras , 2010 # diff --git a/PLUGINS/src/skincurses/po/ru_RU.po b/PLUGINS/src/skincurses/po/ru_RU.po index fe049953..93e89612 100644 --- a/PLUGINS/src/skincurses/po/ru_RU.po +++ b/PLUGINS/src/skincurses/po/ru_RU.po @@ -1,5 +1,5 @@ # VDR plugin language source file. -# Copyright (C) 2008 Klaus Schmidinger +# Copyright (C) 2013 Klaus Schmidinger # This file is distributed under the same license as the VDR package. # Alexander Gross , 2008 # diff --git a/PLUGINS/src/skincurses/po/sk_SK.po b/PLUGINS/src/skincurses/po/sk_SK.po index 0426c70b..b03d9b48 100644 --- a/PLUGINS/src/skincurses/po/sk_SK.po +++ b/PLUGINS/src/skincurses/po/sk_SK.po @@ -1,7 +1,7 @@ # VDR plugin language source file. -# Copyright (C) 2008 Klaus Schmidinger +# Copyright (C) 2013 Klaus Schmidinger # This file is distributed under the same license as the VDR package. -# Klaus Schmidinger , 2007 +# Klaus Schmidinger , 2007 # msgid "" msgstr "" diff --git a/PLUGINS/src/status/README b/PLUGINS/src/status/README index b73e6be2..334c8082 100644 --- a/PLUGINS/src/status/README +++ b/PLUGINS/src/status/README @@ -1,6 +1,6 @@ This is a "plugin" for the Video Disk Recorder (VDR). -Written by: Klaus Schmidinger +Written by: Klaus Schmidinger Project's homepage: http://www.tvdr.de diff --git a/README b/README index 116385ec..f88b9172 100644 --- a/README +++ b/README @@ -6,9 +6,6 @@ which is based on the DVB driver of the LinuxTV project (http://linuxtv.org). For details about the "Video Disk Recorder" project please refer to http://www.tvdr.de. -There is also a remote control unit described on those -Web pages, which can be used within this program. - Please see the INSTALL file for details on how to install this program on your computer. @@ -17,7 +14,7 @@ The MANUAL file describes how to operate the VDR. The CONTRIBUTORS file lists all the people who have contributed to the development of VDR. -The author can be contacted at kls@tvdr.de. +The author can be contacted at vdr@tvdr.de. Yet another "set-top box"? -------------------------- diff --git a/README.i18n b/README.i18n index 476d5b63..219b21e3 100644 --- a/README.i18n +++ b/README.i18n @@ -52,5 +52,5 @@ How to maintain an existing language file Once you have created or updated a translation file, please send it to the maintainer of the respective plugin (in case -it belongs to a plugin) or to kls@tvdr.de (for core VDR +it belongs to a plugin) or to vdr@tvdr.de (for core VDR language files). diff --git a/UPDATE-2.0.0 b/UPDATE-2.0.0 index 0632bfba..c24fcb0d 100644 --- a/UPDATE-2.0.0 +++ b/UPDATE-2.0.0 @@ -478,3 +478,7 @@ Misc: to avoid discontinuities. If the time difference is more than 10 seconds, stime() is still used to do the initial sync. - Implemented scaling of SPU bitmaps. +- WARNING: Using multiple disks to form one large video directory is deprecated and + will be removed from VDR in a future version! Either use one of today's large + terabyte disks (preferably with a backup disk in a RAID-1 array), or use something + like "mhddfs". diff --git a/config.h b/config.h index 9d88d6c2..f7b3795f 100644 --- a/config.h +++ b/config.h @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: config.h 2.71 2013/03/04 13:58:40 kls Exp $ + * $Id: config.h 2.74 2013/03/11 11:07:59 kls Exp $ */ #ifndef __CONFIG_H @@ -22,13 +22,13 @@ // VDR's own version number: -#define VDRVERSION "1.7.40" -#define VDRVERSNUM 10740 // Version * 10000 + Major * 100 + Minor +#define VDRVERSION "1.7.41" +#define VDRVERSNUM 10741 // Version * 10000 + Major * 100 + Minor // The plugin API's version number: -#define APIVERSION "1.7.40" -#define APIVERSNUM 10740 // Version * 10000 + Major * 100 + Minor +#define APIVERSION "1.7.41" +#define APIVERSNUM 10741 // Version * 10000 + Major * 100 + Minor // When loading plugins, VDR searches them by their APIVERSION, which // may be smaller than VDRVERSION in case there have been no changes to @@ -260,7 +260,7 @@ public: int MenuScrollWrap; int MenuKeyCloses; int MarkInstantRecord; - char NameInstantRecord[NAME_MAX]; + char NameInstantRecord[NAME_MAX + 1]; int InstantRecordTime; int LnbSLOF; int LnbFrequLo; diff --git a/dvbdevice.c b/dvbdevice.c index cd017a2d..1fba1661 100644 --- a/dvbdevice.c +++ b/dvbdevice.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: dvbdevice.c 2.84 2013/03/07 09:42:29 kls Exp $ + * $Id: dvbdevice.c 2.87 2013/03/13 11:23:53 kls Exp $ */ #include "dvbdevice.h" @@ -426,7 +426,7 @@ bool cDvbTuner::BondingOk(const cChannel *Channel, bool ConsiderOccupied) const cString BondingParams = GetBondingParams(Channel); do { if (t->device->Priority() > IDLEPRIORITY || ConsiderOccupied && t->device->Occupied()) { - if (strcmp(BondingParams, t->GetBondingParams()) != 0) + if (strcmp(BondingParams, t->GetBondedMaster()->GetBondingParams()) != 0) return false; } t = t->bondedTuner; @@ -1485,6 +1485,7 @@ bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Ne needsDetachReceivers = Receiving(); } if (result) { + cMutexLock MutexLock(&bondMutex); if (!BondingOk(Channel)) { // This device is bonded, so we need to check the priorities of the others: for (cDvbDevice *d = bondedDevice; d && d != this; d = d->bondedDevice) { @@ -1492,9 +1493,10 @@ bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Ne result = false; break; } + needsDetachReceivers |= d->Receiving(); } needsDetachBondedReceivers = true; - needsDetachReceivers = Receiving(); + needsDetachReceivers |= Receiving(); } } } diff --git a/po/ar.po b/po/ar.po index 80d3e7de..54c3f3c4 100644 --- a/po/ar.po +++ b/po/ar.po @@ -1,11 +1,11 @@ # VDR language source file. -# Copyright (C) 2008 Klaus Schmidinger +# Copyright (C) 2013 Klaus Schmidinger # This file is distributed under the same license as the VDR package. # Osama Alrawab , 2010, 2013 # msgid "" msgstr "" -"Project-Id-Version: VDR 1.7.0\n" +"Project-Id-Version: VDR 2.0.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-02-03 16:46+0100\n" "PO-Revision-Date: 2008-10-16 11:16-0400\n" diff --git a/po/ca_ES.po b/po/ca_ES.po index 22aeb052..89d65568 100644 --- a/po/ca_ES.po +++ b/po/ca_ES.po @@ -1,5 +1,5 @@ # VDR language source file. -# Copyright (C) 2008 Klaus Schmidinger +# Copyright (C) 2013 Klaus Schmidinger # This file is distributed under the same license as the VDR package. # Marc Rovira Vall , 2003 # Ramon Roca , 2003 @@ -8,7 +8,7 @@ # msgid "" msgstr "" -"Project-Id-Version: VDR 1.6.0\n" +"Project-Id-Version: VDR 2.0.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-03-04 14:46+0100\n" "PO-Revision-Date: 2008-03-02 19:02+0100\n" diff --git a/po/cs_CZ.po b/po/cs_CZ.po index 818c9c17..5409f089 100644 --- a/po/cs_CZ.po +++ b/po/cs_CZ.po @@ -1,5 +1,5 @@ # VDR language source file. -# Copyright (C) 2008 Klaus Schmidinger +# Copyright (C) 2013 Klaus Schmidinger # This file is distributed under the same license as the VDR package. # Vladimír Bárta , 2006, 2008 # Jiří Dobrý , 2008 @@ -8,7 +8,7 @@ # msgid "" msgstr "" -"Project-Id-Version: VDR 1.7.14\n" +"Project-Id-Version: VDR 2.0.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-03-04 14:46+0100\n" "PO-Revision-Date: 2010-05-06 11:00+0200\n" diff --git a/po/da_DK.po b/po/da_DK.po index 73a21221..4069a7b4 100644 --- a/po/da_DK.po +++ b/po/da_DK.po @@ -1,11 +1,11 @@ # VDR language source file. -# Copyright (C) 2008 Klaus Schmidinger +# Copyright (C) 2013 Klaus Schmidinger # This file is distributed under the same license as the VDR package. # Mogens Elneff , 2004, 2008 # msgid "" msgstr "" -"Project-Id-Version: VDR 1.6.0\n" +"Project-Id-Version: VDR 2.0.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-03-04 14:46+0100\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n" diff --git a/po/de_DE.po b/po/de_DE.po index 9e879771..0e24ab22 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -1,15 +1,15 @@ # VDR language source file. -# Copyright (C) 2008 Klaus Schmidinger +# Copyright (C) 2013 Klaus Schmidinger # This file is distributed under the same license as the VDR package. -# Klaus Schmidinger , 2000-2008 +# Klaus Schmidinger , 2000-2008 # msgid "" msgstr "" -"Project-Id-Version: VDR 1.6.0\n" +"Project-Id-Version: VDR 2.0.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-03-04 14:46+0100\n" "PO-Revision-Date: 2010-01-16 16:46+0100\n" -"Last-Translator: Klaus Schmidinger \n" +"Last-Translator: Klaus Schmidinger \n" "Language-Team: German \n" "Language: de\n" "MIME-Version: 1.0\n" diff --git a/po/el_GR.po b/po/el_GR.po index 50fe4601..b61174e5 100644 --- a/po/el_GR.po +++ b/po/el_GR.po @@ -1,11 +1,11 @@ # VDR language source file. -# Copyright (C) 2008 Klaus Schmidinger +# Copyright (C) 2013 Klaus Schmidinger # This file is distributed under the same license as the VDR package. # Dimitrios Dimitrakos , 2002, 2006 # msgid "" msgstr "" -"Project-Id-Version: VDR 1.6.0\n" +"Project-Id-Version: VDR 2.0.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-03-04 14:46+0100\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n" diff --git a/po/es_ES.po b/po/es_ES.po index 2ef8807a..fba8c21d 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -1,12 +1,12 @@ # VDR language source file. -# Copyright (C) 2008 Klaus Schmidinger +# Copyright (C) 2013 Klaus Schmidinger # This file is distributed under the same license as the VDR package. # Ruben Nunez Francisco , 2002, 2006 # Luca Olivetti , 2008, 2013 # msgid "" msgstr "" -"Project-Id-Version: VDR 1.6.0\n" +"Project-Id-Version: VDR 2.0.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-03-04 14:46+0100\n" "PO-Revision-Date: 2008-03-02 19:02+0100\n" diff --git a/po/et_EE.po b/po/et_EE.po index e60cf5ae..333f0b0b 100644 --- a/po/et_EE.po +++ b/po/et_EE.po @@ -1,11 +1,11 @@ # VDR language source file. -# Copyright (C) 2008 Klaus Schmidinger +# Copyright (C) 2013 Klaus Schmidinger # This file is distributed under the same license as the VDR package. # Arthur Konovalov , 2004-2013 # msgid "" msgstr "" -"Project-Id-Version: VDR 1.6.0\n" +"Project-Id-Version: VDR 2.0.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-03-04 14:46+0100\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n" diff --git a/po/fi_FI.po b/po/fi_FI.po index 7475eb79..37571576 100644 --- a/po/fi_FI.po +++ b/po/fi_FI.po @@ -1,5 +1,5 @@ # VDR language source file. -# Copyright (C) 2008 Klaus Schmidinger +# Copyright (C) 2013 Klaus Schmidinger # This file is distributed under the same license as the VDR package. # Hannu Savolainen , 2002 # Jaakko Hyvätti , 2002, 2003 @@ -9,7 +9,7 @@ # msgid "" msgstr "" -"Project-Id-Version: VDR 1.6.0\n" +"Project-Id-Version: VDR 2.0.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-03-04 14:46+0100\n" "PO-Revision-Date: 2007-08-15 15:52+0200\n" diff --git a/po/fr_FR.po b/po/fr_FR.po index 57a6927b..7d0d90ca 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -1,5 +1,5 @@ # VDR language source file. -# Copyright (C) 2008 Klaus Schmidinger +# Copyright (C) 2013 Klaus Schmidinger # This file is distributed under the same license as the VDR package. # Jean-Claude Repetto , 2001, 2002, 2008 # Olivier Jacques , 2003, 2005 @@ -15,7 +15,7 @@ # msgid "" msgstr "" -"Project-Id-Version: VDR 1.7.37\n" +"Project-Id-Version: VDR 2.0.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-03-04 14:46+0100\n" "PO-Revision-Date: 2013-02-24 12:56+0100\n" diff --git a/po/hr_HR.po b/po/hr_HR.po index 3a0f73ab..3925422b 100644 --- a/po/hr_HR.po +++ b/po/hr_HR.po @@ -1,5 +1,5 @@ # VDR language source file. -# Copyright (C) 2008 Klaus Schmidinger +# Copyright (C) 2013 Klaus Schmidinger # This file is distributed under the same license as the VDR package. # Drazen Dupor , 2004, 2005 # Dino Ravnic , 2004 @@ -7,7 +7,7 @@ # msgid "" msgstr "" -"Project-Id-Version: VDR 1.6.0\n" +"Project-Id-Version: VDR 2.0.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-03-04 14:46+0100\n" "PO-Revision-Date: 2008-03-17 19:00+0100\n" diff --git a/po/hu_HU.po b/po/hu_HU.po index 26ed167a..e4f8594c 100644 --- a/po/hu_HU.po +++ b/po/hu_HU.po @@ -1,5 +1,5 @@ # VDR language source file. -# Copyright (C) 2008 Klaus Schmidinger +# Copyright (C) 2013 Klaus Schmidinger # This file is distributed under the same license as the VDR package. # Istvan Koenigsberger , 2002, 2003, 2006 # Guido Josten , 2002, 2003, 2006 @@ -8,7 +8,7 @@ # msgid "" msgstr "" -"Project-Id-Version: VDR 1.6.0\n" +"Project-Id-Version: VDR 2.0.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-03-04 14:46+0100\n" "PO-Revision-Date: 2013-03-01 19:22+0200\n" @@ -851,7 +851,7 @@ msgid "Setup.OSD$Folders in timer menu" msgstr "Könyvtárválasztás az idÅ‘zítÅ‘ menüben" msgid "Setup.OSD$Always sort folders first" -msgstr "" +msgstr "Könyvtárakat rendezd elÅ‘re" msgid "Setup.OSD$Number keys for characters" msgstr "Számgombok a betűkön" diff --git a/po/it_IT.po b/po/it_IT.po index ebd68f9b..281434c9 100644 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -1,5 +1,5 @@ # VDR language source file. -# Copyright (C) 2008 Klaus Schmidinger +# Copyright (C) 2013 Klaus Schmidinger # This file is distributed under the same license as the VDR package. # Alberto Carraro , 2001 # Antonio Ospite , 2003, 2006 @@ -9,7 +9,7 @@ # msgid "" msgstr "" -"Project-Id-Version: VDR 1.6.0\n" +"Project-Id-Version: VDR 2.0.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-03-04 14:46+0100\n" "PO-Revision-Date: 2013-02-11 23:46+0100\n" diff --git a/po/lt_LT.po b/po/lt_LT.po index 6337db4b..19262472 100644 --- a/po/lt_LT.po +++ b/po/lt_LT.po @@ -1,11 +1,11 @@ # VDR language source file. -# Copyright (C) 2009 Klaus Schmidinger +# Copyright (C) 2013 Klaus Schmidinger # This file is distributed under the same license as the VDR package. # Valdemaras Pipiras , 2009, 2010, 2013. # msgid "" msgstr "" -"Project-Id-Version: VDR 1.7.37\n" +"Project-Id-Version: VDR 2.0.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-03-04 14:46+0100\n" "PO-Revision-Date: 2010-10-30 11:55+0200\n" diff --git a/po/mk_MK.po b/po/mk_MK.po index 39444c74..b9f56a25 100644 --- a/po/mk_MK.po +++ b/po/mk_MK.po @@ -1,11 +1,11 @@ # VDR language source file. -# Copyright (C) 2008 Klaus Schmidinger +# Copyright (C) 2013 Klaus Schmidinger # This file is distributed under the same license as the VDR package. # Dimitar Petrovski , 2009, 2012, 2013 # msgid "" msgstr "" -"Project-Id-Version: VDR-1.7.14\n" +"Project-Id-Version: VDR 2.0.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-03-04 14:46+0100\n" "PO-Revision-Date: 2012-11-19 15:18+0100\n" diff --git a/po/nl_NL.po b/po/nl_NL.po index 1d1bb731..8766f344 100644 --- a/po/nl_NL.po +++ b/po/nl_NL.po @@ -1,5 +1,5 @@ # VDR language source file. -# Copyright (C) 2008 Klaus Schmidinger +# Copyright (C) 2013 Klaus Schmidinger # This file is distributed under the same license as the VDR package. # Arnold Niessen , 2001 # Hans Dingemans , 2003, 2005 @@ -10,7 +10,7 @@ # msgid "" msgstr "" -"Project-Id-Version: VDR 1.7.38\n" +"Project-Id-Version: VDR 2.0.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-03-04 14:46+0100\n" "PO-Revision-Date: 2008-02-26 17:20+0100\n" diff --git a/po/nn_NO.po b/po/nn_NO.po index c8491e1e..4f6668c6 100644 --- a/po/nn_NO.po +++ b/po/nn_NO.po @@ -1,12 +1,12 @@ # VDR language source file. -# Copyright (C) 2008 Klaus Schmidinger +# Copyright (C) 2013 Klaus Schmidinger # This file is distributed under the same license as the VDR package. # Jørgen Tvedt , 2001 # Truls Slevigen , 2002 # msgid "" msgstr "" -"Project-Id-Version: VDR 1.6.0\n" +"Project-Id-Version: VDR 2.0.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-03-04 14:46+0100\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n" diff --git a/po/pl_PL.po b/po/pl_PL.po index 35a39c43..c11c6561 100644 --- a/po/pl_PL.po +++ b/po/pl_PL.po @@ -1,5 +1,5 @@ # VDR language source file. -# Copyright (C) 2008 Klaus Schmidinger +# Copyright (C) 2013 Klaus Schmidinger # This file is distributed under the same license as the VDR package. # Michael Rakowski , 2002, 2003, 2008 # Jaroslaw Swierczynski , 2006 @@ -7,7 +7,7 @@ # msgid "" msgstr "" -"Project-Id-Version: VDR 1.6.0\n" +"Project-Id-Version: VDR 2.0.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-03-04 14:46+0100\n" "PO-Revision-Date: 2008-03-09 12:59+0100\n" @@ -849,7 +849,7 @@ msgid "Setup.OSD$Folders in timer menu" msgstr "Katalogi w menu timera" msgid "Setup.OSD$Always sort folders first" -msgstr "" +msgstr "Sortuj najpierw katalogi" msgid "Setup.OSD$Number keys for characters" msgstr "Klawisze numeryczne dla liter" diff --git a/po/pt_PT.po b/po/pt_PT.po index a485e2ba..ffd3fecb 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -1,12 +1,12 @@ # VDR language source file. -# Copyright (C) 2008 Klaus Schmidinger +# Copyright (C) 2013 Klaus Schmidinger # This file is distributed under the same license as the VDR package. # Paulo Lopes , 2001 # Cris Silva , 2010 # msgid "" msgstr "" -"Project-Id-Version: VDR 1.7.15\n" +"Project-Id-Version: VDR 2.0.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-03-04 14:46+0100\n" "PO-Revision-Date: 2010-03-28 22:49+0100\n" diff --git a/po/ro_RO.po b/po/ro_RO.po index a7b6ce81..3214a2e9 100644 --- a/po/ro_RO.po +++ b/po/ro_RO.po @@ -1,12 +1,12 @@ # VDR language source file. -# Copyright (C) 2008 Klaus Schmidinger +# Copyright (C) 2013 Klaus Schmidinger # This file is distributed under the same license as the VDR package. # Paul Lacatus , 2002 # Lucian Muresan , 2004-2006, 2008, 2010-2013 # msgid "" msgstr "" -"Project-Id-Version: VDR 1.7.37\n" +"Project-Id-Version: VDR 2.0.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-03-04 14:46+0100\n" "PO-Revision-Date: 2013-02-09 23:01+0100\n" diff --git a/po/ru_RU.po b/po/ru_RU.po index ea09a3ff..eecc89e6 100644 --- a/po/ru_RU.po +++ b/po/ru_RU.po @@ -1,15 +1,15 @@ # VDR language source file. -# Copyright (C) 2008 Klaus Schmidinger +# Copyright (C) 2013 Klaus Schmidinger # This file is distributed under the same license as the VDR package. # Vyacheslav Dikonov , 2004, 2005 # Oleg Roitburd , 2005-2008, 2013 # msgid "" msgstr "" -"Project-Id-Version: VDR 1.6.0\n" +"Project-Id-Version: VDR 2.0.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-03-04 14:46+0100\n" -"PO-Revision-Date: 2013-03-03 13:43+0100\n" +"PO-Revision-Date: 2013-03-10 17:13+0100\n" "Last-Translator: Oleg Roitburd \n" "Language-Team: Russian \n" "Language: ru\n" @@ -848,7 +848,7 @@ msgid "Setup.OSD$Folders in timer menu" msgstr "´ØàÕÚâÞàØØ Ò ÜÕÝî âÐÙÜÕà" msgid "Setup.OSD$Always sort folders first" -msgstr "" +msgstr "´ØàÕÚâÞàØØ ÒáÕÓÔÐ Ò ßÕàÒãî ÞçÕàÕÔì áÞàâØàÞÒÐâì" msgid "Setup.OSD$Number keys for characters" msgstr "ºÞÛØçÕáâÒÞ ÚÝÞßÞÚ ÔÛï áØÜÒÞÛÞÒ" diff --git a/po/sk_SK.po b/po/sk_SK.po index 977d7636..46dc3ae1 100644 --- a/po/sk_SK.po +++ b/po/sk_SK.po @@ -1,11 +1,11 @@ # VDR language source file. -# Copyright (C) 2008 Klaus Schmidinger +# Copyright (C) 2013 Klaus Schmidinger # This file is distributed under the same license as the VDR package. # Milan Hrala , 2011, 2013 # msgid "" msgstr "" -"Project-Id-Version: VDR 1.7.16\n" +"Project-Id-Version: VDR 2.0.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-02-03 16:46+0100\n" "PO-Revision-Date: 2013-03-04 21:24+0100\n" diff --git a/po/sl_SI.po b/po/sl_SI.po index 86fefbc0..842157ed 100644 --- a/po/sl_SI.po +++ b/po/sl_SI.po @@ -1,12 +1,12 @@ # VDR language source file. -# Copyright (C) 2008 Klaus Schmidinger +# Copyright (C) 2013 Klaus Schmidinger # This file is distributed under the same license as the VDR package. # Miha Setina , 2000 # Matjaz Thaler , 2003, 2005, 2006, 2008, 2013 # msgid "" msgstr "" -"Project-Id-Version: VDR 1.6.0\n" +"Project-Id-Version: VDR 2.0.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-03-04 14:46+0100\n" "PO-Revision-Date: 2013-03-04 12:46+0100\n" diff --git a/po/sr_SR.po b/po/sr_SR.po index d6b5f7af..140bd463 100644 --- a/po/sr_SR.po +++ b/po/sr_SR.po @@ -1,11 +1,11 @@ # VDR language source file. -# Copyright (C) 2008 Klaus Schmidinger +# Copyright (C) 2013 Klaus Schmidinger # This file is distributed under the same license as the VDR package. # Milan Cvijanoviæ , 2010 # msgid "" msgstr "" -"Project-Id-Version: VDR 1.7.1\n" +"Project-Id-Version: VDR 2.0.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-03-04 14:46+0100\n" "PO-Revision-Date: 2011-01-09 15:57+0100\n" diff --git a/po/sv_SE.po b/po/sv_SE.po index 9b2ce7cc..15a49ee7 100644 --- a/po/sv_SE.po +++ b/po/sv_SE.po @@ -1,5 +1,5 @@ # VDR language source file. -# Copyright (C) 2008 Klaus Schmidinger +# Copyright (C) 2013 Klaus Schmidinger # This file is distributed under the same license as the VDR package. # Tomas Prybil , 2002, 2003, 2005, 2006 # Jan Ekholm , 2003 @@ -9,7 +9,7 @@ # msgid "" msgstr "" -"Project-Id-Version: VDR 1.6.0\n" +"Project-Id-Version: VDR 2.0.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-03-04 14:46+0100\n" "PO-Revision-Date: 2013-02-18 17:04+0100\n" diff --git a/po/tr_TR.po b/po/tr_TR.po index b5f57b02..54956de1 100644 --- a/po/tr_TR.po +++ b/po/tr_TR.po @@ -1,11 +1,11 @@ # VDR language source file. -# Copyright (C) 2008 Klaus Schmidinger +# Copyright (C) 2013 Klaus Schmidinger # This file is distributed under the same license as the VDR package. # Oktay Yolgeçen , 2007, 2008 # msgid "" msgstr "" -"Project-Id-Version: VDR 1.6.0\n" +"Project-Id-Version: VDR 2.0.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-03-04 14:46+0100\n" "PO-Revision-Date: 2008-02-28 00:33+0100\n" diff --git a/po/uk_UA.po b/po/uk_UA.po index 47534324..7626d8db 100644 --- a/po/uk_UA.po +++ b/po/uk_UA.po @@ -1,11 +1,11 @@ # VDR language source file. -# Copyright (C) 2008 Klaus Schmidinger +# Copyright (C) 2013 Klaus Schmidinger # This file is distributed under the same license as the VDR package. # Yarema Aka Knedlyk , 2007-2010, 2013 # msgid "" msgstr "" -"Project-Id-Version: VDR 1.7.7\n" +"Project-Id-Version: VDR 2.0.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-03-04 14:46+0100\n" "PO-Revision-Date: 2013-02-09 16:00+0100\n" diff --git a/po/zh_CN.po b/po/zh_CN.po index efb03006..98e3f98b 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -1,11 +1,11 @@ # VDR language source file. -# Copyright (C) 2008 Klaus Schmidinger +# Copyright (C) 2013 Klaus Schmidinger # This file is distributed under the same license as the VDR package. # Nan Feng , 2008, 2013 # msgid "" msgstr "" -"Project-Id-Version: VDR 1.7.39\n" +"Project-Id-Version: VDR 2.0.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-02-03 16:46+0100\n" "PO-Revision-Date: 2013-03-04 14:52+0800\n" diff --git a/recording.c b/recording.c index 032175dd..f43ce52e 100644 --- a/recording.c +++ b/recording.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: recording.c 2.90 2013/03/04 14:02:40 kls Exp $ + * $Id: recording.c 2.91 2013/03/11 10:34:41 kls Exp $ */ #include "recording.h" @@ -66,7 +66,7 @@ #define MAX_LINK_LEVEL 6 -int DirectoryPathMax = PATH_MAX; +int DirectoryPathMax = PATH_MAX - 1; int DirectoryNameMax = NAME_MAX; bool DirectoryEncoding = false; int InstanceId = 0; diff --git a/sources.conf b/sources.conf index 8c352fd3..c7f76d1f 100644 --- a/sources.conf +++ b/sources.conf @@ -12,7 +12,7 @@ # '/' means same (or very little deviation) orbital position & host. # A value in () means this satellite is still in it's test phase. # -# Please contact kls@tvdr.de before assigning a new code +# Please contact vdr@tvdr.de before assigning a new code # to a description, in order to keep them unique. # Satellites diff --git a/svdrpsend.1 b/svdrpsend.1 index 3743739f..a0b3fd9f 100644 --- a/svdrpsend.1 +++ b/svdrpsend.1 @@ -1,4 +1,4 @@ -.TH "svdrpsend" "1" "23 Feb 2013" "1.7" "Video Disk Recorder" +.TH "svdrpsend" "1" "31 Mar 2013" "2.0" "Video Disk Recorder" .SH NAME .LP svdrpsend \- sends commands to VDR diff --git a/timers.c b/timers.c index 16cf8cef..279f5532 100644 --- a/timers.c +++ b/timers.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: timers.c 2.16 2013/02/05 11:13:20 kls Exp $ + * $Id: timers.c 2.17 2013/03/16 10:37:10 kls Exp $ */ #include "timers.h" @@ -43,7 +43,7 @@ cTimer::cTimer(bool Instant, bool Pause, cChannel *Channel) weekdays = 0; start = now->tm_hour * 100 + now->tm_min; stop = 0; - if (!Setup.InstantRecordTime && channel) { + if (!Setup.InstantRecordTime && channel && (Instant || Pause)) { cSchedulesLock SchedulesLock; if (const cSchedules *Schedules = cSchedules::Schedules(SchedulesLock)) { if (const cSchedule *Schedule = Schedules->GetSchedule(channel)) { diff --git a/timers.h b/timers.h index adc55096..8910c106 100644 --- a/timers.h +++ b/timers.h @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: timers.h 2.6 2013/02/05 11:23:24 kls Exp $ + * $Id: timers.h 2.7 2013/03/11 10:35:53 kls Exp $ */ #ifndef __TIMERS_H @@ -39,7 +39,7 @@ private: int stop; int priority; int lifetime; - mutable char file[NAME_MAX * 2]; // *2 to be able to hold 'title' and 'episode', which can each be up to 255 characters long + mutable char file[NAME_MAX * 2 + 1]; // *2 to be able to hold 'title' and 'episode', which can each be up to 255 characters long char *aux; const cEvent *event; public: diff --git a/vdr.1 b/vdr.1 index 1046ca77..6c37cc0c 100644 --- a/vdr.1 +++ b/vdr.1 @@ -2,15 +2,15 @@ .\" ** The above line should force tbl to be a preprocessor ** .\" Man page for vdr .\" -.\" Copyright (C) 2008 Klaus Schmidinger +.\" Copyright (C) 2013 Klaus Schmidinger .\" .\" You may distribute under the terms of the GNU General Public .\" License as specified in the file COPYING that comes with the .\" vdr distribution. .\" -.\" $Id: vdr.1 2.12 2013/02/24 10:41:12 kls Exp $ +.\" $Id: vdr.1 2.17 2013/03/15 10:44:54 kls Exp $ .\" -.TH vdr 1 "10 Feb 2008" "1.6" "Video Disk Recorder" +.TH vdr 1 "31 Mar 2013" "2.0" "Video Disk Recorder" .SH NAME vdr \- the Video Disk Recorder .SH SYNOPSIS @@ -27,13 +27,16 @@ live TV while recording one or more other broadcasts from the same transponder. It is also possible to start watching a recorded programme before the live broadcast has ended (\fBtime shifting\fR). In order to record from different transponders simultaneously two or more DVB cards are necessary. -By default \fBvdr\fR can support up to four -DVB cards. The primary DVB card (the one your TV set is connected to) has -to be a "full featured" card, which means it must contain an MPEG decoder -and provide audio and video signal outputs. +By default \fBvdr\fR can support up to eight DVB cards. +The primary DVB card (the one your TV set is connected to) can either +be a "full featured" card, which means it contains an MPEG decoder +and provides audio and video signal outputs, or you can use some third party +plugin that implements software decoding of the MPEG data and displays it via +the system's graphics adapter. -\fBvdr\fR uses the On Screen Display of the DVB card to display its menus. -It can be controlled by the PC keyboard or the "Linux Infrared Remote Control" (LIRC). +\fBvdr\fR uses an On Screen Display (OSD) to display its menus. +It can be controlled by the PC keyboard, the "Linux Infrared Remote Control" (LIRC), +or any other means of remote control, implemented by a third party plugin. Remote access is possible via the "Simple Video Disk Recorder Protocol" (SVDRP), which can be accessed on port 6419, for instance by \fBtelnet\fR. @@ -57,12 +60,13 @@ Run in daemon mode (implies \-\-no\-kbd). Use only the given DVB device (\fInum\fR = 0, 1, 2...). There may be several \fB\-D\fR options (by default all DVB devices will be used). .TP -.BI \-\-dirnames= path[,name[,enc]] +.BI \-\-dirnames= path [, name [, enc ]] Set the maximum directory path length to \fIpath\fR (default is the maximum value allowed on the system). If \fIname\fR is also given, it defines the maximum directory name length (default is the maximum value allowed on the system). The optional \fIenc\fR can be 0 or 1, and controls whether special characters in directory names are encoded as hex values (default: 0). +If \fIpath\fR or \fIname\fR are left empty (as in ",,1" to only set \fIenc\fR), the defaults apply. The length of the video directory name and that of the actual recording directory is subtracted from \fIpath\fR, to make sure the directory path will never become too long. .TP @@ -73,7 +77,7 @@ The program will return immediately after editing the recording. .TP .BI \-E\ file ,\ \-\-epgfile= file Write the EPG data into the given \fIfile\fR -(default is \fI/video/epg.data\fR). +(default is \fIepg.data\fR in the cache directory). Use \fB\-E\-\fR to disable this. If \fIfile\fR is a directory, the file \fIepg.data\fR will be created in that directory. @@ -282,7 +286,7 @@ See the file \fICONTRIBUTORS\fR in the \fBvdr\fR source distribution. .SH REPORTING BUGS Report bugs to . .SH COPYRIGHT -Copyright \(co 2008 Klaus Schmidinger. +Copyright \(co 2013 Klaus Schmidinger. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. diff --git a/vdr.5 b/vdr.5 index ca705d4b..86b798c3 100644 --- a/vdr.5 +++ b/vdr.5 @@ -2,15 +2,15 @@ .\" ** The above line should force tbl to be a preprocessor ** .\" Man page for vdr file formats .\" -.\" Copyright (C) 2008 Klaus Schmidinger +.\" Copyright (C) 2013 Klaus Schmidinger .\" .\" You may distribute under the terms of the GNU General Public .\" License as specified in the file COPYING that comes with the .\" vdr distribution. .\" -.\" $Id: vdr.5 2.31 2013/03/07 09:42:29 kls Exp $ +.\" $Id: vdr.5 2.33 2013/03/11 13:17:12 kls Exp $ .\" -.TH vdr 5 "10 Feb 2008" "1.6" "Video Disk Recorder Files" +.TH vdr 5 "31 Mar 2013" "2.0" "Video Disk Recorder Files" .SH NAME vdr_files \- the Video Disk Recorder Files .SH DESCRIPTION @@ -891,7 +891,7 @@ Written by Klaus Schmidinger. .SH REPORTING BUGS Report bugs to . .SH COPYRIGHT -Copyright \(co 2008 Klaus Schmidinger. +Copyright \(co 2013 Klaus Schmidinger. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. diff --git a/vdr.c b/vdr.c index f46589f5..c63eecaa 100644 --- a/vdr.c +++ b/vdr.c @@ -1,7 +1,7 @@ /* * vdr.c: Video Disk Recorder main program * - * Copyright (C) 2000, 2003, 2006, 2008 Klaus Schmidinger + * Copyright (C) 2000, 2003, 2006, 2008, 2013 Klaus Schmidinger * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -18,11 +18,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Or, point your browser to http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * - * The author can be reached at kls@tvdr.de + * The author can be reached at vdr@tvdr.de * * The project's page is at http://www.tvdr.de * - * $Id: vdr.c 2.50 2013/03/03 10:25:11 kls Exp $ + * $Id: vdr.c 2.57 2013/03/15 10:44:54 kls Exp $ */ #include @@ -87,7 +87,7 @@ static int LastSignal = 0; -static bool SetUser(const char *UserName, bool UserDump)//XXX name? +static bool SetUser(const char *UserName, bool UserDump) { if (UserName) { struct passwd *user = getpwnam(UserName); @@ -109,6 +109,10 @@ static bool SetUser(const char *UserName, bool UserDump)//XXX name? } if (UserDump && prctl(PR_SET_DUMPABLE, 1, 0, 0, 0) < 0) fprintf(stderr, "vdr: warning - cannot set dumpable: %s\n", strerror(errno)); + setenv("HOME", user->pw_dir, 1); + setenv("USER", user->pw_name, 1); + setenv("LOGNAME", user->pw_name, 1); + setenv("SHELL", user->pw_shell, 1); } return true; } @@ -280,31 +284,41 @@ int main(int argc, char *argv[]) return 2; case 'd' | 0x100: { char *s = optarg; + if (*s != ',') { + int n = strtol(s, &s, 10); + if (n <= 0 || n >= PATH_MAX) { // PATH_MAX includes the terminating 0 + fprintf(stderr, "vdr: invalid directory path length: %s\n", optarg); + return 2; + } + DirectoryPathMax = n; + if (!*s) + break; + if (*s != ',') { + fprintf(stderr, "vdr: invalid delimiter: %s\n", optarg); + return 2; + } + } + s++; + if (!*s) + break; + if (*s != ',') { + int n = strtol(s, &s, 10); + if (n <= 0 || n > NAME_MAX) { // NAME_MAX excludes the terminating 0 + fprintf(stderr, "vdr: invalid directory name length: %s\n", optarg); + return 2; + } + DirectoryNameMax = n; + if (!*s) + break; + if (*s != ',') { + fprintf(stderr, "vdr: invalid delimiter: %s\n", optarg); + return 2; + } + } + s++; + if (!*s) + break; int n = strtol(s, &s, 10); - if (n <= 0 || n >= PATH_MAX) { - fprintf(stderr, "vdr: invalid directory path length: %s\n", optarg); - return 2; - } - DirectoryPathMax = n; - if (!*s) - break; - if (*s++ != ',') { - fprintf(stderr, "vdr: invalid delimiter: %s\n", optarg); - return 2; - } - n = strtol(s, &s, 10); - if (n <= 0 || n >= NAME_MAX) { - fprintf(stderr, "vdr: invalid directory name length: %s\n", optarg); - return 2; - } - DirectoryNameMax = n; - if (!*s) - break; - if (*s++ != ',') { - fprintf(stderr, "vdr: invalid delimiter: %s\n", optarg); - return 2; - } - n = strtol(s, &s, 10); if (n != 0 && n != 1) { fprintf(stderr, "vdr: invalid directory encoding: %s\n", optarg); return 2; @@ -480,10 +494,12 @@ int main(int argc, char *argv[]) " the maximum directory name length (default: %d);\n" " the optional ENC can be 0 or 1, and controls whether\n" " special characters in directory names are encoded as\n" - " hex values (default: 0)\n" + " hex values (default: 0); if PATH or NAME are left\n" + " empty (as in \",,1\" to only set ENC), the defaults\n" + " apply\n" " --edit=REC cut recording REC and exit\n" " -E FILE, --epgfile=FILE write the EPG data into the given FILE (default is\n" - " '%s' in the video directory)\n" + " '%s' in the cache directory)\n" " '-E-' disables this\n" " if FILE is a directory, the default EPG file will be\n" " created in that directory\n" @@ -530,7 +546,7 @@ int main(int argc, char *argv[]) "\n", DEFAULTCACHEDIR, DEFAULTCONFDIR, - PATH_MAX, + PATH_MAX - 1, NAME_MAX, DEFAULTEPGDATAFILENAME, MAXVIDEOFILESIZEDEFAULT,