Merge pull request #467 from hissingshark/master

Vero4k autodetection and volume mixer fix

CMakeLists.txt

@@ -25,6 +25,12 @@ elseif(EXISTS "/opt/vc/include/bcm_host.h")
     set(BCMHOST found)
     set(GLSystem "OpenGL ES" CACHE STRING "The OpenGL system to be used")
 #-------------------------------------------------------------------------------
+#check if we're running on OSMC Vero4K
+elseif(EXISTS "/opt/vero3/lib/libMali.so")
+    MESSAGE("libMali.so found")
+    set(VERO4K found)
+    set(GLSystem "OpenGL ES" CACHE STRING "The OpenGL system to be used")
+#-------------------------------------------------------------------------------
 #check if we're running on olinuxino / odroid / etc
 elseif(EXISTS "/usr/lib/libMali.so" OR
     EXISTS "/usr/lib/arm-linux-gnueabihf/libMali.so" OR
@@ -64,6 +70,10 @@ if(DEFINED BCMHOST)
     add_definitions(-D_RPI_)
 endif()
 
+if(DEFINED VERO4K)
+    add_definitions(-D_VERO4K_)
+endif()
+
 if(DEFINED libCEC_FOUND)
     add_definitions(-DHAVE_LIBCEC)
 endif()
@@ -135,6 +145,11 @@ if(DEFINED BCMHOST)
         "/opt/vc/include/interface/vmcs_host/linux"
         "/opt/vc/include/interface/vcos/pthreads"
     )
+#add include directory for Vero4K
+elseif(DEFINED VERO4K)
+    LIST(APPEND COMMON_INCLUDE_DIRS
+        "/opt/vero3/include"
+    )
 else()
     if(${GLSystem} MATCHES "Desktop OpenGL")
         LIST(APPEND COMMON_INCLUDE_DIRS
@@ -153,6 +168,10 @@ if(DEFINED BCMHOST)
     link_directories(
         "/opt/vc/lib"
     )
+elseif(DEFINED VERO4K)
+    link_directories(
+        "/opt/vero3/lib"
+    )
 endif()
 
 set(COMMON_LIBRARIES
@@ -191,6 +210,11 @@ if(DEFINED BCMHOST)
         brcmEGL
         ${OPENGLES_LIBRARIES}
     )
+elseif(DEFINED VERO4K)
+    LIST(APPEND COMMON_LIBRARIES
+        EGL
+        ${OPENGLES_LIBRARIES}
+    )
 else()
     if(MSVC)
         LIST(APPEND COMMON_LIBRARIES

es-app/src/VolumeControl.cpp

@@ -8,7 +8,7 @@
 #endif
 
 #if defined(__linux__)
-    #ifdef _RPI_
+    #if defined(_RPI_) || defined(_VERO4K_)
         const char * VolumeControl::mixerName = "PCM";
     #else
     	const char * VolumeControl::mixerName = "Master";