summaryrefslogtreecommitdiff
path: root/config.h
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2002-10-06 10:25:42 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2002-10-06 10:25:42 +0200
commit962596f4abc3790ac0f3f317079a3362210fff8f (patch)
treeb9428aea092f90731b389604fcc8540070dbf556 /config.h
parentb7615a7ae144789da14d32019b2f86fc4bf6dcef (diff)
downloadvdr-962596f4abc3790ac0f3f317079a3362210fff8f.tar.gz
vdr-962596f4abc3790ac0f3f317079a3362210fff8f.tar.bz2
Modified channel handling; full DiSEqC support
Diffstat (limited to 'config.h')
-rw-r--r--config.h50
1 files changed, 2 insertions, 48 deletions
diff --git a/config.h b/config.h
index c8a9cdd0..2da1420b 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: config.h 1.130 2002/09/30 15:57:23 kls Exp $
+ * $Id: config.h 1.131 2002/10/05 09:58:58 kls Exp $
*/
#ifndef __CONFIG_H
@@ -32,34 +32,6 @@
#define MaxFileName 256
-#define ISTRANSPONDER(f1, f2) (abs((f1) - (f2)) < 4)
-
-class cChannel : public cListObject {
-private:
- static char *buffer;
- static const char *ToText(cChannel *Channel);
-public:
- enum { MaxChannelName = 32 }; // 31 chars + terminating 0!
- char name[MaxChannelName];
- int frequency; // MHz
- char polarization;
- int diseqc;
- int srate;
- int vpid;
- int apid1, apid2;
- int dpid1, dpid2;
- int tpid;
- int ca;
- int pnr;
- int number; // Sequence number assigned on load
- bool groupSep;
- cChannel(void);
- cChannel(const cChannel *Channel);
- const char *ToText(void);
- bool Parse(const char *s);
- bool Save(FILE *f);
- };
-
enum eTimerActive { taInactive = 0,
taActive = 1,
taInstant = 2,
@@ -193,7 +165,7 @@ public:
if (l->Parse(buffer))
Add(l);
else {
- esyslog("error in %s, line %d\n", fileName, line);
+ esyslog("ERROR: error in %s, line %d\n", fileName, line);
delete l;
result = false;
break;
@@ -229,23 +201,6 @@ public:
}
};
-class cChannels : public cConfig<cChannel> {
-protected:
- int maxNumber;
-public:
- cChannels(void) { maxNumber = 0; }
- virtual bool Load(const char *FileName, bool AllowComments = false);
- int GetNextGroup(int Idx); // Get next channel group
- int GetPrevGroup(int Idx); // Get previous channel group
- int GetNextNormal(int Idx); // Get next normal channel (not group)
- void ReNumber(void); // Recalculate 'number' based on channel type
- cChannel *GetByNumber(int Number);
- cChannel *GetByServiceID(unsigned short ServiceId);
- const char *GetChannelNameByNumber(int Number);
- bool SwitchTo(int Number);
- int MaxNumber(void) { return maxNumber; }
- };
-
class cTimers : public cConfig<cTimer> {
public:
cTimer *GetTimer(cTimer *Timer);
@@ -265,7 +220,6 @@ public:
const cCaDefinition *Get(int Number);
};
-extern cChannels Channels;
extern cTimers Timers;
extern cCommands Commands;
extern cSVDRPhosts SVDRPhosts;