various assorted build fixes / hacks

Origin commit data
------------------
Branch: ni/coolstream
Commit: 5e86416ccb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2010-02-01 (Mon, 01 Feb 2010)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit

src/neutrino.cpp

@@ -2902,6 +2902,7 @@ void CNeutrinoApp::ExitRun(const bool /*write_si*/, int retcode)
 			system("/bin/umount -a");
 			sleep(1);
 			{
+#if HAVE_COOL_HARDWARE
 				standby_data_t standby;
 				time_t mtime = time(NULL);
 				struct tm *tmtime = localtime(&mtime);
@@ -2955,6 +2956,9 @@ void CNeutrinoApp::ExitRun(const bool /*write_si*/, int retcode)
 						while(true) sleep(1);
 					}
 				}
+#else
+				reboot(LINUX_REBOOT_CMD_RESTART);
+#endif
 			}
 #if 0
 			neutrino_msg_t      msg;

src/system/setting_helpers.cpp

@@ -925,6 +925,7 @@ bool CLedControlNotifier::changeNotify(const neutrino_locale_t, void* /*data*/)
 	return true;
 }
 
+#if HAVE_COOL_HARDWARE
 bool CFanControlNotifier::changeNotify(const neutrino_locale_t, void * data)
 {
 	int cfd, ret;
@@ -945,6 +946,12 @@ bool CFanControlNotifier::changeNotify(const neutrino_locale_t, void * data)
 	}
 	return true;
 }
+#else
+bool CFanControlNotifier::changeNotify(const neutrino_locale_t, void *)
+{
+	return true;
+}
+#endif
 
 bool CCpuFreqNotifier::changeNotify(const neutrino_locale_t, void * data)
 {

src/zapit/include/zapit/settings.h

@@ -48,10 +48,12 @@
 #define CABLES_XML      CONFIGDIR "/cables.xml"
 #define SATELLITES_XML  CONFIGDIR "/satellites.xml" 
 
+#if HAVE_TRIPLEDRAGON == 0
 #define AUDIO_DEVICE          "/dev/dvb/adapter0/audio0"
 #define DEMUX_DEVICE          "/dev/dvb/adapter0/demux0"
 #define FRONTEND_DEVICE       "/dev/dvb/adapter0/frontend0"
 #define VIDEO_DEVICE          "/dev/dvb/adapter0/video0"
+#endif
 
 #define CAMD_UDS_NAME  "/tmp/camd.socket"