Undo OSX specific Changes

libsrc/leddevice/LedDevicePhilipsHue.h

@@ -2,8 +2,7 @@
 
 // STL includes
 #include <string>
-#include <cmath>
-  
+
 // Qt includes
 #include <QObject>
 #include <QString>

libsrc/leddevice/LedUdpDevice.h

@@ -2,6 +2,8 @@
 
 #include <QUdpSocket>
 
+// Linux-SPI includes
+#include <linux/spi/spidev.h>
 
 // Hyperion includes
 #include <leddevice/LedDevice.h>
@@ -60,6 +62,5 @@ private:
 	QUdpSocket *udpSocket;
 	QHostAddress _address;
 	quint16 _port;
-	
 };
 

libsrc/utils/Logger.cpp

@@ -62,7 +62,7 @@ Logger::Logger ( std::string name, LogLevel minLevel ):
 	
 	if (_syslogEnabled && loggerCount == 1 )
 	{
-		openlog (getprogname(), LOG_CONS | LOG_PID | LOG_NDELAY, LOG_LOCAL0);
+		openlog (program_invocation_short_name, LOG_CONS | LOG_PID | LOG_NDELAY, LOG_LOCAL0);
 	}
 }
 

src/hyperiond/hyperiond.cpp

@@ -63,9 +63,8 @@
 #include <protoserver/ProtoServer.h>
 #include <boblightserver/BoblightServer.h>
 #include <webconfig/WebConfig.h>
-#ifndef ENABLE_OSX
-  #include <sys/prctl.h> 
- #endif
+
+#include <sys/prctl.h> 
 #include <utils/Logger.h>
 
 using namespace vlofgren;
@@ -75,6 +74,7 @@ using namespace vlofgren;
 
 // BoblightServer includes
 #include <boblightserver/BoblightServer.h>
+#include <sys/prctl.h> 
 
 using namespace vlofgren;
 
@@ -474,9 +474,7 @@ int main(int argc, char** argv)
 	if (argParentPid.getValue() > 0 )
 	{
 		std::cout << "hyperiond client, parent is pid " << argParentPid.getValue() << std::endl;
-		#ifndef ENABLE_OSX
-  			prctl(PR_SET_PDEATHSIG, SIGHUP);
- 		#endif
+		prctl(PR_SET_PDEATHSIG, SIGHUP);
 	}
 	
 	int argvId = -1;
@@ -572,7 +570,7 @@ int main(int argc, char** argv)
 #ifdef ENABLE_OSX
 	// Construct and start the osx grabber if the configuration is present
 	OsxWrapper * osxGrabber = nullptr;
-	startGrabberOsx(config, hyperion, protoServer, xbmcVideoChecker, osxGrabber);
+	startGrabberDispmanx(config, hyperion, protoServer, xbmcVideoChecker, osxGrabber);
 #else
 	if (config.isMember("osxgrabber"))
 	{