From a9d8e7ca82ca19006f1e16cdee4802257e85d39a Mon Sep 17 00:00:00 2001 From: Jade Rowland Date: Mon, 4 Sep 2023 15:33:44 -0400 Subject: [PATCH] cleaning up --- packages/desktopbridge/index.mjs | 1 + packages/desktopbridge/oscbridge.mjs | 10 +++++----- packages/desktopbridge/package.json | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/packages/desktopbridge/index.mjs b/packages/desktopbridge/index.mjs index 2cc9db3d..591bbe34 100644 --- a/packages/desktopbridge/index.mjs +++ b/packages/desktopbridge/index.mjs @@ -6,3 +6,4 @@ This program is free software: you can redistribute it and/or modify it under th export * from './midibridge.mjs'; export * from './utils.mjs'; +export * from './oscbridge.mjs'; diff --git a/packages/desktopbridge/oscbridge.mjs b/packages/desktopbridge/oscbridge.mjs index d6c13d45..135a2b02 100644 --- a/packages/desktopbridge/oscbridge.mjs +++ b/packages/desktopbridge/oscbridge.mjs @@ -1,4 +1,4 @@ -import { logger, parseNumeral, Pattern } from '@strudel.cycles/core'; +import { parseNumeral, Pattern } from '@strudel.cycles/core'; import { Invoke } from './utils.mjs'; Pattern.prototype.osc = function () { @@ -11,9 +11,9 @@ Pattern.prototype.osc = function () { controls.n && (controls.n = parseNumeral(controls.n)); controls.note && (controls.note = parseNumeral(controls.note)); - const messagesfromjs = []; const params = []; - const offset = Math.round((time - currentTime) * 1000 - 48); + + const timestamp = Math.round(Date.now() + (time - currentTime) * 1000); Object.keys(controls).forEach((key) => { const val = controls[key]; @@ -29,10 +29,10 @@ Pattern.prototype.osc = function () { }); }); + const messagesfromjs = []; if (params.length) { - messagesfromjs.push({ target: '/dirt/play', offset, params }); + messagesfromjs.push({ target: '/dirt/play', timestamp, params }); } - console.log(messagesfromjs); if (messagesfromjs.length) { setTimeout(() => { diff --git a/packages/desktopbridge/package.json b/packages/desktopbridge/package.json index bdeda2d9..c2acba9e 100644 --- a/packages/desktopbridge/package.json +++ b/packages/desktopbridge/package.json @@ -1,7 +1,7 @@ { "name": "@strudel/desktopbridge", "version": "0.1.0", - "description": "send midi messages between the JS and Tauri (Rust) sides of the Studel desktop app", + "description": "tools/shims for communicating between the JS and Tauri (Rust) sides of the Studel desktop app", "main": "index.mjs", "type": "module", "repository": {