mirror/lmms
1
0
Fork 0
mirror of https://github.com/LMMS/lmms.git synced 2026-05-18 19:55:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2020 from tresf/master

Browse Source 
Remove Win32 GetSpecialFolderPath ; fix windows builds
This commit is contained in:
Tres Finocchiaro
2015-04-27 16:45:13 +00:00
parent bdf7cce0d6 b19a9dc903
commit 3eafcd0a58
1 changed files with 2 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/core/ConfigManager.cpp
View File

@@ -252,31 +252,6 @@ void ConfigManager::setValue( const QString & _class,
#ifdef LMMS_BUILD_WIN32
#include <QLibrary>
#include <shlobj.h>
// taken from qt-win-opensource-src-4.2.2/src/corelib/io/qsettings.cpp
static QString windowsConfigPath( int _type )
{
QString result;
QLibrary library( "shell32" );
typedef BOOL( WINAPI* GetSpecialFolderPath )( HWND, char *, int, BOOL );
GetSpecialFolderPath SHGetSpecialFolderPath = (GetSpecialFolderPath)
library.resolve( "SHGetSpecialFolderPathA" );
if( SHGetSpecialFolderPath )
{
char path[MAX_PATH];
SHGetSpecialFolderPath( 0, path, _type, false );
result = QString::fromLocal8Bit( path );
}
return result;
}
#endif
void ConfigManager::loadConfigFile()
{
// read the XML file and create DOM tree
@@ -381,8 +356,8 @@ void ConfigManager::loadConfigFile()
!QDir( m_vstDir ).exists() )
{
#ifdef LMMS_BUILD_WIN32
m_vstDir = windowsConfigPath( CSIDL_PROGRAM_FILES ) +
QDir::separator() + "VstPlugins";
QString programFiles = getenv("ProgramFiles");
m_vstDir = programFiles + QDir::separator() + "VstPlugins";
#else
m_vstDir = m_workingDir + "plugins/vst" + QDir::separator();
#endif