From 2a2202c1fd7469a37213fcaa083427696a45d52f Mon Sep 17 00:00:00 2001 From: yaw-man Date: Tue, 9 Aug 2022 13:20:33 -0300 Subject: [PATCH] =?UTF-8?q?Supprimer=20les=20parametres=20d'=C3=A9xample?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/yaw-tab/DistrhoPluginInfo.h | 15 +-------------- src/yaw-tab/dsp.cpp | 31 +++++++++++++++++-------------- src/yaw-tab/ui.cpp | 28 ++++++++++++++++++++-------- 3 files changed, 38 insertions(+), 36 deletions(-) diff --git a/src/yaw-tab/DistrhoPluginInfo.h b/src/yaw-tab/DistrhoPluginInfo.h index c94c051..9648b4a 100644 --- a/src/yaw-tab/DistrhoPluginInfo.h +++ b/src/yaw-tab/DistrhoPluginInfo.h @@ -20,20 +20,7 @@ #endif enum Parameters { - kParameterBufferSize = 0, - kParameterCanRequestParameterValueChanges, - kParameterTimePlaying, - kParameterTimeFrame, - kParameterTimeValidBBT, - kParameterTimeBar, - kParameterTimeBeat, - kParameterTimeTick, - kParameterTimeBarStartTick, - kParameterTimeBeatsPerBar, - kParameterTimeBeatType, - kParameterTimeTicksPerBeat, - kParameterTimeBeatsPerMinute, - kParameterTabletX, + kParameterTabletX = 0, kParameterTabletY, kParameterTabletZ, kParameterTabletPressure, diff --git a/src/yaw-tab/dsp.cpp b/src/yaw-tab/dsp.cpp index 0e04244..9668707 100644 --- a/src/yaw-tab/dsp.cpp +++ b/src/yaw-tab/dsp.cpp @@ -11,9 +11,10 @@ public: // clear all parameters std::memset(fParameters, 0, sizeof(float) * kParameterCount); - // we can know some things right at the start + /* we can know some things right at the start fParameters[kParameterBufferSize] = getBufferSize(); fParameters[kParameterCanRequestParameterValueChanges] = canRequestParameterValueChanges(); + */ } protected: @@ -94,7 +95,7 @@ protected: parameter.ranges.max = 16777216.0f; switch (index) - { + {/* case kParameterBufferSize: parameter.name = "BufferSize"; parameter.symbol = "buffer_size"; @@ -152,28 +153,28 @@ protected: case kParameterTimeBeatsPerMinute: parameter.name = "TimeBeatsPerMinute"; parameter.symbol = "time_beatsperminute"; - break; + break;*/ case kParameterTabletX: - parameter.name = "TabletX"; - parameter.symbol = "tablet_x"; + parameter.name = "x"; + parameter.symbol = "x"; parameter.ranges.min = 0; parameter.ranges.max = 1024; break; case kParameterTabletY: - parameter.name = "TabletY"; - parameter.symbol = "tablet_y"; + parameter.name = "y"; + parameter.symbol = "y"; parameter.ranges.min = 0; parameter.ranges.max = 1024; break; case kParameterTabletZ: - parameter.name = "TabletZ"; - parameter.symbol = "tablet_z"; + parameter.name = "z"; + parameter.symbol = "z"; parameter.ranges.min = 0; parameter.ranges.max = 1024; break; case kParameterTabletPressure: - parameter.name = "TabletPressure"; - parameter.symbol = "tablet_p"; + parameter.name = "p"; + parameter.symbol = "p"; parameter.ranges.min = 0; parameter.ranges.max = 1024; break; @@ -228,6 +229,7 @@ protected: const TimePosition& timePos(getTimePosition()); // set basic values + /* fParameters[kParameterTimePlaying] = timePos.playing ? 1.0f : 0.0f; fParameters[kParameterTimeFrame] = timePos.frame; fParameters[kParameterTimeValidBBT] = timePos.bbt.valid ? 1.0f : 0.0f; @@ -255,9 +257,10 @@ protected: fParameters[kParameterTimeTicksPerBeat] = 0.0f; fParameters[kParameterTimeBeatsPerMinute] = 0.0f; } + */ - //il faut seulment changer un des parametres pour mettre à jour les donnés de la tablet - fParameters[kParameterTabletPressure] = 0; + + fParameters[kParameterTabletPressure] = timePos.bbt.tick; } /* -------------------------------------------------------------------------------------------------------- @@ -271,7 +274,7 @@ protected: */ void bufferSizeChanged(uint32_t newBufferSize) override { - fParameters[kParameterBufferSize] = newBufferSize; + //fParameters[kParameterBufferSize] = newBufferSize; } // ------------------------------------------------------------------------------------------------------- diff --git a/src/yaw-tab/ui.cpp b/src/yaw-tab/ui.cpp index b983bcf..6246121 100644 --- a/src/yaw-tab/ui.cpp +++ b/src/yaw-tab/ui.cpp @@ -41,17 +41,17 @@ protected: { // some hosts send parameter change events for output parameters even when nothing changed // we catch that here in order to prevent excessive repaints - if (d_isEqual(fParameters[index], value)) - return; + //if (d_isEqual(fParameters[index], value)) + // return; fParameters[index] = value; //Lire donnés de la tablet tab.NewPacket(); - fParameters[kParameterTabletX] = tab.pkt.pkX; - fParameters[kParameterTabletY] = tab.pkt.pkY; - fParameters[kParameterTabletZ] = tab.pkt.pkZ; - fParameters[kParameterTabletPressure] = tab.pkt.pkNormalPressure; + fParameters[kParameterTabletX] = static_cast(tab.pkt.pkX); + fParameters[kParameterTabletY] = static_cast(tab.pkt.pkY); + fParameters[kParameterTabletZ] = static_cast(tab.pkt.pkZ); + fParameters[kParameterTabletPressure] = static_cast(tab.pkt.pkNormalPressure); repaint(); @@ -84,7 +84,7 @@ protected: float x = 0.0f * fScale; float y = 15.0f * fScale; - + /* // buffer size drawLeft(x, y, "Buffer Size:"); drawRight(x, y, getTextBufInt(fParameters[kParameterBufferSize])); @@ -172,10 +172,22 @@ protected: drawLeft(x, y, "BPM:"); drawRight(x, y, getTextBufFloat(fParameters[kParameterTimeBeatsPerMinute])); y += lineHeight; - + */ drawLeft(x, y, "x:"); drawRight(x, y, getTextBufFloat(fParameters[kParameterTabletX])); y += lineHeight; + + drawLeft(x, y, "y:"); + drawRight(x, y, getTextBufFloat(fParameters[kParameterTabletY])); + y += lineHeight; + + drawLeft(x, y, "z:"); + drawRight(x, y, getTextBufFloat(fParameters[kParameterTabletZ])); + y += lineHeight; + + drawLeft(x, y, "p:"); + drawRight(x, y, getTextBufFloat(fParameters[kParameterTabletPressure])); + y += lineHeight; } void onResize(const ResizeEvent& ev) override