rpms/methane/F-8 methane-1.4.7-pulseaudio.patch,NONE,1.1

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/methane/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25331

Added Files:
	methane-1.4.7-pulseaudio.patch 
Log Message:
* Sun Feb 17 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.4.7-4
- Rebuild for new libmikmod
- Rebuild with gcc 4.3
- Try pulseaudio (esd) before oss (mikmod doesn't support alsa)


methane-1.4.7-pulseaudio.patch:

--- NEW FILE methane-1.4.7-pulseaudio.patch ---
diff -up methane-1.4.7/source/mikmod/audiodrv.cpp~ methane-1.4.7/source/mikmod/audiodrv.cpp
--- methane-1.4.7/source/mikmod/audiodrv.cpp~	2008-02-18 14:36:29.000000000 +0100
+++ methane-1.4.7/source/mikmod/audiodrv.cpp	2008-02-18 14:36:29.000000000 +0100
@@ -140,13 +140,9 @@ void CMikModDrv::InitDriver(void)
 	MikMod_RegisterDriver(&drv_win);
 	MikMod_RegisterDriver(&drv_nos);
 #else		// Must be Linux
-	if (drv_oss.Name)	// Valid OSS driver
+	if (drv_esd.Name)	// Register esd first for pulseaudiu support
 	{
-		if (drv_oss.CommandLine)	// Valid Commandline
-		{
-			drv_oss.CommandLine("buffer=14,count=2");
-		}
-		MikMod_RegisterDriver(&drv_oss);
+		MikMod_RegisterDriver(&drv_esd);
 	}
 	if (drv_alsa.Name)	// Valid ALSA driver
 	{
@@ -156,6 +152,14 @@ void CMikModDrv::InitDriver(void)
 		}
 		MikMod_RegisterDriver(&drv_alsa);
 	}
+	if (drv_oss.Name)	// Valid OSS driver
+	{
+		if (drv_oss.CommandLine)	// Valid Commandline
+		{
+			drv_oss.CommandLine("buffer=14,count=2");
+		}
+		MikMod_RegisterDriver(&drv_oss);
+	}
 	MikMod_RegisterDriver(&drv_nos);
 #endif