macos,ios: engine: use openal instead of old macos api

Mathlib optimize

engine/audio/snd_dev_mac_audioqueue.cpp

@@ -1,599 +0,0 @@
-//========= Copyright Valve Corporation, All rights reserved. ============//
-//
-// Purpose: 
-//
-//===========================================================================//
-
-#include "audio_pch.h"
-#include <AudioToolbox/AudioQueue.h>
-#include <AudioToolbox/AudioFile.h>
-#include <AudioToolbox/AudioFormat.h>
-
-// memdbgon must be the last include file in a .cpp file!!!
-#include "tier0/memdbgon.h"
-
-extern bool snd_firsttime;
-extern bool MIX_ScaleChannelVolume( paintbuffer_t *ppaint, channel_t *pChannel, int volume[CCHANVOLUMES], int mixchans );
-extern void S_SpatializeChannel( int volume[6], int master_vol, const Vector *psourceDir, float gain, float mono );
-
-#define NUM_BUFFERS_SOURCES		128
-#define	BUFF_MASK				(NUM_BUFFERS_SOURCES - 1 )
-#define	BUFFER_SIZE			0x0400
-
-
-//-----------------------------------------------------------------------------
-//
-// NOTE: This only allows 16-bit, stereo wave out
-//
-//-----------------------------------------------------------------------------
-class CAudioDeviceAudioQueue : public CAudioDeviceBase
-{
-public:
-	bool		IsActive( void );
-	bool		Init( void );
-	void		Shutdown( void );
-	void		PaintEnd( void );
-	int			GetOutputPosition( void );
-	void		ChannelReset( int entnum, int channelIndex, float distanceMod );
-	void		Pause( void );
-	void		UnPause( void );
-	float		MixDryVolume( void );
-	bool		Should3DMix( void );
-	void		StopAllSounds( void );
-
-	int			PaintBegin( float mixAheadTime, int soundtime, int paintedtime );
-	void		ClearBuffer( void );
-	void		UpdateListener( const Vector& position, const Vector& forward, const Vector& right, const Vector& up );
-	void		MixBegin( int sampleCount );
-	void		MixUpsample( int sampleCount, int filtertype );
-	void		Mix8Mono( channel_t *pChannel, char *pData, int outputOffset, int inputOffset, fixedint rateScaleFix, int outCount, int timecompress );
-	void		Mix8Stereo( channel_t *pChannel, char *pData, int outputOffset, int inputOffset, fixedint rateScaleFix, int outCount, int timecompress );
-	void		Mix16Mono( channel_t *pChannel, short *pData, int outputOffset, int inputOffset, fixedint rateScaleFix, int outCount, int timecompress );
-	void		Mix16Stereo( channel_t *pChannel, short *pData, int outputOffset, int inputOffset, fixedint rateScaleFix, int outCount, int timecompress );
-
-	void		TransferSamples( int end );
-	void		SpatializeChannel( int volume[CCHANVOLUMES/2], int master_vol, const Vector& sourceDir, float gain, float mono);
-	void		ApplyDSPEffects( int idsp, portable_samplepair_t *pbuffront, portable_samplepair_t *pbufrear, portable_samplepair_t *pbufcenter, int samplecount );
-
-	const char *DeviceName( void )			{ return "AudioQueue"; }
-	int			DeviceChannels( void )		{ return 2; }
-	int			DeviceSampleBits( void )	{ return 16; }
-	int			DeviceSampleBytes( void )	{ return 2; }
-	int			DeviceDmaSpeed( void )		{ return SOUND_DMA_SPEED; }
-	int			DeviceSampleCount( void )	{ return m_deviceSampleCount; }
-
-	void BufferCompleted() { m_buffersCompleted++; }
-	void SetRunning( bool bState ) { m_bRunning = bState; }
-	
-private:
-	void	OpenWaveOut( void );
-	void	CloseWaveOut( void );
-	bool	ValidWaveOut( void ) const;
-	bool	BIsPlaying();
-
-	AudioStreamBasicDescription m_DataFormat;
-	AudioQueueRef               m_Queue;
-	AudioQueueBufferRef         m_Buffers[NUM_BUFFERS_SOURCES];
-	
-	int		m_SndBufSize;
-	
-	void *m_sndBuffers;
-	
-	CInterlockedInt	m_deviceSampleCount;
-
-	int			m_buffersSent;
-	int			m_buffersCompleted;
-	int			m_pauseCount;
-	bool		m_bSoundsShutdown;
-	
-	bool m_bFailed;
-	bool m_bRunning;
-	
-	
-};
-
-CAudioDeviceAudioQueue *wave = NULL;
-
-
-static void AudioCallback(void *pContext, AudioQueueRef pQueue, AudioQueueBufferRef pBuffer)
-{
-	if ( wave )
-		wave->BufferCompleted();
-}
-
-
-IAudioDevice *Audio_CreateMacAudioQueueDevice( void )
-{
-	wave = new CAudioDeviceAudioQueue;
-	if ( wave->Init() )
-		return wave;
-	
-	delete wave;
-	wave = NULL;
-	
-	return NULL;
-}
-
-
-void OnSndSurroundCvarChanged2( IConVar *pVar, const char *pOldString, float flOldValue );
-void OnSndSurroundLegacyChanged2( IConVar *pVar, const char *pOldString, float flOldValue );
-
-//-----------------------------------------------------------------------------
-// Init, shutdown
-//-----------------------------------------------------------------------------
-bool CAudioDeviceAudioQueue::Init( void )
-{
-	m_SndBufSize = 0;
-	m_sndBuffers = NULL;
-	m_pauseCount = 0;
-
-	m_bSurround = false;
-	m_bSurroundCenter = false;
-	m_bHeadphone = false;
-	m_buffersSent = 0;
-	m_buffersCompleted = 0;
-	m_pauseCount = 0;
-	m_bSoundsShutdown = false;
-	m_bFailed = false;
-	m_bRunning = false;
-	
-	m_Queue = NULL;
-	
-	static bool first = true;
-	if ( first )
-	{
-		snd_surround.SetValue( 2 );
-		snd_surround.InstallChangeCallback( &OnSndSurroundCvarChanged2 );
-		snd_legacy_surround.InstallChangeCallback( &OnSndSurroundLegacyChanged2 );
-		first = false;
-	}
-	
-	OpenWaveOut();
-
-	if ( snd_firsttime )
-	{
-		DevMsg( "Wave sound initialized\n" );
-	}
-	return ValidWaveOut() && !m_bFailed;
-}
-
-void CAudioDeviceAudioQueue::Shutdown( void )
-{
-	CloseWaveOut();
-}
-
-
-//-----------------------------------------------------------------------------
-// WAV out device
-//-----------------------------------------------------------------------------
-inline bool CAudioDeviceAudioQueue::ValidWaveOut( void ) const 
-{ 
-	return m_sndBuffers != 0 && m_Queue; 
-}
-
-
-//-----------------------------------------------------------------------------
-// called by the mac audioqueue code when we run out of playback buffers
-//-----------------------------------------------------------------------------
-void AudioQueueIsRunningCallback( void* inClientData, AudioQueueRef inAQ, AudioQueuePropertyID inID)
-{
-    CAudioDeviceAudioQueue* audioqueue = (CAudioDeviceAudioQueue*)inClientData;
-	
-	UInt32 running = 0;
-	UInt32 size;
-	OSStatus err = AudioQueueGetProperty(inAQ, kAudioQueueProperty_IsRunning, &running, &size);
-	audioqueue->SetRunning( running != 0 );
-	//DevWarning( "AudioQueueStart %d\n", running );
-}
-
-
-
-
-//-----------------------------------------------------------------------------
-// Opens the windows wave out device
-//-----------------------------------------------------------------------------
-void CAudioDeviceAudioQueue::OpenWaveOut( void )
-{
-	if ( m_Queue ) 
-		return;
-		
-	m_buffersSent = 0;
-	m_buffersCompleted = 0;
-		
-    m_DataFormat.mSampleRate       = 44100;
-    m_DataFormat.mFormatID         = kAudioFormatLinearPCM;
-    m_DataFormat.mFormatFlags      = kAudioFormatFlagIsSignedInteger|kAudioFormatFlagIsPacked;
-    m_DataFormat.mBytesPerPacket   = 4; // 16-bit samples * 2 channels
-    m_DataFormat.mFramesPerPacket  = 1;
-    m_DataFormat.mBytesPerFrame    = 4; // 16-bit samples * 2 channels
-    m_DataFormat.mChannelsPerFrame = 2;
-    m_DataFormat.mBitsPerChannel   = 16;
-    m_DataFormat.mReserved         = 0;
-	
-    // Create the audio queue that will be used to manage the array of audio
-    // buffers used to queue samples.
-    OSStatus err = AudioQueueNewOutput(&m_DataFormat, AudioCallback, this, NULL, NULL, 0, &m_Queue);	
-	if ( err != noErr) 
-	{
-		DevMsg( "Failed to create AudioQueue output %d\n", (int)err );
-		m_bFailed = true;
-		return;
-	}
-		
-    for ( int i = 0; i < NUM_BUFFERS_SOURCES; ++i) 
-	{
-        err = AudioQueueAllocateBuffer( m_Queue, BUFFER_SIZE,&(m_Buffers[i]));
-		if ( err != noErr) 
-		{
-			DevMsg( "Failed to AudioQueueAllocateBuffer output %d (%i)\n",(int)err,i );
-			m_bFailed = true;
-		}
-		
-        m_Buffers[i]->mAudioDataByteSize = BUFFER_SIZE;        
-        Q_memset( m_Buffers[i]->mAudioData, 0, BUFFER_SIZE );
-    }
-	
-    err = AudioQueuePrime( m_Queue, 0, NULL);
-	if ( err != noErr) 
-	{
-		DevMsg( "Failed to create AudioQueue output %d\n", (int)err );
-		m_bFailed = true;
-		return;
-	}
-	
-	AudioQueueSetParameter( m_Queue, kAudioQueueParam_Volume, 1.0);
-	
-	err = AudioQueueAddPropertyListener( m_Queue, kAudioQueueProperty_IsRunning, AudioQueueIsRunningCallback, this );
-	if ( err != noErr) 
-	{
-		DevMsg( "Failed to create AudioQueue output %d\n", (int)err );
-		m_bFailed = true;
-		return;
-	}
-	
-	m_SndBufSize = NUM_BUFFERS_SOURCES*BUFFER_SIZE;
-	m_deviceSampleCount = m_SndBufSize / DeviceSampleBytes();
-	
-	if ( !m_sndBuffers )
-	{
-		m_sndBuffers = malloc( m_SndBufSize );
-		memset( m_sndBuffers, 0x0, m_SndBufSize );
-	}
-}
-
-
-//-----------------------------------------------------------------------------
-// Closes the windows wave out device
-//-----------------------------------------------------------------------------
-void CAudioDeviceAudioQueue::CloseWaveOut( void ) 
-{ 
-	if ( ValidWaveOut() )
-	{
-		AudioQueueStop(m_Queue, true);
-		m_bRunning = false;
-		
-		AudioQueueRemovePropertyListener( m_Queue, kAudioQueueProperty_IsRunning, AudioQueueIsRunningCallback, this );
-		
-		for ( int i = 0; i < NUM_BUFFERS_SOURCES; i++ )
-			AudioQueueFreeBuffer( m_Queue, m_Buffers[i]);
-
-		AudioQueueDispose( m_Queue, true);
-		
-		m_Queue = NULL;
-	}
-	
-	if ( m_sndBuffers )
-	{
-		free( m_sndBuffers );
-		m_sndBuffers = NULL;
-	}
-}
-
-
-
-//-----------------------------------------------------------------------------
-// Mixing setup
-//-----------------------------------------------------------------------------
-int CAudioDeviceAudioQueue::PaintBegin( float mixAheadTime, int soundtime, int paintedtime )
-{
-	//  soundtime - total samples that have been played out to hardware at dmaspeed
-	//  paintedtime - total samples that have been mixed at speed
-	//  endtime - target for samples in mixahead buffer at speed
-
-	unsigned int endtime = soundtime + mixAheadTime * DeviceDmaSpeed();
-	
-	int samps = DeviceSampleCount() >> (DeviceChannels()-1);
-
-	if ((int)(endtime - soundtime) > samps)
-		endtime = soundtime + samps;
-
-	if ((endtime - paintedtime) & 0x3)
-	{
-		// The difference between endtime and painted time should align on 
-		// boundaries of 4 samples.  This is important when upsampling from 11khz -> 44khz.
-		endtime -= (endtime - paintedtime) & 0x3;
-	}
-
-	return endtime;
-}
-
-
-//-----------------------------------------------------------------------------
-// Actually performs the mixing
-//-----------------------------------------------------------------------------
-void CAudioDeviceAudioQueue::PaintEnd( void )
-{
-	int	cblocks = 4 << 1; 
-
-	if ( m_bRunning && m_buffersSent == m_buffersCompleted )
-	{
-		// We are running the audio queue but have become starved of buffers.
-		// Stop the audio queue so we force a restart of it.
-		AudioQueueStop( m_Queue, true );
-	}
-
-	//
-	// submit a few new sound blocks
-	//
-	// 44K sound support
-	while (((m_buffersSent - m_buffersCompleted) >> SAMPLE_16BIT_SHIFT) < cblocks)
-	{	
-		int iBuf = m_buffersSent&BUFF_MASK; 
-		
-		m_Buffers[iBuf]->mAudioDataByteSize = BUFFER_SIZE;
-		Q_memcpy( m_Buffers[iBuf]->mAudioData, (char *)m_sndBuffers + iBuf*BUFFER_SIZE, BUFFER_SIZE);
-		
-		// Queue the buffer for playback.
-		OSStatus err = AudioQueueEnqueueBuffer( m_Queue, m_Buffers[iBuf], 0, NULL);
-		if ( err != noErr) 
-		{
-			DevMsg( "Failed to AudioQueueEnqueueBuffer output %d\n", (int)err );
-		}
-		
-		m_buffersSent++;
-	}
-
-	
-	if ( !m_bRunning )
-	{
-		DevMsg( "Restarting sound playback\n" );
-		m_bRunning = true;
-		AudioQueueStart( m_Queue, NULL);
-	}
-
-}
-
-int CAudioDeviceAudioQueue::GetOutputPosition( void )
-{
-	int s = m_buffersSent * BUFFER_SIZE;
-
-	s >>= SAMPLE_16BIT_SHIFT;
-
-	s &= (DeviceSampleCount()-1);
-
-	return s / DeviceChannels();
-}
-
-
-//-----------------------------------------------------------------------------
-// Pausing
-//-----------------------------------------------------------------------------
-void CAudioDeviceAudioQueue::Pause( void )
-{
-	m_pauseCount++;
-	if (m_pauseCount == 1)
-	{
-		m_bRunning = false;
-		AudioQueueStop(m_Queue, true);
-	}
-}
-
-
-void CAudioDeviceAudioQueue::UnPause( void )
-{
-	if ( m_pauseCount > 0 )
-	{
-		m_pauseCount--;
-	}
-	
-	if ( m_pauseCount == 0 )
-	{ 
-		m_bRunning = true;
-		AudioQueueStart( m_Queue, NULL);
-	}
-}
-
-bool CAudioDeviceAudioQueue::IsActive( void )
-{
-	return ( m_pauseCount == 0 );
-}
-
-float CAudioDeviceAudioQueue::MixDryVolume( void )
-{
-	return 0;
-}
-
-
-bool CAudioDeviceAudioQueue::Should3DMix( void )
-{
-	return false;
-}
-
-
-void CAudioDeviceAudioQueue::ClearBuffer( void )
-{
-	if ( !m_sndBuffers )
-		return;
-
-	Q_memset( m_sndBuffers, 0x0, DeviceSampleCount() * DeviceSampleBytes() );
-}
-
-void CAudioDeviceAudioQueue::UpdateListener( const Vector& position, const Vector& forward, const Vector& right, const Vector& up )
-{
-}
-
-
-bool CAudioDeviceAudioQueue::BIsPlaying()
-{
-	UInt32 isRunning;  
-	UInt32 propSize = sizeof(isRunning);  
-  
-    OSStatus result = AudioQueueGetProperty( m_Queue, kAudioQueueProperty_IsRunning, &isRunning, &propSize);  
-	return isRunning != 0;
-}
-
-
-void CAudioDeviceAudioQueue::MixBegin( int sampleCount )
-{
-	MIX_ClearAllPaintBuffers( sampleCount, false );
-}
-
-
-void CAudioDeviceAudioQueue::MixUpsample( int sampleCount, int filtertype )
-{
-	paintbuffer_t *ppaint = MIX_GetCurrentPaintbufferPtr();
-	int ifilter = ppaint->ifilter;
-	
-	Assert (ifilter < CPAINTFILTERS);
-
-	S_MixBufferUpsample2x( sampleCount, ppaint->pbuf, &(ppaint->fltmem[ifilter][0]), CPAINTFILTERMEM, filtertype );
-
-	ppaint->ifilter++;
-}
-
-void CAudioDeviceAudioQueue::Mix8Mono( channel_t *pChannel, char *pData, int outputOffset, int inputOffset, fixedint rateScaleFix, int outCount, int timecompress )
-{
-	int volume[CCHANVOLUMES];
-	paintbuffer_t *ppaint = MIX_GetCurrentPaintbufferPtr();
-
-	if (!MIX_ScaleChannelVolume( ppaint, pChannel, volume, 1))
-		return;
-
-	Mix8MonoWavtype( pChannel, ppaint->pbuf + outputOffset, volume, (byte *)pData, inputOffset, rateScaleFix, outCount );
-}
-
-
-void CAudioDeviceAudioQueue::Mix8Stereo( channel_t *pChannel, char *pData, int outputOffset, int inputOffset, fixedint rateScaleFix, int outCount, int timecompress )
-{
-	int volume[CCHANVOLUMES];
-	paintbuffer_t *ppaint = MIX_GetCurrentPaintbufferPtr();
-
-	if (!MIX_ScaleChannelVolume( ppaint, pChannel, volume, 2 ))
-		return;
-
-	Mix8StereoWavtype( pChannel, ppaint->pbuf + outputOffset, volume, (byte *)pData, inputOffset, rateScaleFix, outCount );
-}
-
-
-void CAudioDeviceAudioQueue::Mix16Mono( channel_t *pChannel, short *pData, int outputOffset, int inputOffset, fixedint rateScaleFix, int outCount, int timecompress )
-{
-	int volume[CCHANVOLUMES];
-	paintbuffer_t *ppaint = MIX_GetCurrentPaintbufferPtr();
-
-	if (!MIX_ScaleChannelVolume( ppaint, pChannel, volume, 1 ))
-		return;
-
-	Mix16MonoWavtype( pChannel, ppaint->pbuf + outputOffset, volume, pData, inputOffset, rateScaleFix, outCount );
-}
-
-
-void CAudioDeviceAudioQueue::Mix16Stereo( channel_t *pChannel, short *pData, int outputOffset, int inputOffset, fixedint rateScaleFix, int outCount, int timecompress )
-{
-	int volume[CCHANVOLUMES];
-	paintbuffer_t *ppaint = MIX_GetCurrentPaintbufferPtr();
-
-	if (!MIX_ScaleChannelVolume( ppaint, pChannel, volume, 2 ))
-		return;
-
-	Mix16StereoWavtype( pChannel, ppaint->pbuf + outputOffset, volume, pData, inputOffset, rateScaleFix, outCount );
-}
-
-
-void CAudioDeviceAudioQueue::ChannelReset( int entnum, int channelIndex, float distanceMod )
-{
-}
-
-
-void CAudioDeviceAudioQueue::TransferSamples( int end )
-{
-	int		lpaintedtime = g_paintedtime;
-	int		endtime = end;
-	
-	// resumes playback...
-
-	if ( m_sndBuffers )
-	{
-		S_TransferStereo16( m_sndBuffers, PAINTBUFFER, lpaintedtime, endtime );
-	}
-}
-
-void CAudioDeviceAudioQueue::SpatializeChannel( int volume[CCHANVOLUMES/2], int master_vol, const Vector& sourceDir, float gain, float mono )
-{
-	VPROF("CAudioDeviceAudioQueue::SpatializeChannel");
-	S_SpatializeChannel( volume, master_vol, &sourceDir, gain, mono );
-}
-
-void CAudioDeviceAudioQueue::StopAllSounds( void )
-{
-	m_bSoundsShutdown = true;
-	m_bRunning = false;
-	AudioQueueStop(m_Queue, true);
-}
-
-
-
-void CAudioDeviceAudioQueue::ApplyDSPEffects( int idsp, portable_samplepair_t *pbuffront, portable_samplepair_t *pbufrear, portable_samplepair_t *pbufcenter, int samplecount )
-{
-	//SX_RoomFX( endtime, filter, timefx );
-	DSP_Process( idsp, pbuffront, pbufrear, pbufcenter, samplecount );
-}
-
-
-static uint32 GetOSXSpeakerConfig()
-{
-	return 2;
-}
-
-static uint32 GetSpeakerConfigForSurroundMode( int surroundMode, const char **pConfigDesc )
-{
-	uint32 newSpeakerConfig = 2;
-	*pConfigDesc = "stereo speaker";
-	return newSpeakerConfig;
-}
-
-
-
-void OnSndSurroundCvarChanged2( IConVar *pVar, const char *pOldString, float flOldValue )
-{
-	// if the old value is -1, we're setting this from the detect routine for the first time
-	// no need to reset the device
-	if ( flOldValue == -1 )
-		return;
-	
-	// get the user's previous speaker config
-	uint32 speaker_config = GetOSXSpeakerConfig();
-	
-	// get the new config
-	uint32 newSpeakerConfig = 0;
-	const char *speakerConfigDesc = "";
-	
-	ConVarRef var( pVar );
-	newSpeakerConfig = GetSpeakerConfigForSurroundMode( var.GetInt(), &speakerConfigDesc );
-	// make sure the config has changed
-	if (newSpeakerConfig == speaker_config)
-		return;
-	
-	// set new configuration
-	//SetWindowsSpeakerConfig(newSpeakerConfig);
-	
-	Msg("Speaker configuration has been changed to %s.\n", speakerConfigDesc);
-	
-	// restart sound system so it takes effect
-	//g_pSoundServices->RestartSoundSystem();
-}
-
-void OnSndSurroundLegacyChanged2( IConVar *pVar, const char *pOldString, float flOldValue )
-{
-}
-
-

