diff --git a/src/lib/constants.ts b/src/lib/constants.ts
index 881b055..9343f73 100644
--- a/src/lib/constants.ts
+++ b/src/lib/constants.ts
@@ -1,3 +1,5 @@
+import type { Duration, SequenceOption, SettingsScheme } from "./stores";
+
/* Used for internal purposes */
export const INITIAL_THEME = "dark";
@@ -23,18 +25,35 @@ export const INITIAL_PAN = 0; // means center
export const MAX_PAN = 1; // means right
export const MIN_PAN = -1; // means left
-export const LOOP_REPEAT = 4;
-export const REST_LENGTH = 4;
+/**
+ * The number of times the sequence will repeat.
+ */
+export const DEFAULT_LOOP_REPEAT = 3;
+export const MIN_LOOP_REPEAT = 1;
+export const MAX_LOOP_REPEAT = 10;
+
+/**
+ * The number of rests in the sequence.
+ */
+export const DEFAULT_REST_LENGTH = 2 * 4;
+export const MIN_REST_LENGTH = 0;
+export const MAX_REST_LENGTH = 16 * 4;
+
+/**
+ * The duration of the note in the sequence.
+ */
+export const DEFAULT_DURATION: Duration = "4n"; // 4n = 1/4
+export const MIN_DURATION: Duration = "128n"; // 16n = 1/16
+export const MAX_DURATION: Duration = "1n"; // 1n = 1/1
+
+export const DEFAULT_SEQUENCE_OPTION: SequenceOption = {
+ loopRepeat: DEFAULT_LOOP_REPEAT,
+ restLength: DEFAULT_REST_LENGTH,
+ duration: DEFAULT_DURATION,
+};
/* settings */
export const LOCAL_STORAGE_SETTINGS_KEY = "settings";
-export type SettingsScheme = {
- theme: "dark" | "light";
- frequency: number;
- bpm: number;
- volume: number;
- pan: number;
-};
export const SETTINGS_FILE_NAME = "user-settings";
export const DEFAULT_SETTINGS: SettingsScheme = {
theme: INITIAL_THEME,
@@ -42,4 +61,7 @@ export const DEFAULT_SETTINGS: SettingsScheme = {
bpm: INITIAL_BPM,
volume: INITIAL_VOLUME,
pan: INITIAL_PAN,
+ loopRepeat: DEFAULT_LOOP_REPEAT,
+ restLength: DEFAULT_REST_LENGTH,
+ duration: DEFAULT_DURATION,
};
diff --git a/src/lib/settings.ts b/src/lib/settings.ts
index abcc30d..288ca9d 100644
--- a/src/lib/settings.ts
+++ b/src/lib/settings.ts
@@ -3,13 +3,13 @@ import {
LOCAL_STORAGE_SETTINGS_KEY,
SAVE_DELAY_TIME,
SETTINGS_FILE_NAME,
- type SettingsScheme,
} from "@/lib/constants";
import { get, writable, type Writable } from "svelte/store";
import { getAll } from "tauri-settings";
import { STATUS } from "tauri-settings/dist/fs/ensure-settings-file";
import { saveSettings as saveAll } from "tauri-settings/dist/fs/load-save";
import { match } from "ts-pattern";
+import type { SettingsScheme } from "./stores";
import { isTauri } from "./utils";
export const timer = writable(0); // 0 ~ SAVE_DELAY_TIME
diff --git a/src/lib/stores.ts b/src/lib/stores.ts
index a94f03a..b6a7cf7 100644
--- a/src/lib/stores.ts
+++ b/src/lib/stores.ts
@@ -1,5 +1,9 @@
import { writable, type Writable } from "svelte/store";
+import type { Unit } from "tone";
import {
+ DEFAULT_DURATION,
+ DEFAULT_LOOP_REPEAT,
+ DEFAULT_REST_LENGTH,
INITIAL_BPM,
INITIAL_FREQUENCY,
INITIAL_PAN,
@@ -9,15 +13,42 @@ import { updateCache } from "./settings";
export type Mode = "TONE" | "ACRN";
export type Theme = "light" | "dark";
+export type SequenceOption = {
+ loopRepeat: number;
+ restLength: number;
+ duration: Unit.Time;
+};
+export type Duration =
+ | "1n"
+ | "2n"
+ | "4n"
+ | "8n"
+ | "16n"
+ | "32n"
+ | "64n"
+ | "128n"
+ | "256n";
+export type SettingsScheme = {
+ theme: "dark" | "light";
+ frequency: number;
+ bpm: number;
+ volume: number;
+ pan: number;
+ loopRepeat: number;
+ restLength: number;
+ duration: Duration;
+};
export const frequency = writable([INITIAL_FREQUENCY]); // 0kHz to 15kHz
export const volume = writable([INITIAL_VOLUME]); // 0 ~ 100
export const bpm = writable([INITIAL_BPM]); // According to the paper, the cycle repetition rate was 1.5 Hz. (T = 0.66 s)
export const pan = writable([INITIAL_PAN]); // -1 ~ 1
+export const loopRepeat = writable([DEFAULT_LOOP_REPEAT]);
+export const restLength = writable([DEFAULT_REST_LENGTH]);
+export const duration: Writable
= writable([DEFAULT_DURATION]);
export const mode: Writable = writable("TONE");
export const isPlaying = writable(false);
export const theme: Writable = writable("light");
-
export const clientWidth = writable(0);
/**
@@ -41,6 +72,15 @@ export function subscribeStores() {
pan.subscribe(value => {
updateCache({ pan: value[0] });
}),
+ loopRepeat.subscribe(value => {
+ updateCache({ loopRepeat: value[0] });
+ }),
+ restLength.subscribe(value => {
+ updateCache({ restLength: value[0] });
+ }),
+ duration.subscribe(value => {
+ updateCache({ duration: value[0] });
+ }),
];
return unsubscribe;
}
diff --git a/src/tests/Sequence.test.ts b/src/tests/Sequence.test.ts
index d2db6d8..792a046 100644
--- a/src/tests/Sequence.test.ts
+++ b/src/tests/Sequence.test.ts
@@ -1,3 +1,4 @@
+import { DEFAULT_SEQUENCE_OPTION } from "@/lib/constants";
import "@testing-library/jest-dom";
import type { PolySynth } from "tone";
import * as Tone from "tone";
@@ -6,7 +7,6 @@ import { createPanner } from "../lib/Oscillator.svelte";
import {
createSequence,
createSynth,
- defaultSequenceOption,
generateAcrnSheet,
generateFrequencies,
shuffledFrequencies,
@@ -47,9 +47,12 @@ describe("generateFrequencies", () => {
describe("shuffledFrequencies", () => {
test("returns shuffled array", () => {
const input = [1, 2, 3, 4, 5, 6];
- const result = shuffledFrequencies(input);
- while (result === input) {
- shuffledFrequencies(input);
+ let result;
+ for (let i = 0; i < 100; i++) {
+ result = shuffledFrequencies(input);
+ if (result === input) {
+ break;
+ }
}
expect(result).not.toEqual(input);
}, 50);
@@ -190,7 +193,7 @@ describe("createSequence", () => {
test("default option", async () => {
const frequencies = generateFrequencies(8000);
- const { loopRepeat, restLength } = defaultSequenceOption;
+ const { loopRepeat, restLength } = DEFAULT_SEQUENCE_OPTION;
const seq = createSequence(synthMock, frequencies);
expect(seq.events).toEqual(generateAcrnSheet(loopRepeat, restLength));
expect(seq.loop).toBe(true);