another unusued parameter fix

[ardour.git] / libs / ardour / session_vst.cc

diff --git a/libs/ardour/session_vst.cc b/libs/ardour/session_vst.cc
index 91a845e495e5fdb4413f930dfeffeeab73063089..644fb19ffbd1c38a11081437d9360f237991f676 100644 (file)
--- a/libs/ardour/session_vst.cc
+++ b/libs/ardour/session_vst.cc
@@ -20,12 +20,11 @@
 #include <stdbool.h>
 #include <cstdio>
 
-#include <fst.h>
-
 #include "ardour/session.h"
 #include "ardour/tempo.h"
 #include "ardour/windows_vst_plugin.h"
 #include "ardour/vestige/aeffectx.h"
+#include "ardour/vst_types.h"
 
 #include "i18n.h"
 
@@ -50,7 +49,7 @@ intptr_t Session::vst_callback (
        )
 {
        static VstTimeInfo _timeInfo;
-       WindowsVSTPlugin* plug;
+       VSTPlugin* plug;
        Session* session;
 
        if (debug_callbacks < 0) {
@@ -58,7 +57,7 @@ intptr_t Session::vst_callback (
        }
 
        if (effect && effect->user) {
-               plug = (WindowsVSTPlugin*) (effect->user);
+               plug = (VSTPlugin *) (effect->user);
                session = &plug->session();
                SHOW_CALLBACK ("am callback 0x%x, opcode = %d, plugin = \"%s\" ", (int) pthread_self(), opcode, plug->name());
        } else {
@@ -133,7 +132,7 @@ intptr_t Session::vst_callback (
                        }
                        if (value & (kVstBarsValid)) {
                                const Meter& m (session->tempo_map().meter_at (session->transport_frame()));
-                               _timeInfo.timeSigNumerator = m.beats_per_bar ();
+                               _timeInfo.timeSigNumerator = m.divisions_per_bar ();
                                _timeInfo.timeSigDenominator = m.note_divisor ();
                                _timeInfo.flags |= (kVstBarsValid);
                        }
@@ -248,6 +247,8 @@ intptr_t Session::vst_callback (
 
        case audioMasterOfflineStart:
                SHOW_CALLBACK ("amc: audioMasterOfflineStart\n");
+               return 0;
+               
        case audioMasterOfflineRead:
                SHOW_CALLBACK ("amc: audioMasterOfflineRead\n");
               // ptr points to offline structure, see below. return 0: error, 1 ok
@@ -260,6 +261,8 @@ intptr_t Session::vst_callback (
 
        case audioMasterOfflineGetCurrentPass:
                SHOW_CALLBACK ("amc: audioMasterOfflineGetCurrentPass\n");
+               return 0;
+               
        case audioMasterOfflineGetCurrentMetaPass:
                SHOW_CALLBACK ("amc: audioMasterOfflineGetCurrentMetaPass\n");
                return 0;
@@ -283,7 +286,7 @@ intptr_t Session::vst_callback (
        case audioMasterGetProductString:
                SHOW_CALLBACK ("amc: audioMasterGetProductString\n");
                // fills <ptr> with a string with product name (max 64 char)
-               strcpy ((char*) ptr, "Ardour");
+               strcpy ((char*) ptr, PROGRAM_NAME);
                return 0;
 
        case audioMasterGetVendorVersion: