Merge branch 'ripple-mode-cc' into cairocanvas

[ardour.git] / libs / fst / fst.h

diff --git a/libs/fst/fst.h b/libs/fst/fst.h
index 61dc09a2a193932230a6a060c66f954657ded2df..7b9a67125e5b381e2aab97105b5c51667522a9e9 100644 (file)
--- a/libs/fst/fst.h
+++ b/libs/fst/fst.h
@@ -5,104 +5,31 @@
 #include <signal.h>
 #include <pthread.h>
 
-/**
- * Display FST error message.
- *
- * Set via fst_set_error_function(), otherwise a FST-provided
- * default will print @a msg (plus a newline) to stderr.
- *
- * @param msg error message text (no newline at end).
- */
-extern void (*fst_error_callback)(const char *msg);
-
-/**
- * Set the @ref fst_error_callback for error message display.
- *
- * The FST library provides two built-in callbacks for this purpose:
- * default_fst_error_callback() and silent_fst_error_callback().
- */
-void fst_set_error_function (void (*func)(const char *));
-
-#include <vst/AEffect.h>
-
-typedef struct _FST FST;
-typedef struct _FSTHandle FSTHandle;
-typedef struct _FSTInfo FSTInfo;
-
-struct _FSTInfo 
-{
-    char *name;
-    int UniqueID;
-    char *Category;
-    
-    int numInputs;
-    int numOutputs;
-    int numParams;
-
-    int wantMidi;
-    int wantEvents;
-    int hasEditor;
-    int canProcessReplacing; // what do we need this for ?
-
-    // i think we should save the parameter Info Stuff soon.
-    // struct VstParameterInfo *infos;
-    char **ParamNames;
-    char **ParamLabels;
-};
-
-struct _FSTHandle
-{
-    void*    dll;
-    char*    name;
-    char*    nameptr; /* ptr returned from strdup() etc. */
-    AEffect* (*main_entry)(audioMasterCallback);
-
-    int plugincnt;
-};
-
-struct _FST 
-{
-    AEffect*    plugin;
-    void*       window; /* win32 HWND */
-    int         xid; /* X11 XWindow */
-    FSTHandle*  handle;
-    int        width;
-    int        height;
-    int         destroy;
-
-    struct _FST* next;
-
-    pthread_mutex_t lock;
-    pthread_cond_t  window_status_change;
-    int             been_activated;
-};
+#include "ardour/libardour_visibility.h"
+#include "ardour/vst_types.h"
+#include "ardour/vestige/aeffectx.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-extern int        fst_init (void (*sighandler)(int,siginfo_t*,void*));
-
-extern FSTHandle* fst_load (const char*);
-extern int        fst_unload (FSTHandle*);
-
-extern FST*       fst_instantiate (FSTHandle*, audioMasterCallback amc, void* userptr);
-extern void       fst_close (FST*);
-
-extern void fst_event_loop_remove_plugin (FST* fst);
-extern void fst_event_loop_add_plugin (FST* fst);
+LIBARDOUR_API int        fst_init (void* possible_hmodule);
+LIBARDOUR_API void       fst_exit (void);
 
-extern int  fst_run_editor (FST*);
-extern void  fst_destroy_editor (FST*);
-extern int  fst_get_XID (FST*);
+LIBARDOUR_API VSTHandle* fst_load (const char*);
+LIBARDOUR_API int        fst_unload (VSTHandle**);
 
-extern int   fst_adopt_thread ();
-extern void* fst_get_teb();
+LIBARDOUR_API VSTState * fst_instantiate (VSTHandle *, audioMasterCallback amc, void* userptr);
+LIBARDOUR_API void       fst_close (VSTState *);
 
-extern void fst_signal_handler (int sig, siginfo_t* info, void* context);
+LIBARDOUR_API int  fst_run_editor (VSTState *, void* window_parent);
+LIBARDOUR_API void fst_destroy_editor (VSTState *);
+LIBARDOUR_API void fst_move_window_into_view (VSTState *);
 
-extern FSTInfo *fst_get_info( char *dllpathname );
-extern void fst_free_info( FSTInfo *info );
+LIBARDOUR_API void fst_event_loop_remove_plugin (VSTState* fst);
+LIBARDOUR_API void fst_start_threading(void);
+LIBARDOUR_API void fst_stop_threading(void);
+LIBARDOUR_API void fst_audio_master_idle(void);
 
 #ifdef __cplusplus
 }