rpms/qsynth/F-11 qsynth-fedora-defaults.patch, NONE, 1.1 qsynth.spec, 1.11, 1.12

[Orcan Ogetbil]

Author: oget

Update of /cvs/pkgs/rpms/qsynth/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2733

Modified Files:
	qsynth.spec 
Added Files:
	qsynth-fedora-defaults.patch 
Log Message:
* Sat Apr 18 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 0.3.3-6
- Set Fedora defaults


qsynth-fedora-defaults.patch:

--- NEW FILE qsynth-fedora-defaults.patch ---
--- qsynth-0.3.3.old/src/qsynthOptions.cpp	2008-07-01 10:04:41.000000000 -0400
+++ qsynth-0.3.3/src/qsynthOptions.cpp	2009-04-18 01:09:18.000000000 -0400
@@ -61,7 +61,7 @@ qsynthOptions::qsynthOptions (void)
 
 	// Load defaults...
 	m_settings.beginGroup("/Defaults");
-	sSoundFontDir  = m_settings.value("/SoundFontDir").toString();
+	sSoundFontDir  = m_settings.value("/SoundFontDir", "/usr/share/soundfonts").toString();
 	bPresetPreview = m_settings.value("/PresetPreview", false).toBool();
 	m_settings.endGroup();
 
@@ -492,7 +492,7 @@ void qsynthOptions::loadSetup ( qsynthSe
 #else
 	pSetup->sMidiDriver      = m_settings.value("/MidiDriver", "alsa_seq").toString();
     pSetup->sAudioDriver     = m_settings.value("/AudioDriver", "jack").toString();
-    pSetup->iAudioBufSize    = m_settings.value("/AudioBufSize", 64).toInt();
+    pSetup->iAudioBufSize    = m_settings.value("/AudioBufSize", 1024).toInt();
     pSetup->iAudioBufCount   = m_settings.value("/AudioBufCount", 2).toInt();
 #endif
     pSetup->sAlsaName        = m_settings.value("/AlsaName", "pid").toString();
@@ -529,7 +529,9 @@ void qsynthOptions::loadSetup ( qsynthSe
 	m_settings.beginGroup("/SoundFonts");
 	const QString sSoundFontPrefix  = "/SoundFont%1";
 	const QString sBankOffsetPrefix = "/BankOffset%1";
+	const QString defaultSoundfont = "/usr/share/soundfonts/default.sf2";
 	int i = 0;
+	int f = 0;
 	for (;;) {
 		++i;
 		QString sSoundFont  = m_settings.value(sSoundFontPrefix.arg(i)).toString();
@@ -538,6 +540,11 @@ void qsynthOptions::loadSetup ( qsynthSe
 			break;
 		pSetup->soundfonts.append(sSoundFont);
 		pSetup->bankoffsets.append(sBankOffset);
+		f++;
+	}
+	if (f == 0) {
+	  pSetup->soundfonts.append(defaultSoundfont);
+	  pSetup->bankoffsets.append("0");
 	}
 	m_settings.endGroup();
 


Index: qsynth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qsynth/F-11/qsynth.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- qsynth.spec	17 Apr 2009 22:31:08 -0000	1.11
+++ qsynth.spec	18 Apr 2009 05:30:43 -0000	1.12
@@ -3,7 +3,7 @@
 Summary:       Qt based Fluidsynth GUI front end
 Name:          qsynth
 Version:       0.3.3
-Release:       5%{?dist}
+Release:       6%{?dist}
 URL:           http://qsynth.sourceforge.net
 Source0:       http://dl.sourceforge.net/qsynth/qsynth-%{version}.tar.gz
 #Source1: qsynth.desktop
@@ -13,11 +13,19 @@
 Patch1:        qsynth-0.3.3-qt45.patch
 # We don't want .qm files in the default locale dir
 Patch2:        qsynth-fix-locale-path.patch
+# Tweak the defaults to make things work properly
+Patch3:        qsynth-fedora-defaults.patch
 License:       GPLv2+
 Group:         Applications/Multimedia
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:      hicolor-icon-theme
 
+%if x%{fedora} < x11
+Requires:      PersonalCopy-Lite-soundfont
+%else
+Requires:      soundfont2-default
+%endif
+
 BuildRequires: fluidsynth-devel qt-devel desktop-file-utils
 
 %description
@@ -33,6 +41,12 @@
 %patch0 -p1 -b .qt4
 %patch1 -p1 -b .qt45
 %patch2 -p1 -b .localedir
+%patch3 -p1 -b .defaults
+
+# default.sf2 not available for Fedora < 11
+%if x%{fedora} < x11
+sed -i 's|default\.sf2|PCLite.sf2|' src/qsynthOptions.cpp
+%endif
 
 iconv --from=ISO88591 --to=UTF8 AUTHORS -o AUTHORS.tmp
 touch -r AUTHORS AUTHORS.tmp
@@ -82,6 +96,9 @@
 
 
 %changelog
+* Sat Apr 18 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 0.3.3-6
+- Set Fedora defaults
+
 * Fri Apr 17 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 0.3.3-5
 - Fix locale path (#494470)
 - Fix mixed spaces&tabs warnings