actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed the smnew macro and the call to _CrtSetDbgFlag() to get ready for

Browse Source 
merging with the main branch.
This commit is contained in:
Shenjoku
2013-04-19 20:34:11 -07:00
parent dac4493fe5
commit 0792db752a
195 changed files with 585 additions and 598 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/arch/Dialog/Dialog.cpp
+3 -3
View File
@@ -30,13 +30,13 @@ DialogDriver *MakeDialogDriver()
sDriver = asDriversToTry[i];
#ifdef USE_DIALOG_DRIVER_COCOA
if( !asDriversToTry[i].CompareNoCase("Cocoa") ) pRet = smnew DialogDriver_MacOSX;
if( !asDriversToTry[i].CompareNoCase("Cocoa") ) pRet = new DialogDriver_MacOSX;
#endif
#ifdef USE_DIALOG_DRIVER_WIN32
if( !asDriversToTry[i].CompareNoCase("Win32") ) pRet = smnew DialogDriver_Win32;
if( !asDriversToTry[i].CompareNoCase("Win32") ) pRet = new DialogDriver_Win32;
#endif
#ifdef USE_DIALOG_DRIVER_NULL
if( !asDriversToTry[i].CompareNoCase("Null") ) pRet = smnew DialogDriver_Null;
if( !asDriversToTry[i].CompareNoCase("Null") ) pRet = new DialogDriver_Null;
#endif
if( pRet == NULL )
src/arch/InputHandler/InputHandler.cpp
+1 -1
View File
@@ -189,7 +189,7 @@ void InputHandler::Create( const RString &drivers_, vector<InputHandler *> &Add
}
// Always add
Add.push_back( smnew InputHandler_MonkeyKeyboard );
Add.push_back( new InputHandler_MonkeyKeyboard );
}
src/arch/InputHandler/InputHandler_Win32_Para.cpp
+1 -1
View File
@@ -30,7 +30,7 @@ InputHandler_Win32_Para::InputHandler_Win32_Para()
const int para_usb_vid = 0x0507;
const int para_usb_pid = 0x0011;
USBDevice *dev = smnew USBDevice;
USBDevice *dev = new USBDevice;
if( dev->Open(para_usb_vid, para_usb_pid, sizeof(long), 0, InitHack) )
{
src/arch/InputHandler/InputHandler_Win32_Pump.cpp
+1 -1
View File
@@ -19,7 +19,7 @@ InputHandler_Win32_Pump::InputHandler_Win32_Pump()
0x0003 /* shipped with Exceed */
};
m_pDevice = smnew USBDevice[NUM_PUMPS];
m_pDevice = new USBDevice[NUM_PUMPS];
int iNumFound = 0;
for( int p = 0; p < ARRAYSIZE(pump_usb_pids); ++p )
src/arch/LoadingWindow/LoadingWindow.cpp
+6 -6
View File
@@ -7,9 +7,9 @@
LoadingWindow *LoadingWindow::Create()
{
if( !PREFSMAN->m_bShowLoadingWindow )
return smnew LoadingWindow_Null;
return new LoadingWindow_Null;
#if defined(UNIX) && !defined(HAVE_GTK)
return smnew LoadingWindow_Null;
return new LoadingWindow_Null;
#endif
// Don't load NULL by default.
const RString drivers = "win32,macosx,gtk";
@@ -26,15 +26,15 @@ LoadingWindow *LoadingWindow::Create()
Driver = DriversToTry[i];
#ifdef USE_LOADING_WINDOW_MACOSX
if( !DriversToTry[i].CompareNoCase("MacOSX") ) ret = smnew LoadingWindow_MacOSX;
if( !DriversToTry[i].CompareNoCase("MacOSX") ) ret = new LoadingWindow_MacOSX;
#endif
#ifdef USE_LOADING_WINDOW_GTK
if( !DriversToTry[i].CompareNoCase("Gtk") ) ret = smnew LoadingWindow_Gtk;
if( !DriversToTry[i].CompareNoCase("Gtk") ) ret = new LoadingWindow_Gtk;
#endif
#ifdef USE_LOADING_WINDOW_WIN32
if( !DriversToTry[i].CompareNoCase("Win32") ) ret = smnew LoadingWindow_Win32;
if( !DriversToTry[i].CompareNoCase("Win32") ) ret = new LoadingWindow_Win32;
#endif
if( !DriversToTry[i].CompareNoCase("Null") ) ret = smnew LoadingWindow_Null;
if( !DriversToTry[i].CompareNoCase("Null") ) ret = new LoadingWindow_Null;
if( ret == NULL )
continue;
src/arch/LowLevelWindow/LowLevelWindow.cpp
+1 -1
View File
@@ -4,7 +4,7 @@
LowLevelWindow *LowLevelWindow::Create()
{
return smnew ARCH_LOW_LEVEL_WINDOW;
return new ARCH_LOW_LEVEL_WINDOW;
}
/*
src/arch/LowLevelWindow/LowLevelWindow_Win32.cpp
+1 -1
View File
@@ -403,7 +403,7 @@ void RenderTarget_Win32::FinishRenderingTo()
RenderTarget* LowLevelWindow_Win32::CreateRenderTarget()
{
return smnew RenderTarget_Win32( this );
return new RenderTarget_Win32( this );
}
/*
src/arch/MemoryCard/MemoryCardDriver.cpp
+2 -2
View File
@@ -127,11 +127,11 @@ MemoryCardDriver *MemoryCardDriver::Create()
MemoryCardDriver *ret = NULL;
#ifdef ARCH_MEMORY_CARD_DRIVER
ret = smnew ARCH_MEMORY_CARD_DRIVER;
ret = new ARCH_MEMORY_CARD_DRIVER;
#endif
if( !ret )
ret = smnew MemoryCardDriver_Null;
ret = new MemoryCardDriver_Null;
return ret;
}
src/arch/MovieTexture/MovieTexture_DShow.cpp
+2 -2
View File
@@ -31,7 +31,7 @@
RageMovieTexture *RageMovieTextureDriver_DShow::Create( RageTextureID ID, RString &sError )
{
MovieTexture_DShow *pRet = smnew MovieTexture_DShow( ID );
MovieTexture_DShow *pRet = new MovieTexture_DShow( ID );
sError = pRet->Init();
if( !sError.empty() )
SAFE_DELETE( pRet );
@@ -349,7 +349,7 @@ RString MovieTexture_DShow::Create()
RageException::Throw( hr_ssprintf(hr, "Could not create CLSID_FilterGraph!") );
// Create the Texture Renderer object
CTextureRenderer *pCTR = smnew CTextureRenderer;
CTextureRenderer *pCTR = new CTextureRenderer;
/* Get a pointer to the IBaseFilter on the TextureRenderer, and add it to the
* graph. When m_pGB is released, it will free pFTR. */
src/arch/MovieTexture/MovieTexture_FFMpeg.cpp
+4 -4
View File
@@ -570,7 +570,7 @@ static RString averr_ssprintf( int err, const char *fmt, ... )
va_end(va);
size_t errbuf_size = 512;
char* errbuf = smnew char[errbuf_size];
char* errbuf = new char[errbuf_size];
avcodec::av_strerror(err, errbuf, errbuf_size);
RString Error = ssprintf("%i: %s", err, errbuf);
delete errbuf;
@@ -620,7 +620,7 @@ RString MovieDecoder_FFMpeg::Open( RString sFile )
if( !m_fctx )
return "AVCodec: Couldn't allocate context";
RageFile *f = smnew RageFile;
RageFile *f = new RageFile;
if( !f->Open(sFile, RageFile::READ) )
{
@@ -719,13 +719,13 @@ RageSurface *MovieDecoder_FFMpeg::CreateCompatibleSurface( int iTextureWidth, in
}
MovieTexture_FFMpeg::MovieTexture_FFMpeg( RageTextureID ID ):
MovieTexture_Generic( ID, smnew MovieDecoder_FFMpeg )
MovieTexture_Generic( ID, new MovieDecoder_FFMpeg )
{
}
RageMovieTexture *RageMovieTextureDriver_FFMpeg::Create( RageTextureID ID, RString &sError )
{
MovieTexture_FFMpeg *pRet = smnew MovieTexture_FFMpeg( ID );
MovieTexture_FFMpeg *pRet = new MovieTexture_FFMpeg( ID );
sError = pRet->Init();
if( !sError.empty() )
SAFE_DELETE( pRet );
src/arch/MovieTexture/MovieTexture_Generic.cpp
+3 -3
View File
@@ -35,7 +35,7 @@ MovieTexture_Generic::MovieTexture_Generic( RageTextureID ID, MovieDecoder *pDec
m_bWantRewind = false;
m_fClock = 0;
m_bFrameSkipMode = false;
m_pSprite = smnew Sprite;
m_pSprite = new Sprite;
}
RString MovieTexture_Generic::Init()
@@ -270,13 +270,13 @@ void MovieTexture_Generic::CreateTexture()
RageTextureID TargetID( GetID() );
TargetID.filename += " target";
m_pRenderTarget = smnew RageTextureRenderTarget( TargetID, param );
m_pRenderTarget = new RageTextureRenderTarget( TargetID, param );
/* Create the intermediate texture. This receives the YUV image. */
RageTextureID IntermedID( GetID() );
IntermedID.filename += " intermediate";
m_pTextureIntermediate = smnew RageMovieTexture_Generic_Intermediate( IntermedID,
m_pTextureIntermediate = new RageMovieTexture_Generic_Intermediate( IntermedID,
m_pDecoder->GetWidth(), m_pDecoder->GetHeight(),
m_pSurface->w, m_pSurface->h,
power_of_two(m_pSurface->w), power_of_two(m_pSurface->h),
src/arch/MovieTexture/MovieTexture_Null.cpp
+1 -1
View File
@@ -68,7 +68,7 @@ REGISTER_MOVIE_TEXTURE_CLASS( Null );
RageMovieTexture *RageMovieTextureDriver_Null::Create( RageTextureID ID, RString &sError )
{
return smnew MovieTexture_Null( ID );
return new MovieTexture_Null( ID );
}
/*
src/arch/Sound/DSoundHelpers.cpp
+1 -1
View File
@@ -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();
}
src/arch/Sound/RageSoundDriver_DSound_Software.cpp
+1 -1
View File
@@ -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;
src/arch/Sound/RageSoundDriver_WDMKS.cpp
+3 -3
View File
@@ -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,
src/arch/Sound/RageSoundDriver_WaveOut.cpp
+1 -1
View File
@@ -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" );
src/arch/Threads/Threads_Win32.cpp
+5 -5
View File
@@ -125,7 +125,7 @@ static int GetOpenSlot( uint64_t iID )
ThreadImpl *MakeThisThread()
{
ThreadImpl_Win32 *thread = smnew ThreadImpl_Win32;
ThreadImpl_Win32 *thread = new ThreadImpl_Win32;
SetThreadName( GetCurrentThreadId(), RageThread::GetCurrentThreadName() );
@@ -151,7 +151,7 @@ ThreadImpl *MakeThisThread()
ThreadImpl *MakeThread( int (*pFunc)(void *pData), void *pData, uint64_t *piThreadID )
{
ThreadImpl_Win32 *thread = smnew ThreadImpl_Win32;
ThreadImpl_Win32 *thread = new ThreadImpl_Win32;
thread->m_pFunc = pFunc;
thread->m_pData = pData;
@@ -254,7 +254,7 @@ uint64_t GetInvalidThreadId()
MutexImpl *MakeMutex( RageMutex *pParent )
{
return smnew MutexImpl_Win32( pParent );
return new MutexImpl_Win32( pParent );
}
EventImpl_Win32::EventImpl_Win32( MutexImpl_Win32 *pParent )
@@ -425,7 +425,7 @@ EventImpl *MakeEvent( MutexImpl *pMutex )
{
MutexImpl_Win32 *pWin32Mutex = (MutexImpl_Win32 *) pMutex;
return smnew EventImpl_Win32( pWin32Mutex );
return new EventImpl_Win32( pWin32Mutex );
}
SemaImpl_Win32::SemaImpl_Win32( int iInitialValue )
@@ -480,7 +480,7 @@ bool SemaImpl_Win32::TryWait()
SemaImpl *MakeSemaphore( int iInitialValue )
{
return smnew SemaImpl_Win32( iInitialValue );
return new SemaImpl_Win32( iInitialValue );
}
/*