frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Made cChannel::GetChannelID() inline

Browse Source
This commit is contained in:
Klaus Schmidinger 2005-05-28 13:57:08 +02:00
parent 7701acd968
commit ae3da0bcec
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
channels.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: channels.c 1.40 2005/05/28 09:44:41 kls Exp $ * $Id: channels.c 1.41 2005/05/28 13:55:57 kls Exp $
*/ */
#include "channels.h" #include "channels.h"
@ -258,11 +258,6 @@ int cChannel::Transponder(void) const
return tf; return tf;
} }
tChannelID cChannel::GetChannelID(void) const
{
return tChannelID(source, nid, (nid || tid) ? tid : Transponder(), sid, rid);
}
int cChannel::Modification(int Mask) int cChannel::Modification(int Mask)
{ {
int Result = modification & Mask; int Result = modification & Mask;

4
channels.h
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: channels.h 1.31 2005/05/28 09:47:23 kls Exp $ * $Id: channels.h 1.32 2005/05/28 13:57:08 kls Exp $
*/ */
#ifndef __CHANNELS_H #ifndef __CHANNELS_H
@ -179,7 +179,7 @@ public:
bool IsCable(void) const { return cSource::IsCable(source); } bool IsCable(void) const { return cSource::IsCable(source); }
bool IsSat(void) const { return cSource::IsSat(source); } bool IsSat(void) const { return cSource::IsSat(source); }
bool IsTerr(void) const { return cSource::IsTerr(source); } bool IsTerr(void) const { return cSource::IsTerr(source); }
tChannelID GetChannelID(void) const; tChannelID GetChannelID(void) const { return tChannelID(source, nid, (nid || tid) ? tid : Transponder(), sid, rid); }
int Modification(int Mask = CHANNELMOD_ALL); int Modification(int Mask = CHANNELMOD_ALL);
bool SetSatTransponderData(int Source, int Frequency, char Polarization, int Srate, int CoderateH); bool SetSatTransponderData(int Source, int Frequency, char Polarization, int Srate, int CoderateH);
bool SetCableTransponderData(int Source, int Frequency, int Modulation, int Srate, int CoderateH); bool SetCableTransponderData(int Source, int Frequency, int Modulation, int Srate, int CoderateH);