engine/audio/snd_win.cpp

@@ -11,10 +11,6 @@
 #endif
 #ifdef OSX
 #include "snd_dev_openal.h"
-#include "snd_dev_mac_audioqueue.h"
-
-ConVar snd_audioqueue( "snd_audioqueue", "1" );
-
 #endif
 
 // memdbgon must be the last include file in a .cpp file!!!
@@ -94,11 +90,6 @@ IAudioDevice *IAudioDevice::AutoDetectInit( bool waveOnly )
 			pDevice = Audio_CreateWaveDevice();
 		}
 #elif defined(OSX)
-		if ( !CommandLine()->CheckParm( "-snd_openal" ) )
-		{
-			DevMsg( "Using AudioQueue Interface\n" );
-			pDevice = Audio_CreateMacAudioQueueDevice();
-		}
 		if ( !pDevice )
 		{
 			DevMsg( "Using OpenAL Interface\n" );

engine/audio/voice.cpp

@@ -189,8 +189,6 @@ bool				g_bUsingSteamVoice = false;
 
 #ifdef WIN32
 extern IVoiceRecord* CreateVoiceRecord_DSound(int nSamplesPerSec);
-#elif defined( OSX )
-extern IVoiceRecord* CreateVoiceRecord_AudioQueue(int sampleRate);
 #endif
 
 #ifdef POSIX
@@ -643,13 +641,8 @@ bool Voice_Init( const char *pCodecName, int nSampleRate )
 		return false;
 
 	// Get the voice input device.
-#ifdef OSX
+#if defined( OSX )
-	g_pVoiceRecord = CreateVoiceRecord_AudioQueue( Voice_SamplesPerSec() );
+	g_pVoiceRecord = CreateVoiceRecord_OpenAL( Voice_SamplesPerSec() );
-	if ( !g_pVoiceRecord )
-	{
-		// Fall back to OpenAL
-		g_pVoiceRecord = CreateVoiceRecord_OpenAL( Voice_SamplesPerSec() );
-	}
 #elif defined( WIN32 )
 	g_pVoiceRecord = CreateVoiceRecord_DSound( Voice_SamplesPerSec() );
 #elif defined( USE_SDL )

engine/audio/voice_record_mac_audioqueue.cpp

@@ -1,528 +0,0 @@
-//========= Copyright 1996-2009, Valve Corporation, All rights reserved. ============//
-//
-// Purpose: 
-//
-// $NoKeywords: $
-//
-//=============================================================================//
-// This module implements the voice record and compression functions 
-
-#include <Carbon/Carbon.h>
-#include <AudioUnit/AudioUnit.h>
-#include <AudioToolbox/AudioToolbox.h>
-
-#include "tier0/platform.h"
-#include "tier0/threadtools.h"
-//#include "tier0/vcrmode.h"
-#include "ivoicerecord.h"
-
-
-#define kNumSecAudioBuffer	1.0f
-
-// ------------------------------------------------------------------------------
-// VoiceRecord_AudioQueue
-// ------------------------------------------------------------------------------
-
-class VoiceRecord_AudioQueue : public IVoiceRecord
-{
-public:
-	
-	VoiceRecord_AudioQueue();
-	virtual	~VoiceRecord_AudioQueue();
-
-	// IVoiceRecord.
-	virtual void		Release();
-	
-	virtual bool		RecordStart();
-	virtual void		RecordStop();
-	
-	// Initialize. The format of the data we expect from the provider is
-	// 8-bit signed mono at the specified sample rate.
-	virtual bool		Init( int nSampleRate );
-
-	virtual void		Idle();
-	
-	// Get the most recent N samples.
-	virtual int			GetRecordedData(short *pOut, int nSamplesWanted );
-	
-	AudioUnit GetAudioUnit() { return m_AudioUnit; }
-	AudioConverterRef GetConverter() { return m_Converter; }
-	void RenderBuffer( const short *pszBuf, int nSamples );
-	bool BRecording() { return m_bRecordingAudio; }
-	void ClearThreadHandle() { m_hThread = NULL; m_bFirstInit = false; }
-	
-	AudioBufferList m_MicInputBuffer;
-	AudioBufferList m_ConverterBuffer;
-	void *m_pMicInputBuffer;
-	
-	int m_nMicInputSamplesAvaialble;
-	float m_flSampleRateConversion;
-	int m_nBufferFrameSize;
-	int m_ConverterBufferSize;
-	int m_MicInputBufferSize;
-	int m_InputBytesPerPacket;
-
-private:
-	bool				InitalizeInterfaces();	// Initialize the openal capture buffers and other interfaces
-	void				ReleaseInterfaces();	// Release openal buffers and other interfaces
-	void				ClearInterfaces();				// Clear members.
-	
-	
-private:
-	AudioUnit m_AudioUnit;
-	char *m_SampleBuffer;
-	int m_SampleBufferSize;
-	int m_nSampleRate;
-	bool m_bRecordingAudio;
-	bool m_bFirstInit;
-	ThreadHandle_t m_hThread;
-	AudioConverterRef m_Converter;
-	
-	CInterlockedUInt m_SampleBufferReadPos;
-	CInterlockedUInt m_SampleBufferWritePos;
-	
-	//UInt32 nPackets = 0;
-	//bool bHaveListData = false;
-
-	
-};
-
-
-VoiceRecord_AudioQueue::VoiceRecord_AudioQueue() :
-m_nSampleRate( 0 ), m_AudioUnit( NULL ), m_SampleBufferSize(0), m_SampleBuffer(NULL),
-m_SampleBufferReadPos(0), m_SampleBufferWritePos(0), m_bRecordingAudio(false), m_hThread( NULL ), m_bFirstInit( true )
-{
-	ClearInterfaces();
-}
-
-
-VoiceRecord_AudioQueue::~VoiceRecord_AudioQueue()
-{
-	ReleaseInterfaces();
-	if ( m_hThread )
-		ReleaseThreadHandle( m_hThread );
-	m_hThread = NULL;
-}
-
-
-void VoiceRecord_AudioQueue::Release()
-{
-	ReleaseInterfaces();
-}
-
-uintp StartAudio( void *pRecorder )
-{
-	VoiceRecord_AudioQueue *vr = (VoiceRecord_AudioQueue *)pRecorder;
-	if ( vr )
-	{
-		//printf( "AudioOutputUnitStart\n" );
-		AudioOutputUnitStart( vr->GetAudioUnit() );
-		vr->ClearThreadHandle();
-	}
-	//printf( "StartAudio thread done\n" );
-
-	return 0;
-}
-
-bool VoiceRecord_AudioQueue::RecordStart()
-{
-	if ( !m_AudioUnit )
-		return false;
-	
-	if ( m_bFirstInit )
-		m_hThread = CreateSimpleThread( StartAudio, this );
-	else 
-		AudioOutputUnitStart( m_AudioUnit );
-
-	m_SampleBufferReadPos = m_SampleBufferWritePos = 0;
-
-	m_bRecordingAudio = true;
-	//printf( "VoiceRecord_AudioQueue::RecordStart\n" );
-	return ( !m_bFirstInit || m_hThread != NULL );
-}
-
-
-void VoiceRecord_AudioQueue::RecordStop()
-{
-	// Stop capturing.
-	if ( m_AudioUnit && m_bRecordingAudio )
-	{
-		AudioOutputUnitStop( m_AudioUnit );
-		//printf( "AudioOutputUnitStop\n" );
-	}
-
-	m_SampleBufferReadPos = m_SampleBufferWritePos = 0;
-	m_bRecordingAudio = false;
-
-	if ( m_hThread )
-		ReleaseThreadHandle( m_hThread );
-	m_hThread = NULL;
-}
-
-
-
-OSStatus ComplexBufferFillPlayback( AudioConverterRef            inAudioConverter,
-									UInt32                   *ioNumberDataPackets,
-									AudioBufferList           *ioData,
-									AudioStreamPacketDescription **outDataPacketDesc,
-									void             *inUserData)
-{
-	VoiceRecord_AudioQueue *vr = (VoiceRecord_AudioQueue *)inUserData;
-	if ( !vr->BRecording() )
-		return noErr;
-
-	if ( vr->m_nMicInputSamplesAvaialble )
-	{
-		int nBytesRequired = *ioNumberDataPackets * vr->m_InputBytesPerPacket;
-		int nBytesAvailable = vr->m_nMicInputSamplesAvaialble*vr->m_InputBytesPerPacket;
-		
-		if ( nBytesRequired < nBytesAvailable )
-		{
-			ioData->mBuffers[0].mData = vr->m_MicInputBuffer.mBuffers[0].mData;
-			ioData->mBuffers[0].mDataByteSize = nBytesRequired;
-			vr->m_MicInputBuffer.mBuffers[0].mData = (char *)vr->m_MicInputBuffer.mBuffers[0].mData+nBytesRequired;
-			vr->m_MicInputBuffer.mBuffers[0].mDataByteSize = nBytesAvailable - nBytesRequired;
-		}
-		else 
-		{
-			ioData->mBuffers[0].mData = vr->m_MicInputBuffer.mBuffers[0].mData;
-			ioData->mBuffers[0].mDataByteSize = nBytesAvailable;
-			vr->m_MicInputBuffer.mBuffers[0].mData = vr->m_pMicInputBuffer;
-			vr->m_MicInputBuffer.mBuffers[0].mDataByteSize = vr->m_MicInputBufferSize;
-		}
-		
-		*ioNumberDataPackets = ioData->mBuffers[0].mDataByteSize / vr->m_InputBytesPerPacket;
-		vr->m_nMicInputSamplesAvaialble = nBytesAvailable / vr->m_InputBytesPerPacket - *ioNumberDataPackets;
-	}
-	else
-	{
-		*ioNumberDataPackets = 0;
-		return -1;
-	}
-	
-	return noErr;
-}
-
-
-
-
-static OSStatus recordingCallback(void *inRefCon, AudioUnitRenderActionFlags *ioActionFlags, const AudioTimeStamp *inTimeStamp, 
-                                  UInt32 inBusNumber, UInt32 inNumberFrames, AudioBufferList *ioData) 
-{	
-	VoiceRecord_AudioQueue *vr = (VoiceRecord_AudioQueue *)inRefCon;
-	if ( !vr->BRecording() )
-		return noErr;
-	
-	OSStatus err = noErr;
-	if ( vr->m_nMicInputSamplesAvaialble == 0 )
-	{
-		err = AudioUnitRender( vr->GetAudioUnit(), ioActionFlags, inTimeStamp, 1, inNumberFrames, &vr->m_MicInputBuffer );
-		if ( err == noErr )
-			vr->m_nMicInputSamplesAvaialble = vr->m_MicInputBuffer.mBuffers[0].mDataByteSize / vr->m_InputBytesPerPacket;
-	}
-	
-	if ( vr->m_nMicInputSamplesAvaialble > 0 )
-	{
-		UInt32 nConverterSamples = ceil(vr->m_nMicInputSamplesAvaialble/vr->m_flSampleRateConversion);
-		vr->m_ConverterBuffer.mBuffers[0].mDataByteSize = vr->m_ConverterBufferSize;
-		OSStatus err = AudioConverterFillComplexBuffer( vr->GetConverter(),
-													   ComplexBufferFillPlayback, 
-													   vr, 
-													   &nConverterSamples, 
-													   &vr->m_ConverterBuffer, 
-													   NULL );
-		if ( err == noErr || err == -1 )
-			vr->RenderBuffer( (short *)vr->m_ConverterBuffer.mBuffers[0].mData, vr->m_ConverterBuffer.mBuffers[0].mDataByteSize/sizeof(short) );
-	}
-	
-	return err;
-}
-
-
-void VoiceRecord_AudioQueue::RenderBuffer( const short *pszBuf, int nSamples )
-{
-	int samplePos = m_SampleBufferWritePos;
-	int samplePosBefore = samplePos;
-	int readPos = m_SampleBufferReadPos;
-	bool bBeforeRead = false;
-	if ( samplePos <  readPos )
-		bBeforeRead = true;
-	char *pOut = (char *)(m_SampleBuffer + samplePos);
-	int nFirstCopy = MIN( nSamples*sizeof(short), m_SampleBufferSize - samplePos );
-	memcpy( pOut, pszBuf, nFirstCopy );
-	samplePos += nFirstCopy;
-	if ( nSamples*sizeof(short) > nFirstCopy )
-	{
-		nSamples -= ( nFirstCopy / sizeof(short) );
-		samplePos = 0;
-		memcpy( m_SampleBuffer, pszBuf + nFirstCopy, nSamples * sizeof(short) );
-		samplePos += nSamples * sizeof(short);
-	}
-	
-	m_SampleBufferWritePos = samplePos%m_SampleBufferSize;
-	if ( (bBeforeRead && samplePos > readPos) )
-	{
-		m_SampleBufferReadPos = (readPos+m_SampleBufferSize/2)%m_SampleBufferSize; // if we crossed the read pointer then bump it forward
-		//printf( "Crossed %d %d (%d)\n", (int)samplePosBefore, (int)samplePos, readPos );
-	}
-}
-
-
-bool VoiceRecord_AudioQueue::InitalizeInterfaces()
-{	
-	//printf( "Initializing audio queue recorder\n" );
-	// Describe audio component
-	ComponentDescription desc;
-	desc.componentType = kAudioUnitType_Output;
-	desc.componentSubType = kAudioUnitSubType_HALOutput;
-	desc.componentManufacturer = kAudioUnitManufacturer_Apple;
-    desc.componentFlags = 0;
-    desc.componentFlagsMask = 0;
-	
-	Component comp = FindNextComponent(NULL, &desc);
-    if (comp == NULL) 
-		return false;
-	
-	OSStatus status = OpenAComponent(comp, &m_AudioUnit);  
-	if ( status != noErr )
-		return false;
-
-	// Enable IO for recording
-	UInt32 flag = 1;
-	status = AudioUnitSetProperty( m_AudioUnit, kAudioOutputUnitProperty_EnableIO, kAudioUnitScope_Input, 
-								  1, &flag, sizeof(flag));
-	if ( status != noErr )
-		return false;
-
-	// disable output on the device
-	flag = 0;
-	status = AudioUnitSetProperty( m_AudioUnit,kAudioOutputUnitProperty_EnableIO, kAudioUnitScope_Output, 
-						 0, &flag,sizeof(flag));
-	if ( status != noErr )
-		return false;
-
-	UInt32 size = sizeof(AudioDeviceID);	
-    AudioDeviceID inputDevice;
-    status = AudioHardwareGetProperty(kAudioHardwarePropertyDefaultInputDevice,&size, &inputDevice);
-	if ( status != noErr )
-		return false;
-
-    status =AudioUnitSetProperty( m_AudioUnit, kAudioOutputUnitProperty_CurrentDevice,  kAudioUnitScope_Global, 
-							  0,  &inputDevice, sizeof(inputDevice));
-	if ( status != noErr )
-		return false;
-	
-	// Describe format
-	AudioStreamBasicDescription audioDeviceFormat;
-	size = sizeof(AudioStreamBasicDescription);
-	status = AudioUnitGetProperty( m_AudioUnit,
-								kAudioUnitProperty_StreamFormat,
-								kAudioUnitScope_Input,
-								1,  // input bus 
-								&audioDeviceFormat,
-								&size);
-	
-	if ( status != noErr )
-		return false;
-	
-	// we only want mono audio, so if they have a stero input ask for mono
-	if ( audioDeviceFormat.mChannelsPerFrame == 2 )
-	{
-		audioDeviceFormat.mChannelsPerFrame = 1;
-		audioDeviceFormat.mBytesPerPacket /= 2;
-		audioDeviceFormat.mBytesPerFrame /= 2;
-	}
-	
-	// Apply format
-	status = AudioUnitSetProperty( m_AudioUnit, kAudioUnitProperty_StreamFormat, kAudioUnitScope_Output, 
-								  1, &audioDeviceFormat, sizeof(audioDeviceFormat) );
-	if ( status != noErr )
-		return false;
-	
-	AudioStreamBasicDescription audioOutputFormat;
-	audioOutputFormat					= audioDeviceFormat;
-	audioOutputFormat.mFormatID			= kAudioFormatLinearPCM;
-	audioOutputFormat.mFormatFlags		= kAudioFormatFlagIsSignedInteger | kAudioFormatFlagIsPacked;
-    audioOutputFormat.mBytesPerPacket   = 2; // 16-bit samples * 1 channels
-    audioOutputFormat.mFramesPerPacket  = 1;
-    audioOutputFormat.mBytesPerFrame    = 2; // 16-bit samples * 1 channels
-    audioOutputFormat.mChannelsPerFrame = 1;
-    audioOutputFormat.mBitsPerChannel   = 16;
-    audioOutputFormat.mReserved         = 0;
-	
-	audioOutputFormat.mSampleRate = m_nSampleRate;
-	
-	m_flSampleRateConversion = audioDeviceFormat.mSampleRate / audioOutputFormat.mSampleRate;
-	
-	// setup sample rate conversion
-	status = AudioConverterNew( &audioDeviceFormat, &audioOutputFormat, &m_Converter );
-	if ( status != noErr )
-		return false;
-
-	
-	UInt32 primeMethod = kConverterPrimeMethod_None;
-	status = AudioConverterSetProperty( m_Converter, kAudioConverterPrimeMethod, sizeof(UInt32), &primeMethod);
-	if ( status != noErr )
-		return false;
-
-	UInt32 quality = kAudioConverterQuality_Medium;
-	status = AudioConverterSetProperty( m_Converter, kAudioConverterSampleRateConverterQuality, sizeof(UInt32), &quality);
-	if ( status != noErr )
-		return false;
-			
-	// Set input callback
-	AURenderCallbackStruct callbackStruct;
-	callbackStruct.inputProc = recordingCallback;
-	callbackStruct.inputProcRefCon = this;
-	status = AudioUnitSetProperty( m_AudioUnit, kAudioOutputUnitProperty_SetInputCallback, kAudioUnitScope_Global, 
-								  0,  &callbackStruct, sizeof(callbackStruct) );
-	if ( status != noErr )
-		return false;
-	
-	UInt32 bufferFrameSize;
-	size = sizeof(bufferFrameSize);
-	status = AudioDeviceGetProperty( inputDevice, 1, 1, kAudioDevicePropertyBufferFrameSize, &size, &bufferFrameSize );
-	if ( status != noErr )
-		return false;
-	
-	m_nBufferFrameSize = bufferFrameSize;
-	
-	// allocate the input and conversion sound storage buffers
-	m_MicInputBuffer.mNumberBuffers = 1;
-	m_MicInputBuffer.mBuffers[0].mDataByteSize = m_nBufferFrameSize*audioDeviceFormat.mBitsPerChannel/8*audioDeviceFormat.mChannelsPerFrame;
-	m_MicInputBuffer.mBuffers[0].mData = malloc( m_MicInputBuffer.mBuffers[0].mDataByteSize );
-	m_MicInputBuffer.mBuffers[0].mNumberChannels = audioDeviceFormat.mChannelsPerFrame;
-	m_pMicInputBuffer = m_MicInputBuffer.mBuffers[0].mData;
-	m_MicInputBufferSize = m_MicInputBuffer.mBuffers[0].mDataByteSize;
-	
-	m_InputBytesPerPacket = audioDeviceFormat.mBytesPerPacket;
-
-	m_ConverterBuffer.mNumberBuffers = 1;
-	m_ConverterBuffer.mBuffers[0].mDataByteSize = m_nBufferFrameSize*audioOutputFormat.mBitsPerChannel/8*audioOutputFormat.mChannelsPerFrame;
-	m_ConverterBuffer.mBuffers[0].mData = malloc( m_MicInputBuffer.mBuffers[0].mDataByteSize );
-	m_ConverterBuffer.mBuffers[0].mNumberChannels = 1;
-	
-	m_ConverterBufferSize = m_ConverterBuffer.mBuffers[0].mDataByteSize;
-	
-	m_nMicInputSamplesAvaialble = 0;
-	
-	
-	m_SampleBufferReadPos = m_SampleBufferWritePos = 0;
-	m_SampleBufferSize = ceil( kNumSecAudioBuffer * m_nSampleRate * audioOutputFormat.mBytesPerPacket );
-	m_SampleBuffer = (char *)malloc( m_SampleBufferSize ); 
-	memset( m_SampleBuffer, 0x0, m_SampleBufferSize );
-
-	DevMsg( "Initialized AudioQueue record interface\n" );
-	return true;
-}
-
-bool VoiceRecord_AudioQueue::Init( int nSampleRate )
-{
-	if ( m_AudioUnit && m_nSampleRate != nSampleRate )
-	{
-		// Need to recreate interfaces with different sample rate
-		ReleaseInterfaces();
-		ClearInterfaces();
-	}
-	m_nSampleRate = nSampleRate;
-
-	// Re-initialize the capture buffer if neccesary
-	if ( !m_AudioUnit )
-	{
-		InitalizeInterfaces();
-	}
-
-	m_SampleBufferReadPos = m_SampleBufferWritePos = 0;
-
-	//printf( "VoiceRecord_AudioQueue::Init()\n" );
-	// Initialise
-	OSStatus status = AudioUnitInitialize( m_AudioUnit );
-	if ( status != noErr )
-		return false;
-
-	return true;
-}
-
-
-void VoiceRecord_AudioQueue::ReleaseInterfaces()
-{
-	AudioOutputUnitStop( m_AudioUnit );
-	AudioConverterDispose( m_Converter );
-	AudioUnitUninitialize( m_AudioUnit );
-	m_AudioUnit = NULL;
-	m_Converter = NULL;
-}
-
-
-void VoiceRecord_AudioQueue::ClearInterfaces()
-{
-	m_AudioUnit = NULL;
-	m_Converter = NULL;
-	m_SampleBufferReadPos = m_SampleBufferWritePos = 0;
-	if ( m_SampleBuffer )
-		free( m_SampleBuffer );
-	m_SampleBuffer = NULL;
-
-	if ( m_MicInputBuffer.mBuffers[0].mData )
-		free( m_MicInputBuffer.mBuffers[0].mData );
-	if ( m_ConverterBuffer.mBuffers[0].mData )
-		free( m_ConverterBuffer.mBuffers[0].mData );
-	m_MicInputBuffer.mBuffers[0].mData = NULL;
-	m_ConverterBuffer.mBuffers[0].mData = NULL;
-}
-
-
-void VoiceRecord_AudioQueue::Idle()
-{
-}
-
-
-int VoiceRecord_AudioQueue::GetRecordedData(short *pOut, int nSamples )
-{
-	if ( !m_SampleBuffer )
-		return 0;
-		
-	int cbSamples = nSamples*2; // convert to bytes
-	int writePos = m_SampleBufferWritePos;
-	int readPos = m_SampleBufferReadPos;
-	
-	int nOutstandingSamples = ( writePos - readPos );
-	if ( readPos > writePos ) // writing has wrapped around
-	{
-		nOutstandingSamples = writePos + ( m_SampleBufferSize - readPos );
-	}
-	
-	if ( !nOutstandingSamples ) 
-		return 0;
-
-	if ( nOutstandingSamples < cbSamples )
-		cbSamples = nOutstandingSamples; // clamp to the number of samples we have available
-	
-	memcpy( (char *)pOut, m_SampleBuffer + readPos, MIN( cbSamples, m_SampleBufferSize - readPos ) );
-	if ( cbSamples > ( m_SampleBufferSize - readPos ) )
-	{
-		int offset = m_SampleBufferSize - readPos;
-		cbSamples -= offset;
-		readPos = 0;
-		memcpy( (char *)pOut + offset, m_SampleBuffer, cbSamples );
-	}
-	readPos+=cbSamples;
-	m_SampleBufferReadPos = readPos%m_SampleBufferSize;
-	//printf( "Returning %d samples, %d %d (%d)\n", cbSamples/2, (int)m_SampleBufferReadPos, (int)m_SampleBufferWritePos, m_SampleBufferSize );
-	return cbSamples/2;
-}
-
-
-VoiceRecord_AudioQueue g_AudioQueueVoiceRecord;
-IVoiceRecord* CreateVoiceRecord_AudioQueue( int sampleRate )
-{
-	if ( g_AudioQueueVoiceRecord.Init( sampleRate ) )
-	{
-		return &g_AudioQueueVoiceRecord;
-	}
-	else
-	{
-		g_AudioQueueVoiceRecord.Release();
-		return NULL;
-	}
-}

engine/wscript

@@ -341,8 +341,7 @@ def build(bld):
 		if bld.env.DEST_OS == 'darwin':
 			source += [
 				'audio/snd_dev_openal.cpp', # [$OSXALL]
-				'audio/snd_dev_mac_audioqueue.cpp',#	[$OSXALL]
+				'audio/snd_dev_mac_audioqueue.cpp', # [$OSXALL]
-				'audio/voice_record_mac_audioqueue.cpp',	#[$OSXALL]
 			]
 
 	includes = [

filesystem/filesystem_stdio.cpp

@@ -696,6 +696,7 @@ int CFileSystem_Stdio::FS_stat( const char *pathT, struct _stat *buf, bool *pbLo
 	int rt = _stat( path, buf );
 
 	// Workaround bug wherein stat() randomly fails on Windows XP.  See comment on function.
+/*
 #if defined(_WIN32) && defined(FILESYSTEM_MSVC2015_STAT_BUG_WORKAROUND)
 	if ( rt == -1 )
 	{
@@ -706,6 +707,7 @@ int CFileSystem_Stdio::FS_stat( const char *pathT, struct _stat *buf, bool *pbLo
 		}
 	}
 #endif // defined(_WIN32) && defined(FILESYSTEM_MSVC2015_STAT_BUG_WORKAROUND)
+*/
 
 #if defined(LINUX) || defined(PLATFORM_BSD)
 	if ( rt == -1 )

inputsystem/wscript

@@ -43,17 +43,8 @@ def build(bld):
 
 	if bld.env.DEST_OS == 'win32':
 		libs += ['USER32']
-		
-	install_path = bld.env.LIBDIR
 
-	# Copy SDL2 dependency
+	install_path = bld.env.LIBDIR
-	if bld.env.DEST_OS == 'win32':
-		bld(
-			rule=(('cp' if 'MSYSTEM' in os.environ or sys.platform != 'win32' else 'copy')+' ${SRC} ${TGT}'),
-			source='../lib/win32/'+bld.env.DEST_CPU+'/SDL2.dll',
-			target='SDL2.dll',
-			install_path=install_path,
-		)
 
 	bld.shlib(
 		source   = source,

scripts/waifulib/vpc_parser.py

@@ -90,6 +90,9 @@ def fix_dos_path( path ):
 	if find_path == '': find_path = './'
 	else: find_path += '/'
 
+	if not os.path.exists(find_path):
+		return find_path+filename
+
 	dirlist = os.listdir(find_path)
 	for file in dirlist:
 		if file == filename:

scripts/waifulib/xcompile.py

@@ -215,7 +215,6 @@ class Android:
 		# TODO: proper STL support
 		return [
 			#os.path.abspath(os.path.join(self.ndk_home, 'sources', 'cxx-stl', 'system', 'include')),
-			os.path.abspath(os.path.join(self.ndk_home, 'sources', 'cxx-stl', 'stlport', 'stlport')),
 			os.path.abspath(os.path.join(self.ndk_home, 'sources', 'android', 'support', 'include'))
 		]
 
@@ -346,8 +345,12 @@ def configure(conf):
 		conf.env.CXXFLAGS += android.cflags(True)
 		conf.env.LINKFLAGS += android.linkflags()
 		conf.env.LDFLAGS += android.ldflags()
-		conf.env.STLIBPATH += [os.path.abspath(os.path.join(android.ndk_home, 'sources','cxx-stl','stlport','libs',stlarch))]
+		conf.env.INCLUDES += [
-		conf.env.LDFLAGS += ['-lstlport_static']
+			os.path.abspath(os.path.join(android.ndk_home, 'sources', 'cxx-stl', 'gnu-libstdc++', '4.9', 'include')),
+			os.path.abspath(os.path.join(android.ndk_home, 'sources', 'cxx-stl', 'gnu-libstdc++', '4.9', 'libs', stlarch, 'include'))
+		]
+		conf.env.STLIBPATH += [os.path.abspath(os.path.join(android.ndk_home, 'sources','cxx-stl','gnu-libstdc++','4.9','libs',stlarch))]
+		conf.env.LDFLAGS += ['-lgnustl_static']
 
 		conf.env.HAVE_M = True
 		if android.is_hardfp():

stub_steam/steam_api.cpp

@@ -0,0 +1,185 @@
+#define _CRT_SECURE_NO_WARNINGS
+#define STEAM_API_EXPORTS
+
+#if defined __GNUC__
+ #define S_API extern "C" __attribute__ ((visibility("default"))) 
+#elif defined _MSC_VER
+#define S_API extern "C" __declspec(dllexport)
+#endif
+#define NULL 0
+
+S_API void *g_pSteamClientGameServer;
+void *g_pSteamClientGameServer = NULL;
+
+//steam_api.h
+S_API bool SteamAPI_Init() {
+	return true;
+}
+
+S_API bool SteamAPI_InitSafe() {
+	return true;
+}
+
+S_API void SteamAPI_Shutdown() {
+
+}
+
+S_API bool SteamAPI_RestartAppIfNecessary() {
+	return false;
+}
+
+S_API void SteamAPI_ReleaseCurrentThreadMemory() {
+
+}
+
+S_API void SteamAPI_WriteMiniDump() {
+
+}
+
+S_API void SteamAPI_SetMiniDumpComment() {
+
+}
+
+S_API void SteamAPI_RunCallbacks() {
+}
+
+S_API void SteamAPI_RegisterCallback() {
+
+}
+
+S_API void SteamAPI_UnregisterCallback() {
+
+}
+
+S_API void SteamAPI_RegisterCallResult() {
+
+}
+
+S_API void SteamAPI_UnregisterCallResult() {
+
+}
+
+S_API bool SteamAPI_IsSteamRunning() {
+	return false;
+}
+
+S_API void Steam_RunCallbacks() {
+
+}
+
+S_API void Steam_RegisterInterfaceFuncs() {
+}
+
+S_API int Steam_GetHSteamUserCurrent() {
+	return 0;
+}
+
+S_API const char *SteamAPI_GetSteamInstallPath() {
+	return NULL;
+}
+
+S_API int SteamAPI_GetHSteamPipe() {
+	return 0;
+}
+
+S_API void SteamAPI_SetTryCatchCallbacks() {
+
+}
+
+S_API void SteamAPI_SetBreakpadAppID() {
+
+}
+
+S_API void SteamAPI_UseBreakpadCrashHandler() {
+
+}
+
+S_API int GetHSteamPipe() {
+	return 0;
+}
+
+S_API int GetHSteamUser() {
+	return 0;
+}
+
+S_API int SteamAPI_GetHSteamUser() {
+	return 0;
+}
+
+S_API void *SteamInternal_ContextInit() {
+	return NULL;
+}
+
+S_API void *SteamInternal_CreateInterface() {
+	return NULL;
+}
+
+S_API void *SteamApps() {
+	return NULL;
+}
+
+S_API void *SteamClient() {
+	return NULL;
+}
+
+S_API void *SteamFriends() {
+	return NULL;
+}
+
+S_API void *SteamHTTP() {
+	return NULL;
+}
+
+S_API void *SteamMatchmaking() {
+	return NULL;
+}
+
+S_API void *SteamMatchmakingServers() {
+	return NULL;
+}
+
+S_API void *SteamNetworking() {
+	return NULL;
+}
+
+S_API void *SteamRemoteStorage() {
+	return NULL;
+}
+
+S_API void *SteamScreenshots() {
+	return NULL;
+}
+
+S_API void *SteamUser() {
+	return NULL;
+}
+
+S_API void *SteamUserStats() {
+	return NULL;
+}
+
+S_API void *SteamUtils() {
+	return NULL;
+}
+
+S_API int SteamGameServer_GetHSteamPipe() {
+	return 0;
+}
+
+S_API int SteamGameServer_GetHSteamUser() {
+	return 0;
+}
+
+S_API int SteamGameServer_GetIPCCallCount() {
+	return 0;
+}
+
+S_API int SteamGameServer_InitSafe() {
+	return 0;
+}
+
+S_API void SteamGameServer_RunCallbacks() {
+}
+
+S_API void SteamGameServer_Shutdown() {
+}

stub_steam/wscript

@@ -0,0 +1,46 @@
+#! /usr/bin/env python
+# encoding: utf-8
+
+from waflib import Utils
+import os
+
+top = '.'
+PROJECT_NAME = 'steam_api'
+
+def options(opt):
+	# stub
+	return
+
+def configure(conf):
+	return
+
+def build(bld):
+	source = [
+		'steam_api.cpp'
+	]
+
+	includes = [
+		'.',
+		'../public',
+		'../public/tier0',
+	] + bld.env.INCLUDES_SDL2
+
+	defines = []
+
+	libs = []
+
+	install_path = None if bld.env.BUILD_SDK else bld.env.LIBDIR
+
+	bld.shlib(
+		source   = source,
+		target   = PROJECT_NAME,
+		name     = PROJECT_NAME,
+		features = 'c cxx',
+		includes = includes,
+		defines  = defines,
+		install_path = install_path,
+		use      = libs,
+		subsystem = bld.env.MSVC_SUBSYSTEM,
+		idx      = bld.get_taskgen_count()
+	)
+

tier0/wscript

@@ -83,7 +83,7 @@ def build(bld):
 	else:
 		libs = ['DL', 'M', 'LOG']
 
-	install_path = bld.env.LIBDIR
+	install_path = None if bld.env.BUILD_SDK else bld.env.LIBDIR
 
 	bld.shlib(
 		source   = source,

vgui2/vgui_controls/TextEntry.cpp

@@ -95,6 +95,8 @@ TextEntry::TextEntry(Panel *parent, const char *panelName) : BaseClass(parent, p
 	
 	SetEditable(true);
 	
+	_dataChanged = false;
+
 	// initialize the line break array
 	m_LineBreaks.AddToTail(BUFFER_SIZE);
 	

vstdlib/osversion.cpp

@@ -1,427 +0,0 @@
-//========= Copyright Valve Corporation, All rights reserved. ============//
-//
-// Purpose: 
-//
-// $NoKeywords: $
-//
-//=============================================================================//
-
-#include "vstdlib/osversion.h"
-#include "winlite.h"
-#include "strtools.h"
-#include "tier0/dbg.h"
-
-#ifdef OSX
-#include <CoreServices/CoreServices.h>
-#endif
-
-//-----------------------------------------------------------------------------
-// Purpose: return the OS type for this machine
-//-----------------------------------------------------------------------------
-EOSType GetOSType()
-{
-	static EOSType eOSVersion = k_eOSUnknown;
-
-#if defined( _WIN32 ) && !defined( _X360 )
-	if ( eOSVersion == k_eOSUnknown || eOSVersion == k_eWinUnknown )
-	{
-		eOSVersion = k_eWinUnknown;
-		OSVERSIONINFOEX osvi;
-		Q_memset( &osvi, 0x00, sizeof(osvi) );
-		osvi.dwOSVersionInfoSize = sizeof(osvi);
-		
-		if ( GetVersionEx( (OSVERSIONINFO *) &osvi ) )
-		{
-			switch ( osvi.dwPlatformId )
-			{
-			case VER_PLATFORM_WIN32_NT:
-				if ( osvi.dwMajorVersion <= 4 )
-				{
-					eOSVersion = k_eWinNT;
-				}
-				else if ( osvi.dwMajorVersion == 5 )
-				{
-					switch(  osvi.dwMinorVersion ) 
-					{
-					case 0:
-						eOSVersion = k_eWin2000;
-						break;
-					case 1:
-						eOSVersion = k_eWinXP;
-						break;
-					case 2:
-						eOSVersion = k_eWin2003;
-						break;
-					}
-				}
-				else if ( osvi.dwMajorVersion >= 6 )
-				{
-					if ( osvi.wProductType == VER_NT_WORKSTATION )
-					{
-						switch ( osvi.dwMinorVersion )
-						{
-						case 0:
-							eOSVersion = k_eWinVista;
-							break;
-						case 1:
-							eOSVersion = k_eWindows7;
-							break;
-						}
-					}
-					else /* ( osvi.wProductType != VER_NT_WORKSTATION ) */
-					{
-						switch ( osvi.dwMinorVersion )
-						{
-						case 0:
-							eOSVersion = k_eWin2008;	// Windows 2008, not R2
-							break;
-						case 1:
-							eOSVersion = k_eWin2008;	// Windows 2008 R2
-							break;
-						}
-					}
-				}
-				break;
-			case VER_PLATFORM_WIN32_WINDOWS:
-				switch ( osvi.dwMinorVersion )
-				{
-				case 0:
-					eOSVersion = k_eWin95;
-					break;
-				case 10:
-					eOSVersion = k_eWin98;
-					break;
-				case 90:
-					eOSVersion = k_eWinME;
-					break;
-				}
-				break;
-			case VER_PLATFORM_WIN32s:
-				eOSVersion = k_eWin311;
-				break;
-			}
-		}
-	}
-#elif defined(OSX)
-	if ( eOSVersion == k_eOSUnknown )
-	{
-		SInt32 MajorVer = 0;
-		SInt32 MinorVer = 0;
-		SInt32 PatchVer = 0;
-		OSErr err = noErr;
-		err = Gestalt( gestaltSystemVersionMajor, &MajorVer );
-		if ( err != noErr )
-			return k_eOSUnknown;
-		err = Gestalt( gestaltSystemVersionMinor, &MinorVer );
-		if ( err != noErr )
-			return k_eOSUnknown;
-		err = Gestalt( gestaltSystemVersionBugFix, &PatchVer );
-		if ( err != noErr )
-			return k_eOSUnknown;
-		
-		switch ( MajorVer )
-		{
-			case 10:
-			{
-				switch( MinorVer )
-				{
-					case 4:
-						eOSVersion = k_eMacOS104;
-						break;
-					case 5:
-						eOSVersion = k_eMacOS105;						
-						switch ( PatchVer )
-						{
-							case 8:
-								eOSVersion = k_eMacOS1058;								
-							default:
-								break;
-						}
-						break;
-					case 6:
-						eOSVersion = k_eMacOS106;
-						switch ( PatchVer )
-						{
-							case 1:
-							case 2:
-								break;
-							case 3:
-							default:
-								// note the default here - 10.6.4 (5,6...) >= 10.6.3, so we want to 
-								// identify as 10.6.3 for sysreqs purposes
-								eOSVersion = k_eMacOS1063;
-								break;
-						}
-						break;
-					case 7:
-						eOSVersion = k_eMacOS107;							
-						break;
-					default:
-						break;
-				}
-			}
-			default:
-				break;
-		}
-	}
-#elif defined(LINUX)
-	if ( eOSVersion == k_eOSUnknown )
-	{
-		
-		FILE *fpKernelVer = fopen( "/proc/version", "r" );
-		
-		if ( !fpKernelVer )
-			return k_eLinuxUnknown;
-		
-		char rgchVersionLine[1024];
-		char *pchRet = fgets( rgchVersionLine, sizeof(rgchVersionLine), fpKernelVer );
-		fclose( fpKernelVer );
-		
-		eOSVersion = k_eLinuxUnknown;
-		
-		// move past "Linux version "
-		const char *pchVersion = rgchVersionLine + Q_strlen( "Linux version " );
-		if ( pchRet && *pchVersion == '2' && *(pchVersion+1) == '.' )
-		{
-			pchVersion += 2; // move past "2."
-			if ( *pchVersion == '2' && *(pchVersion+1) == '.' )
-				eOSVersion = k_eLinux22;
-			else if ( *pchVersion == '4' && *(pchVersion+1) == '.' )
-				eOSVersion = k_eLinux24;
-			else if ( *pchVersion == '6' && *(pchVersion+1) == '.' )
-				eOSVersion = k_eLinux26;
-		}
-	}
-#endif
-	return eOSVersion;
-}
-
-//-----------------------------------------------------------------------------
-// Purpose: get platform-specific OS details (distro, on linux)
-// returns a pointer to the input buffer on success (for convenience), 
-// NULL on failure.
-//-----------------------------------------------------------------------------
-const char *GetOSDetailString( char *pchOutBuf, int cchOutBuf )
-{
-#if defined WIN32 
-	(void)( pchOutBuf );
-	(void)( cchOutBuf );
-	// no interesting details
-	return NULL;
-#else
-#if defined LINUX
-	// we're about to go poking around to see if we can figure out distribution
-	// looking @ any /etc file is fragile (people can change 'em), 
-	// but since this is just hardware survey data, we're not super concerned.  
-	// a bunch of OS-specific issue files
-	const char *pszIssueFile[] =
-	{
-		"/etc/redhat-release",
-		"/etc/fedora-release",
-		"/etc/slackware-release",
-		"/etc/debian_release",
-		"/etc/mandrake-release",
-		"/etc/yellowdog-release",
-		"/etc/gentoo-release",
-		"/etc/lsb-release",
-		"/etc/SUSE-release",
-	};
-	if ( !pchOutBuf )
-		return NULL;
-
-	for (int i = 0; i < Q_ARRAYSIZE( pszIssueFile ); i++ )
-	{
-		FILE *fdInfo = fopen( pszIssueFile[i], "r" );
-		if ( !fdInfo  )
-			continue;
-		
-		// prepend the buffer with the name of the file we found for easier grouping
-		snprintf( pchOutBuf, cchOutBuf, "%s\n", pszIssueFile[i] );
-		int cchIssueFile = strlen( pszIssueFile[i] ) + 1;
-		ssize_t cubRead = fread( (void*) (pchOutBuf + cchIssueFile) , sizeof(char), cchOutBuf - cchIssueFile, fdInfo );
-		fclose( fdInfo );
-
-		if ( cubRead < 0 )
-			return NULL;
-
-		// null terminate
-		pchOutBuf[ MIN( cubRead, cchOutBuf-1 ) ] = '\0';
-		return pchOutBuf;
-	}
-#endif
-	// if all else fails, just send back uname -a
-	if ( !pchOutBuf )
-		return NULL;
-	FILE *fpUname = popen( "uname -mrsv", "r" );
-	if ( !fpUname )
-		return NULL;
-	size_t cchRead = fread( pchOutBuf, sizeof(char), cchOutBuf, fpUname );
-	pclose( fpUname );
-
-	pchOutBuf[ MIN( cchRead, (size_t)cchOutBuf-1 ) ] = '\0';
-	return pchOutBuf;
-#endif
-}
-
-
-//-----------------------------------------------------------------------------
-// Purpose: get a friendly name for an OS type
-//-----------------------------------------------------------------------------
-const char *GetNameFromOSType( EOSType eOSType )
-{
-	switch ( eOSType )
-	{
-	case k_eWinUnknown:
-		return "Windows";
-	case k_eWin311:
-		return "Windows 3.11";
-	case k_eWin95:
-		return "Windows 95";
-	case k_eWin98:
-		return "Windows 98";
-	case k_eWinME:
-		return "Windows ME";
-	case k_eWinNT:
-		return "Windows NT";
-	case k_eWin2000:
-		return "Windows 2000";
-	case k_eWinXP:
-		return "Windows XP";
-	case k_eWin2003:
-		return "Windows 2003";
-	case k_eWinVista:
-		return "Windows Vista";
-	case k_eWindows7:
-		return "Windows 7";
-	case k_eWin2008:
-		return "Windows 2008";
-#ifdef POSIX
-	case k_eMacOSUnknown:
-		return "Mac OS";
-	case k_eMacOS104:
-		return "MacOS 10.4";
-	case k_eMacOS105:
-		return "MacOS 10.5";
-	case k_eMacOS1058:
-		return "MacOS 10.5.8";
-	case k_eMacOS106:
-		return "MacOS 10.6";
-	case k_eMacOS1063:
-		return "MacOS 10.6.3";
-	case k_eMacOS107:
-		return "MacOS 10.7";
-	case k_eLinuxUnknown:
-		return "Linux";
-	case k_eLinux22:
-		return "Linux 2.2";
-	case k_eLinux24:
-		return "Linux 2.4";
-	case k_eLinux26:
-		return "Linux 2.6";
-#endif
-	default:
-	case k_eOSUnknown:
-		return "Unknown";
-	}
-}
-
-
-// friendly name to OS type, MUST be same size as EOSType enum
-struct OSTypeNameTuple
-{
-	EOSType m_OSType;
-	const char *m_pchOSName;
-
-};
-
-const OSTypeNameTuple k_rgOSTypeToName[] = 
-{
-	{ k_eOSUnknown, "unknown" },
-	{ k_eMacOSUnknown, "macos" },
-	{ k_eMacOS104, "macos104" },
-	{ k_eMacOS105, "macos105" },
-	{ k_eMacOS1058, "macos1058" },
-	{ k_eMacOS106, "macos106" },
-	{ k_eMacOS1063, "macos1063" },
-	{ k_eMacOS107, "macos107" },
-	{ k_eLinuxUnknown, "linux" },
-	{ k_eLinux22, "linux22" },
-	{ k_eLinux24, "linux24" },
-	{ k_eLinux26, "linux26" },
-	{ k_eWinUnknown, "windows" },
-	{ k_eWin311, "win311" },
-	{ k_eWin95, "win95" },
-	{ k_eWin98, "win98" },
-	{ k_eWinME, "winME" },
-	{ k_eWinNT, "winNT" },
-	{ k_eWin2000, "win200" },
-	{ k_eWinXP, "winXP" },
-	{ k_eWin2003, "win2003" },
-	{ k_eWinVista, "winVista" },
-	{ k_eWindows7, "win7" },
-	{ k_eWin2008, "win2008" },
-};
-
-//-----------------------------------------------------------------------------
-// Purpose: convert a friendly OS name to a eostype
-//-----------------------------------------------------------------------------
-EOSType GetOSTypeFromString_Deprecated( const char *pchName )
-{
-	EOSType eOSType;
-#ifdef WIN32
-	eOSType = k_eWinUnknown;
-#else
-	eOSType = k_eOSUnknown;
-#endif
-
-	// if this fires, make sure all OS types are in the map
-	Assert( Q_ARRAYSIZE( k_rgOSTypeToName ) == k_eOSTypeMax ); 
-	if ( !pchName || Q_strlen( pchName ) == 0 )
-		return eOSType;
-
-	for ( int iOS = 0; iOS < Q_ARRAYSIZE( k_rgOSTypeToName ) ; iOS++ )
-	{
-		if ( !Q_stricmp( k_rgOSTypeToName[iOS].m_pchOSName, pchName ) ) 
-			return k_rgOSTypeToName[iOS].m_OSType;
-	}
-	return eOSType;
-}
-
-bool OSTypesAreCompatible( EOSType eOSTypeDetected, EOSType eOSTypeRequired )
-{
-	// check windows (on the positive side of the number line)
-	if ( eOSTypeRequired >= k_eWinUnknown )
-		return ( eOSTypeDetected >= eOSTypeRequired );
-
-	if ( eOSTypeRequired == k_eOSUnknown )
-		return true;
-
-	// osx
-	if ( eOSTypeRequired >= k_eMacOSUnknown && eOSTypeRequired < k_eOSUnknown )
-		return ( eOSTypeDetected >= eOSTypeRequired && eOSTypeDetected < k_eOSUnknown );
-
-	// and linux
-	if ( eOSTypeRequired >= k_eLinuxUnknown && eOSTypeRequired < k_eMacOSUnknown )
-		return ( eOSTypeDetected >= eOSTypeRequired && eOSTypeDetected < k_eMacOSUnknown );
-
-	return false;
-}
-
-// these strings "windows", "macos", "linux" are part of the
-// interface, which is why they're hard-coded here, rather than using
-// the strings in k_rgOSTypeToName
-const char *GetPlatformName( bool *pbIs64Bit )
-{
-	if ( pbIs64Bit )
-		*pbIs64Bit = Is64BitOS();
-	
-	EOSType eType = GetOSType(); 
-	if ( OSTypesAreCompatible( eType, k_eWinUnknown ) )
-		return "windows";
-	if ( OSTypesAreCompatible( eType, k_eMacOSUnknown ) )
-		return "macos";
-	if ( OSTypesAreCompatible( eType, k_eLinuxUnknown ) )
-		return "linux";
-	return "unknown";
-}
-

vstdlib/wscript

@@ -21,7 +21,6 @@ def build(bld):
 		'cvar.cpp',
 		'jobthread.cpp',
 		'KeyValuesSystem.cpp',
-		'osversion.cpp',
 		'random.cpp',
 		'vcover.cpp',
 		'../public/tier0/memoverride.cpp'
@@ -55,7 +54,7 @@ def build(bld):
 	elif bld.env.DEST_OS == 'darwin':
 		linkflags += ['-framework', 'CoreServices']
 
-	install_path = bld.env.LIBDIR
+	install_path = None if bld.env.BUILD_SDK else bld.env.LIBDIR
 
 	bld.shlib(
 		source   = source,

wscript

@@ -61,7 +61,7 @@ projects={
 		'serverbrowser',
 		'soundemittersystem',
 		'studiorender',
-		'thirdparty/StubSteamAPI',
+		'stub_steam',
 		'tier0',
 		'tier1',
 		'tier2',
@@ -129,7 +129,7 @@ projects={
 		'vpklib',
 		'vstdlib',
 		'vtf',
-		'thirdparty/StubSteamAPI'
+		'stub_steam'
 	]
 }
 
@@ -514,30 +514,32 @@ def configure(conf):
 			'/TP',
 			'/EHsc'
 		]
-		
+
 		if conf.options.BUILD_TYPE == 'debug':
 			linkflags += [
 				'/INCREMENTAL:NO',
 				'/NODEFAULTLIB:libc',
 				'/NODEFAULTLIB:libcd',
 				'/NODEFAULTLIB:libcmt',
-				'/FORCE'
+				'/FORCE',
+				'/LARGEADDRESSAWARE'
 			]
 		else:
 			linkflags += [
 				'/INCREMENTAL',
 				'/NODEFAULTLIB:libc',
 				'/NODEFAULTLIB:libcd',
-				'/NODEFAULTLIB:libcmtd'
+				'/NODEFAULTLIB:libcmtd',
+				'/LARGEADDRESSAWARE'
 			]
 
 		linkflags += [
 			'/LIBPATH:'+os.path.abspath('.')+'/lib/win32/'+conf.env.DEST_CPU+'/',
 			'/LIBPATH:'+os.path.abspath('.')+'/dx9sdk/lib/'+conf.env.DEST_CPU+'/'
 		]
-		
+
 	# And here C++ flags starts to be treated separately
-	cxxflags = list(cflags) 
+	cxxflags = list(cflags)
 	if conf.env.DEST_OS != 'win32':
 		cxxflags += ['-std=c++11','-fpermissive']
 
@@ -591,6 +593,11 @@ def configure(conf):
 def build(bld):
 	os.environ["CCACHE_DIR"] = os.path.abspath('.ccache/'+bld.env.COMPILER_CC+'/'+bld.env.DEST_OS+'/'+bld.env.DEST_CPU)
 
+	if bld.env.DEST_OS in ['win32', 'android']:
+		sdl_name = 'SDL2.dll' if bld.env.DEST_OS == 'win32' else 'libSDL2.so'
+		sdl_path = os.path.join('lib', bld.env.DEST_OS, bld.env.DEST_CPU, sdl_name)
+		bld.install_files(bld.env.LIBDIR, [sdl_path])
+
 	if bld.env.DEST_OS == 'win32':
 		projects['game'] += ['utils/bzip2']
 		projects['dedicated'] += ['utils/bzip2']