duplicate char-pointer returned by qPrintable - fixes bugs when loading sound-fonts

git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@811 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Tobias Doerffel
2008-03-30 17:06:23 +00:00
parent f68d50da78
commit 0355877769
3 changed files with 12 additions and 4 deletions

View File

@@ -1,3 +1,9 @@
2008-03-30 Tobias Doerffel <tobydox/at/users/dot/sourceforge/dot/net>
* plugins/sf2_player/sf2_player.cpp:
duplicate char-pointer returned by qPrintable - fixes bugs when
loading sound-fonts
2008-03-24 Tobias Doerffel <tobydox/at/users/dot/sourceforge/dot/net>
* src/core/fx_mixer.cpp:

View File

@@ -2,8 +2,8 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.50)
AC_INIT(lmms, 0.4.0-svn20080324, lmms-devel/at/lists/dot/sf/dot/net)
AM_INIT_AUTOMAKE(lmms, 0.4.0-svn20080324)
AC_INIT(lmms, 0.4.0-svn20080330, lmms-devel/at/lists/dot/sf/dot/net)
AM_INIT_AUTOMAKE(lmms, 0.4.0-svn20080330)
AM_CONFIG_HEADER(config.h)

View File

@@ -164,10 +164,10 @@ void sf2Instrument::openFile( const QString & _sf2File )
// on all fonts. This, causes sfloaderFreeFont to run.
}
const char * sf2Ascii = qPrintable( _sf2File );
char * sf2Ascii = qstrdup( qPrintable( _sf2File ) );
m_fontId = fluid_synth_sfload( m_synth, sf2Ascii, TRUE );
QString sf2Key = qPrintable( _sf2File );
QString sf2Key( sf2Ascii );
// Add to map, if doesn't exist.
// We can't do this in callback because fluid hasn't created the sfont yet
@@ -192,6 +192,8 @@ void sf2Instrument::openFile( const QString & _sf2File )
emit fileChanged();
}
delete[] sf2Ascii;
}