From ae3da0bcec271892b4e4aa1c34a0eb06c3856035 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Sat, 28 May 2005 13:57:08 +0200
Subject: [PATCH] Made cChannel::GetChannelID() inline

---
 channels.c | 7 +------
 channels.h | 4 ++--
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/channels.c b/channels.c
index 7185a99f..084b6996 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * 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"
@@ -258,11 +258,6 @@ int cChannel::Transponder(void) const
   return tf;
 }
 
-tChannelID cChannel::GetChannelID(void) const
-{
-  return tChannelID(source, nid, (nid || tid) ? tid : Transponder(), sid, rid);
-}
-
 int cChannel::Modification(int Mask)
 {
   int Result = modification & Mask;
diff --git a/channels.h b/channels.h
index 297aab55..3cb7e8f8 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 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
@@ -179,7 +179,7 @@ public:
   bool IsCable(void) const { return cSource::IsCable(source); }
   bool IsSat(void) const { return cSource::IsSat(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);
   bool SetSatTransponderData(int Source, int Frequency, char Polarization, int Srate, int CoderateH);
   bool SetCableTransponderData(int Source, int Frequency, int Modulation, int Srate, int CoderateH);