feat: colors

Author: fcastrovilli

src/lib/colors.svelte

@@ -4,11 +4,6 @@
 	import type { voiceType } from './types';
 	export let voice: voiceType;
 
-<<<<<<< Updated upstream
-	let osc: Tone.Oscillator | undefined = undefined;
-	let touchStartY: number = 0;
-	let value: number = 0;
-=======
 	let valueInDb: number = -Infinity;
 	$: {
 		valueInDb = 20 * Math.log10(value);
@@ -18,35 +13,17 @@
 	let osc: Tone.Oscillator | undefined = undefined;
 	// let touchStart: number = 0;
 	let value: number = -100;
->>>>>>> Stashed changes
 
 	onMount(() => {
 		if (osc) return;
 		import('tone').then((Tone) => {
 			osc = new Tone.Oscillator(voice.note, 'sine').toDestination();
 		});
 	});
-<<<<<<< Updated upstream
-	// $: console.log(value);
-=======
->>>>>>> Stashed changes
 </script>
 
 <button
 	on:touchstart={(e) => {
-<<<<<<< Updated upstream
-		touchStartY = e.changedTouches[0].clientY;
-	}}
-	on:touchmove={(e) => {
-		const touch = e.changedTouches[0];
-		const directionY = touchStartY < touch.clientY ? 'down' : 'up';
-		// const directionX = touchStartX < touch.screenX ? 'left' : 'right';
-		if (directionY == 'up' && value == 0) return;
-		if (directionY == 'down' && value < 100) {
-			value += 1;
-		}
-		if (directionY == 'up' && value > 0) value -= 1;
-=======
 		// touchStart = e.changedTouches[0].clientX;
 		if (osc) osc.start();
 	}}
@@ -60,7 +37,6 @@
 			0
 		);
 		if (osc) osc.volume.linearRampTo(value, 0.1);
->>>>>>> Stashed changes
 	}}
 	class="flex justify-center items-center"
 >
@@ -69,12 +45,5 @@
 			<rect width="100" height="100" fill={voice.color} />
 			<text x="10" y="60" font-size="35" fill="white">{value}</text>
 		</g>
-<<<<<<< Updated upstream
-		<!-- <g>
-			<rect x="0" y="0" width="100" height="100" fill="red"></rect>
-			<text x="0" y="50" font-family="Verdana" font-size="35" fill="blue">Hello</text>
-		</g> -->
-=======
->>>>>>> Stashed changes
 	</svg>
 </button>