|
Line
Link Here
|
| 0 |
-- a/src/libprojectM/Renderer/TextureManager.cpp |
0 |
++ b/src/libprojectM/Renderer/TextureManager.cpp |
|
Lines 208-214
unsigned int TextureManager::getTextureMemorySize()
Link Here
|
| 208 |
|
208 |
|
| 209 |
void TextureManager::loadTextureDir() |
209 |
void TextureManager::loadTextureDir() |
| 210 |
{ |
210 |
{ |
| 211 |
std::string dirname = "/usr/local/share/projectM/textures"; |
211 |
std::string dirname = "/usr/share/projectM/textures"; |
| 212 |
|
212 |
|
| 213 |
DIR * m_dir; |
213 |
DIR * m_dir; |
| 214 |
|
214 |
|
| 215 |
-- a/src/libprojectM/projectM.cpp |
215 |
++ b/src/libprojectM/projectM.cpp |
|
Lines 180-186
void projectM::readConfig (const std::string & configFile )
Link Here
|
| 180 |
_settings.presetDuration = config.read<int> ( "Preset Duration", 15 ); |
180 |
_settings.presetDuration = config.read<int> ( "Preset Duration", 15 ); |
| 181 |
|
181 |
|
| 182 |
#ifdef __unix__ |
182 |
#ifdef __unix__ |
| 183 |
_settings.presetURL = config.read<string> ( "Preset Path", "/usr/local/share/projectM/presets" ); |
183 |
_settings.presetURL = config.read<string> ( "Preset Path", "/usr/share/projectM/presets" ); |
| 184 |
#endif |
184 |
#endif |
| 185 |
|
185 |
|
| 186 |
#ifdef __APPLE__ |
186 |
#ifdef __APPLE__ |
|
Lines 201-209
void projectM::readConfig (const std::string & configFile )
Link Here
|
| 201 |
|
201 |
|
| 202 |
#ifdef __unix__ |
202 |
#ifdef __unix__ |
| 203 |
_settings.titleFontURL = config.read<string> |
203 |
_settings.titleFontURL = config.read<string> |
| 204 |
( "Title Font", "/usr/local/share/projectM/fonts/Vera.tff" ); |
204 |
( "Title Font", "/usr/share/projectM/fonts/Vera.ttf" ); |
| 205 |
_settings.menuFontURL = config.read<string> |
205 |
_settings.menuFontURL = config.read<string> |
| 206 |
( "Menu Font", "/usr/local/share/projectM/fonts/VeraMono.tff" ); |
206 |
( "Menu Font", "/usr/share/projectM/fonts/VeraMono.ttf" ); |
| 207 |
#endif |
207 |
#endif |
| 208 |
|
208 |
|
| 209 |
#ifdef WIN32 |
209 |
#ifdef WIN32 |
| 210 |
- |
|
|
