Removed the smnew macro and the call to _CrtSetDbgFlag() to get ready for
merging with the main branch.
This commit is contained in:
@@ -257,7 +257,7 @@ RString DSoundBuf::Init( DSound &ds, DSoundBuf::hw hardware,
|
||||
else if( (int) waveformat.nSamplesPerSec != m_iSampleRate )
|
||||
LOG->Warn( "Secondary buffer set to %i instead of %i", waveformat.nSamplesPerSec, m_iSampleRate );
|
||||
|
||||
m_pTempBuffer = smnew char[m_iBufferSize];
|
||||
m_pTempBuffer = new char[m_iBufferSize];
|
||||
|
||||
return RString();
|
||||
}
|
||||
|
||||
@@ -93,7 +93,7 @@ RString RageSoundDriver_DSound_Software::Init()
|
||||
g_iMaxWriteahead = PREFSMAN->m_iSoundWriteAhead;
|
||||
|
||||
/* Create a DirectSound stream, but don't force it into hardware. */
|
||||
m_pPCM = smnew DSoundBuf;
|
||||
m_pPCM = new DSoundBuf;
|
||||
m_iSampleRate = PREFSMAN->m_iSoundPreferredSampleRate;
|
||||
if( m_iSampleRate == 0 )
|
||||
m_iSampleRate = 44100;
|
||||
|
||||
@@ -370,7 +370,7 @@ WinWdmPin *WinWdmFilter::CreatePin( unsigned long iPinId, RString &sError )
|
||||
}
|
||||
|
||||
/* Allocate the new PIN object */
|
||||
WinWdmPin *pPin = smnew WinWdmPin( this, iPinId );
|
||||
WinWdmPin *pPin = new WinWdmPin( this, iPinId );
|
||||
|
||||
/* Get DATARANGEs */
|
||||
KSMULTIPLE_ITEM *pDataRangesItem;
|
||||
@@ -537,7 +537,7 @@ bool WinWdmPin::IsFormatSupported( const WAVEFORMATEX *pFormat ) const
|
||||
WinWdmFilter *WinWdmFilter::Create( const RString &sFilterName, const RString &sFriendlyName, RString &sError )
|
||||
{
|
||||
/* Allocate the new filter object */
|
||||
WinWdmFilter *pFilter = smnew WinWdmFilter;
|
||||
WinWdmFilter *pFilter = new WinWdmFilter;
|
||||
|
||||
pFilter->m_sFilterName = sFilterName;
|
||||
pFilter->m_sFriendlyName = sFriendlyName;
|
||||
@@ -1321,7 +1321,7 @@ RString RageSoundDriver_WDMKS::Init()
|
||||
}
|
||||
apFilters.clear();
|
||||
|
||||
m_pStream = smnew WinWdmStream;
|
||||
m_pStream = new WinWdmStream;
|
||||
if( !m_pStream->Open( m_pFilter,
|
||||
PREFSMAN->m_iSoundWriteAhead,
|
||||
DeviceSampleFormat_Int16,
|
||||
|
||||
@@ -132,7 +132,7 @@ RString RageSoundDriver_WaveOut::Init()
|
||||
for(int b = 0; b < num_chunks; ++b)
|
||||
{
|
||||
m_aBuffers[b].dwBufferLength = chunksize;
|
||||
m_aBuffers[b].lpData = smnew char[chunksize];
|
||||
m_aBuffers[b].lpData = new char[chunksize];
|
||||
ret = waveOutPrepareHeader( m_hWaveOut, &m_aBuffers[b], sizeof(m_aBuffers[b]) );
|
||||
if( ret != MMSYSERR_NOERROR )
|
||||
return wo_ssprintf( ret, "waveOutPrepareHeader failed" );
|
||||
|
||||
Reference in New Issue
Block a user