From ecd8d199bd4dc122bb72a598855fa5f9d8c39954 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Wed, 23 Nov 2005 22:43:17 +0000 Subject: [PATCH] missed commit: update for USB cleanup --- stepmania/src/arch/InputHandler/InputHandler_Win32_Para.cpp | 5 ++--- stepmania/src/arch/InputHandler/InputHandler_Win32_Pump.cpp | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/stepmania/src/arch/InputHandler/InputHandler_Win32_Para.cpp b/stepmania/src/arch/InputHandler/InputHandler_Win32_Para.cpp index c7b4832d1e..7bbfafda81 100644 --- a/stepmania/src/arch/InputHandler/InputHandler_Win32_Para.cpp +++ b/stepmania/src/arch/InputHandler/InputHandler_Win32_Para.cpp @@ -84,8 +84,8 @@ void InputHandler_Win32_Para::InputThreadMain() LOG->Warn(werr_ssprintf(GetLastError(), "Failed to set Para thread priority")); vector sources; - if( dev->io.IsOpen() ) - sources.push_back( &dev->io ); + if( dev->m_IO.IsOpen() ) + sources.push_back( &dev->m_IO ); while(!shutdown) { @@ -118,7 +118,6 @@ void InputHandler_Win32_Para::Update(float fDeltaTime) } /* - * (c) 2003-2004 Glenn Maynard * (c) 2002-2004 Chris Danford, Glenn Maynard * All rights reserved. * diff --git a/stepmania/src/arch/InputHandler/InputHandler_Win32_Pump.cpp b/stepmania/src/arch/InputHandler/InputHandler_Win32_Pump.cpp index 947bfaf987..da47cfd76d 100644 --- a/stepmania/src/arch/InputHandler/InputHandler_Win32_Pump.cpp +++ b/stepmania/src/arch/InputHandler/InputHandler_Win32_Pump.cpp @@ -96,8 +96,8 @@ void InputHandler_Win32_Pump::InputThreadMain() vector apSources; for( int i = 0; i < NUM_PUMPS; ++i ) { - if( m_pDevice[i].io.IsOpen() ) - apSources.push_back( &m_pDevice[i].io ); + if( m_pDevice[i].m_IO.IsOpen() ) + apSources.push_back( &m_pDevice[i].m_IO ); } while( !m_bShutdown )