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 2.1.1

Browse Source 
VDR developer version 2.1.1 is now available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-2.1.1.tar.bz2

A 'diff' against the previous version is available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-2.0.0-2.1.1.diff

MD5 checksums:

b17f9838bb8ddee9620f838fea7a171d  vdr-2.1.1.tar.bz2
8b8ca593885c380cd370e6d19a5b16a1  vdr-2.0.0-2.1.1.diff

WARNING:
========

This is a *developer* version. Even though *I* use it in my productive
environment, I strongly recommend that you only use it under controlled
conditions and for testing and debugging.

The main focus of this version is on adding basic support for positioners
to control steerable satellite dishes. Manually controlling the dish position
and storing individual positions will follow later.

The fixes contained in this version will be released in a stable version 2.0.3
later, if there are no problems.

From the HISTORY file:
- Fixed initializing cDevice::keepTracks.
- Fixed an endless loop in cTextWrapper::Set() in case the given Width is smaller than
  one character (reported by Stefan Braun).
- Removed all "modified since version 1.6" markers from PLUGINS.html.
- Added definitions for older DVB API versions, back until 5.0 (based on a patch from
  Udo Richter).
- Changed cThread::SetIOPriority() from "best effort class" to "idle class" in order to
  improve overall performance when an editing process is running (thanks to Jochen
  Dolze).
- Fixed handling '/' and '~' in recording file names in case DirectoryEncoding is
  used (thanks to Lars Hanisch).
- Changed the sign of the satellite position value in cSource to reflect the standard
  of western values being negative. The new member function cSource::Position() can be
  used to retrieve the orbital position of a satellite.
- Fixed multiple occurrences of the same directory in the recordings list in case there
  are directories that only differ in non-alphanumeric characters (was broken by
  "Fixed selecting the last replayed recording in the Recordings menu in case there
  are folders and plain recordings with names that differ only in non-alphanumeric
  characters" in version 1.7.36).
- Fixed displaying the frame number when setting an editing mark (thanks to Thomas
  Günther).
- Fixed no longer generating any editing marks if the edited recording results in just
  one single sequence (reported by Halim Sahin).
- Fixed an error message when parsing SCR values in diseqc.conf.
- Fixed an unexpected RCS version tag in the newplugin script.
- Fixed an endless loop in the DrawEllipse() functions for very small ellipses (reported
  by Stefan Braun).
- Fixed a crash in the LCARS skin's main menu in case there is no current channel
  (reported by Dominique Dumont).
- Added basic support for positioners to control steerable satellite dishes (based on
  a patch from Seppo Ingalsuo and Ales Jurik).
  + Supports GotoN (aka "DiSEqC 1.2") and GotoX (aka "USALS").
  + The new DiSEqC command code 'P' can be used to instruct a positioner to move the
    dish to the required satellite position. When a 'P' code is processed, further
    execution of the remaining DiSEqC sequence (if any) is postponed until the positioner
    has reached the new satellite position.
  + The new special source value of "S360E" can be used in diseqc.conf to indicate that
    an entry using a positioner can move the dish to any requested position within its
    range. Think of it as "full circle".
  + The devices a particular cDiseqc or cScr applies to are now stored directly in each
    cDiseqc or cScr, respectively.
  + A plugin can implement a custom positioner control (see PLUGINS.html, section "Positioners").
  + The new function cSkinDisplayChannel::SetPositioner() can be implemented by skins to
    show the user a progress display when the dish is being moved. The default implementation
    calls SetMessage() with a string indicating the new position the dish is being moved to.
    The LCARS skin shows a progress bar indicating the movement of the dish.
  + The new parameters "Site latitude", "Site longitude", "Positioner speed", and
    "Positioner swing" in the "Setup/LNB" menu can be used to configure the necessary
    values for a steerable dish.
  + The cDvbTuner now has a new status tsPositioning, in which it waits until a steerable
    dish has reached its target position. Parsing SI data is paused until the target
    position has been reached.
- The LCARS skin now shows the source value of the current channel in its channel display.
- Fixed asserting free disk space in the cutter.
- No longer trying to delete old recordings in AssertFreeDiskSpace() if the given
  Priority is less than 1.
- Fixed handling LIRC events in case repeated events are lost.
- Fixed a possible crash when shutting down VDR while subtitles are being displayed
  (reported by Ville Skyttä).
- cDevice::IsPrimaryDevice() now also checks whether the primary device actually has
  a decoder and returns false otherwise. This should improve device allocation on
  systems that are only used as a receiver and don't actually display anything.
- Increased the value of MAXRETRIES to 20 to reduce the probability of disturbances
  in transfer mode.
- All bonded devices (except for the master) now turn off their LNB power completely
  to avoid problems when receiving vertically polarized transponders (suggested by
  Manfred Völkel and Oliver Endriss).
- Reverted the change from version 1.5.7 that made all logging go to LOG_ERR (thanks
  to Christopher Reimer).
- Added Begin/EndSegmentTransfer() to the EPG handler interface (thanks to Jörg Wendel).
- The code for distributing recordings over several video directories is now
  deprecated and disabled by default.
  You can re-enable this feature by removing the comment sign ('//') from the beginning
  of the line
  //#define DEPRECATED_DISTRIBUTED_VIDEODIR // Code enclosed with this macro is ...
  in the file videodir.c. Note, though, that this can only be a temporary workaround.
  This feature will be completely removed in one of the next developer versions.
  Distributing the video directory over several disks was a useful feature in times
  when disks were still relatively small, but it also caused serious problems in case
  one of the disks failed. Nowadays hard disks come in sizes measured in terabytes,
  and tools like "mhddfs" can be used to combine several disks to form one large volume.
  A recommended method for a relatively safe disk setup in a VDR system is to use two
  1TB (or larger) disks and use them as a RAID-1 (mirrored). That way, if one disk
  fails, you can replace it without data loss.
This commit is contained in:
Klaus Schmidinger 2013-08-25 12:35:00 +02:00 committed by Dieter Hametner
parent 6781c8ba02
commit 5076cfb2ed
205 changed files with 2277 additions and 390 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
CONTRIBUTORS
View File

@ -537,7 +537,7 @@ Andreas B
Onno Kreuzinger <ok@solutas.net>
for reporting leftover references to the file FORMATS in MANUAL and svdrp.c
Rudi Hofer (Rudi.Hofer@gmx.de)
Rudi Hofer <Rudi.Hofer@gmx.de>
for his help in keeping 'channels.conf' up to date
for reporting a problem with overlapping tab positions in skins when using wide fonts
@ -700,6 +700,8 @@ Oliver Endriss <o.endriss@gmx.de>
for helping to debug a problem with reduced number of retries in Transfer Mode on
SD-FF cards
for reporting a problem with resuming replay of PES recordings
for suggesting to make all bonded devices (except for the master) turn off their LNB
power completely to avoid problems when receiving vertically polarized transponders
Reinhard Walter Buchner <rw.buchner@freenet.de>
for adding some satellites to 'sources.conf'
@ -1790,6 +1792,7 @@ Udo Richter <udo_richter@gmx.de>
for requesting to keep using relative paths when building plugins locally
for fixing a problem with detecting user inactivity in case the system time is
changed after VDR has been started
for a patch that was used to add definitions for older DVB API versions, back until 5.0
Sven Kreiensen <svenk@kammer.uni-hannover.de>
for his help in keeping 'channels.conf.terr' up to date
@ -2017,6 +2020,8 @@ Ville Skytt
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
for reporting a possible crash when shutting down VDR while subtitles are being
displayed
Steffen Beyer <cpunk@reactor.de>
for fixing setting the colored button help after deleting a recording in case the next
@ -2545,6 +2550,7 @@ J
for reporting that cPlugin::Active() was called too often
for adding HandledExternally() to the EPG handler interface
for adding IsUpdate() to the EPG handler interface
for adding Begin/EndSegmentTransfer() to the EPG handler interface
Peter Pinnau <vdr@unterbrecher.de>
for reporting that 'uint32_t' requires including stdint.h in font.h on some systems
@ -2695,6 +2701,7 @@ Ales Jurik <ajurik@quick.cz>
for reporting broken SI data on Czech/Slovak channels after changing the default
character set to ISO-8859-9
for adding MPEG 1 handling to remux.c
for a patch that was used as a base for implementing support for positioners
Magnus Andersson <svankan@bahnhof.se>
for translating OSD texts to the Swedish language
@ -2752,7 +2759,7 @@ Johann Friedrichs <johann.friedrichs@web.de>
Timo Helkio <timolavi@mbnet.fi>
for reporting a hangup when replaying a TS recording with subtitles activated
Derek Kelly (user.vdr@gmail.com)
Derek Kelly <user.vdr@gmail.com>
for fixing handling the 'new' indicator in the recordings menu for TS recordings
for reporting a problem with HD NTSC broadcasts that split frames over several payload
units
@ -2876,6 +2883,7 @@ Christopher Reimer <reimer.christopher@freenet.de>
for making plugin Makefiles use DESTDIR and the 'install' program
for suggesting to make sure that plugins include the VDR header files from the actual
VDR source directory when doing "make plugins"
for reverting the change from version 1.5.7 that made all logging go to LOG_ERR
Stefan Huskamp <coca_cola1@gmx.de>
for suggesting to make entering characters via the number keys
@ -3154,3 +3162,10 @@ Jochen Dolze <vdr@dolze.de>
Dominique Dumont <domi.dumont@free.fr>
for reporting a crash in the LCARS skin's main menu in case there is no current channel
Seppo Ingalsuo <seppo.ingalsuo@iki.fi>
for a patch that was used as a base for implementing support for positioners
Manfred Völkel <mvoelkel@digitaldevices.de>
for suggesting to make all bonded devices (except for the master) turn off their LNB
power completely to avoid problems when receiving vertically polarized transponders

2
Doxyfile.filter
View File

@ -9,7 +9,7 @@
# See the main source file 'vdr.c' for copyright information and
# how to reach the author.
#
# $Id: Doxyfile.filter 2.1 2013/02/17 10:54:05 kls Exp $
# $Id: Doxyfile.filter 3.0 2013/02/17 10:54:05 kls Exp $
$TAG = "///<";

93
HISTORY
View File

@ -7144,7 +7144,7 @@ Video Disk Recorder Revision History
Christian Richter).
- Added DeleteEvent() to the EPG handler interface, so that an EPG handler can trigger
deleting of an event (thanks to Christian Kaiser).
- Speeded up opening menus on systems with many (several thousands) of recordings, by
- Speeded up opening menus on systems with many (several thousands of) recordings, by
caching the information whether a recording is stored on the video directory file
system within the cRecording data (based on a patch from Torsten Lang).
@ -7782,7 +7782,7 @@ Video Disk Recorder Revision History
- Bumped all version numbers to 2.0.0.
- Official release.
2013-04-13: Version 2.0.1
2013-04-11: Version 2.0.1
- Fixed initializing cDevice::keepTracks.
- Fixed an endless loop in cTextWrapper::Set() in case the given Width is smaller than
@ -7805,10 +7805,97 @@ Video Disk Recorder Revision History
- Fixed displaying the frame number when setting an editing mark (thanks to Thomas
Günther).
- Fixed no longer generating any editing marks if the edited recording results in just
one single sequence.
one single sequence (reported by Halim Sahin).
- Fixed an error message when parsing SCR values in diseqc.conf.
- Fixed an unexpected RCS version tag in the newplugin script.
- Fixed an endless loop in the DrawEllipse() functions for very small ellipses (reported
by Stefan Braun).
- Fixed a crash in the LCARS skin's main menu in case there is no current channel
(reported by Dominique Dumont).
2013-08-25: Version 2.1.1
- Fixed initializing cDevice::keepTracks.
- Fixed an endless loop in cTextWrapper::Set() in case the given Width is smaller than
one character (reported by Stefan Braun).
- Removed all "modified since version 1.6" markers from PLUGINS.html.
- Added definitions for older DVB API versions, back until 5.0 (based on a patch from
Udo Richter).
- Changed cThread::SetIOPriority() from "best effort class" to "idle class" in order to
improve overall performance when an editing process is running (thanks to Jochen
Dolze).
- Fixed handling '/' and '~' in recording file names in case DirectoryEncoding is
used (thanks to Lars Hanisch).
- Changed the sign of the satellite position value in cSource to reflect the standard
of western values being negative. The new member function cSource::Position() can be
used to retrieve the orbital position of a satellite.
- Fixed multiple occurrences of the same directory in the recordings list in case there
are directories that only differ in non-alphanumeric characters (was broken by
"Fixed selecting the last replayed recording in the Recordings menu in case there
are folders and plain recordings with names that differ only in non-alphanumeric
characters" in version 1.7.36).
- Fixed displaying the frame number when setting an editing mark (thanks to Thomas
Günther).
- Fixed no longer generating any editing marks if the edited recording results in just
one single sequence (reported by Halim Sahin).
- Fixed an error message when parsing SCR values in diseqc.conf.
- Fixed an unexpected RCS version tag in the newplugin script.
- Fixed an endless loop in the DrawEllipse() functions for very small ellipses (reported
by Stefan Braun).
- Fixed a crash in the LCARS skin's main menu in case there is no current channel
(reported by Dominique Dumont).
- Added basic support for positioners to control steerable satellite dishes (based on
a patch from Seppo Ingalsuo and Ales Jurik).
+ Supports GotoN (aka "DiSEqC 1.2") and GotoX (aka "USALS").
+ The new DiSEqC command code 'P' can be used to instruct a positioner to move the
dish to the required satellite position. When a 'P' code is processed, further
execution of the remaining DiSEqC sequence (if any) is postponed until the positioner
has reached the new satellite position.
+ The new special source value of "S360E" can be used in diseqc.conf to indicate that
an entry using a positioner can move the dish to any requested position within its
range. Think of it as "full circle".
+ The devices a particular cDiseqc or cScr applies to are now stored directly in each
cDiseqc or cScr, respectively.
+ A plugin can implement a custom positioner control (see PLUGINS.html, section "Positioners").
+ The new function cSkinDisplayChannel::SetPositioner() can be implemented by skins to
show the user a progress display when the dish is being moved. The default implementation
calls SetMessage() with a string indicating the new position the dish is being moved to.
The LCARS skin shows a progress bar indicating the movement of the dish.
+ The new parameters "Site latitude", "Site longitude", "Positioner speed", and
"Positioner swing" in the "Setup/LNB" menu can be used to configure the necessary
values for a steerable dish.
+ The cDvbTuner now has a new status tsPositioning, in which it waits until a steerable
dish has reached its target position. Parsing SI data is paused until the target
position has been reached.
- The LCARS skin now shows the source value of the current channel in its channel display.
- Fixed asserting free disk space in the cutter.
- No longer trying to delete old recordings in AssertFreeDiskSpace() if the given
Priority is less than 1.
- Fixed handling LIRC events in case repeated events are lost.
- Fixed a possible crash when shutting down VDR while subtitles are being displayed
(reported by Ville Skyttä).
- cDevice::IsPrimaryDevice() now also checks whether the primary device actually has
a decoder and returns false otherwise. This should improve device allocation on
systems that are only used as a receiver and don't actually display anything.
- Increased the value of MAXRETRIES to 20 to reduce the probability of disturbances
in transfer mode.
- All bonded devices (except for the master) now turn off their LNB power completely
to avoid problems when receiving vertically polarized transponders (suggested by
Manfred Völkel and Oliver Endriss).
- Reverted the change from version 1.5.7 that made all logging go to LOG_ERR (thanks
to Christopher Reimer).
- Added Begin/EndSegmentTransfer() to the EPG handler interface (thanks to Jörg Wendel).
- The code for distributing recordings over several video directories is now
deprecated and disabled by default.
You can re-enable this feature by removing the comment sign ('//') from the beginning
of the line
//#define DEPRECATED_DISTRIBUTED_VIDEODIR // Code enclosed with this macro is ...
in the file videodir.c. Note, though, that this can only be a temporary workaround.
This feature will be completely removed in one of the next developer versions.
Distributing the video directory over several disks was a useful feature in times
when disks were still relatively small, but it also caused serious problems in case
one of the disks failed. Nowadays hard disks come in sizes measured in terabytes,
and tools like "mhddfs" can be used to combine several disks to form one large volume.
A recommended method for a relatively safe disk setup in a VDR system is to use two
1TB (or larger) disks and use them as a RAID-1 (mirrored). That way, if one disk
fails, you can replace it without data loss.

35
INSTALL
View File

@ -325,38 +325,9 @@ Note that the file system need not be 64-bit proof, since the 'vdr'
program splits video files into chunks of about 2GB. You should use
a disk with several gigabytes of free space. One GB can store roughly
half an hour of SD video data, or 10 minutes of HD video.
If you have more than one disk and don't want to combine them to form
one large logical volume, you can set up several video directories as
mount points for these disks. All of these directories must have the
same basic name and must end with a numeric part, which starts at 0 for
the main directory and has increasing values for the rest of the
directories. For example
/srv/vdr/video0
/srv/vdr/video1
/srv/vdr/video2
would be a setup with three directories. You can use more than one
numeric digit:
/mnt/MyVideos/vdr.00
/mnt/MyVideos/vdr.01
/mnt/MyVideos/vdr.02
...
/mnt/MyVideos/vdr.11
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 /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".
Either use one of today's large terabyte disks (preferably with a backup disk
in a RAID-1 array), or use something like "mhddfs" to group several disks
into one large volume.
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

