From 5b0a65a16d060b99dd5cae1504ff6c52c0598c7b Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Sun, 12 Feb 2017 22:21:18 +0100
Subject: [PATCH] more rename hardware defined macros for coolstream stb

Origin commit data
------------------
Commit: https://github.com/neutrino-images/ni-neutrino/commit/596255438268ca1af01eb5e9f3bac4372b865354
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)

Origin message was:
------------------
- more rename hardware defined macros for coolstream stb
---
 lib/Makefile.am               | 2 +-
 src/Makefile.am               | 2 +-
 src/driver/fbaccel.cpp        | 2 +-
 src/driver/framebuffer_ng.cpp | 4 ++--
 src/gui/videosettings.cpp     | 6 +++---
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 0aacf022e..92940156c 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -19,7 +19,7 @@ SUBDIRS += \
 endif
 
 if BOXTYPE_COOL
-if BOXMODEL_APOLLO
+if BOXMODEL_CS_HD2
 SUBDIRS += \
 	libcoolstream2
 else
diff --git a/src/Makefile.am b/src/Makefile.am
index a1103167b..b8fbc0024 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -199,7 +199,7 @@ endif
 if BOXTYPE_COOL
 bin_PROGRAMS += uncooloff
 uncooloff_SOURCES = uncooloff.c
-if BOXMODEL_APOLLO
+if BOXMODEL_CS_HD2
 else
 noinst_PROGRAMS = uncoolinit
 uncoolinit_SOURCES = uncoolinit.cpp
diff --git a/src/driver/fbaccel.cpp b/src/driver/fbaccel.cpp
index 7e7907a1e..661c706d1 100644
--- a/src/driver/fbaccel.cpp
+++ b/src/driver/fbaccel.cpp
@@ -68,7 +68,7 @@ extern GLFramebuffer *glfb;
 #define NEED_BLIT_THREAD 1
 #endif
 
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 #ifndef FB_HW_ACCELERATION
 #define FB_HW_ACCELERATION
 #endif
diff --git a/src/driver/framebuffer_ng.cpp b/src/driver/framebuffer_ng.cpp
index d12d98461..7c70ec5c8 100644
--- a/src/driver/framebuffer_ng.cpp
+++ b/src/driver/framebuffer_ng.cpp
@@ -378,7 +378,7 @@ fprintf(stderr, "CFrameBuffer::setMode avail: %d active: %d\n", available, activ
 	printf("FB: %dx%dx%d line length %d. %s accelerator.\n", xRes, yRes, bpp, stride,
 #if defined(USE_NEVIS_GXA)
 		"Using nevis GXA"
-#elif defined(BOXMODEL_APOLLO)
+#elif defined(BOXMODEL_CS_HD2)
 		"Using fb hw graphics"
 #else
 		"Not using graphics"
@@ -600,7 +600,7 @@ fb_pixel_t* CFrameBuffer::paintBoxRel(const int x, const int y, const int dx, co
 	int w_align;
 	int offs_align;
 
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 	if (_dx%4 != 0) {
 		w_align = GetWidth4FB_HW_ACC(x, _dx, true);
 		if (w_align < _dx)
diff --git a/src/gui/videosettings.cpp b/src/gui/videosettings.cpp
index f9bb20f2f..42c432aba 100644
--- a/src/gui/videosettings.cpp
+++ b/src/gui/videosettings.cpp
@@ -58,7 +58,7 @@
 #include <cs_api.h>
 #include <video.h>
 
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 #include <cnxtfb.h>
 #endif
 
@@ -119,7 +119,7 @@ const CMenuOptionChooser::keyval VIDEOMENU_43MODE_OPTIONS[] =
 };
 #define VIDEOMENU_43MODE_OPTION_COUNT (sizeof(VIDEOMENU_43MODE_OPTIONS)/sizeof(CMenuOptionChooser::keyval))
 
-#ifndef BOXMODEL_APOLLO
+#ifndef BOXMODEL_CS_HD2
 #define VIDEOMENU_VIDEOSIGNAL_TD_OPTION_COUNT 2
 const CMenuOptionChooser::keyval VIDEOMENU_VIDEOSIGNAL_TD_OPTIONS[VIDEOMENU_VIDEOSIGNAL_TD_OPTION_COUNT] =
 {
@@ -353,7 +353,7 @@ int CVideoSettings::showVideoSetup()
 		vs_chinch_ch->setHint("", LOCALE_MENU_HINT_VIDEO_CINCH_MODE);
 #endif
 	}
-#ifndef BOXMODEL_APOLLO
+#ifndef BOXMODEL_CS_HD2
 	else if (g_info.hw_caps->has_SCART) /* TRIPLEDRAGON hack... :-) TODO: SPARK? */
 	{
 		vs_scart_ch = new CMenuOptionChooser(LOCALE_VIDEOMENU_SCART, &g_settings.analog_mode1, VIDEOMENU_VIDEOSIGNAL_TD_OPTIONS, VIDEOMENU_VIDEOSIGNAL_TD_OPTION_COUNT, true, this);