[patch] libmikmod-cvs20051203-RegisterSomeDrivers.patch

libmikmod-cvs20051203-RegisterSomeDrivers.patch (text/plain), 2.73 KB, created by TGL on 2005-12-03 05:55:34 UTC

Index: include/mikmod.h.in
===================================================================
RCS file: /cvsroot/mikmod/libmikmod/include/mikmod.h.in,v
retrieving revision 1.3
diff -u -r1.3 mikmod.h.in
--- include/mikmod.h.in	30 Mar 2005 19:09:21 -0000	1.3
+++ include/mikmod.h.in	3 Dec 2005 13:43:08 -0000
@@ -229,6 +229,7 @@
 struct MDRIVER;
 
 MIKMODAPI extern void   MikMod_RegisterAllDrivers(void);
+MIKMODAPI extern void   MikMod_RegisterSomeDrivers(int);
 
 MIKMODAPI extern CHAR*  MikMod_InfoDriver(void);
 MIKMODAPI extern void   MikMod_RegisterDriver(struct MDRIVER*);
@@ -738,6 +739,18 @@
 MIKMODAPI extern struct MDRIVER drv_wss;    /* DOS WSS driver */
 MIKMODAPI extern struct MDRIVER drv_sb;     /* DOS SB driver */
 
+/* Drivers sets for MikMod_RegisterSomeDrivers(int) */
+#define DRIVERS_SET_NETWORK       0x001
+#define DRIVERS_SET_HARDWARE      0x002
+#define DRIVERS_SET_DISC_WRITER   0x004
+#define DRIVERS_SET_OTHER         0x008
+#define DRIVERS_SET_ALL \
+	( DRIVERS_SET_NETWORK \
+	  + DRIVERS_SET_HARDWARE \
+	  + DRIVERS_SET_DISC_WRITER \
+	  + DRIVERS_SET_OTHER )
+
+
 /*========== Virtual channel mixer interface (for user-supplied drivers only) */
 
 MIKMODAPI extern BOOL  VC_Init(void);
Index: playercode/mdreg.c
===================================================================
RCS file: /cvsroot/mikmod/libmikmod/playercode/mdreg.c,v
retrieving revision 1.2
diff -u -r1.2 mdreg.c
--- playercode/mdreg.c	30 Mar 2005 19:11:13 -0000	1.2
+++ playercode/mdreg.c	3 Dec 2005 13:43:08 -0000
@@ -32,8 +32,9 @@
 
 #include "mikmod_internals.h"
 
-void _mm_registeralldrivers(void)
+void _mm_registersomedrivers(int drivers_sets)
 {
+if (drivers_sets & DRIVERS_SET_NETWORK) {
 	/* Register network drivers */
 #ifdef DRV_AF
 	_mm_registerdriver(&drv_AF);
@@ -44,7 +45,9 @@
 #ifdef DRV_NAS
 	_mm_registerdriver(&drv_nas);
 #endif
+}
 
+if (drivers_sets & DRIVERS_SET_HARDWARE) {
 	/* Register hardware drivers - hardware mixing */
 #ifdef DRV_ULTRA
 	_mm_registerdriver(&drv_ultra);
@@ -99,14 +102,18 @@
 #ifdef DRV_SB
 	_mm_registerdriver(&drv_sb);
 #endif
-	
+}
+
+if (drivers_sets & DRIVERS_SET_DISC_WRITER) {
 	/* Register disk writers */
 	_mm_registerdriver(&drv_raw);
 	_mm_registerdriver(&drv_wav);
 #ifdef DRV_AIFF
 	_mm_registerdriver(&drv_aiff);
 #endif
-	
+}
+
+if (drivers_sets & DRIVERS_SET_OTHER) {
 	/* Register other drivers */
 #ifdef DRV_PIPE
 	_mm_registerdriver(&drv_pipe);
@@ -117,11 +124,19 @@
 
 	_mm_registerdriver(&drv_nos);
 }
+}
 
 void MikMod_RegisterAllDrivers(void)
 {
 	MUTEX_LOCK(lists);
-	_mm_registeralldrivers();
+	_mm_registersomedrivers(DRIVERS_SET_ALL);
+	MUTEX_UNLOCK(lists);
+}
+
+void MikMod_RegisterSomeDrivers(int drivers_sets)
+{
+	MUTEX_LOCK(lists);
+	_mm_registersomedrivers(drivers_sets);
 	MUTEX_UNLOCK(lists);
 }