22
MANUAL
View File

@ -776,6 +776,28 @@ Version 2.0
are connected to the same sat cable must be set to the same
number here.
Use dish positioner = no
By default, the 'P' command code in DiSEqC command sequences
is ignored. Set this parameter to 'yes' if you are using a
satellite dish positioner.
Site latitude (degrees) = 0
Site longitude (degrees) = 0
Set these to the latitude and longitude of your dish's
location if you use a satellite dish positioner. Use the
"Green" key to switch between north/south and east/west,
respectively.
Max. positioner swing (degrees) = 65
Defines the maximum angle by which the positioner can move
the dish away from due south (or north) in either direction.
The valid range is 0...90.
Positioner speed (degrees/s) = 1.5
Defines the speed at which the positioner moves the dish.
The valid range is 0.1...180. This value is used to calculate
how long it takes the positioner to reach the target position.
CAM:
n CAM Name Shows the CAM slots that are present in this system, where

2
Make.config.template
View File

@ -6,7 +6,7 @@
# See the main source file 'vdr.c' for copyright information and
# how to reach the author.
#
# $Id: Make.config.template 2.19 2013/02/18 10:55:39 kls Exp $
# $Id: Make.config.template 3.0 2013/02/18 10:55:39 kls Exp $
### The C compiler and options:

2
Make.global
View File

@ -4,7 +4,7 @@
# See the main source file 'vdr.c' for copyright information and
# how to reach the author.
#
# $Id: Make.global 1.2 2012/12/29 12:03:01 kls Exp $
# $Id: Make.global 3.0 2012/12/29 12:03:01 kls Exp $
# This is just a dummy file for plugins that use old style (version 1.7.33
# or earlier) Makefiles.

4
Makefile
View File

@ -4,7 +4,7 @@
# See the main source file 'vdr.c' for copyright information and
# how to reach the author.
#
# $Id: Makefile 2.54 2013/03/11 15:01:01 kls Exp $
# $Id: Makefile 3.1 2013/04/14 12:18:08 kls Exp $
.DELETE_ON_ERROR:
@ -68,7 +68,7 @@ SILIB = $(LSIDIR)/libsi.a
OBJS = audio.o channels.o ci.o config.o cutter.o device.o diseqc.o dvbdevice.o dvbci.o\
dvbplayer.o dvbspu.o dvbsubtitle.o eit.o eitscan.o epg.o filter.o font.o i18n.o interface.o keys.o\
lirc.o menu.o menuitems.o nit.o osdbase.o osd.o pat.o player.o plugin.o\
lirc.o menu.o menuitems.o nit.o osdbase.o osd.o pat.o player.o plugin.o positioner.o\
receiver.o recorder.o recording.o remote.o remux.o ringbuffer.o sdt.o sections.o shutdown.o\
skinclassic.o skinlcars.o skins.o skinsttng.o sourceparams.o sources.o spu.o status.o svdrp.o themes.o thread.o\
timers.o tools.o transfer.o vdr.o videodir.o

104
PLUGINS.html
View File

