Don't use VST ->user points, prefer host-reserved ptr

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

diff --git a/libs/ardour/session_vst.cc b/libs/ardour/session_vst.cc
index 5da17cf4305ca3dfa248b571fed0a6307f1e25f5..3950a294781ee9b7b6d8a739e14e23e61e6e2811 100644 (file)
--- a/libs/ardour/session_vst.cc
+++ b/libs/ardour/session_vst.cc
@@ -40,35 +40,6 @@ using namespace ARDOUR;
 
 #define SHOW_CALLBACK(MSG) DEBUG_TRACE (PBD::DEBUG::VSTCallbacks, string_compose (MSG " val = %1 idx = %2\n", index, value))
 
-static double
-vst_ppq (const TempoMetric& tm, const Timecode::BBT_Time& bbt, double& ppqBar)
-{
-
-       /* PPQ = pulse per quarter
-        * VST's "pulse" is our "division".
-        *
-        * 8 divisions per bar, 1 division = quarter, so 8 quarters per bar, ppq = 1
-        * 8 divisions per bar, 1 division = eighth, so  4 quarters per bar, ppq = 2
-        * 4 divisions per bar, 1 division = quarter, so  4 quarters per bar, ppq = 1
-        * 4 divisions per bar, 1 division = half, so 8 quarters per bar, ppq = 0.5
-        * 4 divisions per bar, 1 division = fifth, so (4 * 5/4) quarters per bar, ppq = 5/4
-        *
-        * general: divs_per_bar / (note_type / 4.0)
-        */
-       const double ppq_scaling =  tm.meter().note_divisor() / 4.0;
-
-       /* Note that this assumes constant meter/tempo throughout the session. Stupid VST */
-       ppqBar = double(bbt.bars - 1) * tm.meter().divisions_per_bar();
-       double ppqBeat = double(bbt.beats - 1);
-       double ppqTick = double(bbt.ticks) / Timecode::BBT_Time::ticks_per_beat;
-
-       ppqBar *= ppq_scaling;
-       ppqBeat *= ppq_scaling;
-       ppqTick *= ppq_scaling;
-
-       return ppqBar + ppqBeat + ppqTick;
-}
-
 int Session::vst_current_loading_id = 0;
 const char* Session::vst_can_do_strings[] = {
        X_("supplyIdle"),
@@ -98,8 +69,8 @@ intptr_t Session::vst_callback (
        VstTimeInfo* timeinfo;
        int32_t newflags = 0;
 
-       if (effect && effect->user) {
-               plug = (VSTPlugin *) (effect->user);
+       if (effect && effect->ptr1) {
+               plug = (VSTPlugin *) (effect->ptr1);
                session = &plug->session();
                timeinfo = plug->timeinfo ();
                DEBUG_TRACE (PBD::DEBUG::VSTCallbacks, string_compose ("am callback 0x%1%2, opcode = %3%4, plugin = \"%5\"\n",
@@ -208,7 +179,7 @@ intptr_t Session::vst_callback (
 
                        if (value & (kVstTempoValid)) {
                                const Tempo& t (session->tempo_map().tempo_at_frame (now));
-                               timeinfo->tempo = t.beats_per_minute ();
+                               timeinfo->tempo = t.quarter_notes_per_minute ();
                                newflags |= (kVstTempoValid);
                        }
                        if (value & (kVstTimeSigValid)) {
@@ -333,7 +304,7 @@ intptr_t Session::vst_callback (
                // returns tempo (in bpm * 10000) at sample frame location passed in <value>
                if (session) {
                        const Tempo& t (session->tempo_map().tempo_at_frame (value));
-                       return t.beats_per_minute() * 1000;
+                       return t.quarter_notes_per_minute() * 1000;
                } else {
                        return 0;
                }
@@ -366,9 +337,14 @@ intptr_t Session::vst_callback (
        case audioMasterSizeWindow:
                SHOW_CALLBACK ("audioMasterSizeWindow");
                if (plug && plug->state()) {
-                       plug->state()->width = index;
-                       plug->state()->height = value;
-                       plug->state()->want_resize = 1;
+                       if (plug->state()->width != index || plug->state()->height != value) {
+                               plug->state()->width = index;
+                               plug->state()->height = value;
+#ifndef NDEBUG
+                               printf ("audioMasterSizeWindow %d %d\n", plug->state()->width, plug->state()->height);
+#endif
+                               plug->VSTSizeWindow (); /* EMIT SIGNAL */
+                       }
                }
                return 0;
 
@@ -466,7 +442,7 @@ intptr_t Session::vst_callback (
                SHOW_CALLBACK ("audioMasterGetProductString");
                // fills <ptr> with a string with product name (max 64 char)
                strcpy ((char*) ptr, PROGRAM_NAME);
-               return 0;
+               return 1;
 
        case audioMasterGetVendorVersion:
                SHOW_CALLBACK ("audioMasterGetVendorVersion");