add VDADecoder to configure and use HAVE_LIBVDADECODER to ifdef test in source code

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@29627 568bbfeb-2a22-0410-94d2-cc84cf5bfa90

4 files changed, 35 insertions, 4 deletions

diff --git a/configure.in b/configure.in
index c1f17ea81f..fc78407644 100644
--- a/configure.in
+++ b/configure.in
@@ -37,6 +37,8 @@ vaapi_not_found="== Could not find libva. VAAPI support disabled. =="
 vaapi_disabled="== VAAPI support manually disabled. =="
 crystalhd_not_found="== Could not find libldil. CrystalHD support disabled. =="
 crystalhd_disabled="== CrystalHD support manually disabled. =="
+vdadecoder_enabled="== VDADecoder support enabled. =="
+vdadecoder_disabled="== VDADecoder support manually disabled. =="
 ssh_not_found="== Could not find libssh. SSH FTP VFS support disabled. =="
 
 # External library message strings
@@ -136,6 +138,12 @@ AC_ARG_ENABLE([crystalhd],
             [use_crystalhd=$enableval],
             [use_crystalhd=yes])
 
+AC_ARG_ENABLE([vdadecoder],
+            [AS_HELP_STRING([--enable-vdadecoder],
+               [enable VDADecoder decoding (default is yes)])],
+            [use_vdadecoder=$enableval],
+            [use_vdadecoder=yes])
+
 AC_ARG_ENABLE([profiling],
             [AS_HELP_STRING([--enable-profiling],
                [enable gprof profiling (default is no)])],
@@ -794,6 +802,21 @@ else
   AC_MSG_NOTICE($crystalhd_disabled)
 fi
 
+# VDADecoder
+if test "$host_vendor" = "apple" ; then
+  if test "$use_vdadecoder" = "yes"; then
+    HAVE_LIBVDADECODER=1
+    AC_DEFINE([HAVE_LIBVDADECODER], [1], [Define to 1 if you have the `VDADecoder' library.])
+    AC_MSG_NOTICE($vdadecoder_enabled)
+  else
+    use_vdadecoder ="no"
+    AC_MSG_NOTICE($vdadecoder_disabled)
+  fi
+else
+  use_vdadecoder ="no"
+  AC_MSG_NOTICE($vdadecoder_disabled)
+fi
+
 # platform specific bin utilities
 if test "$host_vendor" != "apple" ; then
   AC_CHECK_PROG(HAVE_GAWK,gawk,"yes","no",)
@@ -959,6 +982,12 @@ else
   final_message="$final_message\n  CrystalHD:\tNo"
 fi
 
+if test "$use_vdadecoder" = "yes"; then
+  final_message="$final_message\n  VDADecoder:\tYes"
+else
+  final_message="$final_message\n  VDADecoder:\tNo"
+fi
+
 if test "$use_joystick" = "yes"; then
   final_message="$final_message\n  Joystick:\tYes"
   SDL_DEFINES="$SDL_DEFINES -DHAS_SDL_JOYSTICK"
diff --git a/xbmc/GUISettings.cpp b/xbmc/GUISettings.cpp
index 15710514d1..4007e4cded 100644
--- a/xbmc/GUISettings.cpp
+++ b/xbmc/GUISettings.cpp
@@ -597,7 +597,7 @@ void CGUISettings::Initialize()
 #ifdef HAVE_LIBCRYSTALHD
   AddBool(CCrystalHD::GetInstance()->DevicePresent() ? vp: NULL, "videoplayer.usechd", 13428, true);
 #endif
-#ifdef __APPLE__
+#ifdef HAVE_LIBVDADECODER
 /*
   if (g_sysinfo.HasVDADecoder())
     AddBool(CCrystalHD::GetInstance()->DevicePresent() ? vp: NULL, "videoplayer.usevda", 13429, true);
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.cpp
index 0ece5b2aa4..8f75bc3551 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.cpp
+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.cpp
@@ -19,11 +19,13 @@
  *
  */
 
-#if defined(__APPLE__)
-#if (defined HAVE_CONFIG_H)
+#if (defined HAVE_CONFIG_H) && (!defined WIN32)
   #include "config.h"
+#elif defined(_WIN32)
+#include "system.h"
 #endif
 
+#if defined(HAVE_LIBVDADECODER)
 #include "DynamicDll.h"
 #include "GUISettings.h"
 #include "DVDClock.h"
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.h b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.h
index 22c35ee415..dd0e45743a 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.h
+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.h
@@ -20,7 +20,7 @@
  *
  */
 
-#if defined(__APPLE__)
+#if defined(HAVE_LIBVDADECODER)
 #include <queue>
 
 #include "DVDVideoCodec.h"