From 53a14068a4fd6b470124631e61b7b767d8b397d1 Mon Sep 17 00:00:00 2001 From: Mohit Verma <112820522+mohitvdx@users.noreply.github.com> Date: Tue, 30 Jan 2024 10:44:37 +0530 Subject: [PATCH 1/2] update env file path in docker compose --- app/env/.env.development | 3 ++- docker-compose.yml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/env/.env.development b/app/env/.env.development index d5913244..f2b8b426 100644 --- a/app/env/.env.development +++ b/app/env/.env.development @@ -1,2 +1,3 @@ -// Configuration preset file number to enable +# Configuration preset file number to enable VITE_CONFIG_PRESET = 0 + diff --git a/docker-compose.yml b/docker-compose.yml index 36cdd850..c403483d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,7 +7,7 @@ services: build: ./ image: ghcr.io/sugarlabs/musicblocks:4-dev env_file: - - ./env/development.env + - ./app/env/.env.development ports: - '5173:5173' # development server - '4173:4173' # production preview server From 6e03e231fd373781e4b586780db95b9fcf029dd8 Mon Sep 17 00:00:00 2001 From: Mohit Verma <112820522+mohitvdx@users.noreply.github.com> Date: Wed, 7 Feb 2024 12:46:23 +0530 Subject: [PATCH 2/2] updated singer modules --- modules/singer/playground/pages/Voice.tsx | 2 +- modules/singer/src/singer.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/singer/playground/pages/Voice.tsx b/modules/singer/playground/pages/Voice.tsx index 94ab7ff4..f36f8ea8 100644 --- a/modules/singer/playground/pages/Voice.tsx +++ b/modules/singer/playground/pages/Voice.tsx @@ -1,7 +1,7 @@ import { Voice } from '@/core/voice'; import SynthUtils from '@/core/synthUtils'; import * as Tone from 'tone'; -import { _state, noteValueToSeconds, _defaultSynth, _polySynth } from '@/singer'; +import { _state, noteValueToSeconds, _defaultSynth, /*_polySynth */} from '@/singer'; import { setupSynthUtils } from '@/core/synthUtils'; import { injected } from '@/index'; diff --git a/modules/singer/src/singer.ts b/modules/singer/src/singer.ts index b13ec776..c33b51ed 100644 --- a/modules/singer/src/singer.ts +++ b/modules/singer/src/singer.ts @@ -23,7 +23,7 @@ const currentpitch = new CurrentPitch(testKeySignature, new Temperament(), 1, 4) const _stateObj = { ..._defaultSynthStateValues }; /** Proxy to the synth state parameters. */ -const _state = new Proxy(_stateObj, { +export const _state = new Proxy(_stateObj, { set: (_, key, value) => { if (key === 'beatsPerMinute') { _stateObj.beatsPerMinute = value; @@ -37,7 +37,7 @@ const _state = new Proxy(_stateObj, { }); /** Default synth **/ -const _defaultSynth = new Tone.Synth().toDestination(); +export const _defaultSynth = new Tone.Synth().toDestination(); // -- private functions ----------------------------------------------------------------------------