From 1c44cd23c894961bc8c251422386e537365d9f63 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Thu, 18 Dec 2003 04:24:25 +0000 Subject: [PATCH] add memory card insert/remove sound --- .../Sounds/MemoryCardManager disconnect.ogg | Bin 0 -> 5716 bytes stepmania/src/MemoryCardManager.cpp | 11 +++++++++++ stepmania/src/MemoryCardManager.h | 4 ++++ 3 files changed, 15 insertions(+) create mode 100644 stepmania/Themes/default/Sounds/MemoryCardManager disconnect.ogg diff --git a/stepmania/Themes/default/Sounds/MemoryCardManager disconnect.ogg b/stepmania/Themes/default/Sounds/MemoryCardManager disconnect.ogg new file mode 100644 index 0000000000000000000000000000000000000000..ab3db0f2fc948f4b0ca1ad691d3187962a2ca946 GIT binary patch literal 5716 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 literal 0 HcmV?d00001 diff --git a/stepmania/src/MemoryCardManager.cpp b/stepmania/src/MemoryCardManager.cpp index 48e5486d6d..e696bf6131 100644 --- a/stepmania/src/MemoryCardManager.cpp +++ b/stepmania/src/MemoryCardManager.cpp @@ -15,6 +15,7 @@ #include "arch/MemoryCard/MemoryCardDriver.h" // for UsbStorageDevice #include "arch/arch.h" #include "ScreenManager.h" +#include "ThemeManager.h" MemoryCardManager* MEMCARDMAN = NULL; // global and accessable from anywhere in our program @@ -29,6 +30,10 @@ MemoryCardManager::MemoryCardManager() m_bTooLate[NUM_PLAYERS] = false; m_bWriteError[NUM_PLAYERS] = false; } + m_pDriver->GetStorageDevices( g_StorageDevices ); + + m_soundConnect.Load( THEME->GetPathToS("MemoryCardManager connect") ); + m_soundDisconnect.Load( THEME->GetPathToS("MemoryCardManager disconnect") ); } MemoryCardManager::~MemoryCardManager() @@ -51,7 +56,10 @@ void MemoryCardManager::Update( float fDelta ) { const UsbStorageDevice old = vOld[i]; if( find(vNew.begin(),vNew.end(),old) == vNew.end() ) + { SCREENMAN->SystemMessage( ssprintf("Disconnected bus %d port %d device %d path %s", old.iBus, old.iPortOnHub, old.iDeviceOnBus, old.sOsMountDir.c_str()) ); + m_soundDisconnect.Play(); + } } // check for connects @@ -59,7 +67,10 @@ void MemoryCardManager::Update( float fDelta ) { const UsbStorageDevice newd = vNew[i]; if( find(vOld.begin(),vOld.end(),newd) == vOld.end() ) + { SCREENMAN->SystemMessage( ssprintf("Connected bus %d port %d device %d path %s", newd.iBus, newd.iPortOnHub, newd.iDeviceOnBus, newd.sOsMountDir.c_str()) ); + m_soundConnect.Play(); + } } } } diff --git a/stepmania/src/MemoryCardManager.h b/stepmania/src/MemoryCardManager.h index bc9d862970..babef7f855 100644 --- a/stepmania/src/MemoryCardManager.h +++ b/stepmania/src/MemoryCardManager.h @@ -11,6 +11,7 @@ ----------------------------------------------------------------------------- */ #include "PlayerNumber.h" +#include "RageSound.h" struct UsbStorageDevice; class MemoryCardDriver; @@ -38,6 +39,9 @@ protected: bool m_bTooLate[NUM_PLAYERS]; // card was inserted after lock bool m_bWriteError[NUM_PLAYERS]; // couldn't write to the card UsbStorageDevice* m_pDevice[NUM_PLAYERS]; // device in the memory card slot, NULL if none + + RageSound m_soundConnect; + RageSound m_soundDisconnect; }; extern MemoryCardManager* MEMCARDMAN; // global and accessable from anywhere in our program