auto-enumerate FONT_TYPE_COUNT instead of defining it

Conflicts:
	src/system/settings.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5954735ed8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-15 (Mon, 15 Apr 2013)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2013-04-15 21:37:43 +02:00
committed by [CST] Focus
parent 89d3d162ea
commit 93ed1cbc2b
3 changed files with 28 additions and 27 deletions

View File

@@ -144,7 +144,7 @@ font_sizes_groups font_sizes_groups[6] =
#define FONT_STYLE_BOLD 1
#define FONT_STYLE_ITALIC 2
font_sizes_struct neutrino_font[FONT_TYPE_COUNT] =
font_sizes_struct neutrino_font[SNeutrinoSettings::FONT_TYPE_COUNT] =
{
{LOCALE_FONTSIZE_MENU , 20, FONT_STYLE_BOLD , 0},
{LOCALE_FONTSIZE_MENU_TITLE , 30, FONT_STYLE_BOLD , 0},