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

fixed open-file-dialog, fixed order of member-variable-initialization

Browse Source 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@761 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Tobias Doerffel
2008-03-03 23:28:00 +00:00
parent 0b60ba5ba7
commit aba3cab0ea
2 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@@ -1,5 +1,13 @@
2008-03-03 Tobias Doerffel <tobydox/at/users/dot/sourceforge/dot/net>
* plugins/sf2_player/sf2_player.cpp:
- fixed open-file-dialog
- fixed order of member-variable-initialization
* src/lib/sample_buffer.cpp:
added MP3-files to file-dialog-filter as they theoretically should be
supported through SDL_sound-library
* src/core/mixer.cpp:
always process all note-play-handles of monophonic instruments by the
same thread serially - fixes problems with monophonic instruments

33
plugins/sf2_player/sf2_player.cpp
View File

@@ -67,10 +67,10 @@ plugin::descriptor sf2player_plugin_descriptor =
sf2Instrument::sf2Instrument( instrumentTrack * _instrument_track ) :
instrument( _instrument_track, &sf2player_plugin_descriptor ),
m_bankNum( -1, -1, 999, 1, this ),
m_patchNum( -1, -1, 127, 1, this ),
m_fontId( 0 ),
m_filename( "" ),
m_fontId( 0 )
m_bankNum( -1, -1, 999, 1, this ),
m_patchNum( -1, -1, 127, 1, this )
{
m_settings = new_fluid_settings();
@@ -349,26 +349,25 @@ void sf2InstrumentView::showFileDialog( void )
types << tr( "SoundFont2-Files (*.sf2)" );
ofd.setFilters( types );
if( k->m_filename == "" )
QString dir;
if( k->m_filename != "" )
{
ofd.setDirectory(
configManager::inst()->userSamplesDir() );
}
else if( QFileInfo( k->m_filename ).isRelative() )
{
QString f = configManager::inst()->userSamplesDir()
+ k->m_filename;
if( QFileInfo( f ).exists() == FALSE )
QString f = k->m_filename;
if( QFileInfo( f ).isRelative() )
{
f = configManager::inst()->factorySamplesDir()
+ k->m_filename;
f = configManager::inst()->userSamplesDir() + f;
if( QFileInfo( f ).exists() == FALSE )
{
f = configManager::inst()->factorySamplesDir() +
k->m_filename;
}
}
ofd.selectFile( f );
ofd.setDirectory( QFileInfo( f ).absolutePath() );
ofd.selectFile( QFileInfo( f ).fileName() );
}
else
{
ofd.selectFile( k->m_filename );
ofd.setDirectory( configManager::inst()->userSamplesDir() );
}
if( ofd.exec() == QDialog::Accepted && !ofd.selectedFiles().isEmpty() )