diff options
| author | davilla <davilla@svn> | 2009-12-30 06:54:44 +0000 |
|---|---|---|
| committer | davilla <davilla@svn> | 2009-12-30 06:54:44 +0000 |
| commit | 9afc21d3b786b49748e5de3d6363a31441b043b7 (patch) | |
| tree | ace1d531b67372a1f4135d097470be8fa80654ea | |
| parent | dcbcda7469bd061444d3c82e2b8009f53eb77fd1 (diff) | |
change to released crystalhd headers and lib naming
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@26179 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
| -rw-r--r-- | configure.in | 9 | ||||
| -rw-r--r-- | xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp | 15 |
2 files changed, 13 insertions, 11 deletions
diff --git a/configure.in b/configure.in index 214b66d483..3c3d1229c0 100644 --- a/configure.in +++ b/configure.in @@ -680,11 +680,12 @@ fi # CrystalHD if test "$use_crystalhd" = "yes"; then - AC_CHECK_LIB([ldil], [main], - LIBS=" -lldil $LIBS";INCLUDES="$INCLUDES -D__LINUX_USER__";AC_DEFINE([HAVE_LIBCRYSTALHD], [], [Define to 1 if you have the 'Crystal HD' library (-lldil).]), + AC_CHECK_LIB([crystalhd], [main], + LIBS=" -lcrystalhd $LIBS";INCLUDES="$INCLUDES -D__LINUX_USER__";AC_DEFINE([HAVE_LIBCRYSTALHD], [], [Define to 1 if you have the 'Crystal +HD' library (-lcrystalhd).]), use_crystalhd=no;AC_MSG_RESULT($crystalhd_not_found)) - #AC_CHECK_HEADER([crystalhd/bc_ldil_if.h],AC_DEFINE([HAVE_LIBCRYSTALHD], [], - # [Define to 1 if you have the `crystalhd' library (-lldil).]), + #AC_CHECK_HEADER([libcrystalhd/libcrystalhd_if.h],AC_DEFINE([HAVE_LIBCRYSTALHD], [], + # [Define to 1 if you have the `crystalhd' library (-lcrystalhd).]), # use_crystalhd=no;AC_MSG_RESULT($crystalhd_not_found), [#define __LINUX_USER__]) else AC_MSG_NOTICE($crystalhd_disabled) diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp index 90dbaf50af..a8a70d5e35 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp @@ -42,9 +42,9 @@ namespace BCM #define __LINUX_USER__ #endif - #include "crystalhd/bc_dts_types.h" - #include "crystalhd/bc_dts_defs.h" - #include "crystalhd/bc_ldil_if.h" + #include "libcrystalhd/bc_dts_types.h" + #include "libcrystalhd/bc_dts_defs.h" + #include "libcrystalhd/libcrystalhd_if.h" #endif //defined(WIN32) }; @@ -186,12 +186,12 @@ unsigned char* CMPCDecodeBuffer::GetPtr(void) return m_pBuffer; } -void CMPCDecodeBuffer::SetPts(BCM::U64 pts) +void CMPCDecodeBuffer::SetPts(uint64_t pts) { m_Pts = pts; } -BCM::U64 CMPCDecodeBuffer::GetPts(void) +uint64_t CMPCDecodeBuffer::GetPts(void) { return m_Pts; } @@ -806,7 +806,8 @@ CCrystalHD::CCrystalHD() : { BCM::BC_STATUS res; //BCM::U32 mode = BCM::DTS_PLAYBACK_MODE | BCM::DTS_LOAD_FILE_PLAY_FW | BCM::DTS_PLAYBACK_DROP_RPT_MODE | BCM::DTS_SKIP_TX_CHK_CPB | DTS_DFLT_RESOLUTION(BCM::vdecRESOLUTION_720p23_976); - BCM::U32 mode = BCM::DTS_PLAYBACK_MODE | BCM::DTS_LOAD_FILE_PLAY_FW | BCM::DTS_PLAYBACK_DROP_RPT_MODE | DTS_DFLT_RESOLUTION(BCM::vdecRESOLUTION_720p23_976); + uint32_t mode = BCM::DTS_PLAYBACK_MODE | BCM::DTS_LOAD_FILE_PLAY_FW | BCM::DTS_PLAYBACK_DROP_RPT_MODE | +DTS_DFLT_RESOLUTION(BCM::vdecRESOLUTION_720p23_976); res = BCM::DtsDeviceOpen(&m_Device, mode); if (res != BCM::BC_STS_SUCCESS) @@ -858,7 +859,7 @@ bool CCrystalHD::Open(BCM_STREAM_TYPE stream_type, BCM_CODEC_TYPE codec_type) if (m_IsConfigured) Close(); - BCM::U32 videoAlg = 0; + uint32_t videoAlg = 0; switch (codec_type) { case BC_CODEC_ID_VC1: |