[prev in list] [next in list] [prev in thread] [next in thread]
List: helix-datatype-dev
Subject: RE: [datatype-dev] CR: Fix Windows build busters on 310Atlas/HEAD
From: "Eric Hyche" <ehyche () real ! com>
Date: 2008-01-31 19:35:48
Message-ID: 040501c86440$7bec7e00$db68a8c0 () EHYCHED620
[Download RAW message or body]
Looks good.
=============================================
Eric Hyche (ehyche@real.com)
Technical Lead
RealNetworks, Inc.
> -----Original Message-----
> From: datatype-dev-bounces@helixcommunity.org
> [mailto:datatype-dev-bounces@helixcommunity.org] On Behalf Of
> Greg Wright
> Sent: Thursday, January 31, 2008 2:20 PM
> To: datatype-dev
> Subject: [datatype-dev] CR: Fix Windows build busters on 310Atlas/HEAD
>
> OGG doesn't build because of BOOL->HXBOOL
>
> HEAD and 310Atlas,
> --greg.
>
>
> Index: codec_info.h
> ===================================================================
> RCS file: /cvsroot/xiph/oggff/codec_info.h,v
> retrieving revision 1.5
> diff -u -w -r1.5 codec_info.h
> --- codec_info.h 1 Dec 2006 21:59:04 -0000 1.5
> +++ codec_info.h 31 Jan 2008 19:20:38 -0000
> @@ -64,9 +64,9 @@
> virtual HX_RESULT OnPacket(ogg_packet* pPkt) = 0;
>
> virtual OggCodecType Type() const = 0;
> - virtual BOOL HaveHeaders() const = 0;
> - virtual BOOL HaveBaseGranulePos() const = 0;
> - virtual BOOL AllowPacketOutError() const = 0;
> + virtual HXBOOL HaveHeaders() const = 0;
> + virtual HXBOOL HaveBaseGranulePos() const = 0;
> + virtual HXBOOL AllowPacketOutError() const = 0;
>
> virtual ogg_int64_t CurrentGranulePos() const = 0;
> virtual HX_RESULT SetCurrentGranulePos(ogg_int64_t pos) = 0;
> @@ -74,8 +74,8 @@
> virtual ogg_int64_t GranulePosDifference(ogg_int64_t a,
> ogg_int64_t b)
> const = 0;
>
> - virtual BOOL IsHeader(ogg_packet* pPkt) const = 0;
> - virtual BOOL IsCommentHeader(ogg_packet* pPkt) const = 0;
> + virtual HXBOOL IsHeader(ogg_packet* pPkt) const = 0;
> + virtual HXBOOL IsCommentHeader(ogg_packet* pPkt) const = 0;
> virtual ogg_packet* CreateBlankCommentPacket() const = 0;
>
> virtual HX_RESULT GetTimestamp(ogg_int64_t granulePos,
> Index: collect_headers_strategy.cpp
> ===================================================================
> RCS file: /cvsroot/xiph/oggff/collect_headers_strategy.cpp,v
> retrieving revision 1.2
> diff -u -w -r1.2 collect_headers_strategy.cpp
> --- collect_headers_strategy.cpp 17 Jan 2006 06:00:41
> -0000 1.2
> +++ collect_headers_strategy.cpp 31 Jan 2008 19:20:38 -0000
> @@ -67,7 +67,7 @@
>
> HX_RESULT OnPage(ogg_page* pPage);
>
> - BOOL HaveHeaders() const { return m_bHaveHeaders;}
> + HXBOOL HaveHeaders() const { return m_bHaveHeaders;}
>
> HX_RESULT GetNextPage(ogg_page*& pPage);
>
> @@ -75,7 +75,7 @@
> const COggCodecInfo* m_pCodecInfo;
>
> ogg_page* m_pFirstPage;
> - BOOL m_bHaveHeaders;
> + HXBOOL m_bHaveHeaders;
> ogg_stream_state m_inStream;
> ogg_stream_state m_outStream;
> };
> @@ -361,7 +361,7 @@
> return res;
> }
>
> -BOOL COggCollectHeadersStrategy::Done() const
> +HXBOOL COggCollectHeadersStrategy::Done() const
> {
> return (m_state == ssDone) ? TRUE : FALSE;
> }
> @@ -424,10 +424,10 @@
> m_state = newState;
> }
>
> -BOOL
> +HXBOOL
> COggCollectHeadersStrategy::checkIfDone()
> {
> - BOOL bRet = TRUE;
> + HXBOOL bRet = TRUE;
>
> CHXMapLongToObj::Iterator itr = m_collectorMap.Begin();
> for (; bRet && (itr != m_collectorMap.End()); ++itr)
> @@ -446,7 +446,7 @@
> {
> HX_RESULT res = HXR_OK;
>
> - BOOL bDone = FALSE;
> + HXBOOL bDone = FALSE;
>
> while((HXR_OK == res) && !bDone)
> {
> Index: collect_headers_strategy.h
> ===================================================================
> RCS file: /cvsroot/xiph/oggff/collect_headers_strategy.h,v
> retrieving revision 1.2
> diff -u -w -r1.2 collect_headers_strategy.h
> --- collect_headers_strategy.h 17 Jan 2006 06:00:41
> -0000 1.2
> +++ collect_headers_strategy.h 31 Jan 2008 19:20:38 -0000
> @@ -70,7 +70,7 @@
> ULONG32 ulFileOffset,
> UINT32 ulPageSize,
> ogg_page* pPage);
> - virtual BOOL Done() const;
> + virtual HXBOOL Done() const;
> virtual void Close();
>
> HX_RESULT GetNextPage(ogg_page*& pPage);
> @@ -84,7 +84,7 @@
>
> void changeState(StrategyState newState);
>
> - BOOL checkIfDone();
> + HXBOOL checkIfDone();
> HX_RESULT collectPages();
>
> COggPageReader* m_pPageReader;
> Index: end_time_strategy.cpp
> ===================================================================
> RCS file: /cvsroot/xiph/oggff/end_time_strategy.cpp,v
> retrieving revision 1.3
> diff -u -w -r1.3 end_time_strategy.cpp
> --- end_time_strategy.cpp 17 Jan 2006 06:00:41 -0000 1.3
> +++ end_time_strategy.cpp 31 Jan 2008 19:20:38 -0000
> @@ -145,7 +145,7 @@
> return res;
> }
>
> -BOOL COggGroupEndTimeStrategy::Done() const
> +HXBOOL COggGroupEndTimeStrategy::Done() const
> {
> return (m_state == ssDone) ? TRUE : FALSE;
> }
> Index: end_time_strategy.h
> ===================================================================
> RCS file: /cvsroot/xiph/oggff/end_time_strategy.h,v
> retrieving revision 1.3
> diff -u -w -r1.3 end_time_strategy.h
> --- end_time_strategy.h 17 Jan 2006 06:00:41 -0000 1.3
> +++ end_time_strategy.h 31 Jan 2008 19:20:38 -0000
> @@ -66,7 +66,7 @@
> ULONG32 ulFileOffset,
> UINT32 ulPageSize,
> ogg_page* pPage);
> - virtual BOOL Done() const;
> + virtual HXBOOL Done() const;
> virtual void Close();
>
> // COggGroupEndTimeStrategy methods
> Index: find_eof_strategy.cpp
> ===================================================================
> RCS file: /cvsroot/xiph/oggff/find_eof_strategy.cpp,v
> retrieving revision 1.1
> diff -u -w -r1.1 find_eof_strategy.cpp
> --- find_eof_strategy.cpp 20 Oct 2004 03:54:50 -0000 1.1
> +++ find_eof_strategy.cpp 31 Jan 2008 19:20:38 -0000
> @@ -157,7 +157,7 @@
> return res;
> }
>
> -BOOL COggFindEOFStrategy::Done() const
> +HXBOOL COggFindEOFStrategy::Done() const
> {
> return (m_state == ssDone) ? TRUE : FALSE;
> }
> Index: find_eof_strategy.h
> ===================================================================
> RCS file: /cvsroot/xiph/oggff/find_eof_strategy.h,v
> retrieving revision 1.1
> diff -u -w -r1.1 find_eof_strategy.h
> --- find_eof_strategy.h 20 Oct 2004 03:54:50 -0000 1.1
> +++ find_eof_strategy.h 31 Jan 2008 19:20:38 -0000
> @@ -62,7 +62,7 @@
> ULONG32 ulFileOffset,
> UINT32 ulPageSize,
> ogg_page* pPage);
> - virtual BOOL Done() const;
> + virtual HXBOOL Done() const;
> virtual void Close();
>
> // COggFindEOFStrategy methods
> @@ -87,7 +87,7 @@
>
> ULONG32 m_ulLastSeekOffset;
> UINT32 m_uSeekBackTotal;
> - BOOL m_bLastPageInfoValid;
> + HXBOOL m_bLastPageInfoValid;
> ULONG32 m_ulLastPageOffset;
> UINT32 m_uLastPageSize;
> int m_lastPageSerialNum;
> Index: find_gend_strategy.cpp
> ===================================================================
> RCS file: /cvsroot/xiph/oggff/find_gend_strategy.cpp,v
> retrieving revision 1.1
> diff -u -w -r1.1 find_gend_strategy.cpp
> --- find_gend_strategy.cpp 20 Oct 2004 03:54:50 -0000 1.1
> +++ find_gend_strategy.cpp 31 Jan 2008 19:20:38 -0000
> @@ -183,7 +183,7 @@
> return res;
> }
>
> -BOOL COggFindGroupEndStrategy::Done() const
> +HXBOOL COggFindGroupEndStrategy::Done() const
> {
> return (m_state == ssDone) ? TRUE : FALSE;
> }
> Index: find_gend_strategy.h
> ===================================================================
> RCS file: /cvsroot/xiph/oggff/find_gend_strategy.h,v
> retrieving revision 1.1
> diff -u -w -r1.1 find_gend_strategy.h
> --- find_gend_strategy.h 20 Oct 2004 03:54:50 -0000 1.1
> +++ find_gend_strategy.h 31 Jan 2008 19:20:38 -0000
> @@ -64,7 +64,7 @@
> ULONG32 ulFileOffset,
> UINT32 ulPageSize,
> ogg_page* pPage);
> - virtual BOOL Done() const;
> + virtual HXBOOL Done() const;
> virtual void Close();
>
> // COggFindGroupEndStrategy methods
> Index: ogg_page_reader.cpp
> ===================================================================
> RCS file: /cvsroot/xiph/oggff/ogg_page_reader.cpp,v
> retrieving revision 1.8
> diff -u -w -r1.8 ogg_page_reader.cpp
> --- ogg_page_reader.cpp 17 Jan 2006 03:15:22 -0000 1.8
> +++ ogg_page_reader.cpp 31 Jan 2008 19:20:38 -0000
> @@ -205,7 +205,7 @@
> return res;
> }
>
> -BOOL COggPageReader::IsSeekable() const
> +HXBOOL COggPageReader::IsSeekable() const
> {
> return m_bSeekable;
> }
> @@ -284,7 +284,7 @@
> {
> DPRINTF(D_OGG_PAGE_READER,
> ("COggPageReader::InitDone(0x%08x)\n", status));
>
> - BOOL bCallInitDone = TRUE;
> + HXBOOL bCallInitDone = TRUE;
> if (HXR_OK == status)
> {
> /* Only do a Stat() if we have a IHXFileStat object,
> @@ -357,7 +357,7 @@
> // We are at the end of the file if we get a short
> // read OR we have a seekable file and the current
> // file object offset is >= the file size.
> - BOOL bEOF =
> + HXBOOL bEOF =
> ((pBuffer->GetSize() < DefaultReadSize) ||
> (m_bSeekable && (m_ulFileObjectOffset >=
> m_ulFileSize)));
>
> @@ -405,8 +405,8 @@
> {
> DPRINTF(D_OGG_PAGE_READER,
> ("COggPageReader::SeekDone(0x%08x)\n", status));
>
> - BOOL bDone = FALSE;
> - BOOL bDispatchedError = FALSE;
> + HXBOOL bDone = FALSE;
> + HXBOOL bDispatchedError = FALSE;
>
> while(!bDone)
> {
> @@ -510,17 +510,17 @@
> m_state = newState;
> }
>
> -HX_RESULT COggPageReader::DoReadNextPage(BOOL bEOF)
> +HX_RESULT COggPageReader::DoReadNextPage(HXBOOL bEOF)
> {
> DPRINTF(D_OGG_PAGE_READER,
> ("COggPageReader::DoReadNextPage(%u)\n", bEOF));
>
> HX_RESULT res = HXR_FAILED;
> - BOOL bDone = FALSE;
> + HXBOOL bDone = FALSE;
>
> while(!bDone)
> {
> - BOOL bRecalcDone = TRUE;
> + HXBOOL bRecalcDone = TRUE;
>
> if (m_bEndOfFile)
> {
> Index: ogg_page_reader.h
> ===================================================================
> RCS file: /cvsroot/xiph/oggff/ogg_page_reader.h,v
> retrieving revision 1.7
> diff -u -w -r1.7 ogg_page_reader.h
> --- ogg_page_reader.h 17 Apr 2005 18:18:34 -0000 1.7
> +++ ogg_page_reader.h 31 Jan 2008 19:20:38 -0000
> @@ -88,7 +88,7 @@
> HX_RESULT ReadNextPage();
>
> HX_RESULT CurrentPosition(REF(ULONG32) ulPos) const;
> - BOOL IsSeekable() const;
> + HXBOOL IsSeekable() const;
> ULONG32 FileSize() const;
> HX_RESULT Close();
>
> @@ -138,7 +138,7 @@
>
> void ChangeState(ReaderState newState);
>
> - HX_RESULT DoReadNextPage(BOOL bEOF);
> + HX_RESULT DoReadNextPage(HXBOOL bEOF);
>
> HX_RESULT DoSeek(ULONG32 ulFileOffset);
> HX_RESULT DoRead();
> @@ -152,13 +152,13 @@
> IHXOggPageReaderResponse* m_pResponse;
> IHXFileObject* m_pFile;
> IHXFileStat* m_pStat;
> - BOOL m_bSeekable;
> + HXBOOL m_bSeekable;
> UINT32 m_ulFileSize;
> ULONG32 m_ulPendingSeekOffset;
>
> ULONG32 m_ulCurrentFileOffset;
> ULONG32 m_ulFileObjectOffset;
> - BOOL m_bEndOfFile;
> + HXBOOL m_bEndOfFile;
>
> ogg_sync_state* m_pOy;
> };
> Index: ogg_payload.cpp
> ===================================================================
> RCS file: /cvsroot/xiph/oggff/ogg_payload.cpp,v
> retrieving revision 1.3
> diff -u -w -r1.3 ogg_payload.cpp
> --- ogg_payload.cpp 21 Jan 2005 19:28:07 -0000 1.3
> +++ ogg_payload.cpp 31 Jan 2008 19:20:38 -0000
> @@ -149,7 +149,7 @@
>
> if (piErr == 0)
> {
> - BOOL bDone = FALSE;
> + HXBOOL bDone = FALSE;
> ogg_page og;
>
> res = HXR_OK;
> @@ -286,7 +286,7 @@
> {
> HX_RESULT res = HXR_OK;
>
> - BOOL bDone = FALSE;
> + HXBOOL bDone = FALSE;
>
> while(!bDone && (HXR_OK == res))
> {
> Index: ogg_payload.h
> ===================================================================
> RCS file: /cvsroot/xiph/oggff/ogg_payload.h,v
> retrieving revision 1.3
> diff -u -w -r1.3 ogg_payload.h
> --- ogg_payload.h 17 Apr 2005 18:18:34 -0000 1.3
> +++ ogg_payload.h 31 Jan 2008 19:20:38 -0000
> @@ -89,12 +89,12 @@
> IHXCommonClassFactory* m_pCCF;
> COggCodecInfo* m_pCodecInfo;
> CHXSimpleList m_pktList;
> - BOOL m_bEndOfFile;
> + HXBOOL m_bEndOfFile;
>
> // packetization specific
> ogg_stream_state m_os;
> COggTimestamp m_startTS;
> - BOOL m_bSeenDataPacket;
> + HXBOOL m_bSeenDataPacket;
> };
>
> #endif /* OGG_PAYLOAD_H */
> Index: ogg_stream.cpp
> ===================================================================
> RCS file: /cvsroot/xiph/oggff/ogg_stream.cpp,v
> retrieving revision 1.6
> diff -u -w -r1.6 ogg_stream.cpp
> --- ogg_stream.cpp 1 Dec 2006 21:59:04 -0000 1.6
> +++ ogg_stream.cpp 31 Jan 2008 19:20:38 -0000
> @@ -241,8 +241,8 @@
> if (ogg_stream_pagein(&m_os, pPage) == 0)
> {
> ogg_packet op;
> - BOOL bDone = FALSE;
> - BOOL bSeenError = FALSE;
> + HXBOOL bDone = FALSE;
> + HXBOOL bSeenError = FALSE;
>
> res = HXR_OK;
> while(!bDone && (HXR_OK == res))
> Index: ogg_stream.h
> ===================================================================
> RCS file: /cvsroot/xiph/oggff/ogg_stream.h,v
> retrieving revision 1.6
> diff -u -w -r1.6 ogg_stream.h
> --- ogg_stream.h 1 Dec 2006 21:59:04 -0000 1.6
> +++ ogg_stream.h 31 Jan 2008 19:20:38 -0000
> @@ -85,7 +85,7 @@
> HX_RESULT OnSeek(UINT32 uRequestedTime);
> HX_RESULT GetStartTimestamp(COggTimestamp& timestamp);
>
> - BOOL IsActive() const { return (m_pCodecInfo) ? TRUE : FALSE;}
> + HXBOOL IsActive() const { return (m_pCodecInfo) ? TRUE : FALSE;}
>
> HX_RESULT NextPacketTimestamp(REF(UINT32) uTimestamp) const;
> HX_RESULT GetNextPacket(REF(IHXPacket*) pPkt);
> @@ -107,10 +107,10 @@
>
> COggPayload* m_pPayload;
>
> - BOOL m_bNeedStartTime;
> + HXBOOL m_bNeedStartTime;
> CHXSimpleList m_untimedPkts;
>
> - BOOL m_bIsFirstStream;
> + HXBOOL m_bIsFirstStream;
> UINT32 m_uMaxSampleRate;
> UINT32 m_uMaxChannels;
>
> Index: ogg_timestamp.h
> ===================================================================
> RCS file: /cvsroot/xiph/oggff/ogg_timestamp.h,v
> retrieving revision 1.2
> diff -u -w -r1.2 ogg_timestamp.h
> --- ogg_timestamp.h 17 Apr 2005 18:18:34 -0000 1.2
> +++ ogg_timestamp.h 31 Jan 2008 19:20:38 -0000
> @@ -60,7 +60,7 @@
>
> ogg_int64_t Samples() const { return m_samples;}
> UINT32 SampleRate() const { return m_uSampleRate;}
> - BOOL LostPrecision() const { return m_bLostPrecision;}
> + HXBOOL LostPrecision() const { return m_bLostPrecision;}
>
> void SetSampleRate(UINT32 uSampleRate);
>
> @@ -74,7 +74,7 @@
> private:
> ogg_int64_t m_samples;
> UINT32 m_uSampleRate;
> - BOOL m_bLostPrecision;
> + HXBOOL m_bLostPrecision;
> };
>
> #endif /* OGG_TIMESTAMP_H */
> Index: oggfformat.cpp
> ===================================================================
> RCS file: /cvsroot/xiph/oggff/oggfformat.cpp,v
> retrieving revision 1.16
> diff -u -w -r1.16 oggfformat.cpp
> --- oggfformat.cpp 1 Dec 2006 21:59:04 -0000 1.16
> +++ oggfformat.cpp 31 Jan 2008 19:20:38 -0000
> @@ -129,7 +129,7 @@
> }
>
> STDMETHODIMP COggFileFormat::GetPluginInfo(
> - REF(BOOL) bLoadMultiple,
> + REF(HXBOOL) bLoadMultiple,
> REF(const char *) pDescription,
> REF(const char *) pCopyright,
> REF(const char *) pMoreInfoURL,
> @@ -349,7 +349,7 @@
> if (m_pGetPacketPending)
> {
> memset(m_pGetPacketPending, 0,
> - sizeof(BOOL) * m_streamHdlr.StreamCount());
> + sizeof(HXBOOL) * m_streamHdlr.StreamCount());
> }
>
> res = m_streamHdlr.OnSeek(requestedTime);
> @@ -1104,7 +1104,7 @@
>
> if (HXR_OK == status)
> {
> - BOOL bChangedState = FALSE;
> + HXBOOL bChangedState = FALSE;
> int serialNum = ogg_page_serialno(pPage);
> COggStream* pStream = m_streamHdlr.GetStream(serialNum);
>
> @@ -1555,12 +1555,12 @@
> HX_RESULT res = HXR_OK;
>
> HX_VECTOR_DELETE(m_pGetPacketPending);
> - m_pGetPacketPending = new BOOL[m_streamHdlr.StreamCount()];
> + m_pGetPacketPending = new HXBOOL[m_streamHdlr.StreamCount()];
>
> if (m_pGetPacketPending)
> {
> memset(m_pGetPacketPending, 0,
> - sizeof(BOOL) * m_streamHdlr.StreamCount());
> + sizeof(HXBOOL) * m_streamHdlr.StreamCount());
> }
> else
> {
> @@ -1603,7 +1603,7 @@
> {
> if (!m_bInDispatchPendingRequest)
> {
> - BOOL bDone = FALSE;
> + HXBOOL bDone = FALSE;
>
> m_bInDispatchPendingRequest = TRUE;
>
> Index: oggfformat.h
> ===================================================================
> RCS file: /cvsroot/xiph/oggff/oggfformat.h,v
> retrieving revision 1.10
> diff -u -w -r1.10 oggfformat.h
> --- oggfformat.h 1 Dec 2006 21:59:04 -0000 1.10
> +++ oggfformat.h 31 Jan 2008 19:20:38 -0000
> @@ -148,7 +148,7 @@
> // IHXPlugin Interface
> STDMETHOD(GetPluginInfo)
> (THIS_
> - REF(BOOL) bLoadMultiple,
> + REF(HXBOOL) bLoadMultiple,
> REF(const char *) pDescription,
> REF(const char *) pCopyright,
> REF(const char *) pMoreInfoURL,
> @@ -169,8 +169,8 @@
> COggPageReader* m_pPageReader;
> PluginState m_State; // Status used for async calls
>
> - BOOL* m_pGetPacketPending; // Pending GetPacket() Booleans
> - BOOL m_bInDispatchPendingRequest;
> + HXBOOL* m_pGetPacketPending; // Pending GetPacket() Booleans
> + HXBOOL m_bInDispatchPendingRequest;
>
> COggPageStrategy* m_pCurrentStrategy;
> COggStreamInfoStrategy m_streamInfoStrategy;
> @@ -186,7 +186,7 @@
> ULONG32 m_ulLastCachedPageOffset;
> CHXSimpleList m_pageCache;
>
> - BOOL m_bIsLive;
> + HXBOOL m_bIsLive;
> UINT32 m_uCurrentGroup;
> COggTimestamp m_liveNextGroupStartTime;
>
> Index: page_strategy.h
> ===================================================================
> RCS file: /cvsroot/xiph/oggff/page_strategy.h,v
> retrieving revision 1.1
> diff -u -w -r1.1 page_strategy.h
> --- page_strategy.h 20 Oct 2004 03:54:50 -0000 1.1
> +++ page_strategy.h 31 Jan 2008 19:20:38 -0000
> @@ -60,7 +60,7 @@
> ULONG32 ulFileOffset,
> UINT32 ulPageSize,
> ogg_page* pPage) = 0;
> - virtual BOOL Done() const = 0;
> + virtual HXBOOL Done() const = 0;
> virtual void Close() = 0;
> };
>
> Index: seek_strategy.cpp
> ===================================================================
> RCS file: /cvsroot/xiph/oggff/seek_strategy.cpp,v
> retrieving revision 1.4
> diff -u -w -r1.4 seek_strategy.cpp
> --- seek_strategy.cpp 17 Jan 2006 06:00:41 -0000 1.4
> +++ seek_strategy.cpp 31 Jan 2008 19:20:38 -0000
> @@ -156,8 +156,8 @@
> else if ((ulFileOffset + uPageSize) >=
> m_ulUpperOffset)
> {
> // The current page is the one before
> the upper page
> - BOOL bSeekPointInNextPage = FALSE;
> - BOOL bSeekPointInThisPage = FALSE;
> + HXBOOL bSeekPointInNextPage = FALSE;
> + HXBOOL bSeekPointInThisPage = FALSE;
>
> ULONG32 ulSecondPageOffset =
> (m_ulLowerOffset + m_uLowerPageSize);
> @@ -246,7 +246,7 @@
> return res;
> }
>
> -BOOL COggSeekStrategy::Done() const
> +HXBOOL COggSeekStrategy::Done() const
> {
> return (m_state == ssDone) ? TRUE : FALSE;
> }
> Index: seek_strategy.h
> ===================================================================
> RCS file: /cvsroot/xiph/oggff/seek_strategy.h,v
> retrieving revision 1.1
> diff -u -w -r1.1 seek_strategy.h
> --- seek_strategy.h 20 Oct 2004 03:54:50 -0000 1.1
> +++ seek_strategy.h 31 Jan 2008 19:20:38 -0000
> @@ -68,7 +68,7 @@
> ULONG32 ulFileOffset,
> UINT32 ulPageSize,
> ogg_page* pPage);
> - virtual BOOL Done() const;
> + virtual HXBOOL Done() const;
> virtual void Close();
>
> // COggSeekStrategy methods
> Index: stream_hdlr.cpp
> ===================================================================
> RCS file: /cvsroot/xiph/oggff/stream_hdlr.cpp,v
> retrieving revision 1.7
> diff -u -w -r1.7 stream_hdlr.cpp
> --- stream_hdlr.cpp 1 Dec 2006 21:59:04 -0000 1.7
> +++ stream_hdlr.cpp 31 Jan 2008 19:20:38 -0000
> @@ -246,9 +246,9 @@
> return res;
> }
>
> -BOOL COggStreamHandler::EndOfStream(UINT16 uStreamID) const
> +HXBOOL COggStreamHandler::EndOfStream(UINT16 uStreamID) const
> {
> - BOOL bRet = FALSE;
> + HXBOOL bRet = FALSE;
>
> return bRet;
> }
> @@ -321,7 +321,7 @@
> HX_RESULT res = HXR_OK;
>
> COggTimestamp highest;
> - BOOL bHighestSet = FALSE;
> + HXBOOL bHighestSet = FALSE;
>
> for (UINT16 i = 0; i < StreamCount(); i++)
> {
> @@ -408,7 +408,7 @@
> COggStreamHandler::findNextStreamID()
> {
> HX_RESULT res = HXR_OK;
> - BOOL bNextStreamIDSet = FALSE;
> + HXBOOL bNextStreamIDSet = FALSE;
> UINT16 uNextStreamID = 0;
> UINT32 uLowestTS = 0;
> UINT32 uStreamDoneCount = 0;
> Index: stream_hdlr.h
> ===================================================================
> RCS file: /cvsroot/xiph/oggff/stream_hdlr.h,v
> retrieving revision 1.4
> diff -u -w -r1.4 stream_hdlr.h
> --- stream_hdlr.h 1 Dec 2006 21:59:04 -0000 1.4
> +++ stream_hdlr.h 31 Jan 2008 19:20:38 -0000
> @@ -85,7 +85,7 @@
> HX_RESULT NextPacketStreamID(REF(UINT16) uStreamID);
> HX_RESULT GetNextPacket(REF(IHXPacket*) pPkt);
>
> - BOOL EndOfStream(UINT16 uStreamID) const;
> + HXBOOL EndOfStream(UINT16 uStreamID) const;
>
> COggStream* GetStream(int serialNum);
> HX_RESULT OnEndOfGroup();
> @@ -111,7 +111,7 @@
>
> CHXMapLongToObj m_serialToStreamMap;
>
> - BOOL m_bNextStreamIDSet;
> + HXBOOL m_bNextStreamIDSet;
> UINT16 m_uNextStreamID;
>
> COggSerialNumberSet m_unknownCodecSerialNums;
> Index: stream_info.cpp
> ===================================================================
> RCS file: /cvsroot/xiph/oggff/stream_info.cpp,v
> retrieving revision 1.3
> diff -u -w -r1.3 stream_info.cpp
> --- stream_info.cpp 21 Jan 2005 19:28:07 -0000 1.3
> +++ stream_info.cpp 31 Jan 2008 19:20:38 -0000
> @@ -130,11 +130,11 @@
> return res;
> }
>
> -BOOL COggStreamInfo::HaveHeaders() const
> +HXBOOL COggStreamInfo::HaveHeaders() const
> {
> return (m_pCodecInfo) ? m_pCodecInfo->HaveHeaders() : FALSE;
> }
> -BOOL COggStreamInfo::HaveBaseGranulePos() const
> +HXBOOL COggStreamInfo::HaveBaseGranulePos() const
> {
> return (m_pCodecInfo) ?
> m_pCodecInfo->HaveBaseGranulePos() : FALSE;
> }
> Index: stream_info.h
> ===================================================================
> RCS file: /cvsroot/xiph/oggff/stream_info.h,v
> retrieving revision 1.1
> diff -u -w -r1.1 stream_info.h
> --- stream_info.h 20 Oct 2004 03:54:50 -0000 1.1
> +++ stream_info.h 31 Jan 2008 19:20:38 -0000
> @@ -61,8 +61,8 @@
>
> HX_RESULT OnPage(ogg_page* pPage);
>
> - BOOL HaveHeaders() const;
> - BOOL HaveBaseGranulePos() const;
> + HXBOOL HaveHeaders() const;
> + HXBOOL HaveBaseGranulePos() const;
>
> const COggCodecInfo* CodecInfo() const {return m_pCodecInfo;}
> HX_RESULT SetBaseTimestamp(const COggTimestamp& timestamp);
> Index: stream_info_strategy.cpp
> ===================================================================
> RCS file: /cvsroot/xiph/oggff/stream_info_strategy.cpp,v
> retrieving revision 1.2
> diff -u -w -r1.2 stream_info_strategy.cpp
> --- stream_info_strategy.cpp 17 Jan 2006 06:00:42 -0000 1.2
> +++ stream_info_strategy.cpp 31 Jan 2008 19:20:38 -0000
> @@ -147,7 +147,7 @@
> return res;
> }
>
> -BOOL COggStreamInfoStrategy::Done() const
> +HXBOOL COggStreamInfoStrategy::Done() const
> {
> return (m_state == ssDone) ? TRUE : FALSE;
> }
> @@ -268,7 +268,7 @@
> return res;
> }
>
> -BOOL COggStreamInfoStrategy::HaveSerialNum(int serialNum)
> +HXBOOL COggStreamInfoStrategy::HaveSerialNum(int serialNum)
> {
> return ((getStreamInfo(serialNum) != 0) ||
> m_unknownCodecSerialNums.Find(serialNum));
> @@ -401,7 +401,7 @@
> return res;
> }
>
> -BOOL COggStreamInfoStrategy::haveStream(ogg_page* pPage) const
> +HXBOOL COggStreamInfoStrategy::haveStream(ogg_page* pPage) const
> {
> return (getStreamInfo(pPage)) ? TRUE : FALSE;
> }
> @@ -422,9 +422,9 @@
> return pRet;
> }
>
> -BOOL COggStreamInfoStrategy::haveAllHeaders()
> +HXBOOL COggStreamInfoStrategy::haveAllHeaders()
> {
> - BOOL bRet = TRUE;
> + HXBOOL bRet = TRUE;
>
> CHXMapLongToObj::Iterator itr = m_streamMap.Begin();
>
> @@ -441,9 +441,9 @@
> return bRet;
> }
>
> -BOOL COggStreamInfoStrategy::haveAllBaseGranulePos()
> +HXBOOL COggStreamInfoStrategy::haveAllBaseGranulePos()
> {
> - BOOL bRet = TRUE;
> + HXBOOL bRet = TRUE;
>
> CHXMapLongToObj::Iterator itr = m_streamMap.Begin();
>
> @@ -464,7 +464,7 @@
> {
> CHXMapLongToObj::Iterator itr = m_streamMap.Begin();
>
> - BOOL bMinSet = FALSE;
> + HXBOOL bMinSet = FALSE;
> COggTimestamp minTS;
>
> // find the lowest base timestamp
> Index: stream_info_strategy.h
> ===================================================================
> RCS file: /cvsroot/xiph/oggff/stream_info_strategy.h,v
> retrieving revision 1.2
> diff -u -w -r1.2 stream_info_strategy.h
> --- stream_info_strategy.h 17 Jan 2006 06:00:42 -0000 1.2
> +++ stream_info_strategy.h 31 Jan 2008 19:20:38 -0000
> @@ -68,7 +68,7 @@
> ULONG32 ulFileOffset,
> UINT32 ulPageSize,
> ogg_page* pPage);
> - virtual BOOL Done() const;
> + virtual HXBOOL Done() const;
> virtual void Close();
>
> // COggStreamInfoStrategy methods
> @@ -81,7 +81,7 @@
> HX_RESULT GetStreamSerialNum(UINT32 i, int& serialNum) const;
> HX_RESULT GetCodecInfo(int serialNum, const
> COggCodecInfo*& pInfo) const;
>
> - BOOL HaveSerialNum(int serialNum);
> + HXBOOL HaveSerialNum(int serialNum);
>
> const COggSerialNumberSet& GetUnknownCodecSerialNums() const;
>
> @@ -102,12 +102,12 @@
> HX_RESULT handleHeaderPage(ogg_page* pPage);
> HX_RESULT handleDataPage(ogg_page* pPage);
>
> - BOOL haveStream(ogg_page* pPage) const;
> + HXBOOL haveStream(ogg_page* pPage) const;
> COggStreamInfo* getStreamInfo(ogg_page* pPage) const;
> COggStreamInfo* getStreamInfo(int serialNum) const;
>
> - BOOL haveAllHeaders();
> - BOOL haveAllBaseGranulePos();
> + HXBOOL haveAllHeaders();
> + HXBOOL haveAllBaseGranulePos();
> void adjustBaseTimestamps();
>
> COggPageReader* m_pPageReader;
> Index: theora_codec_info.cpp
> ===================================================================
> RCS file: /cvsroot/xiph/oggff/theora_codec_info.cpp,v
> retrieving revision 1.8
> diff -u -w -r1.8 theora_codec_info.cpp
> --- theora_codec_info.cpp 1 Dec 2006 21:59:04 -0000 1.8
> +++ theora_codec_info.cpp 31 Jan 2008 19:20:38 -0000
> @@ -195,18 +195,18 @@
> return ctTheora;
> }
>
> -BOOL CTheoraCodecInfo::HaveHeaders() const
> +HXBOOL CTheoraCodecInfo::HaveHeaders() const
> {
> return ((NeedBaseTime == m_state) ||
> (Ready == m_state));
> }
>
> -BOOL CTheoraCodecInfo::HaveBaseGranulePos() const
> +HXBOOL CTheoraCodecInfo::HaveBaseGranulePos() const
> {
> return (Ready == m_state);
> }
>
> -BOOL CTheoraCodecInfo::AllowPacketOutError() const
> +HXBOOL CTheoraCodecInfo::AllowPacketOutError() const
> {
> return (m_state == NeedFirstDataPkt) ? TRUE : FALSE;
> }
> @@ -248,13 +248,13 @@
> return framesToGranulePos(aFrames - bFrames);
> }
>
> -BOOL
> +HXBOOL
> CTheoraCodecInfo::IsHeader(ogg_packet* pPkt) const
> {
> return isTheoraHeader(pPkt);
> }
>
> -BOOL CTheoraCodecInfo::IsCommentHeader(ogg_packet* pPkt) const
> +HXBOOL CTheoraCodecInfo::IsCommentHeader(ogg_packet* pPkt) const
> {
> return (IsHeader(pPkt) && (pPkt->packet[0] == 0x81));
> }
> @@ -572,9 +572,9 @@
> return frames << m_uKeyFrameShift;
> }
>
> -BOOL CTheoraCodecInfo::isTheoraHeader(ogg_packet* pPkt)
> +HXBOOL CTheoraCodecInfo::isTheoraHeader(ogg_packet* pPkt)
> {
> - BOOL bRet = FALSE;
> + HXBOOL bRet = FALSE;
>
> if (pPkt && pPkt->packet && (pPkt->bytes > 7) &&
> ((pPkt->packet[0] & 0x80) == 0x80) &&
> Index: theora_codec_info.h
> ===================================================================
> RCS file: /cvsroot/xiph/oggff/theora_codec_info.h,v
> retrieving revision 1.4
> diff -u -w -r1.4 theora_codec_info.h
> --- theora_codec_info.h 1 Dec 2006 21:59:04 -0000 1.4
> +++ theora_codec_info.h 31 Jan 2008 19:20:38 -0000
> @@ -62,9 +62,9 @@
> virtual HX_RESULT OnPacket(ogg_packet* pPkt);
>
> virtual OggCodecType Type() const;
> - virtual BOOL HaveHeaders() const;
> - virtual BOOL HaveBaseGranulePos() const;
> - virtual BOOL AllowPacketOutError() const;
> + virtual HXBOOL HaveHeaders() const;
> + virtual HXBOOL HaveBaseGranulePos() const;
> + virtual HXBOOL AllowPacketOutError() const;
>
> virtual ogg_int64_t CurrentGranulePos() const;
> virtual HX_RESULT SetCurrentGranulePos(ogg_int64_t pos);
> @@ -72,8 +72,8 @@
> virtual ogg_int64_t GranulePosDifference(ogg_int64_t a,
> ogg_int64_t b) const;
>
> - virtual BOOL IsHeader(ogg_packet* pPkt) const;
> - virtual BOOL IsCommentHeader(ogg_packet* pPkt) const;
> + virtual HXBOOL IsHeader(ogg_packet* pPkt) const;
> + virtual HXBOOL IsCommentHeader(ogg_packet* pPkt) const;
> virtual ogg_packet* CreateBlankCommentPacket() const;
>
> virtual HX_RESULT GetTimestamp(ogg_int64_t granulePos,
> @@ -112,7 +112,7 @@
> ogg_int64_t granuleToFrames(ogg_int64_t pos) const;
> ogg_int64_t framesToGranulePos(ogg_int64_t frames) const;
>
> - static BOOL isTheoraHeader(ogg_packet* pPkt);
> + static HXBOOL isTheoraHeader(ogg_packet* pPkt);
>
> State m_state;
> UINT32 m_uFPSNum;
> @@ -120,7 +120,7 @@
> UINT8 m_uKeyFrameShift;
> UINT8* m_pIdentBuf;
> UINT32 m_uIdentBufSize;
> - BOOL m_bFirstPkt;
> + HXBOOL m_bFirstPkt;
> ogg_int64_t m_currentPos;
> ogg_int64_t m_basePos;
> ogg_int64_t m_dropped;
> Index: vorbis_codec_info.cpp
> ===================================================================
> RCS file: /cvsroot/xiph/oggff/vorbis_codec_info.cpp,v
> retrieving revision 1.6
> diff -u -w -r1.6 vorbis_codec_info.cpp
> --- vorbis_codec_info.cpp 1 Dec 2006 21:59:04 -0000 1.6
> +++ vorbis_codec_info.cpp 31 Jan 2008 19:20:38 -0000
> @@ -193,18 +193,18 @@
> return ctVorbis;
> }
>
> -BOOL CVorbisCodecInfo::HaveHeaders() const
> +HXBOOL CVorbisCodecInfo::HaveHeaders() const
> {
> return ((NeedBaseTime == m_state) ||
> (Ready == m_state));
> }
>
> -BOOL CVorbisCodecInfo::HaveBaseGranulePos() const
> +HXBOOL CVorbisCodecInfo::HaveBaseGranulePos() const
> {
> return (Ready == m_state);
> }
>
> -BOOL CVorbisCodecInfo::AllowPacketOutError() const
> +HXBOOL CVorbisCodecInfo::AllowPacketOutError() const
> {
> return (m_state == NeedFirstDataPkt) ? TRUE : FALSE;
> }
> @@ -214,13 +214,13 @@
> return m_currentPos;
> }
>
> -BOOL
> +HXBOOL
> CVorbisCodecInfo::IsHeader(ogg_packet* pPkt) const
> {
> return isVorbisHeader(pPkt);
> }
>
> -BOOL CVorbisCodecInfo::IsCommentHeader(ogg_packet* pPkt) const
> +HXBOOL CVorbisCodecInfo::IsCommentHeader(ogg_packet* pPkt) const
> {
> return (IsHeader(pPkt) && (pPkt->packet[0] == 0x3));
> }
> @@ -537,9 +537,9 @@
> return res;
> }
>
> -BOOL CVorbisCodecInfo::isVorbisHeader(ogg_packet* pPkt)
> +HXBOOL CVorbisCodecInfo::isVorbisHeader(ogg_packet* pPkt)
> {
> - BOOL bRet = FALSE;
> + HXBOOL bRet = FALSE;
>
> if (pPkt && pPkt->packet && (pPkt->bytes > 7) &&
> ((pPkt->packet[0] & 0x1) == 0x1) &&
> Index: vorbis_codec_info.h
> ===================================================================
> RCS file: /cvsroot/xiph/oggff/vorbis_codec_info.h,v
> retrieving revision 1.4
> diff -u -w -r1.4 vorbis_codec_info.h
> --- vorbis_codec_info.h 1 Dec 2006 21:59:04 -0000 1.4
> +++ vorbis_codec_info.h 31 Jan 2008 19:20:38 -0000
> @@ -63,9 +63,9 @@
> virtual HX_RESULT OnPacket(ogg_packet* pPkt);
>
> virtual OggCodecType Type() const;
> - virtual BOOL HaveHeaders() const;
> - virtual BOOL HaveBaseGranulePos() const;
> - virtual BOOL AllowPacketOutError() const;
> + virtual HXBOOL HaveHeaders() const;
> + virtual HXBOOL HaveBaseGranulePos() const;
> + virtual HXBOOL AllowPacketOutError() const;
>
> virtual ogg_int64_t CurrentGranulePos() const;
> virtual HX_RESULT SetCurrentGranulePos(ogg_int64_t pos);
> @@ -73,8 +73,8 @@
> virtual ogg_int64_t GranulePosDifference(ogg_int64_t a,
> ogg_int64_t b) const;
>
> - virtual BOOL IsHeader(ogg_packet* pPkt) const;
> - virtual BOOL IsCommentHeader(ogg_packet* pPkt) const;
> + virtual HXBOOL IsHeader(ogg_packet* pPkt) const;
> + virtual HXBOOL IsCommentHeader(ogg_packet* pPkt) const;
> virtual ogg_packet* CreateBlankCommentPacket() const;
>
> virtual HX_RESULT GetTimestamp(ogg_int64_t granulePos,
> @@ -110,7 +110,7 @@
> HX_RESULT handleIdentHdr(ogg_packet* pPkt);
> HX_RESULT updatePosition(ogg_packet* pPkt);
>
> - static BOOL isVorbisHeader(ogg_packet* pPkt);
> + static HXBOOL isVorbisHeader(ogg_packet* pPkt);
>
> State m_state;
>
>
>
>
> _______________________________________________
> Datatype-dev mailing list
> Datatype-dev@helixcommunity.org
> http://lists.helixcommunity.org/mailman/listinfo/datatype-dev
>
_______________________________________________
Datatype-dev mailing list
Datatype-dev@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/datatype-dev
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic