soundfont 2 beta

git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@733 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Paul Giblock
2008-02-28 22:14:46 +00:00
parent 704527de7d
commit 3a6669a560
2 changed files with 5 additions and 8 deletions

View File

@@ -10,8 +10,8 @@ AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="sf2player"
%.moc: ./%.h
$(MOC) -o $@ $<
%.ui: ./%.ui
$(UIC) -o ui_$@ $<
ui_%h: ./%.ui
$(UIC) -o $@ $<
MOC_FILES = ./sf2_player.moc ./patches_dialog.moc

View File

@@ -49,7 +49,7 @@
extern "C"
{
plugin::descriptor sf2_plugin_descriptor =
plugin::descriptor sf2player_plugin_descriptor =
{
STRINGIFY_PLUGIN_NAME( PLUGIN_NAME ),
"Sf2Player",
@@ -66,7 +66,7 @@ plugin::descriptor sf2_plugin_descriptor =
sf2Instrument::sf2Instrument( instrumentTrack * _instrument_track ) :
instrument( _instrument_track, &sf2_plugin_descriptor ),
instrument( _instrument_track, &sf2player_plugin_descriptor ),
m_bankNum( -1, -1, 999, 1, this ),
m_patchNum( -1, -1, 127, 1, this ),
m_filename( "" ),
@@ -131,7 +131,7 @@ void sf2Instrument::loadSettings( const QDomElement & _this )
QString sf2Instrument::nodeName( void ) const
{
return( sf2_plugin_descriptor.name );
return( sf2player_plugin_descriptor.name );
}
@@ -371,9 +371,6 @@ void sf2InstrumentView::showFileDialog( void )
ofd.selectFile( k->m_filename );
}
// HACK
ofd.setDirectory("/home/llama");
if( ofd.exec() == QDialog::Accepted && !ofd.selectedFiles().isEmpty() )
{
QString f = ofd.selectedFiles()[0];