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

Rename configManager to ConfigManager

Browse Source
This commit is contained in:
Lukas W
2014-11-02 01:02:33 +01:00
parent d68671a6c2
commit 100a67cd3c
47 changed files with 211 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/MidiImport/MidiImport.cpp
View File

@@ -97,7 +97,7 @@ bool MidiImport::tryImport( TrackContainer* tc )
#ifdef LMMS_HAVE_FLUIDSYNTH
if( engine::hasGUI() &&
configManager::inst()->defaultSoundfont().isEmpty() )
ConfigManager::inst()->defaultSoundfont().isEmpty() )
{
QMessageBox::information( engine::mainWindow(),
tr( "Setup incomplete" ),
@@ -226,7 +226,7 @@ public:
if( it_inst )
{
isSF2 = true;
it_inst->loadFile( configManager::inst()->defaultSoundfont() );
it_inst->loadFile( ConfigManager::inst()->defaultSoundfont() );
it_inst->childModel( "bank" )->setValue( 0 );
it_inst->childModel( "patch" )->setValue( 0 );
}

2
plugins/audio_file_processor/audio_file_processor.cpp
View File

@@ -747,7 +747,7 @@ AudioFileProcessorWaveView::AudioFileProcessorWaveView( QWidget * _parent, int _
m_isDragging( false ),
m_reversed( false ),
m_framesPlayed( 0 ),
m_animation(configManager::inst()->value("ui", "animateafp").toInt())
m_animation(ConfigManager::inst()->value("ui", "animateafp").toInt())
{
setFixedSize( _w, _h );
setMouseTracking( true );

6
plugins/flp_import/FlpImport.cpp
View File

@@ -1070,16 +1070,16 @@ if( p.currentEffectChannel <= NumFLFxChannels )
f.mid( 12 );
}*/
f.replace( '\\', QDir::separator() );
if( QFileInfo( configManager::inst()->flDir() +
if( QFileInfo( ConfigManager::inst()->flDir() +
"/Data/" ).exists() )
{
f = configManager::inst()->flDir() +
f = ConfigManager::inst()->flDir() +
"/Data/" + f;
}
else
{
// FL 3 compat
f = configManager::inst()->flDir() +
f = ConfigManager::inst()->flDir() +
"/Samples/" + f;
}
cc->sampleFileName = f;

6
plugins/patman/patman.cpp
View File

@@ -525,16 +525,16 @@ void PatmanView::openFile( void )
else
{
ofd.setDirectory(
configManager::inst()->userSamplesDir() );
ConfigManager::inst()->userSamplesDir() );
}
}
else if( QFileInfo( m_pi->m_patchFile ).isRelative() )
{
QString f = configManager::inst()->userSamplesDir()
QString f = ConfigManager::inst()->userSamplesDir()
+ m_pi->m_patchFile;
if( QFileInfo( f ).exists() == false )
{
f = configManager::inst()->factorySamplesDir()
f = ConfigManager::inst()->factorySamplesDir()
+ m_pi->m_patchFile;
}

8
plugins/sf2_player/sf2_player.cpp
View File

@@ -121,7 +121,7 @@ sf2Instrument::sf2Instrument( InstrumentTrack * _instrument_track ) :
InstrumentPlayHandle * iph = new InstrumentPlayHandle( this );
engine::mixer()->addPlayHandle( iph );
loadFile( configManager::inst()->defaultSoundfont() );
loadFile( ConfigManager::inst()->defaultSoundfont() );
updateSampleRate();
updateReverbOn();
@@ -1060,10 +1060,10 @@ void sf2InstrumentView::showFileDialog()
QString f = k->m_filename;
if( QFileInfo( f ).isRelative() )
{
f = configManager::inst()->userSamplesDir() + f;
f = ConfigManager::inst()->userSamplesDir() + f;
if( QFileInfo( f ).exists() == false )
{
f = configManager::inst()->factorySamplesDir() + k->m_filename;
f = ConfigManager::inst()->factorySamplesDir() + k->m_filename;
}
}
ofd.setDirectory( QFileInfo( f ).absolutePath() );
@@ -1071,7 +1071,7 @@ void sf2InstrumentView::showFileDialog()
}
else
{
ofd.setDirectory( configManager::inst()->userSamplesDir() );
ofd.setDirectory( ConfigManager::inst()->userSamplesDir() );
}
m_fileDialogButton->setEnabled( false );

4
plugins/zynaddsubfx/ZynAddSubFx.cpp
View File

@@ -435,12 +435,12 @@ void ZynAddSubFxInstrument::initPlugin()
RemotePlugin::message( IdZasfLmmsWorkingDirectory ).
addString(
QSTR_TO_STDSTR(
QString( configManager::inst()->workingDir() ) ) ) );
QString( ConfigManager::inst()->workingDir() ) ) ) );
m_remotePlugin->sendMessage(
RemotePlugin::message( IdZasfPresetDirectory ).
addString(
QSTR_TO_STDSTR(
QString( configManager::inst()->factoryPresetsDir() +
QString( ConfigManager::inst()->factoryPresetsDir() +
QDir::separator() + "ZynAddSubFX" ) ) ) );
m_remotePlugin->updateSampleRate( engine::mixer()->processingSampleRate() );