equal
deleted
inserted
replaced
18 |
18 |
19 #include "SDLs.h" |
19 #include "SDLs.h" |
20 |
20 |
21 #include "SDL.h" |
21 #include "SDL.h" |
22 #include "SDL_mixer.h" |
22 #include "SDL_mixer.h" |
23 #include "hwconsts.h" |
23 |
|
24 #include "HWDataManager.h" |
|
25 |
24 #include "HWApplication.h" |
26 #include "HWApplication.h" |
25 |
27 |
26 |
28 |
27 extern char sdlkeys[1024][2][128]; |
29 extern char sdlkeys[1024][2][128]; |
28 extern char xb360buttons[][128]; |
30 extern char xb360buttons[][128]; |
29 extern char xb360dpad[128]; |
31 extern char xb360dpad[128]; |
30 extern char xbox360axes[][128]; |
32 extern char xbox360axes[][128]; |
31 |
|
32 |
33 |
33 SDLInteraction::SDLInteraction() |
34 SDLInteraction::SDLInteraction() |
34 { |
35 { |
35 |
36 |
36 SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK); |
37 SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK); |
157 Mix_OpenAudio(44100, MIX_DEFAULT_FORMAT, 2, 1024); |
158 Mix_OpenAudio(44100, MIX_DEFAULT_FORMAT, 2, 1024); |
158 musicInitialized = 1; |
159 musicInitialized = 1; |
159 } |
160 } |
160 } |
161 } |
161 |
162 |
162 |
|
163 void SDLInteraction::StartMusic() |
163 void SDLInteraction::StartMusic() |
164 { |
164 { |
165 SDLMusicInit(); |
165 SDLMusicInit(); |
166 QFile tmpfile; |
166 QFile * tmpFile = HWDataManager::instance().findFileForRead("Music/main_theme.ogg"); |
167 |
167 |
168 tmpfile.setFileName(cfgdir->absolutePath() + "/Data/Music/main_theme.ogg"); |
168 if (music == NULL) |
169 if (!tmpfile.exists()) tmpfile.setFileName(datadir->absolutePath() + "/Music/main_theme.ogg"); |
169 music = Mix_LoadMUS(tmpFile->fileName().toLocal8Bit().constData()); |
170 if (music == NULL) { |
|
171 music = Mix_LoadMUS(QFileInfo(tmpfile).absoluteFilePath().toLocal8Bit().constData()); |
|
172 |
170 |
173 } |
171 // this QFile isn't needed any further |
|
172 delete tmpFile; |
|
173 |
174 Mix_VolumeMusic(MIX_MAX_VOLUME - 28); |
174 Mix_VolumeMusic(MIX_MAX_VOLUME - 28); |
175 Mix_FadeInMusic(music, -1, 1750); |
175 Mix_FadeInMusic(music, -1, 1750); |
176 } |
176 } |
177 |
177 |
178 void SDLInteraction::StopMusic() |
178 void SDLInteraction::StopMusic() |