On Thursday, March 10, 2005, at 07:54 AM, Bob Clark wrote:
Overview:
Here are the changes in audio for BOOL to HXBOOL transition.
A fuller description and background information is on this thread:
http://lists.helixcommunity.org/pipermail/helix-dna-dev/2005-March/
001354.html
Index: device/fakeaudiodevice.cpp
===================================================================
RCS file: /cvsroot/audio/device/fakeaudiodevice.cpp,v
retrieving revision 1.1
diff -u -w -r1.1 fakeaudiodevice.cpp
--- device/fakeaudiodevice.cpp 6 Aug 2004 19:32:19 -0000 1.1
+++ device/fakeaudiodevice.cpp 11 Mar 2005 22:57:20 -0000
@@ -160,7 +160,7 @@
return retVal;
}
-STDMETHODIMP CHXFakeAudioDevice::Close(const BOOL bFlush)
+STDMETHODIMP CHXFakeAudioDevice::Close(const HXBOOL bFlush)
{
fprintf(stderr, "0x%08x::CHXFakeAudioDevice::Close(%lu)\n", this, bFlush);
// Clear any pending callbacks
@@ -231,7 +231,7 @@
return HXR_OK;
}
-STDMETHODIMP_(BOOL) CHXFakeAudioDevice::InitVolume(const UINT16 uMinVolume,
const UINT16 uMaxVolume)
+STDMETHODIMP_(HXBOOL) CHXFakeAudioDevice::InitVolume(const UINT16 uMinVolume,
const UINT16 uMaxVolume)
{
m_usMinVolume = uMinVolume;
m_usMaxVolume = uMaxVolume;
@@ -361,12 +361,12 @@
return retVal;
}
-STDMETHODIMP_(BOOL) CHXFakeAudioDevice::IsResumed()
+STDMETHODIMP_(HXBOOL) CHXFakeAudioDevice::IsResumed()
{
return (m_eState == StateResumed ? TRUE : FALSE);
}
-STDMETHODIMP_(BOOL) CHXFakeAudioDevice::IsClosed()
+STDMETHODIMP_(HXBOOL) CHXFakeAudioDevice::IsClosed()
{
return (m_eState == StateClosed ? TRUE : FALSE);
}
Index: device/hxaudev.cpp
===================================================================
RCS file: /cvsroot/audio/device/hxaudev.cpp,v
retrieving revision 1.26
diff -u -w -r1.26 hxaudev.cpp
--- device/hxaudev.cpp 13 Oct 2004 20:31:21 -0000 1.26
+++ device/hxaudev.cpp 11 Mar 2005 22:57:20 -0000
@@ -310,7 +310,7 @@
#if defined( _WINDOWS )
#if defined (HELIX_FEATURE_DIRECT_SOUND)
- BOOL bUseDS = FALSE;
+ HXBOOL bUseDS = FALSE;
if(pPrefs)
{
IHXBuffer* pBuff = NULL;
@@ -402,7 +402,7 @@
*/
STDMETHODIMP CHXAudioDevice::Close
(
- const BOOL bFlush
+ const HXBOOL bFlush
)
{
HX_RESULT theErr = HXR_OK;
@@ -510,7 +510,7 @@
*/
STDMETHODIMP CHXAudioDevice::SetBuffering
(
- const BOOL bSetBuffering
+ const HXBOOL bSetBuffering
)
{
m_bBuffer = bSetBuffering;
@@ -523,7 +523,7 @@
* Purpose:
* Initialize the volume. Return TRUE if device supports volume.
*/
-STDMETHODIMP_(BOOL) CHXAudioDevice::InitVolume
+STDMETHODIMP_(HXBOOL) CHXAudioDevice::InitVolume
(
const UINT16 uMinVolume,
const UINT16 uMaxVolume
@@ -652,12 +652,12 @@
return _NumberOfBlocksRemainingToPlay();
}
-BOOL CHXAudioDevice::IsWaveOutDevice()
+HXBOOL CHXAudioDevice::IsWaveOutDevice()
{
return _IsWaveOutDevice();
}
-BOOL CHXAudioDevice::_IsWaveOutDevice()
+HXBOOL CHXAudioDevice::_IsWaveOutDevice()
{
return TRUE;
}
Index: device/platform/mac/macaudio.cp
===================================================================
RCS file: /cvsroot/audio/device/platform/mac/macaudio.cp,v
retrieving revision 1.7
diff -u -w -r1.7 macaudio.cp
--- device/platform/mac/macaudio.cp 9 Jul 2004 18:37:36 -0000 1.7
+++ device/platform/mac/macaudio.cp 11 Mar 2005 22:57:20 -0000
@@ -78,7 +78,7 @@
//#define LOG_MULTIPLE_DEFERRED_TASKS 1
-BOOL gSoundCallbackTime = FALSE;
+HXBOOL gSoundCallbackTime = FALSE;
#if defined( _CARBON ) || defined( _MAC_UNIX )
DeferredTaskUPP CAudioOutMac::gDeferredTask =
NewDeferredTaskUPP(CAudioOutMac::DeferredTaskCallback);
@@ -362,7 +362,7 @@
| Release
--------------------------------------------------------------------------*/
-void CWaveHeader::Release (short releaseCode, BOOL bSendTimeSync /*=
TRUE*/)
+void CWaveHeader::Release (short releaseCode, HXBOOL bSendTimeSync /*=
TRUE*/)
{ /* begin Release */
@@ -659,7 +659,7 @@
!pAudioOut->m_pPendingCallbackList->IsEmpty())
{
SndCommand* cmd = (SndCommand*)
pAudioOut->m_pPendingCallbackList->RemoveHead();
- BOOL bIsEmpty = pAudioOut->m_pPendingCallbackList->IsEmpty();
+ HXBOOL bIsEmpty = pAudioOut->m_pPendingCallbackList->IsEmpty();
#ifdef THREADS_SUPPORTED
// we used to deadlock here; we'd grab the audio mutex before
the core mutex,
@@ -708,7 +708,7 @@
}
void
-CAudioOutMac::ProcessCmd(SndCommand* cmd, BOOL bSendTimeSync /*= TRUE*/)
+CAudioOutMac::ProcessCmd(SndCommand* cmd, HXBOOL bSendTimeSync /*= TRUE*/)
{
CWaveHeader *wh = (CWaveHeader *) cmd->param2;
if (wh)
@@ -802,7 +802,7 @@
Abort ();
#if defined(_DEBUG) && defined(LOG_MULTIPLE_DEFERRED_TASKS)
- BOOL bWaitedForPending = FALSE;
+ HXBOOL bWaitedForPending = FALSE;
if ( m_bAudioCallbacksAreAlive )
{
DebugStr( "\pCAudioOutMac dtor -- m_bAudioCallbacksAreAlive still
true!;g" );
@@ -1144,7 +1144,7 @@
return HX_NO_ERROR;
}
-BOOL
+HXBOOL
CAudioOutMac::_Imp_SupportsVolume( void )
{
return TRUE;
@@ -1349,7 +1349,7 @@
|
--------------------------------------------------------------------------*/
void CAudioOutMac::DonePlaying ( UINT16 cbPlayedArg, ULONG32
timeEndArg,
- short waveTask,
BOOL bSendTimeSync /*= TRUE*/)
+ short waveTask,
HXBOOL bSendTimeSync /*= TRUE*/)
{
mcbPlaying -= cbPlayedArg;
// if (cbPlayedArg)
@@ -1427,8 +1427,8 @@
#endif
}
-BOOL
-CAudioOutMac::OkToPauseResume(BOOL bToBeResumed/* TRUE - Resume. FALSE - Pause
*/)
+HXBOOL
+CAudioOutMac::OkToPauseResume(HXBOOL bToBeResumed/* TRUE - Resume. FALSE -
Pause */)
{
if (m_pInterruptState && m_pInterruptState->AtInterruptTime())
{
@@ -1545,7 +1545,7 @@
{
while (m_pCommandList && m_pCommandList->GetCount() > 0)
{
- BOOL bResume = (BOOL) m_pCommandList->RemoveHead();
+ HXBOOL bResume = (HXBOOL) m_pCommandList->RemoveHead();
if(bResume)
{
m_pAudioDeviceObject->_Imp_Resume();
@@ -1563,7 +1563,7 @@
}
void
-CAudioOutMac::HXPauseResumeCb::Enter(BOOL bResume)
+CAudioOutMac::HXPauseResumeCb::Enter(HXBOOL bResume)
{
if (!m_pCommandList)
{
Index: device/platform/openwave/audOpwave.cpp
===================================================================
RCS file: /cvsroot/audio/device/platform/openwave/audOpwave.cpp,v
retrieving revision 1.4
diff -u -w -r1.4 audOpwave.cpp
--- device/platform/openwave/audOpwave.cpp 9 Jul 2004 18:37:41 -0000
1.4
+++ device/platform/openwave/audOpwave.cpp 11 Mar 2005 22:57:20 -0000
@@ -202,7 +202,7 @@
}
-BOOL CAudioOutOpenwave::_Imp_SupportsVolume()
+HXBOOL CAudioOutOpenwave::_Imp_SupportsVolume()
{
return TRUE;
}
@@ -533,12 +533,12 @@
return RA_AOE_NOTSUPPORTED;
}
-BOOL CAudioOutOpenwave::_IsSelectable() const
+HXBOOL CAudioOutOpenwave::_IsSelectable() const
{
return TRUE;
}
-BOOL CAudioOutOpenwave::_HardwarePauseSupported() const
+HXBOOL CAudioOutOpenwave::_HardwarePauseSupported() const
{
return FALSE;
}
Index: device/platform/symbian/audsymbian.cpp
===================================================================
RCS file: /cvsroot/audio/device/platform/symbian/audsymbian.cpp,v
retrieving revision 1.29
diff -u -w -r1.29 audsymbian.cpp
--- device/platform/symbian/audsymbian.cpp 15 Feb 2005 18:17:47 -0000
1.29
+++ device/platform/symbian/audsymbian.cpp 11 Mar 2005 22:57:20 -0000
@@ -145,7 +145,7 @@
return res;
}
-HX_RESULT CHXAudioDevice::Close(const BOOL bFlush)
+HX_RESULT CHXAudioDevice::Close(const HXBOOL bFlush)
{
Reset();
@@ -238,7 +238,7 @@
return res;
}
-BOOL CHXAudioDevice::SupportsVolume()
+HXBOOL CHXAudioDevice::SupportsVolume()
{
return TRUE;
}
@@ -324,7 +324,7 @@
return (UINT16)(m_pAudioStream->GetBlocksBuffered());
}
-BOOL CHXAudioDevice::InitVolume(const UINT16 uMinVolume,
+HXBOOL CHXAudioDevice::InitVolume(const UINT16 uMinVolume,
const UINT16 uMaxVolume )
{
HX_ASSERT(m_uMaxPlayerVolume > m_uMinPlayerVolume);
Index: device/platform/symbian/audiosvr/mda/audio_session-mda.cpp
===================================================================
RCS file:
/cvsroot/audio/device/platform/symbian/audiosvr/mda/audio_session-mda.cpp,v
retrieving revision 1.8
diff -u -w -r1.8 audio_session-mda.cpp
--- device/platform/symbian/audiosvr/mda/audio_session-mda.cpp 9 Jul 2004
18:37:46 -0000 1.8
+++ device/platform/symbian/audiosvr/mda/audio_session-mda.cpp 11 Mar 2005
22:57:20 -0000
@@ -229,7 +229,7 @@
ClearWritten();
}
-BOOL HXSymbianAudioTimeline::NeedDeviceTime() const
+HXBOOL HXSymbianAudioTimeline::NeedDeviceTime() const
{
// We only want a device time if we don't haven't
// received a non-zero device time.
@@ -748,7 +748,7 @@
return ulRet;
}
-BOOL HXSymbianAudioSession::ReadyToWrite() const
+HXBOOL HXSymbianAudioSession::ReadyToWrite() const
{
return !m_bWritePending && !m_bPaused && !m_bufferList.IsEmpty();
}
Index: device/platform/symbian/audiosvr/mda/audio_session-mda.h
===================================================================
RCS file:
/cvsroot/audio/device/platform/symbian/audiosvr/mda/audio_session-mda.h,v
retrieving revision 1.5
diff -u -w -r1.5 audio_session-mda.h
--- device/platform/symbian/audiosvr/mda/audio_session-mda.h 9 Jul 2004
18:37:46 -0000 1.5
+++ device/platform/symbian/audiosvr/mda/audio_session-mda.h 11 Mar 2005
22:57:20 -0000
@@ -79,7 +79,7 @@
void OnPlay();
void OnPauseOrUnderflow();
- inline BOOL NeedDeviceTime() const;
+ inline HXBOOL NeedDeviceTime() const;
void SetDeviceTime(UINT32 ulDeviceTimeMs);
private:
@@ -142,7 +142,7 @@
UINT32 GetByteRate() const;
UINT32 GetDeviceMs();
- BOOL ReadyToWrite() const;
+ HXBOOL ReadyToWrite() const;
TInt WriteNextBuffer();
private:
@@ -172,8 +172,8 @@
HXSymbianAudioTimeline m_timeline;
CHXSimpleList m_bufferList;
- BOOL m_bPaused;
- BOOL m_bWritePending;
+ HXBOOL m_bPaused;
+ HXBOOL m_bWritePending;
};
#endif // _AUDIO_SESSION_H_
Index: device/platform/unix/audSolaris.cpp
===================================================================
RCS file: /cvsroot/audio/device/platform/unix/audSolaris.cpp,v
retrieving revision 1.5
diff -u -w -r1.5 audSolaris.cpp
--- device/platform/unix/audSolaris.cpp 9 Jul 2004 18:38:01 -0000 1.5
+++ device/platform/unix/audSolaris.cpp 11 Mar 2005 22:57:20 -0000
@@ -571,12 +571,12 @@
return m_wLastError;
}
-BOOL CAudioOutSolaris::_IsSelectable() const
+HXBOOL CAudioOutSolaris::_IsSelectable() const
{
return FALSE;
}
-BOOL CAudioOutSolaris::_HardwarePauseSupported() const
+HXBOOL CAudioOutSolaris::_HardwarePauseSupported() const
{
return TRUE;
}
Index: device/platform/unix/audUnix.cpp
===================================================================
RCS file: /cvsroot/audio/device/platform/unix/audUnix.cpp,v
retrieving revision 1.7
diff -u -w -r1.7 audUnix.cpp
--- device/platform/unix/audUnix.cpp 9 Jul 2004 18:38:01 -0000 1.7
+++ device/platform/unix/audUnix.cpp 11 Mar 2005 22:57:20 -0000
@@ -228,7 +228,7 @@
}
-BOOL CAudioOutUNIX::_Imp_SupportsVolume()
+HXBOOL CAudioOutUNIX::_Imp_SupportsVolume()
{
return TRUE;
}
@@ -727,12 +727,12 @@
return RA_AOE_NOTSUPPORTED;
}
-BOOL CAudioOutUNIX::_IsSelectable() const
+HXBOOL CAudioOutUNIX::_IsSelectable() const
{
return TRUE;
}
-BOOL CAudioOutUNIX::_HardwarePauseSupported() const
+HXBOOL CAudioOutUNIX::_HardwarePauseSupported() const
{
return FALSE;
}
@@ -750,7 +750,7 @@
#if defined(_THREADED_AUDIO) && defined(_UNIX_THREADS_SUPPORTED)
void* CAudioOutUNIX::AudioThread(void *thisPointer )
{
- BOOL bReadyToExit=FALSE;
+ HXBOOL bReadyToExit=FALSE;
CAudioOutUNIX* that = (CAudioOutUNIX*)thisPointer;
while(!bReadyToExit)
Index: device/platform/unix/audaix.cpp
===================================================================
RCS file: /cvsroot/audio/device/platform/unix/audaix.cpp,v
retrieving revision 1.3
diff -u -w -r1.3 audaix.cpp
--- device/platform/unix/audaix.cpp 9 Jul 2004 18:38:01 -0000 1.3
+++ device/platform/unix/audaix.cpp 11 Mar 2005 22:57:20 -0000
@@ -246,7 +246,7 @@
/*
* All UMS audio devices support volume.
*/
-BOOL CAudioOutAIX::_Imp_SupportsVolume()
+HXBOOL CAudioOutAIX::_Imp_SupportsVolume()
{
return TRUE;
}
@@ -362,7 +362,7 @@
return RA_AOE_NOERR;
}
- BOOL bWroteSomething;
+ HXBOOL bWroteSomething;
do {
bWroteSomething = FALSE;
if(m_pWriteList->GetCount() <= 0)
@@ -746,7 +746,7 @@
// CAudioOutAIX::HXPlaybackCountCb
-CAudioOutAIX::HXPlaybackCountCb::HXPlaybackCountCb(BOOL timed)
+CAudioOutAIX::HXPlaybackCountCb::HXPlaybackCountCb(HXBOOL timed)
: m_lRefCount (0),
m_pAudioDeviceObject (0),
m_timed(timed)
Index: device/platform/unix/audbeos.cpp
===================================================================
RCS file: /cvsroot/audio/device/platform/unix/audbeos.cpp,v
retrieving revision 1.3
diff -u -w -r1.3 audbeos.cpp
--- device/platform/unix/audbeos.cpp 9 Jul 2004 18:38:01 -0000 1.3
+++ device/platform/unix/audbeos.cpp 11 Mar 2005 22:57:20 -0000
@@ -300,7 +300,7 @@
pBuffer = pAudioOutData->pData;
}
- BOOL bCanContinue = TRUE;
+ HXBOOL bCanContinue = TRUE;
while (bCanContinue && pBuffer)
{
@@ -467,7 +467,7 @@
return HXR_OK;
}
-BOOL
+HXBOOL
CAudioOutBeOS::_Imp_SupportsVolume()
{
return TRUE;
@@ -659,7 +659,7 @@
return theErr;
}
-CAudioOutBeOS::HXPlaybackCountCb::HXPlaybackCountCb(BOOL timed)
+CAudioOutBeOS::HXPlaybackCountCb::HXPlaybackCountCb(HXBOOL timed)
: m_lRefCount(0)
, m_pAudioDeviceObject(0)
, m_timed(timed)
Index: device/platform/unix/audlinux_alsa.cpp
===================================================================
RCS file: /cvsroot/audio/device/platform/unix/audlinux_alsa.cpp,v
retrieving revision 1.5
diff -u -w -r1.5 audlinux_alsa.cpp
--- device/platform/unix/audlinux_alsa.cpp 9 Mar 2005 18:29:33 -0000
1.5
+++ device/platform/unix/audlinux_alsa.cpp 11 Mar 2005 22:57:20 -0000
@@ -1574,7 +1574,7 @@
return m_wLastError;
}
-BOOL CAudioOutLinuxAlsa::_HardwarePauseSupported() const
+HXBOOL CAudioOutLinuxAlsa::_HardwarePauseSupported() const
{
HX_ASSERT(m_pAlsaPCMHandle != NULL);
Index: device/platform/unix/audlinux_esound.cpp
===================================================================
RCS file: /cvsroot/audio/device/platform/unix/audlinux_esound.cpp,v
retrieving revision 1.2
diff -u -w -r1.2 audlinux_esound.cpp
--- device/platform/unix/audlinux_esound.cpp 9 Jul 2004 18:38:01 -0000
1.2
+++ device/platform/unix/audlinux_esound.cpp 11 Mar 2005 22:57:20 -0000
@@ -580,13 +580,13 @@
return m_wLastError;
}
-BOOL CAudioOutESound::_IsSelectable() const
+HXBOOL CAudioOutESound::_IsSelectable() const
{
return TRUE;
}
-BOOL CAudioOutESound::_HardwarePauseSupported() const
+HXBOOL CAudioOutESound::_HardwarePauseSupported() const
{
return TRUE;
}
Index: device/platform/unix/audqnx.cpp
===================================================================
RCS file: /cvsroot/audio/device/platform/unix/audqnx.cpp,v
retrieving revision 1.4
diff -u -w -r1.4 audqnx.cpp
--- device/platform/unix/audqnx.cpp 9 Jul 2004 18:38:01 -0000 1.4
+++ device/platform/unix/audqnx.cpp 11 Mar 2005 22:57:20 -0000
@@ -208,7 +208,7 @@
return RA_AOE_NOERR;
}
-BOOL CAudioOutQNX::_Imp_SupportsVolume()
+HXBOOL CAudioOutQNX::_Imp_SupportsVolume()
{
return TRUE;
}
@@ -362,7 +362,7 @@
return RA_AOE_NOERR;
}
- BOOL bWroteSomething = TRUE;
+ HXBOOL bWroteSomething = TRUE;
do
{
bWroteSomething = FALSE;
@@ -771,7 +771,7 @@
// CAudioOutQNX::HXPlaybackCountCb
-CAudioOutQNX::HXPlaybackCountCb::HXPlaybackCountCb(BOOL timed) :
+CAudioOutQNX::HXPlaybackCountCb::HXPlaybackCountCb(HXBOOL timed) :
m_lRefCount (0)
,m_pAudioDeviceObject (0)
,m_timed(timed)
@@ -869,7 +869,7 @@
* CAudioOutQNX::BuffersEmpty
* Purpose:
*/
-BOOL CAudioOutQNX::BuffersEmpty()
+HXBOOL CAudioOutQNX::BuffersEmpty()
{
snd_pcm_playback_status_t info;
Index: device/platform/unix/audusound.cpp
===================================================================
RCS file: /cvsroot/audio/device/platform/unix/audusound.cpp,v
retrieving revision 1.1
diff -u -w -r1.1 audusound.cpp
--- device/platform/unix/audusound.cpp 25 Mar 2004 22:09:53 -0000 1.1
+++ device/platform/unix/audusound.cpp 11 Mar 2005 22:57:20 -0000
@@ -400,13 +400,13 @@
return m_wLastError;
}
-BOOL CAudioOutUSound::_IsSelectable() const
+HXBOOL CAudioOutUSound::_IsSelectable() const
{
return TRUE;
}
-BOOL CAudioOutUSound::_HardwarePauseSupported() const
+HXBOOL CAudioOutUSound::_HardwarePauseSupported() const
{
return TRUE;
}
Index: device/platform/win/hxaudevds.cpp
===================================================================
RCS file: /cvsroot/audio/device/platform/win/hxaudevds.cpp,v
retrieving revision 1.26
diff -u -w -r1.26 hxaudevds.cpp
--- device/platform/win/hxaudevds.cpp 17 Jan 2005 20:51:09 -0000 1.26
+++ device/platform/win/hxaudevds.cpp 11 Mar 2005 22:57:20 -0000
@@ -114,7 +114,7 @@
const TCHAR* kDSDestroyMessage = TEXT("HX_DestroyDSWindowInternal");
const int BUFFER_TIME = 8;
-extern BOOL RMEnableLogging();
+extern HXBOOL RMEnableLogging();
extern void RMDSLog(const char* pFormatString, ...);
#define RMDS_LOG RMDSLog
@@ -266,7 +266,7 @@
InternalClose() ;
/* Get the IDirectSound interface */
- BOOL bUsingDS8 = TRUE;
+ HXBOOL bUsingDS8 = TRUE;
FPDIRECTSOUNDCREATE fpCreateDS = (FPDIRECTSOUNDCREATE)
::GetProcAddress(m_hSoundDll, TEXT("DirectSoundCreate8") );
if(!fpCreateDS)
{
Index: device/platform/win/hxdslogger.cpp
===================================================================
RCS file: /cvsroot/audio/device/platform/win/hxdslogger.cpp,v
retrieving revision 1.7
diff -u -w -r1.7 hxdslogger.cpp
--- device/platform/win/hxdslogger.cpp 9 Jul 2004 18:38:05 -0000 1.7
+++ device/platform/win/hxdslogger.cpp 11 Mar 2005 22:57:20 -0000
@@ -79,7 +79,7 @@
bool bEnableDSLoggingStateSet = false;
bool bEnableDSLogging = false;
-BOOL RMEnableLogging();
+HXBOOL RMEnableLogging();
void RMDSLog(const char* pFormatString, ...);
@@ -101,13 +101,13 @@
}
}
-BOOL RMEnableLogging()
+HXBOOL RMEnableLogging()
{
if(bEnableDSLoggingStateSet)
return bEnableDSLogging;
//By default, assume the home page is going to be where we start, then see
if the registry says otherwise.
- BOOL bEnableLogging = FALSE;
+ HXBOOL bEnableLogging = FALSE;
TCHAR szPrefKeyPath[256]; /* Flawfinder: ignore */
HKEY hKeyPlayerPrefsDSLogging;
Index: device/platform/win/winaudio.cpp
===================================================================
RCS file: /cvsroot/audio/device/platform/win/winaudio.cpp,v
retrieving revision 1.6
diff -u -w -r1.6 winaudio.cpp
--- device/platform/win/winaudio.cpp 9 Jul 2004 18:38:05 -0000 1.6
+++ device/platform/win/winaudio.cpp 11 Mar 2005 22:57:20 -0000
@@ -103,13 +103,13 @@
int m_audfile = -1;
#endif
-BOOL CAudioOutWindows::zm_bVolSupport = FALSE;
-BOOL CAudioOutWindows::zm_bLRVolSupport = FALSE;
+HXBOOL CAudioOutWindows::zm_bVolSupport = FALSE;
+HXBOOL CAudioOutWindows::zm_bLRVolSupport = FALSE;
WORD CAudioOutWindows::zm_uMaxVolume = 100;
-BOOL CAudioOutWindows::zm_bMixerVolSupport = FALSE;
-BOOL CAudioOutWindows::zm_bMixerVolSupportChecked = FALSE;
+HXBOOL CAudioOutWindows::zm_bMixerVolSupport = FALSE;
+HXBOOL CAudioOutWindows::zm_bMixerVolSupportChecked = FALSE;
UINT CAudioOutWindows::zm_uDestroyMessage = 0;
-BOOL CAudioOutWindows::zm_bClosed = TRUE;
+HXBOOL CAudioOutWindows::zm_bClosed = TRUE;
CAudioOutWindows* zm_pCurrentAudioDevice = NULL;
// BAD drivers which need to call waveOutSetVolume directly
@@ -208,7 +208,7 @@
UINT16 CAudioOutWindows::_Imp_GetVolume()
{
DWORD dwVol = 0;
- BOOL bSuccess = FALSE;
+ HXBOOL bSuccess = FALSE;
#if defined(_WIN32) && !defined(_WINCE)
if (!zm_bMixerVolSupportChecked)
@@ -269,7 +269,7 @@
)
{
DWORD dwVol = 0;
- BOOL bSuccess = FALSE;
+ HXBOOL bSuccess = FALSE;
if (uVolume > zm_uMaxVolume)
{
@@ -367,7 +367,7 @@
return HXR_OK;
}
-BOOL CAudioOutWindows::_Imp_SupportsVolume()
+HXBOOL CAudioOutWindows::_Imp_SupportsVolume()
{
MMRESULT wSuccess;
WAVEOUTCAPS auxcap;
@@ -568,7 +568,7 @@
const HXAudioData* pAudioOutHdr
)
{
- BOOL bTemp;
+ HXBOOL bTemp;
CWaveHeader* pWaveHeader;
MMRESULT res;
ULONG32 ulBufLen = 0;
@@ -789,7 +789,7 @@
}
-BOOL CAudioOutWindows::AllocateBuffers(UINT16 unNumBuffers, UINT16 unBufSize)
+HXBOOL CAudioOutWindows::AllocateBuffers(UINT16 unNumBuffers, UINT16 unBufSize)
{
UCHAR** ppWaveBuffers;
CWaveHeader* pWaveHdrs;
Index: device/platform/win/HXAudioDeviceHook/CHXAudioDeviceHook.cpp
===================================================================
RCS file:
/cvsroot/audio/device/platform/win/HXAudioDeviceHook/CHXAudioDeviceHook.cpp,v
retrieving revision 1.4
diff -u -w -r1.4 CHXAudioDeviceHook.cpp
--- device/platform/win/HXAudioDeviceHook/CHXAudioDeviceHook.cpp 2 Nov
2004 22:54:22 -0000 1.4
+++ device/platform/win/HXAudioDeviceHook/CHXAudioDeviceHook.cpp 11 Mar
2005 22:57:20 -0000
@@ -1244,7 +1244,7 @@
IHXBuffer* pBuffer = new CHXBuffer( (UCHAR*) pbInputData,
dwInputBufSize, FALSE );
pBuffer->AddRef();
- BOOL bChanged = FALSE;
+ HXBOOL bChanged = FALSE;
if( SUCCEEDED( m_pHook->ProcessAudioDeviceHooks( pBuffer, bChanged ))
&& bChanged )
{
memcpy( pbData, pBuffer->GetBuffer(), HX_MIN( dwInputBufSize,
pBuffer->GetSize()) );
Index: device/platform/win/HXAudioDeviceHook/HXAudioDeviceHook.cpp
===================================================================
RCS file:
/cvsroot/audio/device/platform/win/HXAudioDeviceHook/HXAudioDeviceHook.cpp,v
retrieving revision 1.3
diff -u -w -r1.3 HXAudioDeviceHook.cpp
--- device/platform/win/HXAudioDeviceHook/HXAudioDeviceHook.cpp 2 Jul 2004
22:11:05 -0000 1.3
+++ device/platform/win/HXAudioDeviceHook/HXAudioDeviceHook.cpp 11 Mar 2005
22:57:20 -0000
@@ -59,7 +59,7 @@
// DLL Entry Point
extern "C"
-BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID /*lpReserved*/)
+HXBOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID
/*lpReserved*/)
{
if (DLL_PROCESS_ATTACH == dwReason)
{
Index: device/pub/fakeaudiodevice.h
===================================================================
RCS file: /cvsroot/audio/device/pub/fakeaudiodevice.h,v
retrieving revision 1.1
diff -u -w -r1.1 fakeaudiodevice.h
--- device/pub/fakeaudiodevice.h 6 Aug 2004 19:32:19 -0000 1.1
+++ device/pub/fakeaudiodevice.h 11 Mar 2005 22:57:20 -0000
@@ -63,11 +63,11 @@
// IHXAudioDevice methods
STDMETHOD(Open) (THIS_ const HXAudioFormat* pAudioFormat,
IHXAudioDeviceResponse* pStreamResponse);
- STDMETHOD(Close) (THIS_ const BOOL bFlush);
+ STDMETHOD(Close) (THIS_ const HXBOOL bFlush);
STDMETHOD(Resume) (THIS);
STDMETHOD(Pause) (THIS);
STDMETHOD(Write) (THIS_ const HXAudioData* pAudioData);
- STDMETHOD_(BOOL,InitVolume) (THIS_ const UINT16 uMinVolume, const
UINT16 uMaxVolume);
+ STDMETHOD_(HXBOOL,InitVolume) (THIS_ const UINT16 uMinVolume, const
UINT16 uMaxVolume);
STDMETHOD(SetVolume) (THIS_ const UINT16 uVolume);
STDMETHOD_(UINT16,GetVolume) (THIS);
STDMETHOD(Reset) (THIS);
@@ -80,8 +80,8 @@
// CHXFakeAudioDevice methods
STDMETHOD(Init) (THIS_ IUnknown* pContext);
- STDMETHOD_(BOOL,IsResumed) (THIS);
- STDMETHOD_(BOOL,IsClosed) (THIS);
+ STDMETHOD_(HXBOOL,IsResumed) (THIS);
+ STDMETHOD_(HXBOOL,IsClosed) (THIS);
protected:
enum FakeAudioDeviceState
{
Index: device/pub/hxaudev.h
===================================================================
RCS file: /cvsroot/audio/device/pub/hxaudev.h,v
retrieving revision 1.11
diff -u -w -r1.11 hxaudev.h
--- device/pub/hxaudev.h 28 Sep 2004 21:04:17 -0000 1.11
+++ device/pub/hxaudev.h 11 Mar 2005 22:57:20 -0000
@@ -98,7 +98,7 @@
private:
LONG32 m_lRefCount;
- BOOL m_bBuffer;
+ HXBOOL m_bBuffer;
HX_RESULT m_wLastError;
IHXAudioDeviceResponse* m_pDeviceResponse;
@@ -111,7 +111,7 @@
UINT16 m_uCurVolume; // Current volume
UINT16 m_uSampFrameSize; // Frame size.
HXAudioFormat m_AudioFmt; // Device format
- BOOL m_bPaused; // Whether device is supposed
to be paused!
+ HXBOOL m_bPaused; // Whether device is supposed
to be paused!
ULONG32 m_ulCurrentTime;
ULONG32 m_ulLastSysTime;
ULONG32 m_ulGranularity;
@@ -126,7 +126,7 @@
virtual HX_RESULT _Imp_Pause(void) = 0;
virtual HX_RESULT _Imp_Resume(void) = 0;
virtual HX_RESULT _Imp_Write(const HXAudioData*
pAudioData) = 0;
- virtual BOOL _Imp_SupportsVolume(void) = 0;
+ virtual HXBOOL _Imp_SupportsVolume(void) = 0;
virtual HX_RESULT _Imp_SetVolume(const UINT16 uVolume) =
0;
virtual UINT16 _Imp_GetVolume(void) = 0;
virtual HX_RESULT _Imp_Reset(void) = 0;
@@ -135,7 +135,7 @@
virtual HX_RESULT _Imp_GetCurrentTime(ULONG32&
ulCurrentTime) = 0;
virtual INT16 _Imp_GetAudioFd(void) = 0;
virtual UINT16 _NumberOfBlocksRemainingToPlay(void) =
0;
- virtual BOOL _IsWaveOutDevice(void);
+ virtual HXBOOL _IsWaveOutDevice(void);
virtual ~CHXAudioDevice();
@@ -209,7 +209,7 @@
);
STDMETHOD(Close) (THIS_
- const BOOL bFlush ) ;
+ const HXBOOL bFlush ) ;
STDMETHOD(Pause) (THIS);
STDMETHOD(Resume) (THIS);
@@ -219,9 +219,9 @@
);
STDMETHOD(SetBuffering) (THIS_
- const BOOL bSetBuffering) ;
+ const HXBOOL bSetBuffering) ;
- STDMETHOD_(BOOL,InitVolume) (THIS_
+ STDMETHOD_(HXBOOL,InitVolume) (THIS_
const UINT16 uMinVolume,
const UINT16 uMaxVolume) ;
@@ -248,7 +248,7 @@
};
UINT16 NumberOfBlocksRemainingToPlay();
- BOOL IsWaveOutDevice();
+ HXBOOL IsWaveOutDevice();
};
#endif /* HXAUDEV_H_ */
Index: device/pub/platform/mac/macaudio.h
===================================================================
RCS file: /cvsroot/audio/device/pub/platform/mac/macaudio.h,v
retrieving revision 1.5
diff -u -w -r1.5 macaudio.h
--- device/pub/platform/mac/macaudio.h 9 Jul 2004 18:38:10 -0000 1.5
+++ device/pub/platform/mac/macaudio.h 11 Mar 2005 22:57:20 -0000
@@ -177,7 +177,7 @@
UINT16 channels,
UINT16 bitsPerSample);
- void Release (short param1, BOOL bSendTimeSync =
TRUE);
+ void Release (short param1, HXBOOL bSendTimeSync =
TRUE);
OSErr PlayBuffer(char *pData,
UINT16 cbPlay,
ULONG32 timeEndArg);
@@ -241,10 +241,10 @@
* IHXCallback methods
*/
STDMETHOD(Func) (THIS);
- void Enter(BOOL bResume);
+ void Enter(HXBOOL bResume);
};
friend class HXPauseResumeCb;
- BOOL OkToPauseResume(BOOL bToBeResumed/* TRUE -
Resume. FALSE - Pause */);
+ HXBOOL OkToPauseResume(HXBOOL bToBeResumed/* TRUE -
Resume. FALSE - Pause */);
private:
@@ -312,10 +312,10 @@
CAudioOutMac ();
~CAudioOutMac (void);
- void ProcessCmd(SndCommand* cmd, BOOL bSendTimeSync = TRUE);
+ void ProcessCmd(SndCommand* cmd, HXBOOL bSendTimeSync = TRUE);
void AddToThePendingList(void* pNode);
- BOOL m_bDeferredTaskPending;
+ HXBOOL m_bDeferredTaskPending;
IHXInterruptState* m_pInterruptState;
// m_bAudioCallbacksAreAlive and m_bIsQuitting need to be UINT32s
because
@@ -333,7 +333,7 @@
HX_RESULT _Imp_Write( const HXAudioData* pAudioOutHdr );
HX_RESULT _Imp_Reset( void );
HX_RESULT _Imp_Drain( void );
- BOOL _Imp_SupportsVolume( void );
+ HXBOOL _Imp_SupportsVolume( void );
UINT16 _Imp_GetVolume();
HX_RESULT _Imp_SetVolume( const UINT16 uVolume );
HX_RESULT _Imp_CheckFormat( const HXAudioFormat* pFormat);
@@ -359,7 +359,7 @@
void DonePlaying (UINT16 cbPlayedArg,
ULONG32 timeEndArg,
short waveTask,
- BOOL bSendTimeSync = TRUE);
+ HXBOOL bSendTimeSync = TRUE);
inline void StartedPlaying (UINT16 cbPlayed)
{mcbPlaying += cbPlayed;};
Index: device/pub/platform/openwave/audopwave.h
===================================================================
RCS file: /cvsroot/audio/device/pub/platform/openwave/audopwave.h,v
retrieving revision 1.4
diff -u -w -r1.4 audopwave.h
--- device/pub/platform/openwave/audopwave.h 9 Jul 2004 18:38:13 -0000
1.4
+++ device/pub/platform/openwave/audopwave.h 11 Mar 2005 22:57:20 -0000
@@ -86,7 +86,7 @@
RA_AOS_CLOSING // We've been told to close after audio fin
} AUDIOSTATE;
- inline BOOL IsOpen() const { return (m_wState==RA_AOS_OPEN_PLAYING ||
m_wState==RA_AOS_OPEN_PAUSED);}
+ inline HXBOOL IsOpen() const { return (m_wState==RA_AOS_OPEN_PLAYING ||
m_wState==RA_AOS_OPEN_PAUSED);}
void iodone(); // callback
@@ -94,14 +94,14 @@
class HXPlaybackCountCB : public IHXCallback
{
private:
- BOOL m_timed;
+ HXBOOL m_timed;
LONG32 m_lRefCount;
CAudioOutOpenwave* m_pAudioDeviceObject;
virtual ~HXPlaybackCountCB();
public:
//Ctors
- HXPlaybackCountCB(CAudioOutOpenwave* object, BOOL timed = TRUE) :
+ HXPlaybackCountCB(CAudioOutOpenwave* object, HXBOOL timed = TRUE) :
m_timed(timed),
m_lRefCount(0),
m_pAudioDeviceObject( object )
@@ -134,7 +134,7 @@
HX_RESULT _Imp_Drain( void );
//Implemented.
HX_RESULT _Imp_SetVolume( const UINT16 uVolume );
//Implemented.
HX_RESULT _Imp_GetCurrentTime( ULONG32& ulCurrentTime);
//Implemented.
- BOOL _Imp_SupportsVolume( void );
//Implemented.
+ HXBOOL _Imp_SupportsVolume( void );
//Implemented.
UINT16 _Imp_GetVolume( void );
//Implemented.
//Not used but defined in CHXAudioDevice as pure virtual.
@@ -161,12 +161,12 @@
//A method to determine if the audio devices file descriptor,
//if it has one, should be added to the client core's select loop.
//The default implementation is 'yes it should be added'.
- virtual BOOL _IsSelectable() const;
+ virtual HXBOOL _IsSelectable() const;
//A mehtod to let us know if the hardware supports puase/resume.
//We can use this to remove unneeded memcpys and other expensive
//operations. The default implementation is 'No, not supported'.
- virtual BOOL _HardwarePauseSupported() const;
+ virtual HXBOOL _HardwarePauseSupported() const;
//The Imp_Write method just fills up our write list. This method
//is the one that actually sends the data to the audio device.
@@ -214,16 +214,16 @@
HXPlaybackCountCB* m_pCallback;
AUDIOSTATE m_wState; // This is
- BOOL m_bMixerPresent;
+ HXBOOL m_bMixerPresent;
UINT16 m_wBlockSize;
UINT64 m_ulLastNumBytes; // Number of bytes played back
since last open
UINT32 m_ulLastTick; // Ticks in ms when the audio
playback starts
- BOOL m_bFirstWrite; // First write
- BOOL m_bInitCallback; // Initialize the callback once
+ HXBOOL m_bFirstWrite; // First write
+ HXBOOL m_bInitCallback; // Initialize the callback once
UINT64 m_ulTotalWritten; // Total bytes written
Timeval* m_pPlaybackCountCBTime;
ULONG32 m_PendingCallbackID; // Used for fake time sync
- BOOL m_bCallbackPending; // Used for fake time sync
+ HXBOOL m_bCallbackPending; // Used for fake time sync
CHXSimpleList* m_pWriteList;
UINT32 m_unSampleRate;
Index: device/pub/platform/symbian/audsymbian.h
===================================================================
RCS file: /cvsroot/audio/device/pub/platform/symbian/audsymbian.h,v
retrieving revision 1.10
diff -u -w -r1.10 audsymbian.h
--- device/pub/platform/symbian/audsymbian.h 6 Jan 2005 02:15:34 -0000
1.10
+++ device/pub/platform/symbian/audsymbian.h 11 Mar 2005 22:57:20 -0000
@@ -84,13 +84,13 @@
//IHXAudioDevice methods
HX_RESULT Open( const HXAudioFormat* pFormat,
IHXAudioDeviceResponse* );
- HX_RESULT Close( const BOOL bFlush);
+ HX_RESULT Close( const HXBOOL bFlush);
HX_RESULT Write( const HXAudioData* pAudioOutHdr );
HX_RESULT Reset( void );
HX_RESULT Drain( void );
HX_RESULT SetVolume( const UINT16 uVolume );
HX_RESULT GetCurrentAudioTime( ULONG32& ulCurrentTime);
- BOOL SupportsVolume( void );
+ HXBOOL SupportsVolume( void );
UINT16 GetVolume( void );
short GetAudioFd( void );
HX_RESULT Seek(ULONG32 ulSeekTime);
@@ -98,13 +98,13 @@
HX_RESULT Pause( void );
HX_RESULT CheckFormat( const HXAudioFormat* pFormat);
UINT16 NumberOfBlocksRemainingToPlay(void);
- BOOL InitVolume( const UINT16 uMinVolume, const UINT16 uMaxVolume);
+ HXBOOL InitVolume( const UINT16 uMinVolume, const UINT16 uMaxVolume);
//XXXgfw These is not part of any interface but it is called from
//the audio stream anyway. Need to fix that. We don't need a
//context anyway.
inline void Init(IUnknown* pContext){}
- inline BOOL IsWaveOutDevice() { return TRUE; }
+ inline HXBOOL IsWaveOutDevice() { return TRUE; }
inline void SetGranularity(ULONG32 ulGranularity,
ULONG32 ulBytesPerGran) {}
inline static CHXAudioDevice* Create(IHXPreferences* pPrefs)
Index: device/pub/platform/unix/audSolaris.h
===================================================================
RCS file: /cvsroot/audio/device/pub/platform/unix/audSolaris.h,v
retrieving revision 1.3
diff -u -w -r1.3 audSolaris.h
--- device/pub/platform/unix/audSolaris.h 9 Jul 2004 18:38:19 -0000
1.3
+++ device/pub/platform/unix/audSolaris.h 11 Mar 2005 22:57:20 -0000
@@ -126,8 +126,8 @@
//audio device that can be written without blocking.
virtual HX_RESULT _GetRoomOnDevice( ULONG32& ulBytes) const;
- BOOL _IsSelectable() const;
- BOOL _HardwarePauseSupported() const;
+ HXBOOL _IsSelectable() const;
+ HXBOOL _HardwarePauseSupported() const;
private:
Index: device/pub/platform/unix/audUnix.h
===================================================================
RCS file: /cvsroot/audio/device/pub/platform/unix/audUnix.h,v
retrieving revision 1.4
diff -u -w -r1.4 audUnix.h
--- device/pub/platform/unix/audUnix.h 9 Jul 2004 18:38:19 -0000 1.4
+++ device/pub/platform/unix/audUnix.h 11 Mar 2005 22:57:20 -0000
@@ -91,20 +91,20 @@
RA_AOS_CLOSING // We've been told to close after audio fin
} AUDIOSTATE;
- inline BOOL IsOpen() const { return (m_wState==RA_AOS_OPEN_PLAYING ||
m_wState==RA_AOS_OPEN_PAUSED);}
+ inline HXBOOL IsOpen() const { return (m_wState==RA_AOS_OPEN_PLAYING ||
m_wState==RA_AOS_OPEN_PAUSED);}
// Create friend class for scheduled playback callback.
class HXPlaybackCountCB : public IHXCallback
{
private:
- BOOL m_timed;
+ HXBOOL m_timed;
LONG32 m_lRefCount;
CAudioOutUNIX* m_pAudioDeviceObject;
virtual ~HXPlaybackCountCB();
public:
//Ctors
- HXPlaybackCountCB(CAudioOutUNIX* object, BOOL timed = TRUE) :
+ HXPlaybackCountCB(CAudioOutUNIX* object, HXBOOL timed = TRUE) :
m_timed(timed),
m_lRefCount(0),
m_pAudioDeviceObject( object )
@@ -137,7 +137,7 @@
HX_RESULT _Imp_Drain( void );
//Implemented.
HX_RESULT _Imp_SetVolume( const UINT16 uVolume );
//Implemented.
HX_RESULT _Imp_GetCurrentTime( ULONG32& ulCurrentTime);
//Implemented.
- BOOL _Imp_SupportsVolume( void );
//Implemented.
+ HXBOOL _Imp_SupportsVolume( void );
//Implemented.
UINT16 _Imp_GetVolume( void );
//Implemented.
//Not used but defined in CHXAudioDevice as pure virtual.
@@ -164,12 +164,12 @@
//A method to determine if the audio devices file descriptor,
//if it has one, should be added to the client core's select loop.
//The default implementation is 'yes it should be added'.
- virtual BOOL _IsSelectable() const;
+ virtual HXBOOL _IsSelectable() const;
//A mehtod to let us know if the hardware supports puase/resume.
//We can use this to remove unneeded memcpys and other expensive
//operations. The default implementation is 'No, not supported'.
- virtual BOOL _HardwarePauseSupported() const;
+ virtual HXBOOL _HardwarePauseSupported() const;
//The Imp_Write method just fills up our write list. This method
//is the one that actually sends the data to the audio device.
@@ -246,14 +246,14 @@
HXPlaybackCountCB* m_pCallback;
AUDIOSTATE m_wState; // This is
- BOOL m_bMixerPresent;
+ HXBOOL m_bMixerPresent;
UINT16 m_wBlockSize;
UINT64 m_ulLastNumBytes; // Number of bytes played back
since last open
- BOOL m_bFirstWrite; // First write
+ HXBOOL m_bFirstWrite; // First write
UINT64 m_ulTotalWritten; // Total bytes written
Timeval* m_pPlaybackCountCBTime;
ULONG32 m_PendingCallbackID; // Used for fake time sync
- BOOL m_bCallbackPending; // Used for fake time sync
+ HXBOOL m_bCallbackPending; // Used for fake time sync
CHXSimpleList* m_pWriteList;
UINT32 m_unSampleRate;
@@ -286,7 +286,7 @@
HXMutex* m_mtxWriteListPlayStateLock;
HXMutex* m_mtxDeviceStateLock;
HXThread* m_audioThread;
- BOOL m_bUserWantsThreads;
+ HXBOOL m_bUserWantsThreads;
ULONG32 m_ulSleepTime;
#endif
Index: device/pub/platform/unix/audaix.h
===================================================================
RCS file: /cvsroot/audio/device/pub/platform/unix/audaix.h,v
retrieving revision 1.4
diff -u -w -r1.4 audaix.h
--- device/pub/platform/unix/audaix.h 9 Jul 2004 18:38:19 -0000 1.4
+++ device/pub/platform/unix/audaix.h 11 Mar 2005 22:57:20 -0000
@@ -100,9 +100,9 @@
public:
- HXPlaybackCountCb(BOOL timed = TRUE);
+ HXPlaybackCountCb(HXBOOL timed = TRUE);
- BOOL m_timed;
+ HXBOOL m_timed;
CAudioOutAIX* m_pAudioDeviceObject;
/*
@@ -133,7 +133,7 @@
HX_RESULT _Imp_Write( const HXAudioData* pAudioOutHdr );
HX_RESULT _Imp_Reset( void );
HX_RESULT _Imp_Drain( void );
- BOOL _Imp_SupportsVolume( void );
+ HXBOOL _Imp_SupportsVolume( void );
UINT16 _Imp_GetVolume( void );
HX_RESULT _Imp_SetVolume( const UINT16 uVolume );
HX_RESULT _Imp_CheckFormat( const HXAudioFormat* pFormat);
@@ -158,19 +158,19 @@
AUDIOERROR m_wLastError; // The last error d
char m_DevName[26]; /* Flawfinder: ignore */
// audio device filename
char m_DevCtlName[26]; /* Flawfinder: ignore */
// mixer device filename
- BOOL m_bMixerPresent;
+ HXBOOL m_bMixerPresent;
UINT16 m_wBlockSize;
int m_log; // log file of pcm
ULONG32 m_ulLastNumBytes; // Number of bytes
played back since last open
ULONG32 m_ulBytesRemaining; // Number of bytes
remaining
- BOOL m_bFirstWrite; // First write
+ HXBOOL m_bFirstWrite; // First write
ULONG32 m_ulTotalWritten; // Total bytes written
// ULONG32 m_ulFragSize; // The Fragment
Size
LONG32 m_oSamples; // UMS required # of
samples
Timeval* m_pPlaybackCountCBTime;
ULONG32 m_PendingCallbackID; // Used for
fake time sync
- BOOL m_bCallbackPending; // Used for fake time
sync
- BOOL m_paused;
+ HXBOOL m_bCallbackPending; // Used for fake time
sync
+ HXBOOL m_paused;
CHXSimpleList* m_pWriteList;
CHXSimpleList* m_pTimeStampList; // List of timestamps
of audio data
UINT32 m_ulTotalNumBufs;
Index: device/pub/platform/unix/audbeos.h
===================================================================
RCS file: /cvsroot/audio/device/pub/platform/unix/audbeos.h,v
retrieving revision 1.3
diff -u -w -r1.3 audbeos.h
--- device/pub/platform/unix/audbeos.h 9 Jul 2004 18:38:19 -0000 1.3
+++ device/pub/platform/unix/audbeos.h 11 Mar 2005 22:57:20 -0000
@@ -83,9 +83,9 @@
public:
- HXPlaybackCountCb(BOOL timed = TRUE);
+ HXPlaybackCountCb(HXBOOL timed = TRUE);
- BOOL m_timed;
+ HXBOOL m_timed;
CAudioOutBeOS *m_pAudioDeviceObject;
/*
@@ -117,7 +117,7 @@
HX_RESULT _Imp_Write( const HXAudioData* pAudioOutData );
HX_RESULT _Imp_Reset( void );
HX_RESULT _Imp_Drain( void );
- BOOL _Imp_SupportsVolume( void );
+ HXBOOL _Imp_SupportsVolume( void );
UINT16 _Imp_GetVolume( void );
HX_RESULT _Imp_SetVolume( const UINT16 uVolume );
HX_RESULT _Imp_CheckFormat( const HXAudioFormat* pFormat);
@@ -150,7 +150,7 @@
HX_BITFIELD m_bPlaying : 1;
#if _BEOS_AUDIODEV_CALLBACK
Timeval *m_pPlaybackCountCBTime;
- BOOL m_bCallbackPending;
+ HXBOOL m_bCallbackPending;
ULONG32 m_PendingCallbackID;
#endif
};
Index: device/pub/platform/unix/audhpux.h
===================================================================
RCS file: /cvsroot/audio/device/pub/platform/unix/audhpux.h,v
retrieving revision 1.4
diff -u -w -r1.4 audhpux.h
--- device/pub/platform/unix/audhpux.h 23 Sep 2004 18:20:29 -0000 1.4
+++ device/pub/platform/unix/audhpux.h 11 Mar 2005 22:57:20 -0000
@@ -108,7 +108,7 @@
virtual HX_RESULT _Pause();
virtual HX_RESULT _Resume();
- virtual BOOL _HardwarePauseSupported() { return FALSE ; };
+ virtual HXBOOL _HardwarePauseSupported() { return FALSE ; };
//Device specific method to get/set the devices current volume.
virtual UINT16 _GetVolume() const;
@@ -143,8 +143,8 @@
int m_nDevID;
int m_nMixerID;
- mutable BOOL m_bGetODelayFailed;
- mutable BOOL m_bGetOSpaceFailed;
+ mutable HXBOOL m_bGetODelayFailed;
+ mutable HXBOOL m_bGetOSpaceFailed;
HXAudioFormat m_lastFormat;
};
Index: device/pub/platform/unix/audlinux_alsa.h
===================================================================
RCS file: /cvsroot/audio/device/pub/platform/unix/audlinux_alsa.h,v
retrieving revision 1.4
diff -u -w -r1.4 audlinux_alsa.h
--- device/pub/platform/unix/audlinux_alsa.h 28 Sep 2004 21:04:17 -0000
1.4
+++ device/pub/platform/unix/audlinux_alsa.h 11 Mar 2005 22:57:20 -0000
@@ -122,7 +122,7 @@
//A method to let us know if the hardware supports puase/resume.
//We can use this to remove unneeded memcpys and other expensive
//operations. The default implementation is 'No, not supported'.
- virtual BOOL _HardwarePauseSupported() const;
+ virtual HXBOOL _HardwarePauseSupported() const;
private:
@@ -147,16 +147,16 @@
mutable IHXBuffer* m_pMixerDeviceName;
mutable IHXBuffer* m_pMixerElementName;
- mutable BOOL m_bHasHardwarePauseAndResume;
+ mutable HXBOOL m_bHasHardwarePauseAndResume;
mutable UINT64 m_nBytesPlayedBeforeLastTrigger;
mutable UINT64 m_nLastBytesPlayed;
mutable snd_timestamp_t m_tstampLastTrigger;
- mutable BOOL m_bGotInitialTrigger;
+ mutable HXBOOL m_bGotInitialTrigger;
- mutable BOOL m_bUseMMAPTStamps;
+ mutable HXBOOL m_bUseMMAPTStamps;
};
Index: device/pub/platform/unix/audlinux_esound.h
===================================================================
RCS file: /cvsroot/audio/device/pub/platform/unix/audlinux_esound.h,v
retrieving revision 1.3
diff -u -w -r1.3 audlinux_esound.h
--- device/pub/platform/unix/audlinux_esound.h 9 Jul 2004 18:38:19 -0000
1.3
+++ device/pub/platform/unix/audlinux_esound.h 11 Mar 2005 22:57:20 -0000
@@ -142,9 +142,9 @@
virtual HX_RESULT _Pause();
virtual HX_RESULT _Resume();
- BOOL _IsSelectable() const;
+ HXBOOL _IsSelectable() const;
- BOOL _HardwarePauseSupported() const;
+ HXBOOL _HardwarePauseSupported() const;
private:
esd_player_info_t* _GetPlayerInfo() const;
Index: device/pub/platform/unix/audlinux_oss.h
===================================================================
RCS file: /cvsroot/audio/device/pub/platform/unix/audlinux_oss.h,v
retrieving revision 1.5
diff -u -w -r1.5 audlinux_oss.h
--- device/pub/platform/unix/audlinux_oss.h 9 Jul 2004 18:38:19 -0000
1.5
+++ device/pub/platform/unix/audlinux_oss.h 11 Mar 2005 22:57:20 -0000
@@ -147,9 +147,9 @@
int m_nDevID;
int m_nMixerID;
- mutable BOOL m_bGetODelayFailed;
- mutable BOOL m_bGetOSpaceFailed;
- BOOL m_bTestGetODelay;
+ mutable HXBOOL m_bGetODelayFailed;
+ mutable HXBOOL m_bGetOSpaceFailed;
+ HXBOOL m_bTestGetODelay;
};
Index: device/pub/platform/unix/audqnx.h
===================================================================
RCS file: /cvsroot/audio/device/pub/platform/unix/audqnx.h,v
retrieving revision 1.4
diff -u -w -r1.4 audqnx.h
--- device/pub/platform/unix/audqnx.h 9 Jul 2004 18:38:19 -0000 1.4
+++ device/pub/platform/unix/audqnx.h 11 Mar 2005 22:57:20 -0000
@@ -98,9 +98,9 @@
public:
- HXPlaybackCountCb(BOOL timed = TRUE);
+ HXPlaybackCountCb(HXBOOL timed = TRUE);
- BOOL m_timed;
+ HXBOOL m_timed;
CAudioOutQNX* m_pAudioDeviceObject;
/*
@@ -131,7 +131,7 @@
HX_RESULT _Imp_Write( const HXAudioData* pAudioOutHdr );
HX_RESULT _Imp_Reset( void );
HX_RESULT _Imp_Drain( void );
- BOOL _Imp_SupportsVolume( void );
+ HXBOOL _Imp_SupportsVolume( void );
UINT16 _Imp_GetVolume( void );
HX_RESULT _Imp_SetVolume( const UINT16 uVolume );
HX_RESULT _Imp_CheckFormat( const HXAudioFormat* pFormat);
@@ -147,7 +147,7 @@
ULONG32 GetPlaybackBytes(void);
void DoTimeSyncs(void);
HX_RESULT ReschedPlaybackCheck(void);
- BOOL BuffersEmpty(void);
+ HXBOOL BuffersEmpty(void);
void OpenMixer();
void CloseMixer();
@@ -161,19 +161,19 @@
AUDIOERROR m_wLastError; // The last error d
char m_DevName[25]; /* Flawfinder: ignore */
char m_DevCtlName[25]; /* Flawfinder: ignore */
- BOOL m_bMixerPresent;
+ HXBOOL m_bMixerPresent;
UINT16 m_wBlockSize;
int m_log; // log file of pcm
ULONG32 m_ulLastNumBytes; // Number of bytes
played back since last open
ULONG32 m_ulBytesRemaining; // Number of bytes
remaining
- BOOL m_bFirstWrite; // First write
+ HXBOOL m_bFirstWrite; // First write
ULONG32 m_ulTotalWritten; // Total bytes written
ULONG32 m_ulFragSize; // The Fragment Size
Timeval* m_pPlaybackCountCBTime;
ULONG32 m_PendingCallbackID; // Used for
fake time sync
- BOOL m_bCallbackPending; // Used for fake time
sync
- BOOL m_paused;
+ HXBOOL m_bCallbackPending; // Used for fake time
sync
+ HXBOOL m_paused;
CHXSimpleList* m_pWriteList;
UINT32 m_last_audio_time;
UINT32 m_sample_rate;
Index: device/pub/platform/unix/audusound.h
===================================================================
RCS file: /cvsroot/audio/device/pub/platform/unix/audusound.h,v
retrieving revision 1.1
diff -u -w -r1.1 audusound.h
--- device/pub/platform/unix/audusound.h 25 Mar 2004 22:09:53 -0000
1.1
+++ device/pub/platform/unix/audusound.h 11 Mar 2005 22:57:20 -0000
@@ -124,9 +124,9 @@
virtual HX_RESULT _Pause();
virtual HX_RESULT _Resume();
- BOOL _IsSelectable() const;
+ HXBOOL _IsSelectable() const;
- BOOL _HardwarePauseSupported() const;
+ HXBOOL _HardwarePauseSupported() const;
private:
//protect the unintentional copy ctor.
Index: device/pub/platform/win/hxaudevds.h
===================================================================
RCS file: /cvsroot/audio/device/pub/platform/win/hxaudevds.h,v
retrieving revision 1.11
diff -u -w -r1.11 hxaudevds.h
--- device/pub/platform/win/hxaudevds.h 26 Jul 2004 20:52:21 -0000 1.11
+++ device/pub/platform/win/hxaudevds.h 11 Mar 2005 22:57:20 -0000
@@ -99,7 +99,7 @@
HINSTANCE m_hSoundDll;
HANDLE m_hDSNotifyEvent;
HANDLE m_hWaitThread;
- BOOL m_bExitThread;
+ HXBOOL m_bExitThread;
UINT32 m_ulOriginalThreadId;
CTSConverter m_TSConverter;
IHXAudioDeviceHookDMO* m_pAudioHookDMO;
@@ -108,7 +108,7 @@
inline UINT32 CalcMs(UINT32 ulNumBytes);
HANDLE GetEventHandle() { return m_hDSNotifyEvent; };
- BOOL GetExitCode() { return m_bExitThread; };
+ HXBOOL GetExitCode() { return m_bExitThread; };
void PostTimeSyncMessage();
void KillThreadAndEvent();
virtual HX_RESULT LoadDirectSoundFilter();
@@ -132,14 +132,14 @@
HX_RESULT _Imp_Write( const HXAudioData* pAudioOutData );
HX_RESULT _Imp_Reset( void );
HX_RESULT _Imp_Drain( void );
- BOOL _Imp_SupportsVolume( void ) { return TRUE; };
+ HXBOOL _Imp_SupportsVolume( void ) { return TRUE; };
UINT16 _Imp_GetVolume( void );
HX_RESULT _Imp_SetVolume( const UINT16 uVolume );
HX_RESULT _Imp_CheckFormat( const HXAudioFormat* pFormat);
HX_RESULT _Imp_GetCurrentTime( ULONG32& ulCurrentTime);
INT16 _Imp_GetAudioFd(void) {return 0;};
UINT16 _NumberOfBlocksRemainingToPlay(void){return 0;};
- BOOL _IsWaveOutDevice(void) { return FALSE; };
+ HXBOOL _IsWaveOutDevice(void) { return FALSE; };
static UINT zm_uDestroyMessage;
};
Index: device/pub/platform/win/winaudio.h
===================================================================
RCS file: /cvsroot/audio/device/pub/platform/win/winaudio.h,v
retrieving revision 1.4
diff -u -w -r1.4 winaudio.h
--- device/pub/platform/win/winaudio.h 9 Jul 2004 18:38:24 -0000 1.4
+++ device/pub/platform/win/winaudio.h 11 Mar 2005 22:57:20 -0000
@@ -181,8 +181,8 @@
protected:
WAVEHDR m_WAVEHDR;
- BOOL m_bAvail;
- BOOL m_pPrepared;
+ HXBOOL m_bAvail;
+ HXBOOL m_pPrepared;
CWaveHeader()
{
@@ -230,23 +230,23 @@
HX_RESULT _Imp_Write( const HXAudioData* pAudioOutData );
HX_RESULT _Imp_Reset( void );
HX_RESULT _Imp_Drain( void );
- BOOL _Imp_SupportsVolume( void );
+ HXBOOL _Imp_SupportsVolume( void );
UINT16 _Imp_GetVolume( void );
HX_RESULT _Imp_SetVolume( const UINT16 uVolume );
HX_RESULT _Imp_CheckFormat( const HXAudioFormat* pFormat);
HX_RESULT _Imp_GetCurrentTime( ULONG32& ulCurrentTime);
INT16 _Imp_GetAudioFd(void) {return 0;};
UINT16 _NumberOfBlocksRemainingToPlay(void);
- BOOL _IsWaveOutDevice(void) { return TRUE; };
+ HXBOOL _IsWaveOutDevice(void) { return TRUE; };
private:
- static BOOL zm_bVolSupport;
- static BOOL zm_bLRVolSupport;
+ static HXBOOL zm_bVolSupport;
+ static HXBOOL zm_bLRVolSupport;
static WORD zm_uMaxVolume;
- static BOOL zm_bMixerVolSupport;
- static BOOL zm_bMixerVolSupportChecked;
+ static HXBOOL zm_bMixerVolSupport;
+ static HXBOOL zm_bMixerVolSupportChecked;
CWindowsWaveFormat m_WaveFormat;
@@ -261,17 +261,17 @@
CPtrQueue m_rAvailBuffers;
CHXSimpleList m_UsedBuffersList;
- BOOL m_bInitialized;
- BOOL m_bResetting;
+ HXBOOL m_bInitialized;
+ HXBOOL m_bResetting;
HXMutex* m_pMutex;
- BOOL m_bIsFirstPacket;
+ HXBOOL m_bIsFirstPacket;
- BOOL AllocateBuffers(UINT16 unNumBuffers, UINT16
unBufSize);
+ HXBOOL AllocateBuffers(UINT16 unNumBuffers, UINT16
unBufSize);
HINSTANCE m_hInst;
HWND m_hWnd;
- BOOL m_bClassRegistered;
+ HXBOOL m_bClassRegistered;
#if defined(_WIN32)
UINT32 m_ulOriginalThreadId;
#endif
@@ -294,7 +294,7 @@
UINT32 m_ulDevPosRollOver;
static audioDevice zm_audioDevice;
- static BOOL zm_bClosed;
+ static HXBOOL zm_bClosed;
static UINT zm_uDestroyMessage;
};
Index: mixer/hxmixer.cpp
===================================================================
RCS file: /cvsroot/audio/mixer/hxmixer.cpp,v
retrieving revision 1.7
diff -u -w -r1.7 hxmixer.cpp
--- mixer/hxmixer.cpp 9 Jul 2004 18:37:24 -0000 1.7
+++ mixer/hxmixer.cpp 11 Mar 2005 22:57:20 -0000
@@ -72,10 +72,10 @@
UCHAR* pSrc
, UCHAR* pDst
, ULONG32 ulNumBytes
-, BOOL bChannelConvert
+, HXBOOL bChannelConvert
, UINT16 uVolume
, UINT16 uBitsPerSample
-, BOOL& bIsDestBufferDirty
+, HXBOOL& bIsDestBufferDirty
)
{
if (!(bIsDestBufferDirty || bChannelConvert || uVolume != 100))
Index: mixer/pub/hxmixer.h
===================================================================
RCS file: /cvsroot/audio/mixer/pub/hxmixer.h,v
retrieving revision 1.2
diff -u -w -r1.2 hxmixer.h
--- mixer/pub/hxmixer.h 9 Jul 2004 18:37:20 -0000 1.2
+++ mixer/pub/hxmixer.h 11 Mar 2005 22:57:20 -0000
@@ -57,10 +57,10 @@
static ULONG32 MixBuffer(UCHAR* pSrc,
UCHAR* pDst,
ULONG32 ulNumBytes,
- BOOL bChannelConvert,
+ HXBOOL bChannelConvert,
UINT16 uVolume,
UINT16 uBitsPerSample,
- BOOL& bIsDestBufferDirty);
+ HXBOOL& bIsDestBufferDirty);
static void ApplyVolume(UCHAR* pSrc,
ULONG32 ulNumBytes,
_______________________________________________
Audio-dev mailing list
[email protected]
http://lists.helixcommunity.org/mailman/listinfo/audio-dev
