diff options
| author | erihel <erihel@gmail.com> | 2013-01-14 22:55:16 +0100 |
|---|---|---|
| committer | erihel <erihel@gmail.com> | 2013-01-14 22:55:16 +0100 |
| commit | 58f35e44ae17a8d4c55b1b19696245666d3697d3 (patch) | |
| tree | 26d593e1af405939f8c8c44c605a657c15aceb6c /src/app | |
| parent | 35faf628cf8085a9262c2b89999cacdd3f5bee79 (diff) | |
| download | colobot-58f35e44ae17a8d4c55b1b19696245666d3697d3.tar.gz colobot-58f35e44ae17a8d4c55b1b19696245666d3697d3.tar.bz2 colobot-58f35e44ae17a8d4c55b1b19696245666d3697d3.zip | |
* Removed alut
* Using libsndfile to load sounds and music
* Added support for playing music files
Diffstat (limited to 'src/app')
| -rw-r--r-- | src/app/app.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/app/app.cpp b/src/app/app.cpp index 4a69655..9886b24 100644 --- a/src/app/app.cpp +++ b/src/app/app.cpp @@ -321,10 +321,17 @@ bool CApplication::Create() #endif m_sound->Create(true); - if (GetProfile().GetLocalProfileString("Resources", "Sound", path)) + if (GetProfile().GetLocalProfileString("Resources", "Sound", path)) { m_sound->CacheAll(path); - else + } else { m_sound->CacheAll(GetDataSubdirPath(DIR_SOUND)); + } + + if (GetProfile().GetLocalProfileString("Resources", "Music", path)) { + m_sound->AddMusicFiles(path); + } else { + m_sound->AddMusicFiles(GetDataSubdirPath(DIR_MUSIC)); + } } std::string standardInfoMessage = |