mirror of
https://github.com/projectM-visualizer/projectm.git
synced 2026-03-04 14:35:10 +00:00
- removed unneccessary PROJECTM_PRESET_DIR const string
- fixed error in print out when preset dir is invalid git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@430 6778bc44-b910-0410-a7a0-be141de4315d
This commit is contained in:
@ -56,19 +56,6 @@
|
||||
#include "ConfigFile.h"
|
||||
#include "TextureManager.hpp"
|
||||
|
||||
#ifdef LINUX
|
||||
const std::string projectM::PROJECTM_PRESET_PATH ( "/usr/share/projectM/presets/" );
|
||||
#endif
|
||||
|
||||
#ifdef MACOS
|
||||
const std::string projectM::PROJECTM_PRESET_PATH ( "/usr/share/projectM/presets/" );
|
||||
#endif
|
||||
|
||||
|
||||
#ifdef WIN32
|
||||
const std::string projectM::PROJECTM_PRESET_PATH ( "C:\\Program Files\\ProjectM\\presets" );
|
||||
#endif
|
||||
|
||||
/** Stash current engine */
|
||||
projectM *projectM::currentEngine = NULL;
|
||||
|
||||
@ -850,8 +837,8 @@ int projectM::initPresetTools()
|
||||
// Case where no valid presets exist in directory
|
||||
if (m_presetChooser->empty())
|
||||
{
|
||||
std::cerr << "[projectM] warning: no valid files found in preset directory \""
|
||||
<< PROJECTM_PRESET_PATH << "\"" << std::endl;
|
||||
std::cerr << "[projectM] warning: no valid files found in preset directory \""
|
||||
<< m_presetLoader->directoryName() << "\"" << std::endl;
|
||||
}
|
||||
|
||||
std::cerr << "[projectM] Idle preset allocated." << std::endl;
|
||||
|
||||
Reference in New Issue
Block a user