From 95977e11c0a5c1170351f2fafe400519d7b1086b Mon Sep 17 00:00:00 2001 From: Andreas Mair Date: Fri, 24 Apr 2009 14:32:32 +0200 Subject: 2009-04-25: Version 0.1.0 - Fixed: Calculating width of events' start times in channel info OSD (Reported by tomglx @vdr-poprtal.de). - Changed: pause scrolling when text has scrolled all to the left in scroll behaviour "to the left" (Reported by Andreas Brugger). - Reworked: (simplified) font loading/caching. - Updated Italian translation (Provided by Diego Pierotto). - Removed: ENABLE_COPYFONT define. - Changed: Reduced number of font recreations (Reported by balta @vdr-portal.de). - Added: more CA systems to text mappings in channel info OSD (Submitted by free-x @vdr-portal.de). - Added: symbol in channel info OSD if current channel has subtitles. - Changed: background colors for the DarkBlue theme (Submitted by zulu @vdr-portal.de). - Added: New option "Show CA system as text". - Changed: Reduced number of locks while drawing to OSD which increases display speed especially in menu OSD. - Added: show signal strength and signal-to-noise ratio in channel info OSD (can be disabled by setting SKINENIGMA_DISABLE_SIGNALINFO to 1). - Fixed: compiler error with certain gcc versions (Reported by C-3PO @ vdr-portal.de). - Changed: smooth scrolling text (based on skinelchi by Christoph Haubrich ). - Removed: SKINENIGMA_DISABLE_ANIMATED_TEXT define. - Changed: Replace "/" by "~" in channel logo names. - Added: new setting "Show scrollbar in menu". - Added: Override VDR's SetTabs() to adopt column widths in menu OSD to selected font size. - Added: Support subtitle tracks in tracks OSD: logo will only be shown if icons/subtitle/subtitle.xpm exists. - Fixed: missing logo in tracks OSD while using single area. - Minor bugfixes and enhancements. - Requires at least VDR v1.6.0. --- config.h | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) (limited to 'config.h') diff --git a/config.h b/config.h index c7f7411..25f8258 100644 --- a/config.h +++ b/config.h @@ -17,9 +17,7 @@ extern const char *imageExtensionTexts[NUM_IMAGEEXTENSIONTEXTS]; #define NUM_IMAGEEXTENSIONTEXTS 0 #endif -#ifdef HAVE_FREETYPE -# include "font.h" -#endif +#include "font.h" #include #include @@ -31,11 +29,7 @@ extern const char *imageExtensionTexts[NUM_IMAGEEXTENSIONTEXTS]; #define MAXFONTSIZE 64 #endif -#ifdef DISABLE_ANIMATED_TEXT -# define INIT_FONTS -#else -# define INIT_FONTS EnigmaConfig.InitFonts() -#endif +#define INIT_FONTS EnigmaConfig.InitFonts() struct EnigmaOsdSize { @@ -82,8 +76,8 @@ struct FontInfo struct FontConfig { int Id; - char *KeyId; - char *KeyName; + const char *KeyId; + const char *KeyName; }; extern FontConfig allFontConfig[FONT_NUMFONTS]; @@ -93,9 +87,6 @@ struct cEnigmaConfig private: char logoDir[255]; char strImagesDir[255]; -#ifdef HAVE_FREETYPE - char strFontsDir[255]; -#endif public: cEnigmaConfig(); ~cEnigmaConfig(); @@ -103,16 +94,8 @@ public: char *GetLogoDir(void) { return logoDir; } void SetImagesDir(const char *dir); char *GetImagesDir(void) { return strImagesDir; } -#ifdef HAVE_FREETYPE - void SetFontsDir(const char *dir); - char *GetFontsDir(void) { return strFontsDir; } -#endif const char *GetImageExtension(void); const cFont *GetFont(int id); -#ifndef DISABLE_ANIMATED_TEXT - void InitFonts(void); - const cFont *CopyFont(eDvbFont vdrId); -#endif void SetFont(int id, const char *font); void SetFont(int id, int vdrId); void GetOsdSize(struct EnigmaOsdSize *size); @@ -158,6 +141,9 @@ public: int statusLineMode; int showWssSymbols; int showStatusSymbols; + int showScrollbar; + int showSignalInfo; + int showCaMode; FontInfo allFonts[FONT_NUMFONTS]; }; -- cgit v1.2.3