@ -31,14 +31,14 @@ modified {
<div class="center">
<h1>The VDR Plugin System</h1>
<b>Version 2.0</b>
<b>Version 2.1</b>
<p>
Copyright &copy; 2013 Klaus Schmidinger<br>
<a href="mailto:vdr@tvdr.de">vdr@tvdr.de</a><br>
<a href="http://www.tvdr.de">www.tvdr.de</a>
</div>
<div class="center">
<modified>Important modifications introduced since version 1.6 are marked like this.</modified>
<modified>Important modifications introduced since version 2.0 are marked like this.</modified>
</div>
<p>
VDR provides an easy to use plugin interface that allows additional functionality
@ -82,7 +82,7 @@ structures and allows it to hook itself into specific areas to perform special a
<li><a href="#Wakeup">Wakeup</a>
<li><a href="#Setup parameters">Setup parameters</a>
<li><a href="#The Setup menu">The Setup menu</a>
<li><modified><a href="#Additional files">Additional files</modified></a>
<li><a href="#Additional files">Additional files</a>
<li><a href="#Internationalization">Internationalization</a>
<li><a href="#Custom services">Custom services</a>
<li><a href="#SVDRP commands">SVDRP commands</a>
@ -99,10 +99,11 @@ structures and allows it to hook itself into specific areas to perform special a
<li><a href="#Skins">Skins</a>
<li><a href="#Themes">Themes</a>
<li><a href="#Devices">Devices</a>
<li><modified><a href="#Positioners">Positioners</a></modified>
<li><a href="#Audio">Audio</a>
<li><a href="#Remote Control">Remote Control</a>
<li><a href="#Conditional Access">Conditional Access</a>
<li><modified><a href="#Electronic Program Guide">Electronic Program Guide</modified></a>
<li><a href="#Electronic Program Guide">Electronic Program Guide</a>
</ul>
</ul>
@ -173,15 +174,13 @@ The <tt>src</tt> directory contains one subdirectory for each plugin, which carr
the name of that plugin (in the above example that would be <tt>hello</tt>).
What's inside the individual source directory of a
plugin is entirely up to the author of that plugin. The only prerequisites are
that there is a <tt>Makefile</tt> that provides the targets <tt>all</tt><modified>, <tt>install</tt></modified> and
that there is a <tt>Makefile</tt> that provides the targets <tt>all</tt>, <tt>install</tt> and
<tt>clean</tt>, and that a call to <tt>make all</tt> actually produces a dynamically
loadable library file for that plugin (we'll get to the details later).
<modified>
The dynamically loadable library file for the plugin shall be located directly under
the plugin's source directory.
See the section <a href="#Initializing a new plugin directory">Initializing a new plugin directory</a>
for how to generate an example Makefile.
</modified>
<p>
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
@ -891,70 +890,51 @@ You can first assign the temporary values to the global variables and then do th
your setup parameters and use that one to copy all parameters with one single statement
(like VDR does with its cSetup class).
<hr><h2><modified><a name="Additional files">Additional files</a></modified></h2>
<hr><h2><a name="Additional files">Additional files</a></h2>
<div class="blurb">I want my own stuff!</div><p>
<modified>
There may be situations where a plugin requires files of its own. While the plugin is
free to store such files anywhere it sees fit, it might be a good idea to put them in a common
place, preferably where such data already exists.
</modified>
<p>
<modified>
<i>configuration files</i>, maybe for data that can't be stored in the simple
<a href="#Setup parameters">setup parameters</a> of VDR, or maybe because it needs to
launch other programs that simply need a separate configuration file.
</modified>
<p>
<modified>
<i>cache files</i>, to store data so that future requests for that data can be served faster. The data
that is stored within a cache might be values that have been computed earlier or duplicates of
original values that are stored elsewhere.
</modified>
<p>
<modified>
<i>resource files</i>, for providing additional files, like pictures, movie clips or channel logos.
</modified>
<p>
<modified>
Therefore VDR provides the functions
<p><table><tr><td class="code"><pre>
<modified>
const char *ConfigDirectory(const char *PluginName = NULL);
const char *CacheDirectory(const char *PluginName = NULL);
const char *ResourceDirectory(const char *PluginName = NULL);
</modified>
</pre></td></tr></table><p>
<modified>
each of which returns a string containing the directory that VDR uses for its own
files (defined through the options in the call to VDR), extended by
</modified>
<tt>"/plugins"</tt>. So assuming the VDR configuration directory is <tt>/video</tt>
(the default if no <tt><b>-c</b></tt> or <tt><b>-v</b></tt> option is given),
a call to <tt>ConfigDirectory()</tt> will return <tt>/video/plugins</tt>. The first
call to <tt>ConfigDirectory()</tt> will automatically make sure that the <tt>plugins</tt>
subdirectory will exist. If, for some reason, this cannot be achieved, <tt>NULL</tt>
will be returned.
<modified>
The behavior of <tt>CacheDirectory()</tt> and <tt>ResourceDirectory()</tt> is similar.
</modified>
<p>
The additional <tt>plugins</tt> directory is used to keep files from plugins apart
from those of VDR itself, making sure there will be no name clashes. If a plugin
<modified>
needs only one extra file, it is suggested that this file be named <tt>name.*</tt>,
where <i>name</i> shall be the name of the plugin.
</modified>
<p>
If a plugin needs more than one such file, it is suggested that the plugin stores
these in a subdirectory of its own, named after the plugin. To easily get such a name
<modified>
the functions can be given an additional string that will be appended to the returned
directory name, as in
</modified>
<p><table><tr><td class="code"><pre>
const char *MyConfigDir = ConfigDirectory(Name());
@ -965,16 +945,12 @@ plugin's name. Again, VDR will make sure that the requested directory will exist
(or return <tt>NULL</tt> in case of an error).
<p>
<b>
<modified>
The returned strings are statically allocated and will be overwritten by subsequent calls!
</modified>
</b>
<p>
<modified>
The <tt>ConfigDirectory()</tt>, <tt>CacheDirectory()</tt> and <tt>ResourceDirectory()</tt>
functions are static member functions of the <tt>cPlugin</tt> class. This allows them to be
called even from outside any member function of the derived plugin class, by writing
</modified>
<p><table><tr><td class="code"><pre>
const char *MyConfigDir = cPlugin::ConfigDirectory();
@ -1265,10 +1241,10 @@ If a plugin wants to get informed on various events in VDR, it can derive a clas
class cMyStatusMonitor : public cStatus {
protected:
virtual void ChannelSwitch(const cDevice *Device, int ChannelNumber<modified>, bool LiveView</modified>);
virtual void ChannelSwitch(const cDevice *Device, int ChannelNumber, bool LiveView);
};
void cMyStatusMonitor::ChannelSwitch(const cDevice *Device, int ChannelNumber<modified>, bool LiveView</modified>)
void cMyStatusMonitor::ChannelSwitch(const cDevice *Device, int ChannelNumber, bool LiveView)
{
if (ChannelNumber)
dsyslog("channel switched to %d on DVB %d", ChannelNumber, Device-&gt;CardIndex());
@ -1525,13 +1501,11 @@ public:
cMyReceiver(int Pid);
};
<modified>
cMyReceiver::cMyReceiver(int Pid)
:cReceiver(NULL, -1)
{
AddPid(Pid);
}
</modified>
cMyReceiver::~cMyReceiver()
{
@ -1557,7 +1531,7 @@ The above example sets up a receiver that wants to receive data from only one
PID (for example the Teletext PID). In order to not interfere with other recording
operations, it sets its priority to <tt>-1</tt> (any negative value will allow
a <tt>cReceiver</tt> to be detached from its <tt>cDevice</tt> at any time
<modified>in favor of a timer recording or live viewing</modified>).
in favor of a timer recording or live viewing).
<p>
Once a <tt>cReceiver</tt> has been created, it needs to be <i>attached</i> to
a <tt>cDevice</tt>:
@ -1573,9 +1547,7 @@ the receiver is attached to the device that actually receives the current live
video stream (this may be different from the primary device in case of <i>Transfer
Mode</i>).
<p>
<modified>
The <tt>cReceiver</tt> must be detached from its device before it is deleted.
</modified>
<hr><h2><a name="Filters">Filters</a></h2>
@ -1853,7 +1825,7 @@ If the new device can receive, it most likely needs to provide a way of
selecting which channel it shall tune to:
<p><table><tr><td class="code"><pre>
<modified>virtual int NumProvidedSystems(void) const;</modified>
virtual int NumProvidedSystems(void) const;
virtual bool ProvidesSource(int Source) const;
virtual bool ProvidesTransponder(const cChannel *Channel) const;
virtual bool ProvidesChannel(const cChannel *Channel, int Priority = -1, bool *NeedsDetachReceivers = NULL) const;
@ -1902,7 +1874,7 @@ virtual bool HasDecoder(void) const;
virtual bool CanReplay(void) const;
virtual bool SetPlayMode(ePlayMode PlayMode);
virtual int64_t GetSTC(void);
<modified>virtual bool IsPlayingVideo(void) const;</modified>
virtual bool IsPlayingVideo(void) const;
virtual bool HasIBPTrickSpeed(void);
virtual void TrickSpeed(int Speed);
virtual void Clear(void);
@ -1931,7 +1903,7 @@ the functions
<p><table><tr><td class="code"><pre>
virtual int OpenFilter(u_short Pid, u_char Tid, u_char Mask);
<modified>virtual int ReadFilter(int Handle, void *Buffer, size_t Length);</modified>
virtual int ReadFilter(int Handle, void *Buffer, size_t Length);
virtual void CloseFilter(int Handle);
</pre></td></tr></table><p>
@ -1987,7 +1959,6 @@ user - whether this goes through OSD facilities of the physical device (like
a "full featured" DVB card) or through a graphics adapter that overlays its
output with the video signal, doesn't matter.
<p>
<div class="modified">
In order to be able to determine the proper size of the OSD, the device
should implement the function
@ -1996,7 +1967,6 @@ virtual void GetOsdSize(int &amp;Width, int &amp;Height, double &amp;Aspect);
</pre></td></tr></table><p>
By default, an OSD size of 720x480 with an aspect ratio of 1.0 is assumed.
</div modified>
<p>
<b>Initializing new devices</b>
@ -2017,8 +1987,6 @@ Nothing needs to be done to shut down the devices. VDR will automatically
shut down (delete) all devices when the program terminates. It is therefore
important that the devices are created on the heap, using the <tt>new</tt>
operator!
<div class="modified">
<p>
<b>Device hooks</b>
<p>
@ -2056,6 +2024,48 @@ new cMyDeviceHook;
</pre></td></tr></table><p>
and shall not delete this object. It will be automatically deleted when the program ends.
<div class="modified">
<hr><h2><a name="Positioners">Positioners</a></h2>
<div class="blurb">Now you see me - now you don't!</div><p>
If you are using a positioner (also known as "motor" or "rotor") to move your
satellite dish to receive various satellites, you will be using the 'P' command
in the <tt>diseqc.conf</tt> file. This command sends the necessary data to the
positioner to move the dish to the satellite's orbital position. By default VDR
uses its builtin DiSEqC positioner control. If your positioner requires a different
method of controlling (like maybe via a serial link), you can derive a class
from <tt>cPositioner</tt>, as in
<p><table><tr><td class="code"><pre>
#include &lt;vdr/positioner.h&gt;
class cMyPositioner : public cPositioner {
private:
void SendDiseqc(uint8_t *Codes, int NumCodes);
public:
cMyPositioner(void);
virtual void Drive(ePositionerDirection Direction);
virtual void Step(ePositionerDirection Direction, uint Steps = 1);
virtual void Halt(void);
virtual void SetLimit(ePositionerDirection Direction);
virtual void DisableLimits(void);
virtual void EnableLimits(void);
virtual void StorePosition(uint Number);
virtual void RecalcPositions(uint Number);
virtual void GotoPosition(uint Number, int Longitude);
virtual void GotoAngle(int Longitude);
};
</pre></td></tr></table><p>
See the implementation of <tt>cDiseqcPositioner</tt> in <tt>diseqc.c</tt> for details.
<p>
You should create your derived positioner object in the
<a href="#Getting started"><tt>Start()</tt></a> function of your plugin.
Note that the object has to be created on the heap (using <tt>new</tt>),
and you shall not delete it at any point (it will be deleted automatically
when the program ends).
</div modified>
<hr><h2><a name="Audio">Audio</a></h2>
@ -2222,12 +2232,10 @@ Put(uint64 Code, bool Repeat = false, bool Release = false);
The other parameters have the same meaning as in the first version of this function.
<p>
<modified>
If your remote control has a repeat function that automatically repeats key events
if a key is held pressed down for a while, your derived class should use the global
parameters <tt>Setup.RcRepeatDelay</tt> and <tt>Setup.RcRepeatDelta</tt> to allow
users to configure the behavior of this function.
</modified>
<hr><h2><a name="Conditional Access">Conditional Access</a></h2>
@ -2264,7 +2272,6 @@ virtual bool Assign(cDevice *Device, bool Query = false);
See the description of this function in <tt>ci.h</tt> for details.
<div class="modified">
<hr><h2><a name="Electronic Program Guide">Electronic Program Guide</a></h2>
<div class="blurb">The grass is always greener on the other side...</div><p>
@ -2294,7 +2301,6 @@ where <tt>DescriptionFromDatabase()</tt> would derive the description of the
to signal VDR that no other EPG handlers shall be queried after this one.
<p>
See <tt>VDR/epg.h</tt> for details.
</div modified>
</body>
</html>

5
PLUGINS/src/dvbhddevice/HISTORY
View File

@ -75,3 +75,8 @@ VDR Plugin 'dvbhddevice' Revision History
2013-04-11: Version 2.0.1
- Fixed aspect ratio and position of scaled video.
2013-08-23: Version 2.1.1
- Fixed aspect ratio and position of scaled video.
- Added yellow button in main menu to send CEC TV-Off command.

2
PLUGINS/src/dvbhddevice/dvbhddevice.c
View File

@ -10,7 +10,7 @@
#include "menu.h"
#include "setup.h"
static const char *VERSION = "2.0.1";
static const char *VERSION = "2.1.1";
static const char *DESCRIPTION = trNOOP("HD Full Featured DVB device");
static const char *MAINMENUENTRY = "dvbhddevice";

7
PLUGINS/src/dvbhddevice/menu.c
View File

@ -13,7 +13,7 @@ cHdffMenu::cHdffMenu(HDFF::cHdffCmdIf * pHdffCmdIf)
{
mVideoConversionItem = new cOsdItem("", osUnknown, false);
Add(mVideoConversionItem);
SetHelp(tr("Video Conversion"), tr("TV on"));
SetHelp(tr("Video Conversion"), tr("TV on"), tr("TV off"));
SetVideoConversion();
}
@ -38,6 +38,11 @@ eOSState cHdffMenu::ProcessKey(eKeys key)
state = osEnd;
break;
case kYellow:
mHdffCmdIf->CmdHdmiSendCecCommand(HDFF_CEC_COMMAND_TV_OFF);
state = osEnd;
break;
case kOk:
state = osEnd;
break;

5
PLUGINS/src/dvbhddevice/po/de_DE.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: vdr-dvbhddevice 0.0.4\n"
"Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2012-11-13 20:08+0100\n"
"POT-Creation-Date: 2013-08-23 12:10+0200\n"
"PO-Revision-Date: 2011-04-25 21:44+0200\n"
"Last-Translator: Christoph Haubrich\n"
"Language-Team: <see README>\n"
@ -25,6 +25,9 @@ msgstr "Bildanpassung"
msgid "TV on"
msgstr "TV ein"
msgid "TV off"
msgstr "TV aus"
msgid "Automatic"
msgstr "automatisch"

5
PLUGINS/src/dvbhddevice/po/fi_FI.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: vdr-dvbhddevice 0.0.4\n"
"Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2012-11-13 20:08+0100\n"
"POT-Creation-Date: 2013-08-23 12:10+0200\n"
"PO-Revision-Date: 2011-04-25 21:44+0200\n"
"Last-Translator: Rolf Ahrenberg\n"
"Language-Team: Finnish <vdr@linuxtv.org>\n"
@ -25,6 +25,9 @@ msgstr "Näyttömuoto"
msgid "TV on"
msgstr "TV päälle"
msgid "TV off"
msgstr ""
msgid "Automatic"
msgstr "automaattinen"

5
PLUGINS/src/dvbhddevice/po/it_IT.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: vdr-dvbhddevice 0.0.4\n"
"Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2012-11-13 20:08+0100\n"
"POT-Creation-Date: 2013-08-23 12:10+0200\n"
"PO-Revision-Date: 2013-02-18 23:42+0100\n"
"Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
"Language-Team: <see README>\n"
@ -29,6 +29,9 @@ msgstr "Conversione video"
msgid "TV on"
msgstr "TV accesa"
msgid "TV off"
msgstr ""
msgid "Automatic"
msgstr "Automatica"

5
PLUGINS/src/dvbsddevice/HISTORY
View File

@ -45,3 +45,8 @@ VDR Plugin 'dvbsddevice' Revision History
2013-03-31: Version 2.0.0
- Official release.
2013-08-22: Version 2.0.1
- Fixed handling the -o option (short form of --outputonly; problem reported by
Mario Edelmann).

2
PLUGINS/src/dvbsddevice/Makefile
View File

@ -1,7 +1,7 @@
#
# Makefile for a Video Disk Recorder plugin
#
# $Id: Makefile 1.20 2013/01/12 13:45:01 kls Exp $
# $Id: Makefile 3.0 2013/01/12 13:45:01 kls Exp $
# The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the plugin.

6
PLUGINS/src/dvbsddevice/dvbsddevice.c
View File

@ -3,14 +3,14 @@
*
* See the README file for copyright information and how to reach the author.
*
* $Id: dvbsddevice.c 1.10 2013/03/31 09:30:18 kls Exp $
* $Id: dvbsddevice.c 3.1 2013/08/22 08:20:18 kls Exp $
*/
#include <getopt.h>
#include <vdr/plugin.h>
#include "dvbsdffdevice.h"
static const char *VERSION = "2.0.0";
static const char *VERSION = "2.0.1";
static const char *DESCRIPTION = "SD Full Featured DVB device";
class cPluginDvbsddevice : public cPlugin {
@ -48,7 +48,7 @@ bool cPluginDvbsddevice::ProcessArgs(int argc, char *argv[])
};
int c;
while ((c = getopt_long(argc, argv, "", long_options, NULL)) != -1) {
while ((c = getopt_long(argc, argv, "o", long_options, NULL)) != -1) {
switch (c) {
case 'o': probe->SetOutputOnly(true);
break;

2
PLUGINS/src/dvbsddevice/dvbsdffdevice.c
View File

@ -3,7 +3,7 @@
*
* See the README file for copyright information and how to reach the author.
*
* $Id: dvbsdffdevice.c 2.35 2013/02/17 13:16:18 kls Exp $
* $Id: dvbsdffdevice.c 3.0 2013/02/17 13:16:18 kls Exp $
*/
#include "dvbsdffdevice.h"

2
PLUGINS/src/dvbsddevice/dvbsdffdevice.h
View File

@ -3,7 +3,7 @@
*
* See the README file for copyright information and how to reach the author.
*
* $Id: dvbsdffdevice.h 2.16 2013/02/17 13:16:29 kls Exp $
* $Id: dvbsdffdevice.h 3.0 2013/02/17 13:16:29 kls Exp $
*/
#ifndef __DVBSDFFDEVICE_H

2
PLUGINS/src/dvbsddevice/dvbsdffosd.c
View File

@ -3,7 +3,7 @@
*
* See the README file for copyright information and how to reach the author.
*
* $Id: dvbsdffosd.c 2.3 2011/04/17 12:55:09 kls Exp $
* $Id: dvbsdffosd.c 3.0 2011/04/17 12:55:09 kls Exp $
*/
#include "dvbsdffosd.h"

2
PLUGINS/src/dvbsddevice/dvbsdffosd.h
View File

@ -3,7 +3,7 @@
*
* See the README file for copyright information and how to reach the author.
*
* $Id: dvbsdffosd.h 2.2 2012/12/03 13:43:55 kls Exp $
* $Id: dvbsdffosd.h 3.0 2012/12/03 13:43:55 kls Exp $
*/
#ifndef __DVBSDFFODF_H

2
PLUGINS/src/epgtableid0/Makefile
View File

@ -1,7 +1,7 @@
#
# Makefile for a Video Disk Recorder plugin
#
# $Id: Makefile 1.13 2013/01/12 13:45:01 kls Exp $
# $Id: Makefile 3.0 2013/01/12 13:45:01 kls Exp $
# The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the plugin.

2
PLUGINS/src/epgtableid0/epgtableid0.c
View File

@ -3,7 +3,7 @@
*
* See the README file for copyright information and how to reach the author.
*
* $Id: epgtableid0.c 1.4 2013/03/31 09:30:18 kls Exp $
* $Id: epgtableid0.c 3.0 2013/03/31 09:30:18 kls Exp $
*/
#include <vdr/epg.h>

2
PLUGINS/src/hello/Makefile
View File

@ -1,7 +1,7 @@
#
# Makefile for a Video Disk Recorder plugin
#
# $Id: Makefile 2.18 2013/01/12 13:45:01 kls Exp $
# $Id: Makefile 3.0 2013/01/12 13:45:01 kls Exp $
# The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the plugin.

2
PLUGINS/src/hello/hello.c
View File

@ -3,7 +3,7 @@
*
* See the README file for copyright information and how to reach the author.
*
* $Id: hello.c 2.6 2013/03/31 09:30:18 kls Exp $
* $Id: hello.c 3.0 2013/03/31 09:30:18 kls Exp $
*/
#include <getopt.h>

2
PLUGINS/src/osddemo/Makefile
View File

@ -1,7 +1,7 @@
#
# Makefile for a Video Disk Recorder plugin
#
# $Id: Makefile 2.16 2013/01/12 13:45:01 kls Exp $
# $Id: Makefile 3.0 2013/01/12 13:45:01 kls Exp $
# The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the plugin.

2
PLUGINS/src/osddemo/osddemo.c
View File

@ -3,7 +3,7 @@
*
* See the README file for copyright information and how to reach the author.
*
* $Id: osddemo.c 2.12 2013/03/31 09:30:18 kls Exp $
* $Id: osddemo.c 3.0 2013/03/31 09:30:18 kls Exp $
*/
#include <vdr/osd.h>

4
PLUGINS/src/pictures/HISTORY
View File

@ -87,3 +87,7 @@ VDR Plugin 'pictures' Revision History
2013-03-31: Version 2.0.0
- Official release.
2013-07-01:
- Added option -x to pic2mpg.

2
PLUGINS/src/pictures/Makefile
View File

@ -1,7 +1,7 @@
#
# Makefile for a Video Disk Recorder plugin
#
# $Id: Makefile 2.18 2013/01/12 13:45:01 kls Exp $
# $Id: Makefile 3.0 2013/01/12 13:45:01 kls Exp $
# The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the plugin.

2
PLUGINS/src/pictures/entry.c
View File

@ -3,7 +3,7 @@
*
* See the README file for copyright information and how to reach the author.
*
* $Id: entry.c 2.1 2012/02/17 14:00:28 kls Exp $
* $Id: entry.c 3.0 2012/02/17 14:00:28 kls Exp $
*/
#include "entry.h"

2
PLUGINS/src/pictures/entry.h
View File

@ -3,7 +3,7 @@
*
* See the README file for copyright information and how to reach the author.
*
* $Id: entry.h 2.0 2008/01/06 12:30:50 kls Exp $
* $Id: entry.h 3.0 2008/01/06 12:30:50 kls Exp $
*/
#ifndef _ENTRY_H

2
PLUGINS/src/pictures/menu.c
View File

@ -3,7 +3,7 @@
*
* See the README file for copyright information and how to reach the author.
*
* $Id: menu.c 2.0 2008/01/13 11:35:18 kls Exp $
* $Id: menu.c 3.0 2008/01/13 11:35:18 kls Exp $
*/
#include "menu.h"

2
PLUGINS/src/pictures/menu.h
View File

@ -3,7 +3,7 @@
*
* See the README file for copyright information and how to reach the author.
*
* $Id: menu.h 2.0 2008/01/12 11:22:52 kls Exp $
* $Id: menu.h 3.0 2008/01/12 11:22:52 kls Exp $
*/
#ifndef _MENU_H

10
PLUGINS/src/pictures/pic2mpg
View File

@ -7,7 +7,7 @@
#
# See the README file for copyright information and how to reach the author.
#
# $Id: pic2mpg 2.5 2013/02/17 13:17:13 kls Exp $
# $Id: pic2mpg 3.1 2013/07/01 08:33:38 kls Exp $
use File::Path;
use File::Spec;
@ -23,9 +23,10 @@ Options: -f Force conversion
-o percent overscan in percent
-s size Screen size (WIDTHxHEIGHT, default is 1920x1080)
-v num Verbose (0=none, 1=list files, 2=detailed)
-x dir[,...] eXclude the given directories
};
getopts("fho:s:v:") || die $Usage;
getopts("fho:s:v:x:") || die $Usage;
die $Usage if $opt_h;
@ -33,6 +34,7 @@ $Force = $opt_f;
$Overscan = $opt_o || 0;
$Size = $opt_s || "1920x1080";
$Verbose = $opt_v;
@Exclude = split(',', $opt_x || "");
$ListFiles = $Verbose >= 1;
$Detailed = $Verbose >= 2;
@ -85,7 +87,11 @@ chdir($PICDIR) || die "$PICDIR: $!\n";
@Pictures = `find -type f | sort`;
chomp(@Pictures);
PIC:
for $pic (@Pictures) {
for (@Exclude) {
next PIC if ($pic =~ /\/$_\//);
}
my $mpg = "$MPGDIR/$pic.mpg";
if ($Force || !-e $mpg || -M $mpg > -M $pic) {
(my $dir = $mpg) =~ s/\/[^\/]*$//;

2
PLUGINS/src/pictures/pictures.c
View File

@ -3,7 +3,7 @@
*
* See the README file for copyright information and how to reach the author.
*
* $Id: pictures.c 2.9 2013/03/31 09:30:18 kls Exp $
* $Id: pictures.c 3.0 2013/03/31 09:30:18 kls Exp $
*/
#include <getopt.h>

2
PLUGINS/src/pictures/player.c
View File

@ -3,7 +3,7 @@
*
* See the README file for copyright information and how to reach the author.
*
* $Id: player.c 2.2 2012/04/28 11:58:15 kls Exp $
* $Id: player.c 3.0 2012/04/28 11:58:15 kls Exp $
*/
#include "player.h"

2
PLUGINS/src/pictures/player.h
View File

@ -3,7 +3,7 @@
*
* See the README file for copyright information and how to reach the author.
*
* $Id: player.h 2.1 2012/04/28 11:56:01 kls Exp $
* $Id: player.h 3.0 2012/04/28 11:56:01 kls Exp $
*/
#ifndef _PLAYER_H

2
PLUGINS/src/rcu/Makefile
View File

@ -1,7 +1,7 @@
#
# Makefile for a Video Disk Recorder plugin
#
# $Id: Makefile 1.13 2013/01/12 13:45:01 kls Exp $
# $Id: Makefile 3.0 2013/01/12 13:45:01 kls Exp $
# The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the plugin.

2
PLUGINS/src/rcu/rcu.c
View File

@ -3,7 +3,7 @@
*
* See the README file for copyright information and how to reach the author.
*
* $Id: rcu.c 1.5 2013/03/31 09:30:18 kls Exp $
* $Id: rcu.c 3.0 2013/03/31 09:30:18 kls Exp $
*/
#include <getopt.h>

2
PLUGINS/src/servicedemo/Makefile
View File

@ -1,7 +1,7 @@
#
# Makefile for a Video Disk Recorder plugin
#
# $Id: Makefile 2.14 2013/01/12 13:45:01 kls Exp $
# $Id: Makefile 3.0 2013/01/12 13:45:01 kls Exp $
# The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the plugin.

2
PLUGINS/src/servicedemo/svccli.c
View File

@ -3,7 +3,7 @@
*
* See the README file for copyright information and how to reach the author.
*
* $Id: svccli.c 2.4 2013/03/31 09:30:18 kls Exp $
* $Id: svccli.c 3.0 2013/03/31 09:30:18 kls Exp $
*/
#include <stdlib.h>

2
PLUGINS/src/servicedemo/svcsvr.c
View File

@ -3,7 +3,7 @@
*
* See the README file for copyright information and how to reach the author.
*
* $Id: svcsvr.c 2.4 2013/03/31 09:30:18 kls Exp $
* $Id: svcsvr.c 3.0 2013/03/31 09:30:18 kls Exp $
*/
#include <stdlib.h>

2
PLUGINS/src/skincurses/Makefile
View File

@ -1,7 +1,7 @@
#
# Makefile for a Video Disk Recorder plugin
#
# $Id: Makefile 2.18 2013/01/12 13:45:01 kls Exp $
# $Id: Makefile 3.0 2013/01/12 13:45:01 kls Exp $
# The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the plugin.

2
PLUGINS/src/skincurses/skincurses.c
View File

@ -3,7 +3,7 @@
*
* See the README file for copyright information and how to reach the author.
*
* $Id: skincurses.c 2.13 2013/03/31 09:30:18 kls Exp $
* $Id: skincurses.c 3.0 2013/03/31 09:30:18 kls Exp $
*/
#include <ncurses.h>

2
PLUGINS/src/status/Makefile
View File

@ -1,7 +1,7 @@
#
# Makefile for a Video Disk Recorder plugin
#
# $Id: Makefile 2.15 2013/01/12 13:45:01 kls Exp $
# $Id: Makefile 3.0 2013/01/12 13:45:01 kls Exp $
# The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the plugin.

2
PLUGINS/src/status/status.c
View File

@ -3,7 +3,7 @@
*
* See the README file for copyright information and how to reach the author.
*
* $Id: status.c 2.4 2013/03/31 09:30:18 kls Exp $
* $Id: status.c 3.0 2013/03/31 09:30:18 kls Exp $
*/
#include <vdr/plugin.h>

2
PLUGINS/src/svdrpdemo/Makefile
View File

@ -1,7 +1,7 @@
#
# Makefile for a Video Disk Recorder plugin
#
# $Id: Makefile 2.15 2013/01/12 13:45:01 kls Exp $
# $Id: Makefile 3.0 2013/01/12 13:45:01 kls Exp $
# The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the plugin.

2
PLUGINS/src/svdrpdemo/svdrpdemo.c
View File

@ -3,7 +3,7 @@
*
* See the README file for copyright information and how to reach the author.
*
* $Id: svdrpdemo.c 2.3 2013/03/31 09:30:18 kls Exp $
* $Id: svdrpdemo.c 3.0 2013/03/31 09:30:18 kls Exp $
*/
#include <vdr/plugin.h>

2
audio.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: audio.c 2.2 2010/05/16 13:30:11 kls Exp $
* $Id: audio.c 3.0 2010/05/16 13:30:11 kls Exp $
*/
#include "audio.h"

2
audio.h
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: audio.h 2.1 2008/07/06 11:39:21 kls Exp $
* $Id: audio.h 3.0 2008/07/06 11:39:21 kls Exp $
*/
#ifndef __AUDIO_H

2
channels.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: channels.c 2.24 2012/07/14 12:34:47 kls Exp $
* $Id: channels.c 3.0 2012/07/14 12:34:47 kls Exp $
*/
#include "channels.h"

2
channels.h
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: channels.h 2.16 2012/06/17 11:21:33 kls Exp $
* $Id: channels.h 3.0 2012/06/17 11:21:33 kls Exp $
*/
#ifndef __CHANNELS_H

2
ci.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: ci.c 2.12 2013/02/17 13:17:28 kls Exp $
* $Id: ci.c 3.0 2013/02/17 13:17:28 kls Exp $
*/
#include "ci.h"

2
ci.h
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: ci.h 2.2 2012/02/29 10:24:27 kls Exp $
* $Id: ci.h 3.0 2012/02/29 10:24:27 kls Exp $
*/
#ifndef __CI_H

20
config.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: config.c 2.38 2013/03/18 08:57:50 kls Exp $
* $Id: config.c 3.1 2013/05/23 12:41:06 kls Exp $
*/
#include "config.h"
@ -389,6 +389,12 @@ cSetup::cSetup(void)
LnbFrequLo = 9750;
LnbFrequHi = 10600;
DiSEqC = 0;
UsePositioner = 0;
SiteLat = 0;
SiteLon = 0;
PositionerSpeed = 15;
PositionerSwing = 65;
PositionerLastLon = 0;
SetSystemTime = 0;
TimeSource = 0;
TimeTransponder = 0;
@ -594,6 +600,12 @@ bool cSetup::Parse(const char *Name, const char *Value)
else if (!strcasecmp(Name, "LnbFrequLo")) LnbFrequLo = atoi(Value);
else if (!strcasecmp(Name, "LnbFrequHi")) LnbFrequHi = atoi(Value);
else if (!strcasecmp(Name, "DiSEqC")) DiSEqC = atoi(Value);
else if (!strcasecmp(Name, "UsePositioner")) UsePositioner = atoi(Value);
else if (!strcasecmp(Name, "SiteLat")) SiteLat = atoi(Value);
else if (!strcasecmp(Name, "SiteLon")) SiteLon = atoi(Value);
else if (!strcasecmp(Name, "PositionerSpeed")) PositionerSpeed = atoi(Value);
else if (!strcasecmp(Name, "PositionerSwing")) PositionerSwing = atoi(Value);
else if (!strcasecmp(Name, "PositionerLastLon")) PositionerLastLon = atoi(Value);
else if (!strcasecmp(Name, "SetSystemTime")) SetSystemTime = atoi(Value);
else if (!strcasecmp(Name, "TimeSource")) TimeSource = cSource::FromString(Value);
else if (!strcasecmp(Name, "TimeTransponder")) TimeTransponder = atoi(Value);
@ -703,6 +715,12 @@ bool cSetup::Save(void)
Store("LnbFrequLo", LnbFrequLo);
Store("LnbFrequHi", LnbFrequHi);
Store("DiSEqC", DiSEqC);
Store("UsePositioner", UsePositioner);
Store("SiteLat", SiteLat);
Store("SiteLon", SiteLon);
Store("PositionerSpeed", PositionerSpeed);
Store("PositionerSwing", PositionerSwing);
Store("PositionerLastLon", PositionerLastLon);
Store("SetSystemTime", SetSystemTime);
Store("TimeSource", cSource::ToString(TimeSource));
Store("TimeTransponder", TimeTransponder);

16
config.h
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: config.h 2.76.1.2 2013/04/27 10:18:08 kls Exp $
* $Id: config.h 3.2 2013/05/23 12:40:19 kls Exp $
*/
#ifndef __CONFIG_H
@ -22,13 +22,13 @@
// VDR's own version number:
#define VDRVERSION "2.0.2"
#define VDRVERSNUM 20002 // Version * 10000 + Major * 100 + Minor
#define VDRVERSION "2.1.1"
#define VDRVERSNUM 20101 // Version * 10000 + Major * 100 + Minor
// The plugin API's version number:
#define APIVERSION "2.0.0"
#define APIVERSNUM 20000 // Version * 10000 + Major * 100 + Minor
#define APIVERSION "2.1.1"
#define APIVERSNUM 20101 // 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
@ -266,6 +266,12 @@ public:
int LnbFrequLo;
int LnbFrequHi;
int DiSEqC;
int UsePositioner;
int SiteLat;
int SiteLon;
int PositionerSpeed;
int PositionerSwing;
int PositionerLastLon;
int SetSystemTime;
int TimeSource;
int TimeTransponder;

6
cutter.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: cutter.c 2.25.1.1 2013/05/02 09:21:18 kls Exp $
* $Id: cutter.c 3.2 2013/08/21 13:15:24 kls Exp $
*/
#include "cutter.h"
@ -556,6 +556,8 @@ bool cCuttingThread::ProcessSequence(int LastEndIndex, int BeginIndex, int EndIn
bool Independent;
int Length;
if (LoadFrame(Index, Buffer, Independent, Length)) {
// Make sure there is enough disk space:
AssertFreeDiskSpace(-1);
bool CutIn = !SeamlessBegin && Index == BeginIndex;
bool CutOut = !SeamlessEnd && Index == EndIndex - 1;
bool DeletedFrame = false;
@ -608,8 +610,6 @@ void cCuttingThread::Action(void)
cCondWait::SleepMs(100);
continue;
}
// Make sure there is enough disk space:
AssertFreeDiskSpace(-1);
// Determine the actual begin and end marks, skipping any marks at the same position:
cMark *EndMark = fromMarks.GetNextEnd(BeginMark);
// Process the current sequence:

2
cutter.h
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: cutter.h 2.3 2012/02/16 12:05:33 kls Exp $
* $Id: cutter.h 3.0 2012/02/16 12:05:33 kls Exp $
*/
#ifndef __CUTTER_H

10
device.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: device.c 2.74.1.1 2013/04/05 10:47:38 kls Exp $
* $Id: device.c 3.3 2013/08/22 10:28:55 kls Exp $
*/
#include "device.h"
@ -118,6 +118,8 @@ cDevice::~cDevice()
DetachAllReceivers();
delete liveSubtitle;
delete dvbSubtitleConverter;
if (this == primaryDevice)
primaryDevice = NULL;
}
bool cDevice::WaitForAllDevicesReady(int Timeout)
@ -362,7 +364,6 @@ void cDevice::SetCamSlot(cCamSlot *CamSlot)
void cDevice::Shutdown(void)
{
deviceHooks.Clear();
primaryDevice = NULL;
for (int i = 0; i < numDevices; i++) {
delete device[i];
device[i] = NULL;
@ -665,6 +666,11 @@ int cDevice::NumProvidedSystems(void) const
return 0;
}
const cPositioner *cDevice::Positioner(void) const
{
return NULL;
}
int cDevice::SignalStrength(void) const
{
return -1;

10
device.h
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: device.h 2.47 2013/02/16 15:20:01 kls Exp $
* $Id: device.h 3.2 2013/08/22 11:57:34 kls Exp $
*/
#ifndef __DEVICE_H
@ -17,6 +17,7 @@
#include "filter.h"
#include "nit.h"
#include "pat.h"
#include "positioner.h"
#include "remux.h"
#include "ringbuffer.h"
#include "sdt.h"
@ -196,7 +197,7 @@ protected:
///< A derived class must call the MakePrimaryDevice() function of its
///< base class.
public:
bool IsPrimaryDevice(void) const { return this == primaryDevice; }
bool IsPrimaryDevice(void) const { return this == primaryDevice && HasDecoder(); }
int CardIndex(void) const { return cardIndex; }
///< Returns the card index of this device (0 ... MAXDEVICES - 1).
int DeviceNumber(void) const;
@ -273,6 +274,11 @@ public:
///< actually provide channels must implement this function.
///< The result of this function is used when selecting a device, in order
///< to avoid devices that provide more than one system.
virtual const cPositioner *Positioner(void) const;
///< Returns a pointer to the positioner (if any) this device has used to
///< move the satellite dish to the requested position (only applies to DVB-S
///< devices). If no positioner is involved, or this is not a DVB-S device,
///< NULL will be returned.
virtual int SignalStrength(void) const;
///< Returns the "strength" of the currently received signal.
///< This is a value in the range 0 (no signal at all) through

200
diseqc.c
View File

@ -4,24 +4,37 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: diseqc.c 2.9.1.1 2013/05/02 09:33:12 kls Exp $
* $Id: diseqc.c 3.2 2013/08/21 09:26:11 kls Exp $
*/
#include "diseqc.h"
#include <ctype.h>
#include <linux/dvb/frontend.h>
#include <sys/ioctl.h>
#include "sources.h"
#include "thread.h"
static bool ParseDeviceNumbers(const char *s, int &Devices)
#define ALL_DEVICES (~0) // all bits set to '1'
#define MAX_DEVICES 32 // each bit in a 32-bit integer represents one device
static int CurrentDevices = 0;
static bool IsDeviceNumbers(const char *s)
{
if (*s && s[strlen(s) - 1] == ':') {
return *s && s[strlen(s) - 1] == ':';
}
static bool ParseDeviceNumbers(const char *s)
{
if (IsDeviceNumbers(s)) {
CurrentDevices = 0;
const char *p = s;
while (*p && *p != ':') {
char *t = NULL;
int d = strtol(p, &t, 10);
p = t;
if (0 < d && d < 31)
Devices |= (1 << d - 1);
if (0 < d && d <= MAX_DEVICES)
CurrentDevices |= (1 << d - 1);
else {
esyslog("ERROR: invalid device number %d in '%s'", d, s);
return false;
@ -31,6 +44,107 @@ static bool ParseDeviceNumbers(const char *s, int &Devices)
return true;
}
// --- cDiseqcPositioner -----------------------------------------------------
// See http://www.eutelsat.com/files/live/sites/eutelsatv2/files/contributed/satellites/pdf/Diseqc/associated%20docs/positioner_appli_notice.pdf
cDiseqcPositioner::cDiseqcPositioner(void)
{
SetCapabilities(pcCanDrive |
pcCanStep |
pcCanHalt |
pcCanSetLimits |
pcCanDisableLimits |
pcCanEnableLimits |
pcCanStorePosition |
pcCanRecalcPositions |
pcCanGotoPosition |
pcCanGotoAngle
);
}
void cDiseqcPositioner::SendDiseqc(uint8_t *Codes, int NumCodes)
{
struct dvb_diseqc_master_cmd cmd;
NumCodes = min(NumCodes, int(sizeof(cmd.msg) - 2));
cmd.msg_len = 0;
cmd.msg[cmd.msg_len++] = 0xE0;
cmd.msg[cmd.msg_len++] = 0x31;
for (int i = 0; i < NumCodes; i++)
cmd.msg[cmd.msg_len++] = Codes[i];
CHECK(ioctl(Frontend(), FE_DISEQC_SEND_MASTER_CMD, &cmd));
}
void cDiseqcPositioner::Drive(ePositionerDirection Direction)
{
uint8_t Code[] = { uint8_t(Direction == pdLeft ? 0x68 : 0x69), 0x00 };
SendDiseqc(Code, 2);
}
void cDiseqcPositioner::Step(ePositionerDirection Direction, uint Steps)
{
if (Steps == 0)
return;
uint8_t Code[] = { uint8_t(Direction == pdLeft ? 0x68 : 0x69), 0xFF };
Code[1] -= min(Steps, uint(0x7F)) - 1;
SendDiseqc(Code, 2);
}
void cDiseqcPositioner::Halt(void)
{
uint8_t Code[] = { 0x60 };
SendDiseqc(Code, 1);
}
void cDiseqcPositioner::SetLimit(ePositionerDirection Direction)
{
uint8_t Code[] = { uint8_t(Direction == pdLeft ? 0x66 : 0x67) };
SendDiseqc(Code, 1);
}
void cDiseqcPositioner::DisableLimits(void)
{
uint8_t Code[] = { 0x63 };
SendDiseqc(Code, 1);
}
void cDiseqcPositioner::EnableLimits(void)
{
uint8_t Code[] = { 0x6A, 0x00 };
SendDiseqc(Code, 2);
}
void cDiseqcPositioner::StorePosition(uint Number)
{
uint8_t Code[] = { 0x6A, uint8_t(Number) };
SendDiseqc(Code, 2);
}
void cDiseqcPositioner::RecalcPositions(uint Number)
{
uint8_t Code[] = { 0x6F, uint8_t(Number), 0x00, 0x00 };
SendDiseqc(Code, 4);
}
void cDiseqcPositioner::GotoPosition(uint Number, int Longitude)
{
uint8_t Code[] = { 0x6B, uint8_t(Number) };
SendDiseqc(Code, 2);
cPositioner::GotoPosition(Number, Longitude);
}
void cDiseqcPositioner::GotoAngle(int Longitude)
{
uint8_t Code[] = { 0x6E, 0x00, 0x00 };
int Angle = CalcHourAngle(Longitude);
int a = abs(Angle);
Code[1] = a / 10 / 16;
Code[2] = a / 10 % 16 * 16 + a % 10 * 16 / 10;
Code[1] |= (Angle < 0) ? 0xE0 : 0xD0;
SendDiseqc(Code, 3);
cPositioner::GotoAngle(Longitude);
}
// --- cScr ------------------------------------------------------------------
cScr::cScr(void)
@ -44,10 +158,9 @@ cScr::cScr(void)
bool cScr::Parse(const char *s)
{
if (!ParseDeviceNumbers(s, devices))
return false;
if (devices)
return true;
if (IsDeviceNumbers(s))
return ParseDeviceNumbers(s);
devices = CurrentDevices;
bool result = false;
int fields = sscanf(s, "%d %u %d", &channel, &userBand, &pin);
if (fields == 2 || fields == 3) {
@ -68,16 +181,17 @@ bool cScr::Parse(const char *s)
cScrs Scrs;
bool cScrs::Load(const char *FileName, bool AllowComments, bool MustExist)
{
CurrentDevices = ALL_DEVICES;
return cConfig<cScr>::Load(FileName, AllowComments, MustExist);
}
cScr *cScrs::GetUnused(int Device)
{
cMutexLock MutexLock(&mutex);
int Devices = 0;
for (cScr *p = First(); p; p = Next(p)) {
if (p->Devices()) {
Devices = p->Devices();
continue;
}
if (Devices && !(Devices & (1 << Device - 1)))
if (!IsBitSet(p->Devices(), Device - 1))
continue;
if (!p->Used()) {
p->SetUsed(true);
@ -96,6 +210,7 @@ cDiseqc::cDiseqc(void)
slof = 0;
polarization = 0;
lof = 0;
position = -1;
scrBank = -1;
commands = NULL;
parsing = false;
@ -108,10 +223,9 @@ cDiseqc::~cDiseqc()
bool cDiseqc::Parse(const char *s)
{
if (!ParseDeviceNumbers(s, devices))
return false;
if (devices)
return true;
if (IsDeviceNumbers(s))
return ParseDeviceNumbers(s);
devices = CurrentDevices;
bool result = false;
char *sourcebuf = NULL;
int fields = sscanf(s, "%a[^ ] %d %c %d %a[^\n]", &sourcebuf, &slof, &polarization, &lof, &commands);
@ -178,6 +292,28 @@ const char *cDiseqc::Wait(const char *s) const
return NULL;
}
const char *cDiseqc::GetPosition(const char *s) const
{
if (!*s || !isdigit(*s)) {
position = 0;
return s;
}
char *p = NULL;
errno = 0;
int n = strtol(s, &p, 10);
if (!errno && p != s && n >= 0 && n < 0xFF) {
if (parsing) {
if (position < 0)
position = n;
else
esyslog("ERROR: more than one position in '%s'", s - 1);
}
return p;
}
esyslog("ERROR: invalid satellite position in '%s'", s - 1);
return NULL;
}
const char *cDiseqc::GetScrBank(const char *s) const
{
char *p = NULL;
@ -250,8 +386,12 @@ cDiseqc::eDiseqcActions cDiseqc::Execute(const char **CurrentAction, uchar *Code
case 'V': return daVoltage18;
case 'A': return daMiniA;
case 'B': return daMiniB;
case 'W': *CurrentAction = Wait(*CurrentAction); break;
case 'S': *CurrentAction = GetScrBank(*CurrentAction); break;
case 'W': *CurrentAction = Wait(*CurrentAction); return daWait;
case 'P': *CurrentAction = GetPosition(*CurrentAction);
if (Setup.UsePositioner)
return position ? daPositionN : daPositionA;
break;
case 'S': *CurrentAction = GetScrBank(*CurrentAction); return daScr;
case '[': *CurrentAction = GetCodes(*CurrentAction, Codes, MaxCodes);
if (*CurrentAction) {
if (Scr && Frequency) {
@ -261,7 +401,8 @@ cDiseqc::eDiseqcActions cDiseqc::Execute(const char **CurrentAction, uchar *Code
return daCodes;
}
break;
default: return daNone;
default: esyslog("ERROR: unknown diseqc code '%c'", *(*CurrentAction - 1));
return daNone;
}
}
return daNone;
@ -271,17 +412,18 @@ cDiseqc::eDiseqcActions cDiseqc::Execute(const char **CurrentAction, uchar *Code
cDiseqcs Diseqcs;
bool cDiseqcs::Load(const char *FileName, bool AllowComments, bool MustExist)
{
CurrentDevices = ALL_DEVICES;
return cConfig<cDiseqc>::Load(FileName, AllowComments, MustExist);
}
const cDiseqc *cDiseqcs::Get(int Device, int Source, int Frequency, char Polarization, const cScr **Scr) const
{
int Devices = 0;
for (const cDiseqc *p = First(); p; p = Next(p)) {
if (p->Devices()) {
Devices = p->Devices();
if (!IsBitSet(p->Devices(), Device - 1))
continue;
}
if (Devices && !(Devices & (1 << Device - 1)))
continue;
if (p->Source() == Source && p->Slof() > Frequency && p->Polarization() == toupper(Polarization)) {
if (cSource::Matches(p->Source(), Source) && p->Slof() > Frequency && p->Polarization() == toupper(Polarization)) {
if (p->IsScr() && Scr && !*Scr) {
*Scr = Scrs.GetUnused(Device);
if (*Scr)

14
diseqc.conf
View File

@ -5,6 +5,9 @@
# satellite slof polarization lof command...
#
# satellite: one of the 'S' codes defined in sources.conf
# the special value 'S360E' means that this entry uses a positioner
# (command 'P') that can move the dish to any requested satellite
# position withing its range
# slof: switch frequency of LNB; the first entry with
# an slof greater than the actual transponder
# frequency will be used
@ -18,7 +21,9 @@
# V voltage high (18V)
# A mini A
# B mini B
# Sn Satellite channel routing code sequence for bank n follows
# Pn use positioner to move dish to satellite position n (or to the
# satellite's orbital position, if no position number is given)
# Sn satellite channel routing code sequence for bank n follows
# Wnn wait nn milliseconds (nn may be any positive integer number)
# [xx ...] hex code sequence (max. 6)
#
@ -88,3 +93,10 @@ S13.0E 99999 H 10600 t V W15 [E0 10 38 F7] W15 B W15 T
# S13.0E 99999 V 10600 t V W10 S5 [E0 10 5A 00 00] W10 v
# S13.0E 11700 H 9750 t V W10 S6 [E0 10 5A 00 00] W10 v
# S13.0E 99999 H 10600 t V W10 S7 [E0 10 5A 00 00] W10 v
#
# Positioner for steerable dish:
#
# S360E 11700 V 9750 t V W20 P W20 t v
# S360E 99999 V 10600 t V W20 P W20 T v
# S360E 11700 H 9750 t V W20 P W20 t V
# S360E 99999 H 10600 t V W20 P W20 T V

43
diseqc.h
View File

@ -4,15 +4,33 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: diseqc.h 2.5 2011/09/17 13:15:17 kls Exp $
* $Id: diseqc.h 3.1 2013/06/12 11:52:17 kls Exp $
*/
#ifndef __DISEQC_H
#define __DISEQC_H
#include "config.h"
#include "positioner.h"
#include "thread.h"
class cDiseqcPositioner : public cPositioner {
private:
void SendDiseqc(uint8_t *Codes, int NumCodes);
public:
cDiseqcPositioner(void);
virtual void Drive(ePositionerDirection Direction);
virtual void Step(ePositionerDirection Direction, uint Steps = 1);
virtual void Halt(void);
virtual void SetLimit(ePositionerDirection Direction);
virtual void DisableLimits(void);
virtual void EnableLimits(void);
virtual void StorePosition(uint Number);
virtual void RecalcPositions(uint Number);
virtual void GotoPosition(uint Number, int Longitude);
virtual void GotoAngle(int Longitude);
};
class cScr : public cListObject {
private:
int devices;
@ -35,6 +53,7 @@ class cScrs : public cConfig<cScr> {
private:
cMutex mutex;
public:
bool Load(const char *FileName, bool AllowComments = false, bool MustExist = false);
cScr *GetUnused(int Device);
};
@ -50,8 +69,11 @@ public:
daVoltage18,
daMiniA,
daMiniB,
daPositionN,
daPositionA,
daScr,
daCodes,
daWait,
};
enum { MaxDiseqcCodes = 6 };
private:
@ -60,12 +82,14 @@ private:
int slof;
char polarization;
int lof;
mutable int position;
mutable int scrBank;
char *commands;
bool parsing;
uint SetScrFrequency(uint SatFrequency, const cScr *Scr, uint8_t *Codes) const;
int SetScrPin(const cScr *Scr, uint8_t *Codes) const;
const char *Wait(const char *s) const;
const char *GetPosition(const char *s) const;
const char *GetScrBank(const char *s) const;
const char *GetCodes(const char *s, uchar *Codes = NULL, uint8_t *MaxCodes = NULL) const;
public:
@ -89,16 +113,31 @@ public:
///< Frequency must be the frequency the tuner will be tuned to, and will be
///< set to the proper SCR frequency upon return (if SCR is used).
int Devices(void) const { return devices; }
///< Returns an integer where each bit represents one of the system's devices.
///< If a bit is set, this DiSEqC sequence applies to the corresponding device.
int Source(void) const { return source; }
///< Returns the satellite source this DiSEqC sequence applies to.
int Slof(void) const { return slof; }
///< Returns the switch frequency of the LNB this DiSEqC sequence applies to.
char Polarization(void) const { return polarization; }
///< Returns the signal polarization this DiSEqC sequence applies to.
int Lof(void) const { return lof; }
bool IsScr() const { return scrBank >= 0; }
///< Returns the local oscillator frequency of the LNB this DiSEqC sequence applies to.
int Position(void) const { return position; }
///< Indicates which positioning mode to use in order to move the dish to a given
///< satellite position. -1 means "no positioning" (i.e. fixed dish); 0 means the
///< positioner can be moved to any arbitrary satellite position (within its
///< limits); and a positive number means "move the dish to the position stored
///< under the given number".
bool IsScr(void) const { return scrBank >= 0; }
///< Returns true if this DiSEqC sequence uses Satellite Channel Routing.
const char *Commands(void) const { return commands; }
///< Returns a pointer to the actual commands of this DiSEqC sequence.
};
class cDiseqcs : public cConfig<cDiseqc> {
public:
bool Load(const char *FileName, bool AllowComments = false, bool MustExist = false);
const cDiseqc *Get(int Device, int Source, int Frequency, char Polarization, const cScr **Scr) const;
///< Selects a DiSEqC entry suitable for the given Device and tuning parameters.
///< If this DiSEqC entry requires SCR and the given *Scr is NULL

2
dvbci.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: dvbci.c 2.0 2007/01/04 12:49:10 kls Exp $
* $Id: dvbci.c 3.0 2007/01/04 12:49:10 kls Exp $
*/
#include "dvbci.h"

2
dvbci.h
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: dvbci.h 2.0 2006/11/26 11:19:42 kls Exp $
* $Id: dvbci.h 3.0 2006/11/26 11:19:42 kls Exp $
*/
#ifndef __DVBCI_H

101
dvbdevice.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: dvbdevice.c 2.88.1.1 2013/04/09 13:42:26 kls Exp $
* $Id: dvbdevice.c 3.3 2013/08/23 09:19:43 kls Exp $
*/
#include "dvbdevice.h"
@ -284,7 +284,7 @@ bool cDvbTransponderParameters::Parse(const char *s)
class cDvbTuner : public cThread {
private:
static cMutex bondMutex;
enum eTunerStatus { tsIdle, tsSet, tsTuned, tsLocked };
enum eTunerStatus { tsIdle, tsSet, tsPositioning, tsTuned, tsLocked };
int frontendType;
const cDvbDevice *device;
int fd_frontend;
@ -295,6 +295,9 @@ private:
time_t lastTimeoutReport;
cChannel channel;
const cDiseqc *lastDiseqc;
int diseqcOffset;
int lastSource;
cPositioner *positioner;
const cScr *scr;
bool lnbPowerTurnedOn;
eTunerStatus tunerStatus;
@ -309,6 +312,7 @@ private:
bool IsBondedMaster(void) const { return !bondedTuner || bondedMaster; }
void ClearEventQueue(void) const;
bool GetFrontendStatus(fe_status_t &Status) const;
cPositioner *GetPositioner(void);
void ExecuteDiseqc(const cDiseqc *Diseqc, unsigned int *Frequency);
void ResetToneAndVoltage(void);
bool SetFrontend(void);
@ -325,6 +329,7 @@ public:
bool IsTunedTo(const cChannel *Channel) const;
void SetChannel(const cChannel *Channel);
bool Locked(int TimeoutMs = 0);
const cPositioner *Positioner(void) const { return positioner; }
int GetSignalStrength(void) const;
int GetSignalQuality(void) const;
};
@ -343,6 +348,9 @@ cDvbTuner::cDvbTuner(const cDvbDevice *Device, int Fd_Frontend, int Adapter, int
lockTimeout = 0;
lastTimeoutReport = 0;
lastDiseqc = NULL;
diseqcOffset = 0;
lastSource = 0;
positioner = NULL;
scr = NULL;
lnbPowerTurnedOn = false;
tunerStatus = tsIdle;
@ -482,6 +490,7 @@ void cDvbTuner::SetChannel(const cChannel *Channel)
cMutexLock MutexLock(&mutex);
if (!IsTunedTo(Channel))
tunerStatus = tsSet;
diseqcOffset = 0;
channel = *Channel;
lastTimeoutReport = 0;
newSet.Broadcast();
@ -662,6 +671,15 @@ static unsigned int FrequencyToHz(unsigned int f)
return f;
}
cPositioner *cDvbTuner::GetPositioner(void)
{
if (!positioner) {
positioner = cPositioner::GetPositioner();
positioner->SetFrontend(fd_frontend);
}
return positioner;
}
void cDvbTuner::ExecuteDiseqc(const cDiseqc *Diseqc, unsigned int *Frequency)
{
if (!lnbPowerTurnedOn) {
@ -673,23 +691,47 @@ void cDvbTuner::ExecuteDiseqc(const cDiseqc *Diseqc, unsigned int *Frequency)
Mutex.Lock();
struct dvb_diseqc_master_cmd cmd;
const char *CurrentAction = NULL;
for (;;) {
cPositioner *Positioner = NULL;
bool Break = false;
for (int i = 0; !Break; i++) {
cmd.msg_len = sizeof(cmd.msg);
cDiseqc::eDiseqcActions da = Diseqc->Execute(&CurrentAction, cmd.msg, &cmd.msg_len, scr, Frequency);
if (da == cDiseqc::daNone)
if (da == cDiseqc::daNone) {
diseqcOffset = 0;
break;
}
bool d = i >= diseqcOffset;
switch (da) {
case cDiseqc::daToneOff: CHECK(ioctl(fd_frontend, FE_SET_TONE, SEC_TONE_OFF)); break;
case cDiseqc::daToneOn: CHECK(ioctl(fd_frontend, FE_SET_TONE, SEC_TONE_ON)); break;
case cDiseqc::daVoltage13: CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, SEC_VOLTAGE_13)); break;
case cDiseqc::daVoltage18: CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, SEC_VOLTAGE_18)); break;
case cDiseqc::daMiniA: CHECK(ioctl(fd_frontend, FE_DISEQC_SEND_BURST, SEC_MINI_A)); break;
case cDiseqc::daMiniB: CHECK(ioctl(fd_frontend, FE_DISEQC_SEND_BURST, SEC_MINI_B)); break;
case cDiseqc::daCodes: CHECK(ioctl(fd_frontend, FE_DISEQC_SEND_MASTER_CMD, &cmd)); break;
case cDiseqc::daToneOff: if (d) CHECK(ioctl(fd_frontend, FE_SET_TONE, SEC_TONE_OFF)); break;
case cDiseqc::daToneOn: if (d) CHECK(ioctl(fd_frontend, FE_SET_TONE, SEC_TONE_ON)); break;
case cDiseqc::daVoltage13: if (d) CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, SEC_VOLTAGE_13)); break;
case cDiseqc::daVoltage18: if (d) CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, SEC_VOLTAGE_18)); break;
case cDiseqc::daMiniA: if (d) CHECK(ioctl(fd_frontend, FE_DISEQC_SEND_BURST, SEC_MINI_A)); break;
case cDiseqc::daMiniB: if (d) CHECK(ioctl(fd_frontend, FE_DISEQC_SEND_BURST, SEC_MINI_B)); break;
case cDiseqc::daCodes: if (d) CHECK(ioctl(fd_frontend, FE_DISEQC_SEND_MASTER_CMD, &cmd)); break;
case cDiseqc::daPositionN: if ((Positioner = GetPositioner()) != NULL) {
if (d) {
Positioner->GotoPosition(Diseqc->Position(), cSource::Position(channel.Source()));
Break = Positioner->IsMoving();
}
}
break;
case cDiseqc::daPositionA: if ((Positioner = GetPositioner()) != NULL) {
if (d) {
Positioner->GotoAngle(cSource::Position(channel.Source()));
Break = Positioner->IsMoving();
}
}
break;
case cDiseqc::daScr:
case cDiseqc::daWait: break;
default: esyslog("ERROR: unknown diseqc command %d", da);
}
if (Break)
diseqcOffset = i + 1;
}
if (scr)
positioner = Positioner;
if (scr && !Break)
ResetToneAndVoltage(); // makes sure we don't block the bus!
if (Diseqc->IsScr())
Mutex.Unlock();
@ -697,7 +739,7 @@ void cDvbTuner::ExecuteDiseqc(const cDiseqc *Diseqc, unsigned int *Frequency)
void cDvbTuner::ResetToneAndVoltage(void)
{
CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, SEC_VOLTAGE_13));
CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, bondedTuner ? SEC_VOLTAGE_OFF : SEC_VOLTAGE_13));
CHECK(ioctl(fd_frontend, FE_SET_TONE, SEC_TONE_OFF));
}
@ -752,7 +794,7 @@ bool cDvbTuner::SetFrontend(void)
if (Setup.DiSEqC) {
if (const cDiseqc *diseqc = Diseqcs.Get(device->CardIndex() + 1, channel.Source(), frequency, dtp.Polarization(), &scr)) {
frequency -= diseqc->Lof();
if (diseqc != lastDiseqc || diseqc->IsScr()) {
if (diseqc != lastDiseqc || diseqc->IsScr() || diseqc->Position() >= 0 && channel.Source() != lastSource) {
if (IsBondedMaster()) {
ExecuteDiseqc(diseqc, &frequency);
if (frequency == 0)
@ -761,6 +803,7 @@ bool cDvbTuner::SetFrontend(void)
else
ResetToneAndVoltage();
lastDiseqc = diseqc;
lastSource = channel.Source();
}
}
else {
@ -877,15 +920,30 @@ void cDvbTuner::Action(void)
int WaitTime = 1000;
switch (tunerStatus) {
case tsIdle:
break;
break; // we want the TimedWait() below!
case tsSet:
tunerStatus = SetFrontend() ? tsTuned : tsIdle;
Timer.Set(tuneTimeout + (scr ? rand() % SCR_RANDOM_TIMEOUT : 0));
tunerStatus = SetFrontend() ? tsPositioning : tsIdle;
continue;
case tsPositioning:
if (positioner) {
if (positioner->IsMoving())
break; // we want the TimedWait() below!
else if (diseqcOffset) {
lastDiseqc = NULL;
tunerStatus = tsSet; // have it process the rest of the DiSEqC sequence
continue;
}
}
tunerStatus = tsTuned;
Timer.Set(tuneTimeout + (scr ? rand() % SCR_RANDOM_TIMEOUT : 0));
if (positioner)
continue;
// otherwise run directly into tsTuned...
case tsTuned:
if (Timer.TimedOut()) {
tunerStatus = tsSet;
lastDiseqc = NULL;
lastSource = 0;
if (time(NULL) - lastTimeoutReport > 60) { // let's not get too many of these
isyslog("frontend %d/%d timed out while tuning to channel %d, tp %d", adapter, frontend, channel.Number(), channel.Transponder());
lastTimeoutReport = time(NULL);
@ -893,10 +951,12 @@ void cDvbTuner::Action(void)
continue;
}
WaitTime = 100; // allows for a quick change from tsTuned to tsLocked
// run into tsLocked...
case tsLocked:
if (Status & FE_REINIT) {
tunerStatus = tsSet;
lastDiseqc = NULL;
lastSource = 0;
isyslog("frontend %d/%d was reinitialized", adapter, frontend);
lastTimeoutReport = 0;
continue;
@ -1357,7 +1417,7 @@ void cDvbDevice::UnBond(void)
bool cDvbDevice::BondingOk(const cChannel *Channel, bool ConsiderOccupied) const
{
cMutexLock MutexLock(&bondMutex);
if (bondedDevice)
if (bondedDevice || Positioner())
return dvbTuner && dvbTuner->BondingOk(Channel, ConsiderOccupied);
return true;
}
@ -1539,6 +1599,11 @@ int cDvbDevice::NumProvidedSystems(void) const
return numDeliverySystems + numModulations;
}
const cPositioner *cDvbDevice::Positioner(void) const
{
return dvbTuner ? dvbTuner->Positioner() : NULL;
}
int cDvbDevice::SignalStrength(void) const
{
return dvbTuner ? dvbTuner->GetSignalStrength() : -1;

3
dvbdevice.h
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: dvbdevice.h 2.29.1.1 2013/04/09 13:43:33 kls Exp $
* $Id: dvbdevice.h 3.2 2013/06/01 11:36:18 kls Exp $
*/
#ifndef __DVBDEVICE_H
@ -233,6 +233,7 @@ public:
virtual bool ProvidesChannel(const cChannel *Channel, int Priority = IDLEPRIORITY, bool *NeedsDetachReceivers = NULL) const;
virtual bool ProvidesEIT(void) const;
virtual int NumProvidedSystems(void) const;
virtual const cPositioner *Positioner(void) const;
virtual int SignalStrength(void) const;
virtual int SignalQuality(void) const;
virtual const cChannel *GetCurrentlyTunedTransponder(void) const;

2
dvbplayer.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: dvbplayer.c 2.35 2013/03/08 13:44:19 kls Exp $
* $Id: dvbplayer.c 3.0 2013/03/08 13:44:19 kls Exp $
*/
#include "dvbplayer.h"

2
dvbplayer.h
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: dvbplayer.h 2.1 2012/02/19 11:40:36 kls Exp $
* $Id: dvbplayer.h 3.0 2012/02/19 11:40:36 kls Exp $
*/
#ifndef __DVBPLAYER_H

2
dvbspu.c
View File

@ -8,7 +8,7 @@
*
* parts of this file are derived from the OMS program.
*
* $Id: dvbspu.c 2.11 2013/02/22 15:25:16 kls Exp $
* $Id: dvbspu.c 3.0 2013/02/22 15:25:16 kls Exp $
*/
#include "dvbspu.h"

2
dvbspu.h
View File

@ -8,7 +8,7 @@
*
* parts of this file are derived from the OMS program.
*
* $Id: dvbspu.h 2.6 2013/01/20 10:15:47 kls Exp $
* $Id: dvbspu.h 3.0 2013/01/20 10:15:47 kls Exp $
*/
#ifndef __DVBSPU_H

2
dvbsubtitle.c
View File

@ -7,7 +7,7 @@
* Original author: Marco Schluessler <marco@lordzodiac.de>
* With some input from the "subtitle plugin" by Pekka Virtanen <pekka.virtanen@sci.fi>
*
* $Id: dvbsubtitle.c 2.34 2013/02/22 15:25:25 kls Exp $
* $Id: dvbsubtitle.c 3.0 2013/02/22 15:25:25 kls Exp $
*/
#include "dvbsubtitle.h"

2
dvbsubtitle.h
View File

@ -6,7 +6,7 @@
*
* Original author: Marco Schluessler <marco@lordzodiac.de>
*
* $Id: dvbsubtitle.h 2.7 2012/03/11 13:34:12 kls Exp $
* $Id: dvbsubtitle.h 3.0 2012/03/11 13:34:12 kls Exp $
*/
#ifndef __DVBSUBTITLE_H

4
eit.c
View File

@ -8,7 +8,7 @@
* Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
* Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>.
*
* $Id: eit.c 2.23 2012/12/04 11:10:10 kls Exp $
* $Id: eit.c 3.1 2013/08/23 10:52:27 kls Exp $
*/
#include "eit.h"
@ -46,6 +46,7 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo
return;
}
EpgHandlers.BeginSegmentTransfer(channel, OnlyRunningStatus);
bool handledExternally = EpgHandlers.HandledExternally(channel);
cSchedule *pSchedule = (cSchedule *)Schedules->GetSchedule(channel, true);
@ -310,6 +311,7 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo
Schedules->SetModified(pSchedule);
}
Channels.Unlock();
EpgHandlers.EndSegmentTransfer(Modified, OnlyRunningStatus);
}
// --- cTDT ------------------------------------------------------------------

2
eit.h
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: eit.h 2.1 2010/01/03 15:28:34 kls Exp $
* $Id: eit.h 3.0 2010/01/03 15:28:34 kls Exp $
*/
#ifndef __EIT_H

2
eitscan.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: eitscan.c 2.7 2012/04/07 14:39:28 kls Exp $
* $Id: eitscan.c 3.0 2012/04/07 14:39:28 kls Exp $
*/
#include "eitscan.h"

2
eitscan.h
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: eitscan.h 2.1 2012/03/07 13:54:16 kls Exp $
* $Id: eitscan.h 3.0 2012/03/07 13:54:16 kls Exp $
*/
#ifndef __EITSCAN_H

18
epg.c
View File

@ -7,7 +7,7 @@
* Original version (as used in VDR before 1.3.0) written by
* Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
*
* $Id: epg.c 2.23 2013/02/17 14:12:07 kls Exp $
* $Id: epg.c 3.1 2013/08/23 10:46:33 kls Exp $
*/
#include "epg.h"
@ -1537,3 +1537,19 @@ void cEpgHandlers::DropOutdated(cSchedule *Schedule, time_t SegmentStart, time_t
}
Schedule->DropOutdated(SegmentStart, SegmentEnd, TableID, Version);
}
void cEpgHandlers::BeginSegmentTransfer(const cChannel *Channel, bool OnlyRunningStatus)
{
for (cEpgHandler *eh = First(); eh; eh = Next(eh)) {
if (eh->BeginSegmentTransfer(Channel, OnlyRunningStatus))
return;
}
}
void cEpgHandlers::EndSegmentTransfer(bool Modified, bool OnlyRunningStatus)
{
for (cEpgHandler *eh = First(); eh; eh = Next(eh)) {
if (eh->EndSegmentTransfer(Modified, OnlyRunningStatus))
return;
}
}

10
epg.h
View File

@ -7,7 +7,7 @@
* Original version (as used in VDR before 1.3.0) written by
* Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
*
* $Id: epg.h 2.15 2012/09/24 12:53:53 kls Exp $
* $Id: epg.h 3.1 2013/08/23 10:50:05 kls Exp $
*/
#ifndef __EPG_H
@ -273,6 +273,12 @@ public:
virtual bool DropOutdated(cSchedule *Schedule, time_t SegmentStart, time_t SegmentEnd, uchar TableID, uchar Version) { return false; }
///< Takes a look at all EPG events between SegmentStart and SegmentEnd and
///< drops outdated events.
virtual bool BeginSegmentTransfer(const cChannel *Channel, bool OnlyRunningStatus) { return false; }
///< Called directly after IgnoreChannel() before any other handler method is called.
///< Designed to give handlers the possibility to prepare a database transaction.
virtual bool EndSegmentTransfer(bool Modified, bool OnlyRunningStatus) { return false; }
///< Called after the segment data has been processed.
///< At this point handlers should close/commit/rollback any pending database transactions.
};
class cEpgHandlers : public cList<cEpgHandler> {
@ -295,6 +301,8 @@ public:
void HandleEvent(cEvent *Event);
void SortSchedule(cSchedule *Schedule);
void DropOutdated(cSchedule *Schedule, time_t SegmentStart, time_t SegmentEnd, uchar TableID, uchar Version);
void BeginSegmentTransfer(const cChannel *Channel, bool OnlyRunningStatus);
void EndSegmentTransfer(bool Modified, bool OnlyRunningStatus);
};
extern cEpgHandlers EpgHandlers;

2
epg2html
View File

@ -12,7 +12,7 @@
# See the main source file 'vdr.c' for copyright information and
# how to reach the author.
#
# $Id: epg2html 2.2 2013/03/04 13:02:20 kls Exp $
# $Id: epg2html 3.0 2013/03/04 13:02:20 kls Exp $
@Index = ();
($Charset = $ENV{LANG}) =~ s/^[^.]*\.?(.*)/$1/;

2
filter.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: filter.c 2.0 2004/01/11 13:31:34 kls Exp $
* $Id: filter.c 3.0 2004/01/11 13:31:34 kls Exp $
*/
#include "filter.h"

2
filter.h
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: filter.h 2.0 2004/01/11 13:31:59 kls Exp $
* $Id: filter.h 3.0 2004/01/11 13:31:59 kls Exp $
*/
#ifndef __FILTER_H

2
font.c
View File

@ -6,7 +6,7 @@
*
* BiDi support by Osama Alrawab <alrawab@hotmail.com> @2008 Tripoli-Libya.
*
* $Id: font.c 2.13.1.1 2013/04/07 14:54:15 kls Exp $
* $Id: font.c 3.1 2013/04/07 14:42:13 kls Exp $
*/
#include "font.h"

2
font.h
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: font.h 2.7 2013/02/17 13:17:42 kls Exp $
* $Id: font.h 3.0 2013/02/17 13:17:42 kls Exp $
*/
#ifndef __FONT_H

2
i18n.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: i18n.c 2.5 2012/09/01 10:53:43 kls Exp $
* $Id: i18n.c 3.0 2012/09/01 10:53:43 kls Exp $
*/
/*

2
i18n.h
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: i18n.h 2.1 2012/03/11 14:07:45 kls Exp $
* $Id: i18n.h 3.0 2012/03/11 14:07:45 kls Exp $
*/
#ifndef __I18N_H

2
interface.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: interface.c 2.2 2012/11/19 12:21:43 kls Exp $
* $Id: interface.c 3.0 2012/11/19 12:21:43 kls Exp $
*/
#include "interface.h"

2
interface.h
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: interface.h 2.0 2004/05/01 11:11:13 kls Exp $
* $Id: interface.h 3.0 2004/05/01 11:11:13 kls Exp $
*/
#ifndef __INTERFACE_H

2
keys.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: keys.c 2.2 2012/12/04 12:52:52 kls Exp $
* $Id: keys.c 3.0 2012/12/04 12:52:52 kls Exp $
*/
#include "keys.h"

2
keys.h
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: keys.h 2.2 2012/12/04 12:51:25 kls Exp $
* $Id: keys.h 3.0 2012/12/04 12:51:25 kls Exp $
*/
#ifndef __KEYS_H

2
libsi/Makefile
View File

@ -1,7 +1,7 @@
#
# Makefile for a libsi
#
# $Id: Makefile 2.4 2012/12/18 13:35:54 kls Exp $
# $Id: Makefile 3.0 2012/12/18 13:35:54 kls Exp $
### The archiver options:

2
libsi/descriptor.c
View File

@ -6,7 +6,7 @@
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
* $Id: descriptor.c 2.4 2012/01/11 11:35:17 kls Exp $
* $Id: descriptor.c 3.0 2012/01/11 11:35:17 kls Exp $
* *
***************************************************************************/

2
libsi/descriptor.h
View File

@ -6,7 +6,7 @@
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
* $Id: descriptor.h 2.4 2012/01/11 11:35:17 kls Exp $
* $Id: descriptor.h 3.0 2012/01/11 11:35:17 kls Exp $
* *
***************************************************************************/

2
libsi/gendescr
View File

@ -1,6 +1,6 @@
#!/usr/bin/perl
# $Id: gendescr 2.0 2003/12/13 10:40:53 kls Exp $
# $Id: gendescr 3.0 2003/12/13 10:40:53 kls Exp $
print "Name (ohne ...Descriptor):";
$name=<STDIN>;

2
libsi/headers.h
View File

@ -10,7 +10,7 @@
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
* $Id: headers.h 2.5 2012/06/09 14:37:24 kls Exp $
* $Id: headers.h 3.0 2012/06/09 14:37:24 kls Exp $
* *
***************************************************************************/

2
libsi/section.c
View File

@ -6,7 +6,7 @@
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
* $Id: section.c 2.0 2006/04/14 10:53:44 kls Exp $
* $Id: section.c 3.0 2006/04/14 10:53:44 kls Exp $
* *
***************************************************************************/

2
libsi/section.h
View File

@ -6,7 +6,7 @@
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
* $Id: section.h 2.1 2012/02/26 13:58:26 kls Exp $
* $Id: section.h 3.0 2012/02/26 13:58:26 kls Exp $
* *
***************************************************************************/

2
libsi/si.c
View File

@ -6,7 +6,7 @@
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
* $Id: si.c 2.8 2012/09/29 14:44:20 kls Exp $
* $Id: si.c 3.0 2012/09/29 14:44:20 kls Exp $
* *
***************************************************************************/

2
libsi/si.h
View File

@ -6,7 +6,7 @@
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
* $Id: si.h 2.6 2012/10/15 11:56:06 kls Exp $
* $Id: si.h 3.0 2012/10/15 11:56:06 kls Exp $
* *
***************************************************************************/

Some files were not shown because too many files have changed in this diff Show More