X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsession_vst.cc;h=5ba77a9a6e51d36634c35853b77dd44c51ffb969;hb=1bfa74c0f98fb370f1ee4eac6fd6898a24616ccc;hp=ad732e052a185f632a77233b7e0af7e68c08e84f;hpb=8f3bc6f8099d7fc3bcc7f0dc88434afa0084e35f;p=ardour.git diff --git a/libs/ardour/session_vst.cc b/libs/ardour/session_vst.cc index ad732e052a..5ba77a9a6e 100644 --- a/libs/ardour/session_vst.cc +++ b/libs/ardour/session_vst.cc @@ -34,41 +34,12 @@ #include #endif -#include "i18n.h" +#include "pbd/i18n.h" 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"), @@ -200,53 +171,34 @@ intptr_t Session::vst_callback ( timeinfo->nanoSeconds = g_get_monotonic_time () * 1000; - if (session) { - framepos_t now = session->transport_frame(); + if (plug && session) { + framepos_t now = plug->transport_frame(); timeinfo->samplePos = now; timeinfo->sampleRate = session->frame_rate(); - const TempoMetric& tm (session->tempo_map().metric_at (now)); - if (value & (kVstTempoValid)) { - const Tempo& t (tm.tempo()); - timeinfo->tempo = t.beats_per_minute (); + const Tempo& t (session->tempo_map().tempo_at_frame (now)); + timeinfo->tempo = t.quarter_notes_per_minute (); newflags |= (kVstTempoValid); } if (value & (kVstTimeSigValid)) { - const Meter& m (tm.meter()); - timeinfo->timeSigNumerator = m.divisions_per_bar (); - timeinfo->timeSigDenominator = m.note_divisor (); + const MeterSection& ms (session->tempo_map().meter_section_at_frame (now)); + timeinfo->timeSigNumerator = ms.divisions_per_bar (); + timeinfo->timeSigDenominator = ms.note_divisor (); newflags |= (kVstTimeSigValid); } if ((value & (kVstPpqPosValid)) || (value & (kVstBarsValid))) { Timecode::BBT_Time bbt; try { - session->tempo_map().bbt_time (now, bbt); - - /* 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) - */ - double ppq_scaling = tm.meter().note_divisor() / 4.0; - - /* Note that this assumes constant meter/tempo throughout the session. Stupid VST */ - double 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; - + bbt = session->tempo_map().bbt_at_frame_rt (now); + bbt.beats = 1; + bbt.ticks = 0; + /* exact quarter note */ + double ppqBar = session->tempo_map().quarter_note_at_bbt_rt (bbt); + /* quarter note at frame position (not rounded to note subdivision) */ + double ppqPos = session->tempo_map().quarter_note_at_frame_rt (now); if (value & (kVstPpqPosValid)) { timeinfo->ppqPos = ppqPos; newflags |= kVstPpqPosValid; @@ -299,7 +251,7 @@ intptr_t Session::vst_callback ( newflags |= kVstTransportRecording; } - if (session->transport_speed () != 0.0f) { + if (plug->transport_speed () != 0.0f) { newflags |= kVstTransportPlaying; } @@ -307,14 +259,8 @@ intptr_t Session::vst_callback ( newflags |= kVstTransportCycleActive; Location * looploc = session->locations ()->auto_loop_location (); if (looploc) try { - double ppqBar; - Timecode::BBT_Time bbt; - - session->tempo_map().bbt_time_rt (looploc->start (), bbt); - timeinfo->cycleStartPos = vst_ppq (tm, bbt, ppqBar); - - session->tempo_map().bbt_time_rt (looploc->end (), bbt); - timeinfo->cycleEndPos = vst_ppq (tm, bbt, ppqBar); + timeinfo->cycleStartPos = session->tempo_map ().quarter_note_at_frame_rt (looploc->start ()); + timeinfo->cycleEndPos = session->tempo_map ().quarter_note_at_frame_rt (looploc->end ()); newflags |= kVstCyclePosValid; } catch (...) { } @@ -358,7 +304,7 @@ intptr_t Session::vst_callback ( // returns tempo (in bpm * 10000) at sample frame location passed in 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; } @@ -391,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; @@ -568,4 +519,3 @@ intptr_t Session::vst_callback ( return 0; } -