24070-TheGreatTipsy
/
Source-Web-24070-TheGreatTipsy
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update

Browse Source
main
reng 4 months ago
parent a4661e1dbd
commit 5353f5406e
18 changed files with 115 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      vite/index.html
  2. BIN
      vite/public/assets/ai/sfx-06-ai-04-record-03-ai-05-sfx-07.mp3
  3. BIN
      vite/public/assets/ai/sfx-08-record-04-ai-06.mp3
  4. BIN
      vite/public/assets/bg-01 (小束袋）.mp3
  5. BIN
      vite/public/assets/bg-01 (香料瓶）.mp3
  6. BIN
      vite/public/assets/bg-02.mp3
  7. BIN
      vite/public/assets/bg-03.mp3
  8. BIN
      vite/public/assets/bg-04.mp3
  9. BIN
      vite/public/assets/record/record-01（小束袋）.mp3
  10. BIN
      vite/public/assets/record/record-01（香料瓶）.mp3
  11. BIN
      vite/public/assets/record/record-05（小束袋）.mp3
  12. BIN
      vite/public/assets/sfx/sfx-12.mp3
  13. 2
      vite/public/cuelist_demo2.json
  14. 57
      vite/src-tauri/src/lib.rs
  15. 3
      vite/src/App.css
  16. 4
      vite/src/comps/numpad.jsx
  17. 37
      vite/src/pages/flow_free.jsx
  18. 13
      vite/src/util/osc.js

4
vite/index.html
Unescape View File

@ -4,6 +4,10 @@
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<link rel="icon" href="/favicon.ico" /> <link rel="icon" href="/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link
href="https://fonts.googleapis.com/css2?family=Noto+Serif+TC:wght@200..900&family=Sora:wght@100..800&display=swap"
rel="stylesheet">
<title>24070-Conversation</title> <title>24070-Conversation</title>
</head> </head>
<body> <body>

BIN
vite/public/assets/ai/sfx-06-ai-04-record-03-ai-05-sfx-07.mp3
View File

Binary file not shown.

BIN
vite/public/assets/ai/sfx-08-record-04-ai-06.mp3
View File

Binary file not shown.

BIN
vite/public/assets/bg-01 (小束袋）.mp3
View File

Binary file not shown.

BIN
vite/public/assets/bg-01 (香料瓶）.mp3
View File

Binary file not shown.

BIN
vite/public/assets/bg-02.mp3
View File

Binary file not shown.

BIN
vite/public/assets/bg-03.mp3
View File

Binary file not shown.

BIN
vite/public/assets/bg-04.mp3
View File

Binary file not shown.

BIN
vite/public/assets/record/record-01（小束袋）.mp3
View File

Binary file not shown.

BIN
vite/public/assets/record/record-01（香料瓶）.mp3
View File

Binary file not shown.

BIN
vite/public/assets/record/record-05（小束袋）.mp3
View File

Binary file not shown.

BIN
vite/public/assets/sfx/sfx-12.mp3
View File

Binary file not shown.

2
vite/public/cuelist_demo2.json
Unescape View File

@ -5,7 +5,7 @@
"name": "Q1", "name": "Q1",
"type": "space", "type": "space",
"description": "Annonce", "description": "Annonce",
"audioFile": "assets/bg-01 (小束袋）.mp3", "audioFile": "assets/bg-02.mp3",
"loop": true, "loop": true,
"status":"reset" "status":"reset"
}, },

57
vite/src-tauri/src/lib.rs
Unescape View File

@ -2,13 +2,20 @@ use dotenv::dotenv;
use rosc::{encoder, OscMessage, OscPacket, OscType}; use rosc::{encoder, OscMessage, OscPacket, OscType};
use std::env; use std::env;
use std::{net::SocketAddrV4, str::FromStr}; use std::{net::SocketAddrV4, str::FromStr};
use tauri::{AppHandle, Manager}; use tauri::{AppHandle, Manager, Emitter};
use tokio::net::UdpSocket; use tokio::net::UdpSocket;
use webview2_com::Microsoft::Web::WebView2::Win32::{ use webview2_com::Microsoft::Web::WebView2::Win32::{
ICoreWebView2Profile4, ICoreWebView2_13, COREWEBVIEW2_PERMISSION_KIND_MICROPHONE, ICoreWebView2Profile4, ICoreWebView2_13, COREWEBVIEW2_PERMISSION_KIND_MICROPHONE,
COREWEBVIEW2_PERMISSION_STATE_DEFAULT, COREWEBVIEW2_PERMISSION_STATE_DEFAULT,
}; };
use windows::core::{Interface, PCWSTR}; use windows::core::{Interface, PCWSTR};
use serde::Serialize;
#[derive(Serialize, Clone)]
struct OscEvent {
addr: String,
args: Vec<String>,
}
#[tauri::command] #[tauri::command]
fn get_env(name: &str) -> String { fn get_env(name: &str) -> String {
@ -97,10 +104,58 @@ pub fn run() {
.build(), .build(),
)?; )?;
} }
tauri::async_runtime::spawn(setup_osc_server(app.handle().clone()));
Ok(()) Ok(())
}) })
.run(tauri::generate_context!()) .run(tauri::generate_context!())
.expect("error while running tauri application"); .expect("error while running tauri application");
}
async fn setup_osc_server(app_handle: AppHandle) {
println!("Setting up OSC server...");
// setup osc sever
let addr = "0.0.0.0:8000";
let sock = UdpSocket::bind(addr).await.unwrap();
println!("Listening to {}", addr);
let mut buf = [0u8; rosc::decoder::MTU];
loop {
match sock.recv_from(&mut buf).await {
Ok((size, addr)) => {
println!("Received packet with size {} from: {}", size, addr);
if let Ok((_, packet)) = rosc::decoder::decode_udp(&buf[..size]) {
if let OscPacket::Message(msg) = packet {
println!("OSC message: {:?}", msg);
app_handle.emit(
"osc_message",
OscEvent {
addr: msg.addr.clone(),
args: msg.args.iter().map(|arg| match arg {
OscType::Int(i) => i.to_string(),
OscType::Float(f) => f.to_string(),
OscType::String(s) => s.clone(),
OscType::Bool(b) => b.to_string(),
_ => format!("{:?}", arg),
}).collect(),
},
).unwrap();
}
} else {
println!("Failed to decode OSC packet");
}
}
Err(e) => {
println!("Error receiving from socket: {}", e);
break;
}
}
}
} }
static mut LIGHT: Option<enttecopendmx::EnttecOpenDMX> = None; static mut LIGHT: Option<enttecopendmx::EnttecOpenDMX> = None;

