Skip to content

AI media harness for planning, generating, and editing locally

TypeScript

Move music generation status above playback

Bittia916add5b3e1
diff --git a/src/components/workspace/MusicView.tsx b/src/components/workspace/MusicView.tsx
index 17118fa..8cc81b6 100644
--- a/src/components/workspace/MusicView.tsx
+++ b/src/components/workspace/MusicView.tsx
@@ -4,7 +4,7 @@ import { isTauri, readMediaFileUrl } from "../../lib/persistence";
import { loadGeneratorTemplateSettings, subscribeGeneratorTemplates, templateSupportsMusic, templateUsable, generatorPathFields, type GeneratorTemplate } from "../../lib/settings";
import { musicSettingsForModel, moveSong, newMusicFolder, newSong, removeMusicFolder, songReference, updateSong, type MusicSettings, type MusicSong } from "../../lib/music";
import { isWorkActive, type WorkItem } from "../../lib/workQueue";
-import { ComboBox, CommandBarButton, PropRow, PropSection, Slider, Splitter, useContextMenu, usePaneSize, type MenuEntry } from "../ui";
+import { ComboBox, CommandBarButton, ProgressBar, PropRow, PropSection, Slider, Splitter, useContextMenu, usePaneSize, type MenuEntry } from "../ui";
import { Add16, Audio16, Delete16, FolderAdd16, FolderOpen16, GoToEnd16, GoToStart16, GridView16, ListView16, Pause16, Play16, References16, Speaker14, Sparkle16, Stop14 } from "../ui/icons";
import { generatorOptions } from "../generatorOptions";
import { SliderNumberInput, GENERATION_STEPS_RANGE } from "./SliderNumberInput";
@@ -310,12 +310,15 @@ export function MusicView({ config, folderPath, onChange, onGenerate, onCancel,
</PropSection>
</div>
<div className="inspector-actions">
- {selected.error && <p role="alert">{selected.error}</p>}
- {activeWork ? <><progress value={activeWork.progress} max={1} aria-label="Music generation progress" /><button type="button" className="primary-button" disabled={activeWork.cancelling || activeWork.status === "encoding"} onClick={() => onCancel(activeWork.id)}><Stop14 aria-hidden="true" />{activeWork.cancelling ? "Cancelling…" : "Cancel"}</button></> :
+ {activeWork ? <button type="button" className="primary-button" disabled={activeWork.cancelling || activeWork.status === "encoding"} onClick={() => onCancel(activeWork.id)}><Stop14 aria-hidden="true" />{activeWork.cancelling ? "Cancelling…" : "Cancel"}</button> :
<button type="button" className="primary-button" data-tooltip={generatorStatus.state !== "ready" ? generatorStatus.detail : undefined} disabled={!ready || !isTauri() || !selected.style.trim()} onClick={generate}><Sparkle16 aria-hidden="true" />Generate</button>}
</div>
</> : <p className="music-inspector__empty">Add a song to edit its lyrics, style and generation settings.</p>}
</aside>
+ {(activeWork || selected?.error) && <div className="music-generation-status" role={selected?.error ? "alert" : "status"}>
+ {activeWork && <><ProgressBar value={activeWork.progress * 100} aria-label="Music generation progress" /><span>{activeWork.detail}</span></>}
+ {selected?.error && <span>{selected.error}</span>}
+ </div>}
<div className="music-player" aria-label="Music player">
<div className="music-player__now"><Audio16 /><div><strong>{playerAsset?.name ?? "No song playing"}</strong><span>{playing ? "Playing" : playerAsset ? "Paused" : "Choose a generated song"}</span></div></div>
<div className="music-player__transport">
diff --git a/src/styles/music.css b/src/styles/music.css
index 3e85b67..01bdd88 100644
--- a/src/styles/music.css
+++ b/src/styles/music.css
@@ -3,7 +3,7 @@
.music-toolbar > .generator-runtime { flex: 0 1 auto; }
.music-toolbar__views { display: flex; gap: var(--space-1); margin-left: auto; }
.music-toolbar__views [aria-pressed="true"] { background: var(--fill-subtle-hover); color: var(--accent); }
-.music-body { display: grid; grid-template-columns: minmax(180px, 1fr) auto minmax(280px, var(--pane-music-inspector)); grid-template-rows: minmax(0, 1fr) auto; min-height: 0; }
+.music-body { display: grid; grid-template-columns: minmax(180px, 1fr) auto minmax(280px, var(--pane-music-inspector)); grid-template-rows: minmax(0, 1fr) auto auto; min-height: 0; }
.music-body > .ui-splitter { grid-column: 2; grid-row: 1 / -1; }
.music-library { grid-column: 1; grid-row: 1; min-width: 0; overflow: auto; padding: var(--space-4); }
.music-library__heading { display: flex; align-items: center; justify-content: space-between; gap: var(--space-2); margin-bottom: var(--space-4); }
@@ -48,10 +48,10 @@
.music-inspector__fields { overflow-y: auto; min-height: 0; flex: 1; }
.music-prompt { display: flex; flex-direction: column; gap: var(--space-1); color: var(--text-secondary); margin-top: var(--space-2); }
.music-prompt textarea { width: 100%; height: auto; padding: var(--space-2); line-height: var(--leading-normal); resize: vertical; }
-.music-inspector > .inspector-actions p, .music-inspector__empty { color: var(--text-secondary); font-size: var(--text-xs); }
+.music-inspector__empty { color: var(--text-secondary); font-size: var(--text-xs); }
.music-inspector__empty { padding: var(--space-3); }
-.music-inspector > .inspector-actions progress { width: 100%; }
-.music-player { grid-column: 1; grid-row: 2; display: grid; grid-template-columns: minmax(0, 1fr) minmax(140px, 2fr) minmax(0, 1fr); min-width: 0; align-items: center; gap: var(--space-2); padding: var(--space-1) var(--space-2); border-top: 1px solid var(--line); background: var(--surface-pane); }
+.music-generation-status { grid-column: 1; grid-row: 2; display: flex; flex-direction: column; justify-content: center; gap: var(--space-1); min-width: 0; min-height: var(--control-sm); padding: 0 var(--space-3); color: var(--text-secondary); font-size: var(--text-xs); border-top: 1px solid var(--line); overflow-wrap: anywhere; }
+.music-player { grid-column: 1; grid-row: 3; display: grid; grid-template-columns: minmax(0, 1fr) minmax(140px, 2fr) minmax(0, 1fr); min-width: 0; align-items: center; gap: var(--space-2); padding: var(--space-1) var(--space-2); border-top: 1px solid var(--line); background: var(--surface-pane); }
.music-player__now { display: flex; align-items: center; gap: var(--space-3); min-width: 0; overflow: hidden; }
.music-player__now > div { display: grid; gap: var(--space-1); min-width: 0; }
.music-player__now strong, .music-player__now span { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }