Make the windows VST callback use int32_t rather than long (to make it the same as...

git-svn-id: svn://localhost/ardour2/branches/3.0@10754 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index 252c824ce76618a622de8cc4ac1aa1e7042613d3..d302c310c8b1d9ae278571ac60cb4c0eb9a32020 100644 (file)
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -739,10 +739,10 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
 
        /* VST support */
 
-       static long vst_callback (AEffect* effect,
-                       long opcode,
-                       long index,
-                       long value,
+       static intptr_t vst_callback (AEffect* effect,
+                       int32_t opcode,
+                       int32_t index,
+                       intptr_t value,
                        void* ptr,
                        float opt);
                        

diff --git a/libs/ardour/session_vst.cc b/libs/ardour/session_vst.cc
index 504519bfab0bec86555d9b433534d65f8e6a222c..3e3a6d36d21c2330bed06689a2e684041ba1121a 100644 (file)
--- a/libs/ardour/session_vst.cc
+++ b/libs/ardour/session_vst.cc
@@ -40,12 +40,14 @@ static int debug_callbacks = -1;
 
 using namespace ARDOUR;
 
-long Session::vst_callback (AEffect* effect,
-                           long opcode,
-                           long index,
-                           long value,
-                           void* ptr,
-                           float opt)
+intptr_t Session::vst_callback (
+       AEffect* effect,
+       int32_t opcode,
+       int32_t index,
+       intptr_t value,
+       void* ptr,
+       float opt
+       )
 {
        static VstTimeInfo _timeInfo;
        WindowsVSTPlugin* plug;
@@ -58,11 +60,11 @@ long Session::vst_callback (AEffect* effect,
        if (effect && effect->user) {
                plug = (WindowsVSTPlugin*) (effect->user);
                session = &plug->session();
-               SHOW_CALLBACK ("am callback 0x%x, opcode = %ld, plugin = \"%s\" ", (int) pthread_self(), opcode, plug->name());
+               SHOW_CALLBACK ("am callback 0x%x, opcode = %d, plugin = \"%s\" ", (int) pthread_self(), opcode, plug->name());
        } else {
                plug = 0;
                session = 0;
-               SHOW_CALLBACK ("am callback 0x%x, opcode = %ld", (int) pthread_self(), opcode);
+               SHOW_CALLBACK ("am callback 0x%x, opcode = %d", (int) pthread_self(), opcode);
        }
 
        switch(opcode){
@@ -348,7 +350,7 @@ long Session::vst_callback (AEffect* effect,
                return 0;
 
        default:
-               SHOW_CALLBACK ("VST master dispatcher: undefed: %ld\n", opcode);
+               SHOW_CALLBACK ("VST master dispatcher: undefed: %d\n", opcode);
                break;
        }
 

diff --git a/libs/fst/vestige/aeffectx.h b/libs/fst/vestige/aeffectx.h
index dda128f45eeb4837d1467c299bc7fe7172f1a84f..d8287663ea0fe1e8af8c567c088ff31f69554619 100644 (file)
--- a/libs/fst/vestige/aeffectx.h
+++ b/libs/fst/vestige/aeffectx.h
@@ -304,13 +304,6 @@ typedef struct VstTimeInfo
 
 } VstTimeInfo;
 
-
-typedef long int (* audioMasterCallback)( AEffect * , long int , long int ,
-                                               long int , void * , float );
-// we don't use it, may be noise
-#define VSTCALLBACK
-
-
-
+typedef intptr_t (* audioMasterCallback) (AEffect *, int32_t, int32_t, intptr_t, void *, float);
 
 #endif