3
vite/src/App.css
Unescape View File

@ -1,5 +1,8 @@
@import "tailwindcss"; @import "tailwindcss";
html{
font-family: "Sora", sans-serif;
}
#root{ #root{
@apply flex flex-col h-screen; @apply flex flex-col h-screen;
} }

4
vite/src/comps/numpad.jsx
Unescape View File

@ -62,7 +62,7 @@ export default function NumPad({onSend, disabled, type}){
} }
break; break;
case NUMPAD_TYPE.PASSWORD: case NUMPAD_TYPE.PASSWORD:
if(refInput.current.length==3){ if(refInput.current.length=3){
onSend(refInput.current); onSend(refInput.current);
refAudio.current[KEY_ENTER]?.play(); refAudio.current[KEY_ENTER]?.play();
}else{ }else{
@ -88,7 +88,7 @@ export default function NumPad({onSend, disabled, type}){
return; return;
}else if(e.key===KEY_BACKSPACE || e.key==='Backspace' || e.key==='Delete'){ }else if(e.key===KEY_BACKSPACE || e.key==='Backspace' || e.key==='Delete'){
setInput((prev)=>''); setInput(()=>'');
refAudio.current[KEY_BACKSPACE]?.play(); refAudio.current[KEY_BACKSPACE]?.play();
return; return;

37
vite/src/pages/flow_free.jsx
Unescape View File

@ -10,9 +10,10 @@ import NumPad, { NUMPAD_TYPE } from "../comps/numpad";
import { Light } from "../comps/light"; import { Light } from "../comps/light";
import { useData } from "../util/useData"; import { useData } from "../util/useData";
import VoiceAnalysis from "../comps/voiceanalysis"; import VoiceAnalysis from "../comps/voiceanalysis";
import { sendOsc, OSC_ADDRESS, updatePrompt } from "../util/osc"; import { sendOsc, OSC_ADDRESS, updatePrompt, onOscMessageReceived } from "../util/osc";
import { DebugControl, TEST_PROMPT } from "../comps/debug"; import { DebugControl, TEST_PROMPT } from "../comps/debug";
import { useUser } from "../util/useUser"; import { useUser } from "../util/useUser";
import { set } from "zod/v4";
const CUELIST_FILE = 'cuelist_demo2.json'; const CUELIST_FILE = 'cuelist_demo2.json';
@ -47,6 +48,8 @@ export function FreeFlow(){
const [cuelist, setCuelist] = useState([]); const [cuelist, setCuelist] = useState([]);
const [currentCue, setCurrentCue] = useState(null); const [currentCue, setCurrentCue] = useState(null);
const [nextCue, setNextCue] = useState(null);
const [chatWelcome, setChatWelcome] = useState(null); const [chatWelcome, setChatWelcome] = useState(null);
const [audioInput, setAudioInput] = useState(true); const [audioInput, setAudioInput] = useState(true);
const [autoSend, setAutoSend] = useState(true); const [autoSend, setAutoSend] = useState(true);
@ -89,6 +92,24 @@ export function FreeFlow(){
sendOsc(OSC_ADDRESS.CHOICE, 'reset'); sendOsc(OSC_ADDRESS.CHOICE, 'reset');
} }
function onOsc(payload){
console.log('onOsc', payload);
const address=payload.addr;
const message=payload.args[0];
switch(address){
case '/playcue':
// playCue(cuelist.find(c => c.id === message));
setNextCue(()=>message);
break;
case '/stopcue':
onStop();
break;
}
// Handle OSC messages here
}
function playAudio(url){ function playAudio(url){
if(!url) return; if(!url) return;
@ -542,6 +563,18 @@ export function FreeFlow(){
},[status]); },[status]);
useEffect(()=>{
if(!nextCue) return;
console.log('Next cue:', nextCue);
playCue(cuelist.find(c => c.name === nextCue)); // Play the next cue when it changes
// Reset next cue after playing
setNextCue(null);
},[nextCue]);
useEffect(()=>{ useEffect(()=>{
fetch(CUELIST_FILE) fetch(CUELIST_FILE)
@ -557,6 +590,8 @@ export function FreeFlow(){
refAudioPrompt.current = new Audio('assets/sfx/sfx-05.mp3'); // Load audio prompt if available refAudioPrompt.current = new Audio('assets/sfx/sfx-05.mp3'); // Load audio prompt if available
onOscMessageReceived(onOsc); // Set up OSC message listener
},[]); },[]);

13
vite/src/util/osc.js
Unescape View File

@ -1,4 +1,5 @@
import { invoke } from '@tauri-apps/api/core'; import { invoke } from '@tauri-apps/api/core';
import { listen } from '@tauri-apps/api/event';
import { fetch } from '@tauri-apps/plugin-http'; import { fetch } from '@tauri-apps/plugin-http';
export const OSC_ADDRESS={ export const OSC_ADDRESS={
@ -59,3 +60,15 @@ export async function updatePrompt(prompt) {
console.error('Error updating prompt:', error); console.error('Error updating prompt:', error);
} }
} }
export function onOscMessageReceived(callback) {
try{
listen('osc_message', (event) => {
console.log(`Received OSC message: ${event.payload}`);
callback(event.payload);
});
}catch(error){
console.error('Error setting up OSC message listener:', error);
}
}
Write Preview
Loading…
Cancel
Save