hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge pull request #2602 from LMMS/iss-2577

Browse Source 
Fix some Windows data directory resolve issues
This commit is contained in:
Lukas W
2016-02-23 20:06:12 +13:00
parent 13125c6248 d88902e95b
commit 8d91dd657d
3 changed files with 24 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/stk/mallets/mallets.cpp
View File

@@ -79,8 +79,7 @@ malletsInstrument::malletsInstrument( InstrumentTrack * _instrument_track ):
m_presetsModel(this),
m_spreadModel(0, 0, 255, 1, this, tr( "Spread" )),
m_filesMissing( !QDir( ConfigManager::inst()->stkDir() ).exists() ||
!QFileInfo( ConfigManager::inst()->stkDir() + QDir::separator()
+ "sinewave.raw" ).exists() )
!QFileInfo( ConfigManager::inst()->stkDir() + "/sinewave.raw" ).exists() )
{
// ModalBar
m_presetsModel.addItem( tr( "Marimba" ) );
@@ -533,7 +532,7 @@ malletsSynth::malletsSynth( const StkFloat _pitch,
try
{
Stk::setSampleRate( _sample_rate );
Stk::setRawwavePath( ConfigManager::inst()->stkDir()
Stk::setRawwavePath( QDir( ConfigManager::inst()->stkDir() ).absolutePath()
.toLatin1().constData() );
m_voice = new ModalBar();
@@ -580,7 +579,7 @@ malletsSynth::malletsSynth( const StkFloat _pitch,
try
{
Stk::setSampleRate( _sample_rate );
Stk::setRawwavePath( ConfigManager::inst()->stkDir()
Stk::setRawwavePath( QDir( ConfigManager::inst()->stkDir() ).absolutePath()
.toLatin1().constData() );
m_voice = new TubeBell();
@@ -625,7 +624,7 @@ malletsSynth::malletsSynth( const StkFloat _pitch,
try
{
Stk::setSampleRate( _sample_rate );
Stk::setRawwavePath( ConfigManager::inst()->stkDir()
Stk::setRawwavePath( QDir( ConfigManager::inst()->stkDir() ).absolutePath()
.toLatin1().constData() );
m_voice = new BandedWG();