changed build system

1 files changed, 6 insertions, 86 deletions

diff --git a/tvguideosd.c b/tvguideosd.c
index 7598118..67b3c33 100644
--- a/tvguideosd.c
+++ b/tvguideosd.c
@@ -1,94 +1,14 @@
-// --- Theme -------------------------------------------------------------

-static cTheme theme;

-

-//BLENDING SETUP

-#define CLR_BLENDING_NOPACITY   0xFFFFFFFF

-#define CLR_BLENDING_DEFAULT    0xAAAAAAAA

-#define CLR_BLENDING_OFF        0x00000000

-

-THEME_CLR(theme, clrDoBlending, CLR_BLENDING_DEFAULT);

-THEME_CLR(theme, clrBackgroundOSD, clrBlack);

-THEME_CLR(theme, clrBackground, clrBlack);

-THEME_CLR(theme, clrGrid1, 0xFF404749);

-THEME_CLR(theme, clrGrid1Blending, 0xFF000000);

-THEME_CLR(theme, clrGrid2, 0xFF20293F);

-THEME_CLR(theme, clrGrid2Blending, 0xFF000000);

-THEME_CLR(theme, clrHighlight, 0xFFFF4D00);

-THEME_CLR(theme, clrHighlightBlending, 0xFF000000);

-THEME_CLR(theme, clrFont, clrWhite);

-THEME_CLR(theme, clrFontActive, clrWhite);

-THEME_CLR(theme, clrFontHeader, clrWhite);

-THEME_CLR(theme, clrFontButtons, clrWhite);

-THEME_CLR(theme, clrStatusHeader, clrBlack);

-THEME_CLR(theme, clrStatusHeaderBlending, clrBlack);

-THEME_CLR(theme, clrHeader, clrBlack);

-THEME_CLR(theme, clrHeaderBlending, 0xFFE0E0E0);

-THEME_CLR(theme, clrBorder, clrWhite);

-THEME_CLR(theme, clrTimeline1, clrWhite);

-THEME_CLR(theme, clrTimeline1Blending, 0xFF828282);

-THEME_CLR(theme, clrTimeline2, clrBlack);

-THEME_CLR(theme, clrTimeline2Blending, 0xFF3F3F3F);

-THEME_CLR(theme, clrButtonRed, 0x99BB0000);

-THEME_CLR(theme, clrButtonRedBorder, 0xFFBB0000);

-THEME_CLR(theme, clrButtonGreen, 0x9900BB00);

-THEME_CLR(theme, clrButtonGreenBorder, 0xFF00BB00);

-THEME_CLR(theme, clrButtonYellow, 0x99BBBB00);

-THEME_CLR(theme, clrButtonYellowBorder, 0xFFBBBB00);

-THEME_CLR(theme, clrButtonBlue, 0x990000BB);

-THEME_CLR(theme, clrButtonBlueBorder, 0xFF0000BB);

-THEME_CLR(theme, clrButtonBlend, 0xDD000000);

-THEME_CLR(theme, clrRecMenuBackground, 0xB0000000);

-THEME_CLR(theme, clrRecMenuTimerConflictBackground, 0xFFCCCCCC);

-THEME_CLR(theme, clrRecMenuTimerConflictBar, 0xFF222222);

-THEME_CLR(theme, clrRecMenuTimerConflictOverlap, 0xAAFF0000);

-THEME_CLR(theme, clrRecMenuDayActive, 0xFF00FF00);

-THEME_CLR(theme, clrRecMenuDayInactive, 0xFFFF0000);

-THEME_CLR(theme, clrRecMenuDayHighlight, 0x44FFFFFF);

-THEME_CLR(theme, clrRecMenuTextBack, 0xFF000000);

-THEME_CLR(theme, clrRecMenuTextActiveBack, 0xFF404749);

-THEME_CLR(theme, clrRecMenuKeyboardBack, 0xFF000000);

-THEME_CLR(theme, clrRecMenuKeyboardBorder, clrWhite);

-THEME_CLR(theme, clrRecMenuKeyboardHigh, 0x55FFFFFF);

-THEME_CLR(theme, clrButtonRedKeyboard, 0xFFBB0000);

-THEME_CLR(theme, clrButtonGreenKeyboard, 0xFF00BB00);

-THEME_CLR(theme, clrButtonYellowKeyboard, 0xFFBBBB00);

-

-#include "config.c"

-cTvguideConfig tvguideConfig;

-

-#include "osdmanager.c"

-cOsdManager osdManager;

+#include <stdlib.h>

+#include <vector>

 

+#include "config.h"

 #include "services/epgsearch.h"

 #include "services/remotetimers.h"

-cPlugin* pRemoteTimers = NULL;

-#include <vector>

-#include "services/tvscraper.h"

-#include "tools.c"

-#include "switchtimer.c"

-#include "setup.c"

-#include "imageloader.c"

-#include "styledpixmap.c"

-#include "timer.c"

-#include "timeline.c"

-#include "grid.c"

-#include "headergrid.c"

-#include "dummygrid.c"

-#include "epggrid.c"

-#include "statusheader.c"

-#include "detailview.c"

-#include "channelcolumn.c"

-#include "channelgroup.c"

-#include "channelgroups.c"

-#include "footer.c"

-#include "recmenuitem.c"

-#include "recmenu.c"

-#include "recmanager.c"

-#include "recmenus.c"

-#include "recmenumanager.c"

+

+#include "tools.h"

+#include "setup.h"

 

 #include "tvguideosd.h"

-#include <stdlib.h>

 

 cTvGuideOsd::cTvGuideOsd(void) {

     detailView = NULL;