Skip to content

The open-source AI voice studio. Clone, dictate, create.

Merge branch 'main' into channels

Jamie Pined9c7121c5bc0
diff --cc app/src/App.tsx
index 202c8ac4,f28a4a3b..8168494a
--- a/app/src/App.tsx
+++ b/app/src/App.tsx
@@@ -1,8 -1,13 +1,9 @@@
import { useEffect, useState } from 'react';
import voiceboxLogo from '@/assets/voicebox-logo.png';
import { AudioPlayer } from '@/components/AudioPlayer/AudioPlayer';
- import { GenerationForm } from '@/components/Generation/GenerationForm';
+ // import { GenerationForm } from '@/components/Generation/GenerationForm';
+ import { FloatingGenerateBox } from '@/components/Generation/FloatingGenerateBox';
import { HistoryTable } from '@/components/History/HistoryTable';
-import { ConnectionForm } from '@/components/ServerSettings/ConnectionForm';
-import { ModelManagement } from '@/components/ServerSettings/ModelManagement';
-import { ServerStatus } from '@/components/ServerSettings/ServerStatus';
-import { UpdateStatus } from '@/components/ServerSettings/UpdateStatus';
import ShinyText from '@/components/ShinyText';
import { Sidebar } from '@/components/Sidebar';
import { TitleBarDragRegion } from '@/components/TitleBarDragRegion';
@@@ -173,9 -177,29 +176,9 @@@ function App()
<main className="flex-1 ml-20 overflow-hidden flex flex-col">
<div className="container mx-auto px-8 max-w-[1800px] h-full overflow-hidden flex flex-col">
- {activeTab === 'settings' ? (
- <div className="space-y-4 overflow-y-auto flex flex-col">
- <div className="grid gap-4 md:grid-cols-2">
- <ConnectionForm />
- <ServerStatus />
- </div>
- {isTauri() && <UpdateStatus />}
- <ModelManagement />
- <div className="py-8 text-center text-sm text-muted-foreground">
- Created by{' '}
- <a
- href="https://github.com/jamiepine"
- target="_blank"
- rel="noopener noreferrer"
- className="text-accent hover:underline"
- >
- Jamie Pine
- </a>
- </div>
- </div>
- ) : (
+ {activeTab === 'main' && (
// Main view: Profiles top left, Generator bottom left, History right
- <div className="grid grid-cols-1 lg:grid-cols-2 gap-6 h-full min-h-0 overflow-hidden">
+ <div className="grid grid-cols-1 lg:grid-cols-2 gap-6 h-full min-h-0 overflow-hidden relative">
{/* Left Column */}
<div className="flex flex-col gap-6 min-h-0 overflow-y-auto pb-32">
{/* Profiles - Top Left */}
@@@ -193,11 -217,11 +196,14 @@@
<div className="flex flex-col min-h-0 overflow-hidden">
<HistoryTable />
</div>
+
+ {/* Floating Generate Box */}
+ <FloatingGenerateBox isPlayerOpen={!!audioUrl} />
</div>
)}
+ {activeTab === 'voices' && <VoicesTab />}
+ {activeTab === 'audio' && <AudioTab />}
+ {activeTab === 'server' && <ServerTab />}
</div>
</main>
</div>
diff --cc tauri/src-tauri/Cargo.toml
index 343473b4,1e421c45..ab893880
--- a/tauri/src-tauri/Cargo.toml
+++ b/tauri/src-tauri/Cargo.toml
@@@ -22,8 -22,7 +22,9 @@@ serde_json = "1.0
tokio = { version = "1", features = ["full"] }
hound = "3.5"
base64 = "0.22"
+cpal = "0.15"
+symphonia = { version = "0.5", features = ["wav", "pcm"] }
+ scopeguard = "1.2.0"
[target.'cfg(target_os = "macos")'.dependencies]
screencapturekit = { version = "1", features = ["async"] }
diff --cc tauri/src-tauri/src/main.rs
index 272aea06,1610d206..afaa99d1
--- a/tauri/src-tauri/src/main.rs
+++ b/tauri/src-tauri/src/main.rs
@@@ -397,10 -380,12 +397,13 @@@ pub fn run()
keep_running_on_close: Mutex::new(false),
})
.manage(audio_capture::AudioCaptureState::new())
+ .manage(audio_output::AudioOutputState::new())
.setup(|app| {
#[cfg(desktop)]
- app.handle().plugin(tauri_plugin_updater::Builder::new().build())?;
+ {
+ app.handle().plugin(tauri_plugin_updater::Builder::new().build())?;
+ app.handle().plugin(tauri_plugin_process::init())?;
+ }
// Hide title bar icon on Windows
#[cfg(windows)]