Attachment #73982 for bug #99590




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*);

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);

Lines 32-39 Link Here

(-)playercode/mdreg.c (-4 / +19 lines)
32		32
33	#include "mikmod_internals.h"	33	#include "mikmod_internals.h"
34		34
35	void _mm_registeralldrivers(void)	35	void _mm_registersomedrivers(int drivers_sets)
36	{	36	{
		37	if (drivers_sets & DRIVERS_SET_NETWORK) {
37	/* Register network drivers */	38	/* Register network drivers */
38	#ifdef DRV_AF	39	#ifdef DRV_AF
39	_mm_registerdriver(&drv_AF);	40	_mm_registerdriver(&drv_AF);
Lines 44-50 Link Here
44	#ifdef DRV_NAS	45	#ifdef DRV_NAS
45	_mm_registerdriver(&drv_nas);	46	_mm_registerdriver(&drv_nas);
46	#endif	47	#endif
		48	}
47		49
		50	if (drivers_sets & DRIVERS_SET_HARDWARE) {
48	/* Register hardware drivers - hardware mixing */	51	/* Register hardware drivers - hardware mixing */
49	#ifdef DRV_ULTRA	52	#ifdef DRV_ULTRA
50	_mm_registerdriver(&drv_ultra);	53	_mm_registerdriver(&drv_ultra);
Lines 99-112 Link Here
99	#ifdef DRV_SB	102	#ifdef DRV_SB
100	_mm_registerdriver(&drv_sb);	103	_mm_registerdriver(&drv_sb);
101	#endif	104	#endif
102		105	}
		106
		107	if (drivers_sets & DRIVERS_SET_DISC_WRITER) {
103	/* Register disk writers */	108	/* Register disk writers */
104	_mm_registerdriver(&drv_raw);	109	_mm_registerdriver(&drv_raw);
105	_mm_registerdriver(&drv_wav);	110	_mm_registerdriver(&drv_wav);
106	#ifdef DRV_AIFF	111	#ifdef DRV_AIFF
107	_mm_registerdriver(&drv_aiff);	112	_mm_registerdriver(&drv_aiff);
108	#endif	113	#endif
109		114	}
		115
		116	if (drivers_sets & DRIVERS_SET_OTHER) {
110	/* Register other drivers */	117	/* Register other drivers */
111	#ifdef DRV_PIPE	118	#ifdef DRV_PIPE
112	_mm_registerdriver(&drv_pipe);	119	_mm_registerdriver(&drv_pipe);
Lines 117-127 Link Here
117		124
118	_mm_registerdriver(&drv_nos);	125	_mm_registerdriver(&drv_nos);
119	}	126	}
		127	}
120		128
121	void MikMod_RegisterAllDrivers(void)	129	void MikMod_RegisterAllDrivers(void)
122	{	130	{
123	MUTEX_LOCK(lists);	131	MUTEX_LOCK(lists);
124	_mm_registeralldrivers();	132	_mm_registersomedrivers(DRIVERS_SET_ALL);
		133	MUTEX_UNLOCK(lists);
		134	}
		135
		136	void MikMod_RegisterSomeDrivers(int drivers_sets)
		137	{
		138	MUTEX_LOCK(lists);
		139	_mm_registersomedrivers(drivers_sets);
125	MUTEX_UNLOCK(lists);	140	MUTEX_UNLOCK(lists);
126	}	141	}
127		142

Return to bug 99590

Lines 229-234 Link Here

(-)include/mikmod.h.in (+13 lines)
229	struct MDRIVER;	229	struct MDRIVER;
230		230
231	MIKMODAPI extern void MikMod_RegisterAllDrivers(void);	231	MIKMODAPI extern void MikMod_RegisterAllDrivers(void);
		232	MIKMODAPI extern void MikMod_RegisterSomeDrivers(int);
232		233
233	MIKMODAPI extern CHAR* MikMod_InfoDriver(void);	234	MIKMODAPI extern CHAR* MikMod_InfoDriver(void);
234	MIKMODAPI extern void MikMod_RegisterDriver(struct MDRIVER*);	235	MIKMODAPI extern void MikMod_RegisterDriver(struct MDRIVER*);
Lines 738-743 Link Here
738	MIKMODAPI extern struct MDRIVER drv_wss; /* DOS WSS driver */	739	MIKMODAPI extern struct MDRIVER drv_wss; /* DOS WSS driver */
739	MIKMODAPI extern struct MDRIVER drv_sb; /* DOS SB driver */	740	MIKMODAPI extern struct MDRIVER drv_sb; /* DOS SB driver */
740		741
		742	/* Drivers sets for MikMod_RegisterSomeDrivers(int) */
		743	#define DRIVERS_SET_NETWORK 0x001
		744	#define DRIVERS_SET_HARDWARE 0x002
		745	#define DRIVERS_SET_DISC_WRITER 0x004
		746	#define DRIVERS_SET_OTHER 0x008
		747	#define DRIVERS_SET_ALL \
		748	( DRIVERS_SET_NETWORK \
		749	+ DRIVERS_SET_HARDWARE \
		750	+ DRIVERS_SET_DISC_WRITER \
		751	+ DRIVERS_SET_OTHER )
		752
		753
741	/========== Virtual channel mixer interface (for user-supplied drivers only) /	754	/========== Virtual channel mixer interface (for user-supplied drivers only) /
742		755
743	MIKMODAPI extern BOOL VC_Init(void);	756	MIKMODAPI extern BOOL VC_Init(void);