From 5ce592e54a4aa741444afae8eb80dff47bc355fd Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sun, 28 Feb 2010 16:07:00 +0100 Subject: Version 1.7.13 - Updated the Italian OSD texts (thanks to Diego Pierotto). - Changed the position of Sirius 4 to S4.8E in sources.conf (thanks to Alexander Gross). - Updated the Finnish OSD texts (thanks to Rolf Ahrenberg). - Moved the declaration of cMenuCommands to menu.h, so that plugins can use it. - Added a note to the MANUAL, saying that adding new transponders only works if the "EPG scan" is active (suggested by Halim Sahim). - Improved handling frames at the beginning and end of a recording in cDvbPlayer for devices with large buffers (thanks to Reinhard Nissl). - Implemented cDeviceHook to allow plugins more control over which device can provide which transponder (thanks to Reinhard Nissl). - Implemented cDevice::GetCurrentlyTunedTransponder() (thanks to Reinhard Nissl). - Moved strictly necessary Makefile options into Make.global, which is included by all plugins (thanks to Paul Menzel). The Makefiles of existing plugins should be modified like this: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------------------------------------------------------ --- PLUGINS/src/hello/Makefile 2009/10/18 14:00:07 2.1 +++ PLUGINS/src/hello/Makefile 2010/02/06 14:50:03 2.2 @@ -18,7 +18,7 @@ ### The C++ compiler and options: CXX ?= g++ -CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses +CXXFLAGS ?= -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses ### The directory environment: @@ -26,6 +26,10 @@ LIBDIR = ../../lib TMPDIR = /tmp +### Make sure that necessary options are included: + +include $(VDRDIR)/Make.global + ### Allow user defined options to overwrite defaults: -include $(VDRDIR)/Make.config ------------------------------------------------------------ - Added device definitions to the diseqc.conf file format, so that certain satellite positions can be limited to a given list of devices. This obsoletes the SOURCECAPS patch. - Keeping subtitles visible when pausing replay (thanks to Rolf Ahrenberg). - Fixed adding new transponders in case there is only a single channel in the channel list (reported by Halim Sahin). - The file name in the "Timers" menu now shows only the base name of the recording without the folder path (if any). Otherwise with long folder paths the actual recording name was not visible at all. - Updated the Romanian OSD texts (thanks to Lucian Muresan). - Exported some libsi functions (thanks to Lucian Muresan). - Improved scalability of the default skins. - Fixed the German translation of "Folder name must not contain '%c'!" (thanks to Frank Schmirler). - Updated the Estonian OSD texts (thanks to Arthur Konovalov). - Plugins can now define new sources. In order to implement this, the following changes were made: + The transponder parameter string is no longer interpreted by cChannel, but rather stored as is and used only by the respective device. That way plugins can use a channel's parameter string to store arbitrary data (see vdr.5). + The new class cSourceParam can be used by plugins to define new sources, and to implement OSD items that will be used in the channel editor for editing the source specific parameters of a channel (see dvbdevice.c for an example of how this is done for the default DVB devices). + Purely numerical values are no longer accepted in the 'source' parameter of a channel. This obsoletes the PLUGINPARAM patch. - Updated the Lithuanian OSD texts (thanks to Valdemaras Pipiras). - cSafeFile::Close() now flushes the file (suggested by Stephan Austermühle). - The option "Setup/DVB/Use Dolby Digital" now only controls whether Dolby Digital tracks appear in the "Audio" menu. Dolby Digital is always recorded. This obsoletes the DOLBYINREC patch. --- channels.h | 54 +++++------------------------------------------------- 1 file changed, 5 insertions(+), 49 deletions(-) (limited to 'channels.h') diff --git a/channels.h b/channels.h index b465f6a..4ed1358 100644 --- a/channels.h +++ b/channels.h @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: channels.h 2.7 2009/12/06 12:57:45 kls Exp $ + * $Id: channels.h 2.8 2010/02/21 14:05:49 kls Exp $ */ #ifndef __CHANNELS_H @@ -47,27 +47,6 @@ #define CA_ENCRYPTED_MIN 0x0100 #define CA_ENCRYPTED_MAX 0xFFFF -struct tChannelParameterMap { - int userValue; - int driverValue; - const char *userString; - }; - -int MapToUser(int Value, const tChannelParameterMap *Map, const char **String = NULL); -int MapToDriver(int Value, const tChannelParameterMap *Map); -int UserIndex(int Value, const tChannelParameterMap *Map); -int DriverIndex(int Value, const tChannelParameterMap *Map); - -extern const tChannelParameterMap InversionValues[]; -extern const tChannelParameterMap BandwidthValues[]; -extern const tChannelParameterMap CoderateValues[]; -extern const tChannelParameterMap ModulationValues[]; -extern const tChannelParameterMap SystemValues[]; -extern const tChannelParameterMap TransmissionValues[]; -extern const tChannelParameterMap GuardValues[]; -extern const tChannelParameterMap HierarchyValues[]; -extern const tChannelParameterMap RollOffValues[]; - struct tChannelID { private: int source; @@ -110,6 +89,7 @@ class cSchedule; class cChannel : public cListObject { friend class cSchedules; friend class cMenuEditChannel; + friend class cDvbSourceParam; private: static cString ToText(const cChannel *Channel); char *name; @@ -140,25 +120,13 @@ private: int rid; int number; // Sequence number assigned on load bool groupSep; - char polarization; - int inversion; - int bandwidth; - int coderateH; - int coderateL; - int modulation; - int system; - int transmission; - int guard; - int hierarchy; - int rollOff; int __EndData__; + cString parameters; int modification; mutable const cSchedule *schedule; cLinkChannels *linkChannels; cChannel *refChannel; cString TransponderDataToString(void) const; - cString ParametersToString(void) const; - bool StringToParameters(const char *s); public: cChannel(void); cChannel(const cChannel &Channel); @@ -201,17 +169,7 @@ public: int Number(void) const { return number; } void SetNumber(int Number) { number = Number; } bool GroupSep(void) const { return groupSep; } - char Polarization(void) const { return polarization; } - int Inversion(void) const { return inversion; } - int Bandwidth(void) const { return bandwidth; } - int CoderateH(void) const { return coderateH; } - int CoderateL(void) const { return coderateL; } - int Modulation(void) const { return modulation; } - int System(void) const { return system; } - int Transmission(void) const { return transmission; } - int Guard(void) const { return guard; } - int Hierarchy(void) const { return hierarchy; } - int RollOff(void) const { return rollOff; } + const char *Parameters(void) const { return parameters; } const cLinkChannels* LinkChannels(void) const { return linkChannels; } const cChannel *RefChannel(void) const { return refChannel; } bool IsCable(void) const { return cSource::IsCable(source); } @@ -221,9 +179,7 @@ public: bool HasTimer(void) const; int Modification(int Mask = CHANNELMOD_ALL); void CopyTransponderData(const cChannel *Channel); - bool SetSatTransponderData(int Source, int Frequency, char Polarization, int Srate, int CoderateH, int Modulation, int System, int RollOff); - bool SetCableTransponderData(int Source, int Frequency, int Modulation, int Srate, int CoderateH); - bool SetTerrTransponderData(int Source, int Frequency, int Bandwidth, int Modulation, int Hierarchy, int CodeRateH, int CodeRateL, int Guard, int Transmission); + bool SetTransponderData(int Source, int Frequency, int Srate, const char *Parameters, bool Quiet = false); void SetId(int Nid, int Tid, int Sid, int Rid = 0); void SetName(const char *Name, const char *ShortName, const char *Provider); void SetPortalName(const char *PortalName); -- cgit v1.2.3