merge

src/arch/InputHandler/InputHandler.h

@@ -25,7 +25,7 @@ public:
 	static void Create( const RString &sDrivers, vector<InputHandler *> &apAdd );
 	static DriverList m_pDriverList;
 
-	InputHandler() { m_iInputsSinceUpdate = 0; }
+	InputHandler(): m_iInputsSinceUpdate(0) {}
 	virtual ~InputHandler() { }
 	virtual void Update() { }
 	virtual bool DevicesChanged() { return false; }

src/arch/InputHandler/InputHandler_MacOSX_HID.cpp

@@ -425,10 +425,10 @@ wchar_t InputHandler_MacOSX_HID::DeviceButtonToChar( DeviceButton button, bool b
 		if( KeyLayout )
 		{
 			UInt32 keyboardType = LMGetKbdType();
-			UInt32 modifiers = bUseCurrentKeyModifiers ? GetCurrentKeyModifiers() : 0;
+			UInt32 nModifiers = bUseCurrentKeyModifiers ? GetCurrentKeyModifiers() : 0;
 			UniChar unicodeInputString[4];
 			UniCharCount length;
-			OSStatus status = UCKeyTranslate( *KeyLayout, iMacVirtualKey, kUCKeyActionDown, modifiers,
+			OSStatus status = UCKeyTranslate( *KeyLayout, iMacVirtualKey, kUCKeyActionDown, nModifiers,
 							  keyboardType, 0, &iDeadKeyState, ARRAYLEN(unicodeInputString),
 							  &length, unicodeInputString );
 

src/arch/MovieTexture/MovieTexture_FFMpeg.cpp

@@ -690,7 +690,7 @@ int URLRageFile_read( avcodec::URLContext *h, unsigned char *buf, int size )
 #if defined(MACOSX) || defined(_MSC_VER) // still using older ffmpeg versions
 	int URLRageFile_write( avcodec::URLContext *h, unsigned char *buf, int size )
 #else // assume ffmpeg 0.6 on *nix
-	int URLRageFile_write( avcodec::URLContext *h, const unsigned char *buf, int size )
+	int URLRageFile_write( avcodec::URLContext *h, unsigned char *buf, int size )
 #endif
 {
 	RageFileBasic *f = (RageFileBasic *) h->priv_data;

src/arch/MovieTexture/MovieTexture_Theora.cpp

@@ -193,10 +193,10 @@ RString MovieDecoder_Theora::ProcessHeaders()
 		while(1)
 		{
 			ogg_packet op;
-			int ret = ogg_stream_packetpeek( &m_OggStream, &op );
-			if( ret == 0 )
+			int ret2 = ogg_stream_packetpeek( &m_OggStream, &op );
+			if( ret2 == 0 )
 				break;
-			if( ret < 0 )
+			if( ret2 < 0 )
 				return ssprintf( "error opening %s: error parsing Theora stream headers", m_File.GetPath().c_str() );
 
 			if( !theora_packet_isheader(&op) )
@@ -208,8 +208,8 @@ RString MovieDecoder_Theora::ProcessHeaders()
 				return RString();
 			}
 
-			ret = theora_decode_header( &m_TheoraInfo, &m_TheoraComment, &op);
-			if( ret < 0 && ret != OC_NEWPACKET )
+			ret2 = theora_decode_header( &m_TheoraInfo, &m_TheoraComment, &op);
+			if( ret2 < 0 && ret2 != OC_NEWPACKET )
 				return ssprintf( "error opening %s: error parsing Theora stream headers", m_File.GetPath().c_str() );
 
 			ogg_stream_packetout( &m_OggStream, NULL );

src/arch/Sound/RageSoundDriver.h

@@ -150,7 +150,8 @@ private:
 		float *m_BufferNext; // beginning of the unread data
 		int m_FramesInBuffer; // total number of frames at m_BufferNext
 		int64_t m_iPosition; // stream frame of m_BufferNext
-		sound_block() { m_FramesInBuffer = 0; m_iPosition = 0; m_BufferNext = m_Buffer; }
+		sound_block(): m_BufferNext(m_Buffer),
+			m_FramesInBuffer(0), m_iPosition(0) {} 
 	};
 
 	struct Sound

src/arch/Threads/Threads.h

@@ -25,7 +25,7 @@ class MutexImpl
 public:
 	RageMutex *m_Parent;
 
-	MutexImpl( RageMutex *pParent ) { m_Parent = pParent; }
+	MutexImpl( RageMutex *pParent ): m_Parent(pParent) {}
 	virtual ~MutexImpl() { }
 
 	/* Lock the mutex.  If mutex timeouts are implemented, and the mutex times out,
@@ -40,6 +40,10 @@ public:
 	/* Unlock the mutex.  This must only be called when the mutex is locked; implementations
 	 * may fail with an assertion if the mutex is not locked. */
 	virtual void Unlock() = 0;
+	
+private:
+	MutexImpl(const MutexImpl& rhs);
+	MutexImpl& operator=(const MutexImpl& rhs);
 };
 
 class EventImpl