mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 16:01:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

various assorted build fixes / hacks

Browse Source 
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
This commit is contained in:
Stefan Seyfried
2010-02-01 21:16:52 +01:00
parent 799b500b74
commit 0693eef8c2
3 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/neutrino.cpp
View File

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

7
src/system/setting_helpers.cpp
View File

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

2
src/zapit/include/zapit/settings.h
View File

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