diff options
| author | S. Davilla <davilla@4pi.com> | 2011-03-10 21:08:38 -0500 |
|---|---|---|
| committer | S. Davilla <davilla@4pi.com> | 2011-03-14 18:02:09 -0400 |
| commit | 74a488d2c519b106441f7f860cb0bab6b2a793ec (patch) | |
| tree | 2d820a4701c5854dec164efbec03eda9c60cbcb6 | |
| parent | 9f68aa101f4b2ae1e1eb77e4acf53ecbe0d4dc39 (diff) | |
[ios] various compile and makefile fixes
| -rw-r--r-- | lib/libdvd/libdvdread/src/dvd_reader.c | 2 | ||||
| -rw-r--r-- | xbmc/cores/paplayer/CDDAcodec.cpp | 6 | ||||
| -rw-r--r-- | xbmc/osx/Makefile.in | 3 | ||||
| -rw-r--r-- | xbmc/utils/StdString.h | 4 |
4 files changed, 10 insertions, 5 deletions
diff --git a/lib/libdvd/libdvdread/src/dvd_reader.c b/lib/libdvd/libdvdread/src/dvd_reader.c index e865b41ef5..2173cdda1f 100644 --- a/lib/libdvd/libdvdread/src/dvd_reader.c +++ b/lib/libdvd/libdvdread/src/dvd_reader.c @@ -1033,7 +1033,7 @@ static int DVDReadBlocksPath( dvd_file_t *dvd_file, unsigned int offset, #ifdef WITH_CACHE /* returns true aslong as the sector isn't all zeros */ -inline int DVDCheckSector(unsigned char *data, int offset) +int DVDCheckSector(unsigned char *data, int offset) { int i = 0; int32_t *p = (int32_t*)data + (DVD_VIDEO_LB_LEN>>2)*offset; diff --git a/xbmc/cores/paplayer/CDDAcodec.cpp b/xbmc/cores/paplayer/CDDAcodec.cpp index ef040a81bf..02d1e0097e 100644 --- a/xbmc/cores/paplayer/CDDAcodec.cpp +++ b/xbmc/cores/paplayer/CDDAcodec.cpp @@ -20,7 +20,13 @@ */ #include "CDDAcodec.h" +#if !(defined(__APPLE__) && defined(__arm__)) #include <cdio/sector.h> +#else +typedef int32_t lsn_t; +#define CDIO_CD_FRAMESIZE_RAW 2352 +#define CDIO_CD_FRAMES_PER_SEC 75 +#endif #define SECTOR_COUNT 55 // max. sectors that can be read at once #define MAX_BUFFER_SIZE 2*SECTOR_COUNT*CDIO_CD_FRAMESIZE_RAW diff --git a/xbmc/osx/Makefile.in b/xbmc/osx/Makefile.in index e11f105f02..c1747b373e 100644 --- a/xbmc/osx/Makefile.in +++ b/xbmc/osx/Makefile.in @@ -2,8 +2,7 @@ abs_top_srcdir=@abs_top_srcdir@ INCLUDES=-I$(abs_top_srcdir) \ -I$(abs_top_srcdir)/xbmc \ - -I$(abs_top_srcdir)/xbmc/linux \ - -I$(abs_top_srcdir)/lib/libportaudio + -I$(abs_top_srcdir)/xbmc/linux .SUFFIXES : .m .mm diff --git a/xbmc/utils/StdString.h b/xbmc/utils/StdString.h index 9800f946b2..597c4def42 100644 --- a/xbmc/utils/StdString.h +++ b/xbmc/utils/StdString.h @@ -864,7 +864,7 @@ inline const Type& SSMAX(const Type& arg1, const Type& arg2) PWSTR pNextDstW = pDstW; SSCodeCvt::result res = SSCodeCvt::ok; const SSCodeCvt& conv = SS_USE_FACET(loc, SSCodeCvt); - SSCodeCvt::state_type st= { 0 }; + SSCodeCvt::state_type st= {{ 0 }}; res = conv.in(st, pSrcA, pSrcA + nSrc, pNextSrcA, pDstW, pDstW + nDst, pNextDstW); @@ -907,7 +907,7 @@ inline const Type& SSMAX(const Type& arg1, const Type& arg2) PCWSTR pNextSrcW = pSrcW; SSCodeCvt::result res = SSCodeCvt::ok; const SSCodeCvt& conv = SS_USE_FACET(loc, SSCodeCvt); - SSCodeCvt::state_type st= { 0 }; + SSCodeCvt::state_type st= {{ 0 }}; res = conv.out(st, pSrcW, pSrcW + nSrc, pNextSrcW, pDstA, pDstA + nDst, pNextDstA); |