mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-27 15:32:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

neutrino: align tuxtxt defaults with config file

Browse Source 
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


Origin commit data
------------------
Branch: ni/coolstream
Commit: e69a204e73
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2011-11-05 (Sat, 05 Nov 2011)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2011-11-05 17:10:03 +00:00
parent 9b090862b7
commit 46eb6af2fb
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/libtuxtxt/Makefile.am
View File

@@ -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

8
lib/libtuxtxt/tuxtxt.cpp
View File

@@ -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)