replace obsolete _init and _fini

This commit is contained in:
Connor Olding 2013-11-06 04:58:01 -08:00
parent 7a7850d88b
commit f511538d06
3 changed files with 5 additions and 19 deletions

View file

@ -26,8 +26,7 @@ typedef unsigned long ulong;
#define BW_MIN 0.02 #define BW_MIN 0.02
#define BW_MAX 8 #define BW_MAX 8
static int ready = 0; void __attribute__ ((constructor)) eq_init();
void _init();
LADSPA_PortDescriptor p_discs[PCOUNT]; LADSPA_PortDescriptor p_discs[PCOUNT];
LADSPA_PortRangeHint p_hints[PCOUNT]; LADSPA_PortRangeHint p_hints[PCOUNT];
@ -62,10 +61,8 @@ typedef struct {
LADSPA_Data run_adding_gain; LADSPA_Data run_adding_gain;
} eq_t; } eq_t;
DLL_EXPORT const LADSPA_Descriptor * const LADSPA_Descriptor *
ladspa_descriptor(ulong index) { ladspa_descriptor(ulong index) {
if (!ready) _init();
if (index != 0) if (index != 0)
return NULL; return NULL;
return &eqDescriptor; return &eqDescriptor;
@ -180,7 +177,7 @@ set_run_adding_gain(LADSPA_Handle instance, LADSPA_Data gain) {
} }
void void
_init() { eq_init() {
#define INCTRL (LADSPA_PORT_INPUT | LADSPA_PORT_CONTROL) #define INCTRL (LADSPA_PORT_INPUT | LADSPA_PORT_CONTROL)
#define BOUNDED (LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE) #define BOUNDED (LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE)
for (int i = 0; i < BANDS; i++) { for (int i = 0; i < BANDS; i++) {
@ -229,11 +226,4 @@ _init() {
eqDescriptor.run = run_eq; eqDescriptor.run = run_eq;
eqDescriptor.run_adding = run_adding_eq; eqDescriptor.run_adding = run_adding_eq;
eqDescriptor.set_run_adding_gain = set_run_adding_gain; eqDescriptor.set_run_adding_gain = set_run_adding_gain;
ready = 1;
} }
void
_fini() {
}

View file

@ -107,9 +107,6 @@ set_run_adding_gain(LADSPA_Handle instance, LADSPA_Data gain) {
eq->run_adding_gain = gain; eq->run_adding_gain = gain;
} }
void _init() {}
void _fini() {}
static const LADSPA_Descriptor eqDescriptor = { static const LADSPA_Descriptor eqDescriptor = {
.UniqueID = 0xDEFACED, .UniqueID = 0xDEFACED,
.Label = "crap_eq_const", .Label = "crap_eq_const",

View file

@ -1,7 +1,6 @@
#ifdef WIN32 #ifdef WIN32
#define DLL_EXPORT __declspec(dllexport) __declspec(dllexport) const LADSPA_Descriptor *
#else ladspa_descriptor(unsigned long Index);
#define DLL_EXPORT
#endif #endif
#ifndef M_PI #ifndef M_PI