From 8f283f27f50fb221210400b7a77e90eda7a7bf29 Mon Sep 17 00:00:00 2001
From: Rolf Ahrenberg <Rolf.Ahrenberg@sci.fi>
Date: Sun, 23 Nov 2008 03:12:21 +0200
Subject: [PATCH] Removed the FEMON_NTSC option.

---
 HISTORY    | 1 +
 Makefile   | 7 -------
 README     | 2 +-
 femoncfg.c | 4 ----
 4 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/HISTORY b/HISTORY
index ce442d7..a7f86b5 100644
--- a/HISTORY
+++ b/HISTORY
@@ -318,3 +318,4 @@ VDR Plugin 'femon' Revision History
 - Fixed a memory leak.
 - Added a check for the minimum OSD height.
 - Replaced "Use single area (8bpp)" option with VDR's "Setup/OSD/Anti-alias".
+- Removed the FEMON_NTSC option.
diff --git a/Makefile b/Makefile
index 9b4d90d..6ebf289 100644
--- a/Makefile
+++ b/Makefile
@@ -5,9 +5,6 @@
 # Debugging on/off 
 #FEMON_DEBUG = 1
 
-# NTSC on/off 
-#FEMON_NTSC = 1
-
 # Strip debug symbols?  Set eg. to /bin/true if not
 STRIP = strip
 
@@ -53,10 +50,6 @@ INCLUDES += -I$(VDRDIR)/include
 
 DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
 
-ifdef FEMON_NTSC
-DEFINES += -DNTSC
-endif
-
 ifdef FEMON_DEBUG
 DEFINES += -DDEBUG
 endif
diff --git a/README b/README
index e9e42ed..201bdcb 100644
--- a/README
+++ b/README
@@ -112,7 +112,7 @@ Notes:
 - If the OSD isn't visible, you've configured the OSD height too big or too
   small. Please, try to adjust the variable on the setup page before writing
   any bug reports. NTSC users should use a shrinked default OSD height by
-  compiling the plugin with: make FEMON_NTSC=1
+  modifying VDR's setup.conf: femon.OSDHeight = 420
 
 - If the SVDRP service is used: femon won't notice if the server is tuned
   to a different channel and tuning the channel on the server might annoy
diff --git a/femoncfg.c b/femoncfg.c
index 965f03c..2b4d171 100644
--- a/femoncfg.c
+++ b/femoncfg.c
@@ -23,11 +23,7 @@ cFemonConfig::cFemonConfig(void)
   analyzestream  = 1;
   calcinterval   = 20;
   showcasystem   = 0;
-#ifdef NTSC
-  osdheight      = 420;
-#else
   osdheight      = 480;
-#endif
   osdoffset      = 0;
   usesvdrp       = 0;
   svdrpport      = 2001;