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

add hack to not play connect/disconnect sounds after resetting USB

Browse Source
This commit is contained in:
Chris Danford
2004-05-03 02:43:36 +00:00
parent 3525b20e03
commit 9d1a89d0d5
2 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/MemoryCardManager.cpp
+16 -7
View File
@@ -35,6 +35,8 @@ MemoryCardManager::MemoryCardManager()
} }
m_pDriver->GetStorageDevices( m_vStorageDevices ); m_pDriver->GetStorageDevices( m_vStorageDevices );
m_bDontPlaySoundsOnce = false;
m_soundReady.Load( THEME->GetPathToS("MemoryCardManager ready") ); m_soundReady.Load( THEME->GetPathToS("MemoryCardManager ready") );
m_soundError.Load( THEME->GetPathToS("MemoryCardManager error") ); m_soundError.Load( THEME->GetPathToS("MemoryCardManager error") );
m_soundTooLate.Load( THEME->GetPathToS("MemoryCardManager too late") ); m_soundTooLate.Load( THEME->GetPathToS("MemoryCardManager too late") );
@@ -248,15 +250,20 @@ match:
} }
} }
// play sound if( !m_bDontPlaySoundsOnce )
if( m_bWriteError[p] ) {
m_soundError.Play(); // play sound
else if( m_bTooLate[p] ) if( m_bWriteError[p] )
m_soundTooLate.Play(); m_soundError.Play();
else else if( m_bTooLate[p] )
m_soundReady.Play(); m_soundTooLate.Play();
else
m_soundReady.Play();
}
} }
} }
m_bDontPlaySoundsOnce = false;
} }
void MemoryCardManager::FlushAndReset() void MemoryCardManager::FlushAndReset()
@@ -271,6 +278,8 @@ void MemoryCardManager::FlushAndReset()
} }
m_pDriver->ResetUsbStorage(); // forces cards to be re-detected m_pDriver->ResetUsbStorage(); // forces cards to be re-detected
m_bDontPlaySoundsOnce = true;
} }
bool MemoryCardManager::PathIsMemCard( CString sDir ) const bool MemoryCardManager::PathIsMemCard( CString sDir ) const
stepmania/src/MemoryCardManager.h
+3
View File
@@ -55,6 +55,9 @@ protected:
bool m_bWriteError[NUM_PLAYERS]; // couldn't write to the card bool m_bWriteError[NUM_PLAYERS]; // couldn't write to the card
UsbStorageDevice m_Device[NUM_PLAYERS]; // device in the memory card slot, NULL if none UsbStorageDevice m_Device[NUM_PLAYERS]; // device in the memory card slot, NULL if none
// don't play sounds on the first assign after resetting the driver
bool m_bDontPlaySoundsOnce;
RageSound m_soundReady; RageSound m_soundReady;
RageSound m_soundError; RageSound m_soundError;
RageSound m_soundTooLate; RageSound m_soundTooLate;