diff options
author | Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de> | 2013-02-17 15:53:00 +0100 |
---|---|---|
committer | Dieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de> | 2013-02-17 18:11:16 +0100 |
commit | 4c59501a6b52816000d6c483fae619ebccfcdc9b (patch) | |
tree | c3036d65a88d45e0113a41cb78ef8030138de691 /device.h | |
parent | 14bd32b9486980a99ca552ec4eda6a11ab3a286a (diff) | |
download | vdr-patches-4c59501a6b52816000d6c483fae619ebccfcdc9b.tar.gz vdr-patches-4c59501a6b52816000d6c483fae619ebccfcdc9b.tar.bz2 |
Version 1.7.38
VDR developer version 1.7.38 is now available at
ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.38.tar.bz2
A 'diff' against the previous version is available at
ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.37-1.7.38.diff
MD5 checksums:
f4ef0f60ed662f3c983a830da67df9b2 vdr-1.7.38.tar.bz2
e945b0f44e13ed768de726cf6e66317c vdr-1.7.37-1.7.38.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.
Approaching version 2.0.0:
==========================
If all goes well, there should be no more functional or API changes
before the final version 2.0.0. There will just be a few more fixes.
From the HISTORY file:
- Updated the Ukrainian OSD texts (thanks to Yarema Aka Knedlyk).
- Updated the Estonian OSD texts (thanks to Arthur Konovalov).
- Updated the Romanian OSD texts (thanks to Lucian Muresan).
- Updated the French OSD texts (thanks to Marc Perrudin, Bernard Jaulini and Peter
Münster).
- Updated the Macedonian OSD texts (thanks to Dimitar Petrovski).
- Fixed moving editing marks, so that they don't get overwritten with old values
through an update of the marks file.
- Removed an invalid line from channels.conf.terr (reported by Lars Hanisch).
- Fixed an unexpected k_Repeat key event after a k_Release in lirc.c.
- Fixed permissions of po/sr_SR.po (reported by Dominic Evans).
- Updated the Italian OSD texts (thanks to Diego Pierotto).
- Fixed using "Pause" and "Slow motion" near the end of a recording (replay stopped
a few seconds after the end of the recording file has been reached).
- 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 (reported by Andre Weidemann).
- Fixed the description of the OSD drawing functions DrawEllipse() (the values -5...-8
for the Quadrants parameter are not implemented).
- Made cOsd::DestroyPixmap() "NULL proof".
- Now deleting any previously allocated pixmaps in cOsd::SetAreas().
- Added demos of the DrawEllipse() and DrawSlope() function to the 'osddemo'
plugin (press '1' or '2', respectively).
- Updated the Lithuanian OSD texts (thanks to Valdemaras Pipiras).
- The timeout for trying to switch to a valid programme is now reset immediately once
a programme has been found.
- No longer checking for EOPNOTSUPP in cDvbTuner::GetSignalQuality() to avoid breaking
this function in case the driver suddenly decides to return a different errno value
if an operation is not supported.
- Moved the definition of TIMERMACRO_TITLE and TIMERMACRO_EPISODE from recording.h to
config.h and using them to initialize Setup.NameInstantRecord (avoids having the same
information in two places).
- Fixed the return value of cOsdProvider::StoreImage() in case there is no OSD provider.
- Fixed a crash in cMenuEditChanItem::Set() when entering a channel number that
doesn't exist (reported by Mikael Hübsch).
- Fixed displaying pending timers in "alert" mode in the LCARS skin.
- Added missing $(LDFLAGS) to the Makefile of the dvbhddevice plugin (thanks to Ville
Skyttä).
- Fixed some spellings in PLUGINS.html and Doxyfile (thanks to Ville Skyttä).
- Added '-p' to the cp command in the install-conf target of the Makefile (thanks to
Ville Skyttä).
- Added missing 'const' to cDevice::HasProgramme() and cDevice::HasLock().
- Fixed determining the priority of the primary device in case it is neither replaying
nor receiving a live channel (thanks to Matthias Senzel for reporting a problem with
switching back to live viewing after replay in a setup with device bonding).
- Removed all \return and \param tags from comment lines marked with "///<" for Doxygen.
There was only a rather small number of these, and I would probably always forget to
put them in place when writing future comments, so I decided to drop them entirely.
- Added Doxyfile.filter to have special characters escaped that would otherwise be
dropped by Doxygen (reported by Ville Skyttä).
- Using 'cat' instead of 'cp' to copy the Doxyfile to avoid problems in case Doxyfile
is write protected.
- Updated the Doxyfile with a newer version of Doxygen.
- Turned off following symlinks in the Doxyfile.
- Removed trailing whitespace.
- Expanded tabs in PLUGINS/src/dvbhddevice/setup.c.
- Some formatting fixes.
Diffstat (limited to 'device.h')
-rw-r--r-- | device.h | 52 |
1 files changed, 26 insertions, 26 deletions
@@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: device.h 2.45 2013/02/01 11:54:08 kls Exp $ + * $Id: device.h 2.47 2013/02/16 15:20:01 kls Exp $ */ #ifndef __DEVICE_H @@ -116,7 +116,7 @@ public: ///< Waits until all devices have become ready, or the given Timeout ///< (seconds) has expired. While waiting, the Ready() function of each ///< device is called in turn, until they all return true. - ///< \return True if all devices have become ready within the given + ///< Returns true if all devices have become ready within the given ///< timeout. static void SetUseDevice(int n); ///< Sets the 'useDevice' flag of the given device. @@ -127,8 +127,8 @@ public: ///< this instance of VDR. static bool SetPrimaryDevice(int n); ///< Sets the primary device to 'n'. - ///< \param n must be in the range 1...numDevices. - ///< \return true if this was possible. + ///< n must be in the range 1...numDevices. + ///< Returns true if this was possible. static cDevice *PrimaryDevice(void) { return primaryDevice; } ///< Returns the primary device. static cDevice *ActualDevice(void); @@ -136,8 +136,8 @@ public: ///< primary device otherwise. static cDevice *GetDevice(int Index); ///< Gets the device with the given Index. - ///< \param Index must be in the range 0..numDevices-1. - ///< \return A pointer to the device, or NULL if the Index was invalid. + ///< Index must be in the range 0..numDevices-1. + ///< Returns a pointer to the device, or NULL if the Index was invalid. static cDevice *GetDevice(const cChannel *Channel, int Priority, bool LiveView, bool Query = false); ///< Returns a device that is able to receive the given Channel at the ///< given Priority, with the least impact on active recordings and @@ -328,13 +328,13 @@ public: ///< after the device has been successfully tuned to the requested transponder. ///< Seconds will be silently limited to MAXOCCUPIEDTIMEOUT. Values less than ///< 0 will be silently ignored. - virtual bool HasLock(int TimeoutMs = 0); + virtual bool HasLock(int TimeoutMs = 0) const; ///< Returns true if the device has a lock on the requested transponder. ///< Default is true, a specific device implementation may return false ///< to indicate that it is not ready yet. ///< If TimeoutMs is not zero, waits for the given number of milliseconds ///< before returning false. - virtual bool HasProgramme(void); + virtual bool HasProgramme(void) const; ///< Returns true if the device is currently showing any programme to ///< the user, either through replaying or live. @@ -432,19 +432,19 @@ public: public: virtual uchar *GrabImage(int &Size, bool Jpeg = true, int Quality = -1, int SizeX = -1, int SizeY = -1); ///< Grabs the currently visible screen image. - ///< \param Size The size of the returned data block. - ///< \param Jpeg If true will write a JPEG file. Otherwise a PNM file will be written. - ///< \param Quality The compression factor for JPEG. 1 will create a very blocky - ///< and small image, 70..80 will yield reasonable quality images while keeping the - ///< image file size around 50 KB for a full frame. The default will create a big - ///< but very high quality image. - ///< \param SizeX The number of horizontal pixels in the frame (default is the current screen width). - ///< \param SizeY The number of vertical pixels in the frame (default is the current screen height). - ///< \return A pointer to the grabbed image data, or NULL in case of an error. + ///< Size is the size of the returned data block. + ///< If Jpeg is true it will write a JPEG file. Otherwise a PNM file will be written. + ///< Quality is the compression factor for JPEG. 1 will create a very blocky + ///< and small image, 70..80 will yield reasonable quality images while keeping the + ///< image file size around 50 KB for a full frame. The default will create a big + ///< but very high quality image. + ///< SizeX is the number of horizontal pixels in the frame (default is the current screen width). + ///< SizeY is the number of vertical pixels in the frame (default is the current screen height). + ///< Returns a pointer to the grabbed image data, or NULL in case of an error. ///< The caller takes ownership of the returned memory and must free() it once it isn't needed any more. bool GrabImageFile(const char *FileName, bool Jpeg = true, int Quality = -1, int SizeX = -1, int SizeY = -1); ///< Calls GrabImage() and stores the resulting image in a file with the given name. - ///< \return True if all went well. + ///< Returns true if all went well. ///< The caller is responsible for making sure that the given file name ///< doesn't lead to overwriting any important other file. @@ -509,7 +509,7 @@ public: ///< Index tells which track of the given basic type is meant. ///< If Id is 0 any existing id will be left untouched and only the ///< given Language and Description will be set. - ///< \return Returns true if the track was set correctly, false otherwise. + ///< Returns true if the track was set correctly, false otherwise. const tTrackId *GetTrack(eTrackType Type); ///< Returns a pointer to the given track id, or NULL if Type is not ///< less than ttMaxTrackTypes. @@ -525,14 +525,14 @@ public: eTrackType GetCurrentAudioTrack(void) const { return currentAudioTrack; } bool SetCurrentAudioTrack(eTrackType Type); ///< Sets the current audio track to the given Type. - ///< \return Returns true if Type is a valid audio track, false otherwise. + ///< Returns true if Type is a valid audio track, false otherwise. eTrackType GetCurrentSubtitleTrack(void) const { return currentSubtitleTrack; } bool SetCurrentSubtitleTrack(eTrackType Type, bool Manual = false); ///< Sets the current subtitle track to the given Type. ///< IF Manual is true, no automatic preferred subtitle language selection ///< will be done for the rest of the current replay session, or until ///< the channel is changed. - ///< \return Returns true if Type is a valid subtitle track, false otherwise. + ///< Returns true if Type is a valid subtitle track, false otherwise. void EnsureAudioTrack(bool Force = false); ///< Makes sure an audio track is selected that is actually available. ///< If Force is true, the language and Dolby Digital settings will @@ -593,13 +593,13 @@ protected: ///< Returns true if this device can currently start a replay session. virtual bool SetPlayMode(ePlayMode PlayMode); ///< Sets the device into the given play mode. - ///< \return true if the operation was successful. + ///< Returns true if the operation was successful. virtual int PlayVideo(const uchar *Data, int Length); ///< Plays the given data block as video. ///< Data points to exactly one complete PES packet of the given Length. ///< PlayVideo() shall process the packet either as a whole (returning ///< Length) or not at all (returning 0 or -1 and setting 'errno' accordingly). - ///< \return Returns the number of bytes actually taken from Data, or -1 + ///< Returns the number of bytes actually taken from Data, or -1 ///< in case of an error. virtual int PlayAudio(const uchar *Data, int Length, uchar Id); ///< Plays the given data block as audio. @@ -607,14 +607,14 @@ protected: ///< Id indicates the type of audio data this packet holds. ///< PlayAudio() shall process the packet either as a whole (returning ///< Length) or not at all (returning 0 or -1 and setting 'errno' accordingly). - ///< \return Returns the number of bytes actually taken from Data, or -1 + ///< Returns the number of bytes actually taken from Data, or -1 ///< in case of an error. virtual int PlaySubtitle(const uchar *Data, int Length); ///< Plays the given data block as a subtitle. ///< Data points to exactly one complete PES packet of the given Length. ///< PlaySubtitle() shall process the packet either as a whole (returning ///< Length) or not at all (returning 0 or -1 and setting 'errno' accordingly). - ///< \return Returns the number of bytes actually taken from Data, or -1 + ///< Returns the number of bytes actually taken from Data, or -1 ///< in case of an error. virtual int PlayPesPacket(const uchar *Data, int Length, bool VideoOnly = false); ///< Plays the single PES packet in Data with the given Length. @@ -658,7 +658,7 @@ public: ///< Only the lower 32 bit of this value are actually used, since some ///< devices can't handle the msb correctly. virtual bool IsPlayingVideo(void) const { return isPlayingVideo; } - ///< \return Returns true if the currently attached player has delivered + ///< Returns true if the currently attached player has delivered ///< any video packets. virtual cRect CanScaleVideo(const cRect &Rect, int Alignment = taCenter) { return cRect::Null; } ///< Asks the output device whether it can scale the currently shown video in |