From 3a6669a56013d31010f1f80199f5a6dc8cfcaaa3 Mon Sep 17 00:00:00 2001
From: Paul Giblock <drfaygo@gmail.com>
Date: Thu, 28 Feb 2008 22:14:46 +0000
Subject: [PATCH] soundfont 2 beta

git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@733 0778d3d1-df1d-0410-868b-ea421aaaa00d
---
 plugins/sf2_player/Makefile.am    | 4 ++--
 plugins/sf2_player/sf2_player.cpp | 9 +++------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/plugins/sf2_player/Makefile.am b/plugins/sf2_player/Makefile.am
index 37afb4754..77f9d9a77 100644
--- a/plugins/sf2_player/Makefile.am
+++ b/plugins/sf2_player/Makefile.am
@@ -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
diff --git a/plugins/sf2_player/sf2_player.cpp b/plugins/sf2_player/sf2_player.cpp
index 0225bbc2c..0fad1a111 100644
--- a/plugins/sf2_player/sf2_player.cpp
+++ b/plugins/sf2_player/sf2_player.cpp
@@ -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];