From a6419a3f93c115be2aac30a47ad522758af2d7f0 Mon Sep 17 00:00:00 2001 From: Thomas Pietrzak Date: Tue, 24 May 2011 14:25:32 +0000 Subject: [PATCH] debug git-svn-id: svn+ssh://thomaspietrzak.com/var/svn/rep@15 47cf9a05-e0a8-4ed5-9e9b-101a649bc004 --- Haptic Metronome/Haptic Metronome.suo | Bin 72704 -> 28160 bytes .../Haptic Metronome/Haptic Metronome.vcxproj | 15 ++++-- include/MetronomeAudio.hpp | 6 +-- include/MetronomeHaptic.hpp | 6 +-- include/Mixer.hpp | 4 +- include/Sound.hpp | 2 - include/Texture.hpp | 4 -- src/MetronomeAudio.cpp | 4 +- src/Mixer.cpp | 10 +++- src/PaintGame.cpp | 45 +++++++++--------- src/SerialWindows.cpp | 5 +- src/Texture.cpp | 4 +- src/Tools.cpp | 4 -- src/main.cpp | 5 +- 14 files changed, 55 insertions(+), 59 deletions(-) diff --git a/Haptic Metronome/Haptic Metronome.suo b/Haptic Metronome/Haptic Metronome.suo index 5f9e0c5228fb743f7479cfec77b10e20f116a48a..d2e0b3597d8d7369693f48d36ba97919d122e037 100644 GIT binary patch literal 28160 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 D1TH`E literal 72704 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 - ..\..\lib;..\..\lib\SDL_mixer-1.3\include;..\..\lib\wiiuse_v0.12_win;..\..\lib\glew-1.5.8\include;..\..\include;..\..\lib\SDL_image-1.3\include;..\..\lib\SDL-1.3\include;$(IncludePath) + ..\..\include;$(IncludePath) - ..\..\lib\SDL_mixer-1.3\lib;..\..\lib\wiiuse_v0.12_win;..\..\lib\glew-1.5.8\lib;..\..\lib\SDL-1.3\lib;..\..\lib\SDL_image-1.3\lib;$(LibraryPath) + $(LibraryPath) + ../../src;../../include;$(SourcePath) + + + ..\..\lib;..\..\lib\SDL_mixer-1.3\include;..\..\lib\wiiuse_v0.12_win;..\..\lib\glew-1.5.8\include;..\..\include;..\..\lib\SDL_image-1.3\include;..\..\lib\SDL-1.3\include;$(IncludePath) ../../src;../../include;$(SourcePath) + ..\..\lib\SDL_mixer-1.3\lib;..\..\lib\wiiuse_v0.12_win;..\..\lib\glew-1.5.8\lib;..\..\lib\SDL-1.3\lib;..\..\lib\SDL_image-1.3\lib;$(LibraryPath) @@ -53,6 +58,7 @@ true SDL.lib;SDLmain.lib;SDL_image.lib;SDL_mixer.lib;glew32.lib;opengl32.lib;glu32.lib;wiiuse.lib;Winmm.lib;%(AdditionalDependencies) Windows + msvcrt.lib @@ -61,11 +67,14 @@ MaxSpeed true true + _MBCS;%(PreprocessorDefinitions);WIN32 - true + false true true + SDL.lib;SDLmain.lib;SDL_image.lib;SDL_mixer.lib;glew32.lib;opengl32.lib;glu32.lib;wiiuse.lib;Winmm.lib;%(AdditionalDependencies) + Windows diff --git a/include/MetronomeAudio.hpp b/include/MetronomeAudio.hpp index 6d6bb67..8956755 100644 --- a/include/MetronomeAudio.hpp +++ b/include/MetronomeAudio.hpp @@ -5,12 +5,10 @@ #ifdef WIN32 #include -#include -#include -#else +#endif + #include #include -#endif class MetronomeAudio : public Metronome { diff --git a/include/MetronomeHaptic.hpp b/include/MetronomeHaptic.hpp index 361a005..72eff23 100644 --- a/include/MetronomeHaptic.hpp +++ b/include/MetronomeHaptic.hpp @@ -5,12 +5,10 @@ #ifdef WIN32 #include -#include -#include -#else +#endif + #include #include -#endif #include "Serial.hpp" diff --git a/include/Mixer.hpp b/include/Mixer.hpp index 64cb5c5..ba49c2e 100644 --- a/include/Mixer.hpp +++ b/include/Mixer.hpp @@ -30,10 +30,9 @@ #ifdef __APPLE__ #include -#elif WIN32 -#include #else #include +#include #endif class Mixer @@ -74,6 +73,7 @@ class Mixer int _musicVolume, _soundVolume; static Mixer *_minstance; + static SDL_mutex *_mutex; }; #endif diff --git a/include/Sound.hpp b/include/Sound.hpp index fbe81f1..8fae0af 100644 --- a/include/Sound.hpp +++ b/include/Sound.hpp @@ -25,8 +25,6 @@ #ifdef __APPLE__ #include -#elif WIN32 -#include #else #include #endif diff --git a/include/Texture.hpp b/include/Texture.hpp index e2a2ec3..ee7058a 100644 --- a/include/Texture.hpp +++ b/include/Texture.hpp @@ -22,11 +22,7 @@ #define __TEXTURE__ #include -#ifdef WIN32 -#include -#else #include -#endif // #include #include "String.hpp" diff --git a/src/MetronomeAudio.cpp b/src/MetronomeAudio.cpp index 0f2bea0..7d4de30 100644 --- a/src/MetronomeAudio.cpp +++ b/src/MetronomeAudio.cpp @@ -18,8 +18,8 @@ extern FILE*logfile; MetronomeAudio::MetronomeAudio(const Track *track, uint32_t nbbeats, uint32_t tempo, bool activated) :Metronome(track, nbbeats, tempo, activated), thread(NULL) { - Mixer::getInstance()->addSound("bip","bip10.ogg"); - Mixer::getInstance()->addSound("bip2","bip2.ogg"); + Mixer::getInstance()->addSound("bip","bip10.wav"); + Mixer::getInstance()->addSound("bip2","bip2.wav"); } MetronomeAudio::~MetronomeAudio() diff --git a/src/Mixer.cpp b/src/Mixer.cpp index 575e716..2c22ee7 100644 --- a/src/Mixer.cpp +++ b/src/Mixer.cpp @@ -26,6 +26,7 @@ Mix_Music *Mixer::_music = NULL; Mixer *Mixer::_minstance = NULL; int *Mixer::_soundChannels = NULL; +SDL_mutex *Mixer::_mutex = SDL_CreateMutex(); Mixer::Mixer() :/*_music(NULL), *//*_soundChannels(new int[MAXSOUNDS]),*/ _musicVolume(-1), _soundVolume(-1) @@ -56,6 +57,7 @@ Mixer::~Mixer() //for the moment we never unload Sounds... if (_music) stopMusic(); + SDL_DestroyMutex(_mutex); } @@ -93,6 +95,7 @@ void Mixer::playMusic(const String &filename) if (buffer != "") { + SDL_mutexP(_mutex); _music = Mix_LoadMUS(buffer.c_str()); if(_music==NULL) fprintf(stderr, "cannot load music %s\n",buffer.c_str()); @@ -101,6 +104,7 @@ void Mixer::playMusic(const String &filename) Mix_PlayMusic(_music, -1); Mix_HookMusicFinished(stopMusic); } + SDL_mutexV(_mutex); } else fprintf(stderr, "music file %s not found\n",filename.c_str()); @@ -129,7 +133,11 @@ bool Mixer::addSound(const String &s, const String &filename) snd = _sounds[s]; } - return snd->addSound(filename); + SDL_mutexP(_mutex); + bool res = snd->addSound(filename); + SDL_mutexV(_mutex); + + return res; } void Mixer::playSound(const String &s) diff --git a/src/PaintGame.cpp b/src/PaintGame.cpp index 8e89292..bec5368 100644 --- a/src/PaintGame.cpp +++ b/src/PaintGame.cpp @@ -7,17 +7,14 @@ #include "MetronomeHaptic.hpp" #include +#include +#include +#include #ifdef WIN32 -#include -#include -#include struct { int tv_sec, tv_usec; } start; #else struct timeval start; -#include -#include -#include #endif #include @@ -32,8 +29,8 @@ int resolution_x, resolution_y; Config fromKeyboard; extern FILE*logfile; - -#if SDL_VERSION_ATLEAST(1,3,0) + +#if SDL_VERSION_ATLEAST(1,3,0) SDL_Window *window; SDL_Renderer *renderer; #endif @@ -79,7 +76,7 @@ void init() for (i=0 ; modes[i] ; i++) { cout << "Resolution available: " << modes[i]->w << "x" << modes[i]->h << endl; - if (modes[i]->w > resolution_x)//== 1280 && modes[i]->h == 1024) + if (modes[i]->w== 1600 && modes[i]->h == 900) //> resolution_x)// { resolution_x = modes[i]->w; resolution_y = modes[i]->h; @@ -93,12 +90,12 @@ void init() resolution_y = 768; }*/ } - -#if 0//SDL_VERSION_ATLEAST(1,3,0) - if ((window = SDL_CreateWindow("Haptic Metronome", - SDL_WINDOWPOS_CENTERED, - SDL_WINDOWPOS_CENTERED, - resolution_x, resolution_y, + +#if 0//SDL_VERSION_ATLEAST(1,3,0) + if ((window = SDL_CreateWindow("Haptic Metronome", + SDL_WINDOWPOS_CENTERED, + SDL_WINDOWPOS_CENTERED, + resolution_x, resolution_y, SDL_WINDOW_OPENGL|SDL_WINDOW_SHOWN)) == NULL) throw "Unable to create the window"; @@ -130,8 +127,6 @@ void init() SDL_GL_SetAttribute(SDL_GL_ACCUM_GREEN_SIZE, 8); SDL_GL_SetAttribute(SDL_GL_ACCUM_BLUE_SIZE, 8); SDL_GL_SetAttribute(SDL_GL_ACCUM_ALPHA_SIZE, 8); - - int flags = SDL_OPENGL | SDL_OPENGL | SDL_HWSURFACE | SDL_FULLSCREEN; glEnable(GL_MULTISAMPLE); @@ -140,13 +135,17 @@ void init() throw "Impossible to initialize SDL_GL_MULTISAMPLEBUFFERS"; // Nombre de tampons utilisés pour l'anti-aliasing (la valeur utilisée dépend de la carte graphique) - if (SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, 8) == -1) + if (SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, 16) == -1) throw "Impossible to initialize SDL_GL_MULTISAMPLESAMPLES"; - + // int flags = SDL_OPENGL | SDL_OPENGLBLIT | SDL_SWSURFACE | SDL_FULLSCREEN; + int flags = SDL_OPENGL | SDL_FULLSCREEN; SDL_Surface * screen; - if (!(screen = SDL_SetVideoMode(resolution_x, resolution_y, 0, flags))) +// if (!(screen = SDL_SetVideoMode(resolution_x, resolution_y, 0, flags))) + if (!(screen = SDL_SetVideoMode(0, 0, 0, flags))) throw "Impossible to change the video mode"; + resolution_x = 1600; + resolution_y = 900; GLdouble ratio = (GLdouble) screen->w / screen->h; @@ -523,7 +522,7 @@ bool processEvents() break; case SDL_KEYDOWN: -#if SDL_VERSION_ATLEAST(1,3,0) +#if SDL_VERSION_ATLEAST(1,3,0) keystate = SDL_GetKeyboardState(NULL); handleKeys(keystate[SDL_SCANCODE_F1], keystate[SDL_SCANCODE_F2], keystate[SDL_SCANCODE_F3], keystate[SDL_SCANCODE_F4], keystate[SDL_SCANCODE_F5], currenttime); #else @@ -605,7 +604,7 @@ bool processEvents() default: break; } -#if SDL_VERSION_ATLEAST(1,3,0) +#if SDL_VERSION_ATLEAST(1,3,0) keystate = SDL_GetKeyboardState(NULL); handleKeys(keystate[SDL_SCANCODE_F1], keystate[SDL_SCANCODE_F2], keystate[SDL_SCANCODE_F3], keystate[SDL_SCANCODE_F4], keystate[SDL_SCANCODE_F5], currenttime); #else @@ -708,7 +707,7 @@ void loop(const Track &tr, const String &songname) if (iswiimoteconnected) mw->handleEvents(); // cout << "pause" << endl; -// SDL_Delay(10); + SDL_Delay(10); // check metronome events // tr.checkMetronome(currenttime, m); } diff --git a/src/SerialWindows.cpp b/src/SerialWindows.cpp index 927cfae..2b6d4d8 100644 --- a/src/SerialWindows.cpp +++ b/src/SerialWindows.cpp @@ -4,11 +4,10 @@ using namespace std; #ifdef WIN32 -#include #include -#else -#include #endif + +#include SerialWindows::SerialWindows(char *portName) :Serial(portName) diff --git a/src/Texture.cpp b/src/Texture.cpp index 9da81f5..85605e2 100644 --- a/src/Texture.cpp +++ b/src/Texture.cpp @@ -24,8 +24,6 @@ // #include #ifdef __APPLE__ #include -#elif WIN32 -#include #else #include #endif @@ -70,7 +68,7 @@ Texture::Texture(const String &filename, const bool &rep) if (buffer != "") surface = IMG_Load(buffer.c_str()); - else + else cerr << "Could not open texture " << filename << endl; if (surface) diff --git a/src/Tools.cpp b/src/Tools.cpp index a09e915..bb23adc 100644 --- a/src/Tools.cpp +++ b/src/Tools.cpp @@ -20,11 +20,7 @@ */ #include "Tools.hpp" -#ifdef WIN32 -#include -#else #include -#endif #include #include diff --git a/src/main.cpp b/src/main.cpp index 5df6946..f21bc77 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -7,13 +7,12 @@ #ifdef WIN32 #include -#include #include #else #include +#endif #include -#endif #ifdef WIN32 @@ -31,8 +30,6 @@ float SECONDSIZE = 0.050f; FILE *logfile = NULL; -//list bips; -//list::iterator cb; void handleStrokeOff() { -- 2.30.2