CSPublic/Blocks3D
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Made AudioPlayer's play and init method static

Browse Source
This commit is contained in:
andreja6
2018-04-26 21:41:07 -07:00
parent 78cdb01ef1
commit 6d49e266dd
3 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
AudioPlayer.cpp
View File

@@ -5,9 +5,19 @@
#include <malloc.h> #include <malloc.h>
#include <string.h> #include <string.h>
#define NUM_SOUNDS 10 #define NUM_SOUNDS 10
SDL_AudioSpec fmt; static SDL_AudioSpec fmt;
AudioPlayer::AudioPlayer(void) AudioPlayer::AudioPlayer(void)
{
}
AudioPlayer::~AudioPlayer(void)
{
SDL_CloseAudio();
}
void AudioPlayer::init()
{ {
extern void mixaudio(void *unused, Uint8 *stream, int len); extern void mixaudio(void *unused, Uint8 *stream, int len);
fmt.freq = 22050; fmt.freq = 22050;
@@ -25,12 +35,7 @@ AudioPlayer::AudioPlayer(void)
SDL_PauseAudio(0); SDL_PauseAudio(0);
} }
AudioPlayer::~AudioPlayer(void) static struct sample {
{
SDL_CloseAudio();
}
struct sample {
Uint8 *data; Uint8 *data;
Uint32 dpos; Uint32 dpos;
Uint32 dlen; Uint32 dlen;

3
AudioPlayer.h
View File

@@ -6,5 +6,6 @@ class AudioPlayer
public: public:
AudioPlayer(void); AudioPlayer(void);
~AudioPlayer(void); ~AudioPlayer(void);
void PlaySound(std::string); static void PlaySound(std::string);
static void init();
}; };

11
main.cpp
View File

@@ -40,7 +40,6 @@ static int index = 2;
static std::string cameraSound = ""; static std::string cameraSound = "";
static float TIMERVAL = 60.0F; static float TIMERVAL = 60.0F;
static int SCOREVAL = 0; static int SCOREVAL = 0;
static AudioPlayer soundSystem;
static G3D::TextureRef go = NULL; static G3D::TextureRef go = NULL;
static G3D::TextureRef go_ovr = NULL; static G3D::TextureRef go_ovr = NULL;
static G3D::TextureRef go_dn = NULL; static G3D::TextureRef go_dn = NULL;
@@ -251,7 +250,7 @@ public:
void CameraButtonListener::onButton1MouseClick(BaseButtonInstance* button) void CameraButtonListener::onButton1MouseClick(BaseButtonInstance* button)
{ {
soundSystem.PlaySound(cameraSound); AudioPlayer::PlaySound(cameraSound);
CoordinateFrame frame = usableApp->debugCamera.getCoordinateFrame(); CoordinateFrame frame = usableApp->debugCamera.getCoordinateFrame();
if(button->name == "CenterCam") if(button->name == "CenterCam")
centerCam = true; centerCam = true;
@@ -285,7 +284,7 @@ void DeleteListener::onButton1MouseClick(BaseButtonInstance* button)
instances.erase(instances.begin() + i); instances.erase(instances.begin() + i);
delete deleting; delete deleting;
selectedInstance = NULL; selectedInstance = NULL;
soundSystem.PlaySound(GetFileInPath("/content/sounds/pageturn.wav")); AudioPlayer::PlaySound(GetFileInPath("/content/sounds/pageturn.wav"));
} }
@@ -880,13 +879,13 @@ void Demo::onUserInput(UserInput* ui) {
if(ui->keyPressed(SDL_MOUSE_WHEEL_UP_KEY)) if(ui->keyPressed(SDL_MOUSE_WHEEL_UP_KEY))
{ {
soundSystem.PlaySound(cameraSound); AudioPlayer::PlaySound(cameraSound);
CoordinateFrame frame = app->debugCamera.getCoordinateFrame(); CoordinateFrame frame = app->debugCamera.getCoordinateFrame();
cameraPos = cameraPos + frame.lookVector()*2; cameraPos = cameraPos + frame.lookVector()*2;
} }
if(ui->keyPressed(SDL_MOUSE_WHEEL_DOWN_KEY)) if(ui->keyPressed(SDL_MOUSE_WHEEL_DOWN_KEY))
{ {
soundSystem.PlaySound(cameraSound); AudioPlayer::PlaySound(cameraSound);
CoordinateFrame frame = app->debugCamera.getCoordinateFrame(); CoordinateFrame frame = app->debugCamera.getCoordinateFrame();
cameraPos = cameraPos - frame.lookVector()*2; cameraPos = cameraPos - frame.lookVector()*2;
} }
@@ -1469,7 +1468,7 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
int main(int argc, char** argv) { int main(int argc, char** argv) {
//_CrtSetDbgFlag( _CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF ); //_CrtSetDbgFlag( _CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF );
//_CrtSetBreakAlloc(1279); //_CrtSetBreakAlloc(1279);
AudioPlayer::init();
GAppSettings settings; GAppSettings settings;
settings.window.resizable = true; settings.window.resizable = true;
//settings.window.fsaaSamples = 8; //settings.window.fsaaSamples = 8;