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

Merge branch 'master' of github.com:LMMS/lmms

Browse Source
This commit is contained in:
Vesa
2014-11-25 21:24:21 +02:00
parent 33665a2848 435c64cc70
commit eea784ce71
10 changed files with 65 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/VstEffect/VstEffect.cpp
View File

@@ -135,10 +135,7 @@ void VstEffect::openPlugin( const QString & _plugin )
m_pluginMutex.unlock();
closePlugin();
delete tf;
QMessageBox::information( NULL,
VstPlugin::tr( "Failed loading VST plugin" ),
VstPlugin::tr( "The VST plugin %1 could not be loaded for some reason." ).arg( _plugin ),
QMessageBox::Ok );
collectErrorForUI( VstPlugin::tr( "The VST plugin %1 could not be loaded." ).arg( _plugin ) );
return;
}

5
plugins/sf2_player/sf2_player.cpp
View File

@@ -335,7 +335,8 @@ void sf2Instrument::openFile( const QString & _sf2File, bool updateTrackName )
}
else
{
// TODO: Couldn't load file!
collectErrorForUI( sf2Instrument::tr( "A soundfont %1 could not be loaded." ).arg( QFileInfo( _sf2File ).baseName() ) );
// TODO: Why is the filename missing when the file does not exist?
}
}
@@ -357,7 +358,7 @@ void sf2Instrument::openFile( const QString & _sf2File, bool updateTrackName )
if( updateTrackName || instrumentTrack()->displayName() == displayName() )
{
instrumentTrack()->setName( QFileInfo( _sf2File ).baseName() );
instrumentTrack()->setName( QFileInfo( _sf2File ).baseName() );
}
}

10
plugins/vestige/vestige.cpp
View File

@@ -262,15 +262,7 @@ void vestigeInstrument::loadFile( const QString & _file )
m_pluginMutex.unlock();
closePlugin();
delete tf;
QMessageBox::information( 0,
tr( "Failed loading VST-plugin" ),
tr( "The VST-plugin %1 could not "
"be loaded for some reason.\n"
"If it runs with other VST-"
"software under Linux, please "
"contact an LMMS-developer!"
).arg( m_pluginDLL ),
QMessageBox::Ok );
collectErrorForUI( VstPlugin::tr( "The VST plugin %1 could not be loaded." ).arg( m_pluginDLL ) );
return;
}