From e69a204e732d3469a923f20e6af6a8606eb91b31 Mon Sep 17 00:00:00 2001
From: seife <seife@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: Sat, 5 Nov 2011 17:10:03 +0000
Subject: [PATCH] neutrino: align tuxtxt defaults with config file

Let the code use the same defaults as are in the config file,
so that installing the config file is no longer necessary.
This makes for easier packaging of neutrino.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1829 e54a6e83-5905-42d5-8d5c-058d10e6a962
---
 lib/libtuxtxt/Makefile.am | 6 ++++--
 lib/libtuxtxt/tuxtxt.cpp  | 8 ++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/lib/libtuxtxt/Makefile.am b/lib/libtuxtxt/Makefile.am
index bc1b6b968..f80ebfb19 100644
--- a/lib/libtuxtxt/Makefile.am
+++ b/lib/libtuxtxt/Makefile.am
@@ -16,5 +16,7 @@ noinst_LIBRARIES = libtuxtxt.a
 
 libtuxtxt_a_SOURCES = libtuxtxt.cpp tuxtxt.cpp
 
-configdir = $(CONFIGDIR)/tuxtxt
-config_DATA = tuxtxt2.conf
+## not necessary - the defaults in the code are exactly like
+## what is in the config file
+#configdir = $(CONFIGDIR)/tuxtxt
+#config_DATA = tuxtxt2.conf
diff --git a/lib/libtuxtxt/tuxtxt.cpp b/lib/libtuxtxt/tuxtxt.cpp
index f31250dfa..926a062c2 100644
--- a/lib/libtuxtxt/tuxtxt.cpp
+++ b/lib/libtuxtxt/tuxtxt.cpp
@@ -1912,7 +1912,7 @@ int Init(int source)
 	screenmode = 0;
 	screen_mode1 = 0;
 	color_mode   = 10;
-	trans_mode   = 10;
+	trans_mode   = 1;
 	menulanguage = 1;	/* english */
 	/*national_subset = 0;*//* default */
 	auto_national   = 1;
@@ -1923,10 +1923,10 @@ int Init(int source)
 	showl25         = 1;
 	dumpl25         = 0;
 	usettf          = 1;
-	TTFWidthFactor16  = 28;
-	TTFHeightFactor16 = 16;
+	TTFWidthFactor16  = 22;
+	TTFHeightFactor16 = 14;
 	TTFShiftX         = 0;
-	TTFShiftY         = 0;
+	TTFShiftY         = -2;
 
 	/* load config */
 	if ((conf = fopen(TUXTXTCONF, "rt")) == 0)