zdoom/fluidsynth
0
0
Fork 0
mirror of https://github.com/ZDoom/fluidsynth.git synced 2024-11-13 00:04:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "make struct _fluid_ladspa_fx_t opaque" to prepare ladspa merge

Browse source 
It's effects will be replicated after merge.

This reverts commit 5afb1a854b.

# Conflicts:
#	src/bindings/fluid_ladspa.c
This commit is contained in:
derselbst 2017-10-26 21:45:29 +02:00 committed by Marcus Weseloh
parent 15464b1453
commit 2ed47f23b5
2 changed files with 84 additions and 87 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

86
src/bindings/fluid_ladspa.c
View file

@ -31,7 +31,6 @@
#include "fluid_sys.h"
#include <dlfcn.h>
#include <math.h>
#include <ladspa.h>
#define LADSPA_API_ENTER(_fx) (fluid_rec_mutex_lock((_fx)->api_mutex))
@ -39,91 +38,6 @@
fluid_rec_mutex_unlock((_fx)->api_mutex); \
return (_ret)
#define FLUID_LADSPA_MAX_LIBS 100
#define FLUID_LADSPA_MAX_PLUGINS 100
#define FLUID_LADSPA_MAX_NODES 100
#define FLUID_LADSPA_MAX_PATH_LENGTH 512
typedef enum _fluid_ladspa_state_t {
FLUID_LADSPA_INACTIVE = 0,
FLUID_LADSPA_ACTIVE,
FLUID_LADSPA_RUNNING
} fluid_ladspa_state_t;
typedef enum _fluid_ladspa_node_type_t {
FLUID_LADSPA_NODE_AUDIO,
FLUID_LADSPA_NODE_CONTROL,
} fluid_ladspa_node_type_t;
typedef struct _fluid_ladspa_lib_t
{
char *filename;
void *dlib;
LADSPA_Descriptor_Function descriptor;
} fluid_ladspa_lib_t;
typedef struct _fluid_ladspa_node_t
{
char *name;
fluid_ladspa_node_type_t type;
LADSPA_Data *buf;
int num_inputs;
int num_outputs;
} fluid_ladspa_node_t;
typedef struct _fluid_ladspa_plugin_t
{
/* plugin instance id unique to the effects unit */
int id;
const LADSPA_Descriptor *desc;
LADSPA_Handle *handle;
int active;
/* Used to keep track of the port connection state */
fluid_ladspa_node_t **port_nodes;
} fluid_ladspa_plugin_t;
struct _fluid_ladspa_fx_t
{
unsigned long sample_rate;
int audio_groups;
int effects_channels;
int audio_channels;
int buffer_size;
fluid_ladspa_lib_t *libs[FLUID_LADSPA_MAX_LIBS];
int num_libs;
fluid_ladspa_node_t *nodes[FLUID_LADSPA_MAX_NODES];
int num_nodes;
/* plugins are really plugin instances */
fluid_ladspa_plugin_t *plugins[FLUID_LADSPA_MAX_PLUGINS];
int num_plugins;
/* used to generate the unique plugin ids */
int next_plugin_id;
fluid_rec_mutex_t api_mutex;
fluid_atomic_int_t state;
int pending_deactivation;
fluid_cond_mutex_t *run_finished_mutex;
fluid_cond_t *run_finished_cond;
};
static void clear_ladspa(fluid_ladspa_fx_t *fx);
static fluid_ladspa_node_t *new_fluid_ladspa_node(fluid_ladspa_fx_t *fx, const char *name,

85
src/bindings/fluid_ladspa.h
View file

@ -28,6 +28,19 @@
#include "fluidsynth_priv.h"
#ifdef LADSPA
#include <ladspa.h>
#define FLUID_LADSPA_MAX_LIBS 100
#define FLUID_LADSPA_MAX_PLUGINS 100
#define FLUID_LADSPA_MAX_NODES 100
#define FLUID_LADSPA_MAX_PATH_LENGTH 512
typedef enum _fluid_ladspa_state_t {
FLUID_LADSPA_INACTIVE = 0,
FLUID_LADSPA_ACTIVE,
FLUID_LADSPA_RUNNING
} fluid_ladspa_state_t;
typedef enum _fluid_ladspa_dir_t {
FLUID_LADSPA_INPUT,
@ -36,7 +49,77 @@ typedef enum _fluid_ladspa_dir_t {
} fluid_ladspa_dir_t;
typedef struct _fluid_ladspa_fx_t fluid_ladspa_fx_t;
typedef enum _fluid_ladspa_node_type_t {
FLUID_LADSPA_NODE_AUDIO,
FLUID_LADSPA_NODE_CONTROL,
} fluid_ladspa_node_type_t;
typedef struct _fluid_ladspa_lib_t
{
char *filename;
void *dlib;
LADSPA_Descriptor_Function descriptor;
} fluid_ladspa_lib_t;
typedef struct _fluid_ladspa_node_t
{
char *name;
fluid_ladspa_node_type_t type;
LADSPA_Data *buf;
int num_inputs;
int num_outputs;
} fluid_ladspa_node_t;
typedef struct _fluid_ladspa_plugin_t
{
/* plugin instance id unique to the effects unit */
int id;
const LADSPA_Descriptor *desc;
LADSPA_Handle *handle;
int active;
/* Used to keep track of the port connection state */
fluid_ladspa_node_t **port_nodes;
} fluid_ladspa_plugin_t;
typedef struct _fluid_ladspa_fx_t
{
unsigned long sample_rate;
int audio_groups;
int effects_channels;
int audio_channels;
int buffer_size;
fluid_ladspa_lib_t *libs[FLUID_LADSPA_MAX_LIBS];
int num_libs;
fluid_ladspa_node_t *nodes[FLUID_LADSPA_MAX_NODES];
int num_nodes;
/* plugins are really plugin instances */
fluid_ladspa_plugin_t *plugins[FLUID_LADSPA_MAX_PLUGINS];
int num_plugins;
/* used to generate the unique plugin ids */
int next_plugin_id;
fluid_rec_mutex_t api_mutex;
fluid_atomic_int_t state;
int pending_deactivation;
fluid_cond_mutex_t *run_finished_mutex;
fluid_cond_t *run_finished_cond;
} fluid_ladspa_fx_t;
fluid_ladspa_fx_t *new_fluid_ladspa_fx(fluid_real_t sample_rate, int audio_groups, int effects_channels, int audio_channels, int buffer_size);