> {
try {
return { status: "ok", data: await TAURI_INVOKE("plugin:listener|start_session", { params }) };
@@ -156,8 +92,7 @@ export type Alternatives = { transcript: string; words: Word[]; confidence: numb
export type Channel = { alternatives: Alternatives[] }
export type Metadata = { request_id: string; model_info: ModelInfo; model_uuid: string }
export type ModelInfo = { name: string; version: string; arch: string }
-export type PermissionStatus = "NeverRequested" | "Denied" | "Authorized"
-export type SessionEvent = { type: "inactive" } | { type: "running_active" } | { type: "audioAmplitude"; mic: number; speaker: number } | { type: "micMuted"; value: boolean } | { type: "speakerMuted"; value: boolean } | { type: "streamResponse"; response: StreamResponse }
+export type SessionEvent = { type: "inactive" } | { type: "running_active" } | { type: "audioAmplitude"; mic: number; speaker: number } | { type: "micMuted"; value: boolean } | { type: "streamResponse"; response: StreamResponse }
export type SessionParams = { session_id: string; languages: string[]; onboarding: boolean; record_enabled: boolean; model: string; base_url: string; api_key: string; keywords: string[] }
export type StreamResponse = { type: "Results"; start: number; duration: number; is_final: boolean; speech_final: boolean; from_finalize: boolean; channel: Channel; metadata: Metadata; channel_index: number[] } | { type: "Metadata"; request_id: string; created: string; duration: number; channels: number } | { type: "SpeechStarted"; channel: number[]; timestamp: number } | { type: "UtteranceEnd"; channel: number[]; last_word_end: number }
export type Word = { word: string; start: number; end: number; confidence: number; speaker: number | null; punctuated_word: string | null; language: string | null }
diff --git a/plugins/listener/permissions/autogenerated/commands/check_microphone_access.toml b/plugins/listener/permissions/autogenerated/commands/check_microphone_access.toml
deleted file mode 100644
index 1f42890238..0000000000
--- a/plugins/listener/permissions/autogenerated/commands/check_microphone_access.toml
+++ /dev/null
@@ -1,13 +0,0 @@
-# Automatically generated - DO NOT EDIT!
-
-"$schema" = "../../schemas/schema.json"
-
-[[permission]]
-identifier = "allow-check-microphone-access"
-description = "Enables the check_microphone_access command without any pre-configured scope."
-commands.allow = ["check_microphone_access"]
-
-[[permission]]
-identifier = "deny-check-microphone-access"
-description = "Denies the check_microphone_access command without any pre-configured scope."
-commands.deny = ["check_microphone_access"]
diff --git a/plugins/listener/permissions/autogenerated/commands/check_system_audio_access.toml b/plugins/listener/permissions/autogenerated/commands/check_system_audio_access.toml
deleted file mode 100644
index c8c46a3c2f..0000000000
--- a/plugins/listener/permissions/autogenerated/commands/check_system_audio_access.toml
+++ /dev/null
@@ -1,13 +0,0 @@
-# Automatically generated - DO NOT EDIT!
-
-"$schema" = "../../schemas/schema.json"
-
-[[permission]]
-identifier = "allow-check-system-audio-access"
-description = "Enables the check_system_audio_access command without any pre-configured scope."
-commands.allow = ["check_system_audio_access"]
-
-[[permission]]
-identifier = "deny-check-system-audio-access"
-description = "Denies the check_system_audio_access command without any pre-configured scope."
-commands.deny = ["check_system_audio_access"]
diff --git a/plugins/listener/permissions/autogenerated/commands/get_speaker_muted.toml b/plugins/listener/permissions/autogenerated/commands/get_speaker_muted.toml
deleted file mode 100644
index 8985aa4e45..0000000000
--- a/plugins/listener/permissions/autogenerated/commands/get_speaker_muted.toml
+++ /dev/null
@@ -1,13 +0,0 @@
-# Automatically generated - DO NOT EDIT!
-
-"$schema" = "../../schemas/schema.json"
-
-[[permission]]
-identifier = "allow-get-speaker-muted"
-description = "Enables the get_speaker_muted command without any pre-configured scope."
-commands.allow = ["get_speaker_muted"]
-
-[[permission]]
-identifier = "deny-get-speaker-muted"
-description = "Denies the get_speaker_muted command without any pre-configured scope."
-commands.deny = ["get_speaker_muted"]
diff --git a/plugins/listener/permissions/autogenerated/commands/open_microphone_access_settings.toml b/plugins/listener/permissions/autogenerated/commands/open_microphone_access_settings.toml
deleted file mode 100644
index 2e392a1268..0000000000
--- a/plugins/listener/permissions/autogenerated/commands/open_microphone_access_settings.toml
+++ /dev/null
@@ -1,13 +0,0 @@
-# Automatically generated - DO NOT EDIT!
-
-"$schema" = "../../schemas/schema.json"
-
-[[permission]]
-identifier = "allow-open-microphone-access-settings"
-description = "Enables the open_microphone_access_settings command without any pre-configured scope."
-commands.allow = ["open_microphone_access_settings"]
-
-[[permission]]
-identifier = "deny-open-microphone-access-settings"
-description = "Denies the open_microphone_access_settings command without any pre-configured scope."
-commands.deny = ["open_microphone_access_settings"]
diff --git a/plugins/listener/permissions/autogenerated/commands/open_system_audio_access_settings.toml b/plugins/listener/permissions/autogenerated/commands/open_system_audio_access_settings.toml
deleted file mode 100644
index bdf41b119f..0000000000
--- a/plugins/listener/permissions/autogenerated/commands/open_system_audio_access_settings.toml
+++ /dev/null
@@ -1,13 +0,0 @@
-# Automatically generated - DO NOT EDIT!
-
-"$schema" = "../../schemas/schema.json"
-
-[[permission]]
-identifier = "allow-open-system-audio-access-settings"
-description = "Enables the open_system_audio_access_settings command without any pre-configured scope."
-commands.allow = ["open_system_audio_access_settings"]
-
-[[permission]]
-identifier = "deny-open-system-audio-access-settings"
-description = "Denies the open_system_audio_access_settings command without any pre-configured scope."
-commands.deny = ["open_system_audio_access_settings"]
diff --git a/plugins/listener/permissions/autogenerated/commands/request_microphone_access.toml b/plugins/listener/permissions/autogenerated/commands/request_microphone_access.toml
deleted file mode 100644
index 09f966eb1a..0000000000
--- a/plugins/listener/permissions/autogenerated/commands/request_microphone_access.toml
+++ /dev/null
@@ -1,13 +0,0 @@
-# Automatically generated - DO NOT EDIT!
-
-"$schema" = "../../schemas/schema.json"
-
-[[permission]]
-identifier = "allow-request-microphone-access"
-description = "Enables the request_microphone_access command without any pre-configured scope."
-commands.allow = ["request_microphone_access"]
-
-[[permission]]
-identifier = "deny-request-microphone-access"
-description = "Denies the request_microphone_access command without any pre-configured scope."
-commands.deny = ["request_microphone_access"]
diff --git a/plugins/listener/permissions/autogenerated/commands/request_system_audio_access.toml b/plugins/listener/permissions/autogenerated/commands/request_system_audio_access.toml
deleted file mode 100644
index becb5c7c4c..0000000000
--- a/plugins/listener/permissions/autogenerated/commands/request_system_audio_access.toml
+++ /dev/null
@@ -1,13 +0,0 @@
-# Automatically generated - DO NOT EDIT!
-
-"$schema" = "../../schemas/schema.json"
-
-[[permission]]
-identifier = "allow-request-system-audio-access"
-description = "Enables the request_system_audio_access command without any pre-configured scope."
-commands.allow = ["request_system_audio_access"]
-
-[[permission]]
-identifier = "deny-request-system-audio-access"
-description = "Denies the request_system_audio_access command without any pre-configured scope."
-commands.deny = ["request_system_audio_access"]
diff --git a/plugins/listener/permissions/autogenerated/commands/set_speaker_muted.toml b/plugins/listener/permissions/autogenerated/commands/set_speaker_muted.toml
deleted file mode 100644
index c05c7035f5..0000000000
--- a/plugins/listener/permissions/autogenerated/commands/set_speaker_muted.toml
+++ /dev/null
@@ -1,13 +0,0 @@
-# Automatically generated - DO NOT EDIT!
-
-"$schema" = "../../schemas/schema.json"
-
-[[permission]]
-identifier = "allow-set-speaker-muted"
-description = "Enables the set_speaker_muted command without any pre-configured scope."
-commands.allow = ["set_speaker_muted"]
-
-[[permission]]
-identifier = "deny-set-speaker-muted"
-description = "Denies the set_speaker_muted command without any pre-configured scope."
-commands.deny = ["set_speaker_muted"]
diff --git a/plugins/listener/permissions/autogenerated/reference.md b/plugins/listener/permissions/autogenerated/reference.md
index 38d9579e61..03b0dd4765 100644
--- a/plugins/listener/permissions/autogenerated/reference.md
+++ b/plugins/listener/permissions/autogenerated/reference.md
@@ -7,18 +7,10 @@ Default permissions for the plugin
- `allow-list-microphone-devices`
- `allow-get-current-microphone-device`
- `allow-set-microphone-device`
-- `allow-check-microphone-access`
-- `allow-check-system-audio-access`
-- `allow-request-microphone-access`
-- `allow-request-system-audio-access`
-- `allow-open-microphone-access-settings`
-- `allow-open-system-audio-access-settings`
- `allow-start-session`
- `allow-stop-session`
- `allow-get-mic-muted`
- `allow-set-mic-muted`
-- `allow-get-speaker-muted`
-- `allow-set-speaker-muted`
- `allow-get-state`
## Permission Table
@@ -30,58 +22,6 @@ Default permissions for the plugin
-
-|
-
-`listener:allow-check-microphone-access`
-
- |
-
-
-Enables the check_microphone_access command without any pre-configured scope.
-
- |
-
-
-
-|
-
-`listener:deny-check-microphone-access`
-
- |
-
-
-Denies the check_microphone_access command without any pre-configured scope.
-
- |
-
-
-
-|
-
-`listener:allow-check-system-audio-access`
-
- |
-
-
-Enables the check_system_audio_access command without any pre-configured scope.
-
- |
-
-
-
-|
-
-`listener:deny-check-system-audio-access`
-
- |
-
-
-Denies the check_system_audio_access command without any pre-configured scope.
-
- |
-
-
|
@@ -137,32 +77,6 @@ Denies the get_mic_muted command without any pre-configured scope.
|
|
-`listener:allow-get-speaker-muted`
-
- |
-
-
-Enables the get_speaker_muted command without any pre-configured scope.
-
- |
-
-
-
-|
-
-`listener:deny-get-speaker-muted`
-
- |
-
-
-Denies the get_speaker_muted command without any pre-configured scope.
-
- |
-
-
-
-|
-
`listener:allow-get-state`
|
@@ -241,110 +155,6 @@ Denies the list_microphone_devices command without any pre-configured scope.
|
-`listener:allow-open-microphone-access-settings`
-
- |
-
-
-Enables the open_microphone_access_settings command without any pre-configured scope.
-
- |
-
-
-
-|
-
-`listener:deny-open-microphone-access-settings`
-
- |
-
-
-Denies the open_microphone_access_settings command without any pre-configured scope.
-
- |
-
-
-
-|
-
-`listener:allow-open-system-audio-access-settings`
-
- |
-
-
-Enables the open_system_audio_access_settings command without any pre-configured scope.
-
- |
-
-
-
-|
-
-`listener:deny-open-system-audio-access-settings`
-
- |
-
-
-Denies the open_system_audio_access_settings command without any pre-configured scope.
-
- |
-
-
-
-|
-
-`listener:allow-request-microphone-access`
-
- |
-
-
-Enables the request_microphone_access command without any pre-configured scope.
-
- |
-
-
-
-|
-
-`listener:deny-request-microphone-access`
-
- |
-
-
-Denies the request_microphone_access command without any pre-configured scope.
-
- |
-
-
-
-|
-
-`listener:allow-request-system-audio-access`
-
- |
-
-
-Enables the request_system_audio_access command without any pre-configured scope.
-
- |
-
-
-
-|
-
-`listener:deny-request-system-audio-access`
-
- |
-
-
-Denies the request_system_audio_access command without any pre-configured scope.
-
- |
-
-
-
-|
-
`listener:allow-set-mic-muted`
|
@@ -397,32 +207,6 @@ Denies the set_microphone_device command without any pre-configured scope.
|
-`listener:allow-set-speaker-muted`
-
- |
-
-
-Enables the set_speaker_muted command without any pre-configured scope.
-
- |
-
-
-
-|
-
-`listener:deny-set-speaker-muted`
-
- |
-
-
-Denies the set_speaker_muted command without any pre-configured scope.
-
- |
-
-
-
-|
-
`listener:allow-start-session`
|
diff --git a/plugins/listener/permissions/default.toml b/plugins/listener/permissions/default.toml
index e46470fa04..623c122ca1 100644
--- a/plugins/listener/permissions/default.toml
+++ b/plugins/listener/permissions/default.toml
@@ -4,17 +4,9 @@ permissions = [
"allow-list-microphone-devices",
"allow-get-current-microphone-device",
"allow-set-microphone-device",
- "allow-check-microphone-access",
- "allow-check-system-audio-access",
- "allow-request-microphone-access",
- "allow-request-system-audio-access",
- "allow-open-microphone-access-settings",
- "allow-open-system-audio-access-settings",
"allow-start-session",
"allow-stop-session",
"allow-get-mic-muted",
"allow-set-mic-muted",
- "allow-get-speaker-muted",
- "allow-set-speaker-muted",
"allow-get-state",
]
diff --git a/plugins/listener/permissions/schemas/schema.json b/plugins/listener/permissions/schemas/schema.json
index 41fe9c5043..a27c30a074 100644
--- a/plugins/listener/permissions/schemas/schema.json
+++ b/plugins/listener/permissions/schemas/schema.json
@@ -294,30 +294,6 @@
"PermissionKind": {
"type": "string",
"oneOf": [
- {
- "description": "Enables the check_microphone_access command without any pre-configured scope.",
- "type": "string",
- "const": "allow-check-microphone-access",
- "markdownDescription": "Enables the check_microphone_access command without any pre-configured scope."
- },
- {
- "description": "Denies the check_microphone_access command without any pre-configured scope.",
- "type": "string",
- "const": "deny-check-microphone-access",
- "markdownDescription": "Denies the check_microphone_access command without any pre-configured scope."
- },
- {
- "description": "Enables the check_system_audio_access command without any pre-configured scope.",
- "type": "string",
- "const": "allow-check-system-audio-access",
- "markdownDescription": "Enables the check_system_audio_access command without any pre-configured scope."
- },
- {
- "description": "Denies the check_system_audio_access command without any pre-configured scope.",
- "type": "string",
- "const": "deny-check-system-audio-access",
- "markdownDescription": "Denies the check_system_audio_access command without any pre-configured scope."
- },
{
"description": "Enables the get_current_microphone_device command without any pre-configured scope.",
"type": "string",
@@ -342,18 +318,6 @@
"const": "deny-get-mic-muted",
"markdownDescription": "Denies the get_mic_muted command without any pre-configured scope."
},
- {
- "description": "Enables the get_speaker_muted command without any pre-configured scope.",
- "type": "string",
- "const": "allow-get-speaker-muted",
- "markdownDescription": "Enables the get_speaker_muted command without any pre-configured scope."
- },
- {
- "description": "Denies the get_speaker_muted command without any pre-configured scope.",
- "type": "string",
- "const": "deny-get-speaker-muted",
- "markdownDescription": "Denies the get_speaker_muted command without any pre-configured scope."
- },
{
"description": "Enables the get_state command without any pre-configured scope.",
"type": "string",
@@ -390,54 +354,6 @@
"const": "deny-list-microphone-devices",
"markdownDescription": "Denies the list_microphone_devices command without any pre-configured scope."
},
- {
- "description": "Enables the open_microphone_access_settings command without any pre-configured scope.",
- "type": "string",
- "const": "allow-open-microphone-access-settings",
- "markdownDescription": "Enables the open_microphone_access_settings command without any pre-configured scope."
- },
- {
- "description": "Denies the open_microphone_access_settings command without any pre-configured scope.",
- "type": "string",
- "const": "deny-open-microphone-access-settings",
- "markdownDescription": "Denies the open_microphone_access_settings command without any pre-configured scope."
- },
- {
- "description": "Enables the open_system_audio_access_settings command without any pre-configured scope.",
- "type": "string",
- "const": "allow-open-system-audio-access-settings",
- "markdownDescription": "Enables the open_system_audio_access_settings command without any pre-configured scope."
- },
- {
- "description": "Denies the open_system_audio_access_settings command without any pre-configured scope.",
- "type": "string",
- "const": "deny-open-system-audio-access-settings",
- "markdownDescription": "Denies the open_system_audio_access_settings command without any pre-configured scope."
- },
- {
- "description": "Enables the request_microphone_access command without any pre-configured scope.",
- "type": "string",
- "const": "allow-request-microphone-access",
- "markdownDescription": "Enables the request_microphone_access command without any pre-configured scope."
- },
- {
- "description": "Denies the request_microphone_access command without any pre-configured scope.",
- "type": "string",
- "const": "deny-request-microphone-access",
- "markdownDescription": "Denies the request_microphone_access command without any pre-configured scope."
- },
- {
- "description": "Enables the request_system_audio_access command without any pre-configured scope.",
- "type": "string",
- "const": "allow-request-system-audio-access",
- "markdownDescription": "Enables the request_system_audio_access command without any pre-configured scope."
- },
- {
- "description": "Denies the request_system_audio_access command without any pre-configured scope.",
- "type": "string",
- "const": "deny-request-system-audio-access",
- "markdownDescription": "Denies the request_system_audio_access command without any pre-configured scope."
- },
{
"description": "Enables the set_mic_muted command without any pre-configured scope.",
"type": "string",
@@ -462,18 +378,6 @@
"const": "deny-set-microphone-device",
"markdownDescription": "Denies the set_microphone_device command without any pre-configured scope."
},
- {
- "description": "Enables the set_speaker_muted command without any pre-configured scope.",
- "type": "string",
- "const": "allow-set-speaker-muted",
- "markdownDescription": "Enables the set_speaker_muted command without any pre-configured scope."
- },
- {
- "description": "Denies the set_speaker_muted command without any pre-configured scope.",
- "type": "string",
- "const": "deny-set-speaker-muted",
- "markdownDescription": "Denies the set_speaker_muted command without any pre-configured scope."
- },
{
"description": "Enables the start_session command without any pre-configured scope.",
"type": "string",
@@ -499,10 +403,10 @@
"markdownDescription": "Denies the stop_session command without any pre-configured scope."
},
{
- "description": "Default permissions for the plugin\n#### This default permission set includes:\n\n- `allow-list-microphone-devices`\n- `allow-get-current-microphone-device`\n- `allow-set-microphone-device`\n- `allow-check-microphone-access`\n- `allow-check-system-audio-access`\n- `allow-request-microphone-access`\n- `allow-request-system-audio-access`\n- `allow-open-microphone-access-settings`\n- `allow-open-system-audio-access-settings`\n- `allow-start-session`\n- `allow-stop-session`\n- `allow-get-mic-muted`\n- `allow-set-mic-muted`\n- `allow-get-speaker-muted`\n- `allow-set-speaker-muted`\n- `allow-get-state`",
+ "description": "Default permissions for the plugin\n#### This default permission set includes:\n\n- `allow-list-microphone-devices`\n- `allow-get-current-microphone-device`\n- `allow-set-microphone-device`\n- `allow-start-session`\n- `allow-stop-session`\n- `allow-get-mic-muted`\n- `allow-set-mic-muted`\n- `allow-get-state`",
"type": "string",
"const": "default",
- "markdownDescription": "Default permissions for the plugin\n#### This default permission set includes:\n\n- `allow-list-microphone-devices`\n- `allow-get-current-microphone-device`\n- `allow-set-microphone-device`\n- `allow-check-microphone-access`\n- `allow-check-system-audio-access`\n- `allow-request-microphone-access`\n- `allow-request-system-audio-access`\n- `allow-open-microphone-access-settings`\n- `allow-open-system-audio-access-settings`\n- `allow-start-session`\n- `allow-stop-session`\n- `allow-get-mic-muted`\n- `allow-set-mic-muted`\n- `allow-get-speaker-muted`\n- `allow-set-speaker-muted`\n- `allow-get-state`"
+ "markdownDescription": "Default permissions for the plugin\n#### This default permission set includes:\n\n- `allow-list-microphone-devices`\n- `allow-get-current-microphone-device`\n- `allow-set-microphone-device`\n- `allow-start-session`\n- `allow-stop-session`\n- `allow-get-mic-muted`\n- `allow-set-mic-muted`\n- `allow-get-state`"
}
]
}
diff --git a/plugins/listener/src/actors/session.rs b/plugins/listener/src/actors/session.rs
index fa32f768c3..f8859fd5e7 100644
--- a/plugins/listener/src/actors/session.rs
+++ b/plugins/listener/src/actors/session.rs
@@ -18,9 +18,7 @@ use crate::{
#[derive(Debug)]
pub enum SessionMsg {
SetMicMute(bool),
- SetSpeakerMute(bool),
GetMicMute(RpcReplyPort),
- GetSpeakerMute(RpcReplyPort),
GetMicDeviceName(RpcReplyPort>),
ChangeMicDevice(Option),
}
@@ -103,14 +101,6 @@ impl Actor for SessionActor {
SessionEvent::MicMuted { value: muted }.emit(&state.app)?;
}
- SessionMsg::SetSpeakerMute(muted) => {
- if let Some(cell) = registry::where_is(SourceActor::name()) {
- let actor: ActorRef = cell.into();
- actor.cast(SourceMsg::SetSpkMute(muted))?;
- }
- SessionEvent::SpeakerMuted { value: muted }.emit(&state.app)?;
- }
-
SessionMsg::GetMicDeviceName(reply) => {
if !reply.is_closed() {
let device_name = if let Some(cell) = registry::where_is(SourceActor::name()) {
@@ -137,19 +127,6 @@ impl Actor for SessionActor {
}
}
- SessionMsg::GetSpeakerMute(reply) => {
- let muted = if let Some(cell) = registry::where_is(SourceActor::name()) {
- let actor: ActorRef = cell.into();
- call_t!(actor, SourceMsg::GetSpkMute, 100)?
- } else {
- false
- };
-
- if !reply.is_closed() {
- let _ = reply.send(muted);
- }
- }
-
SessionMsg::ChangeMicDevice(device) => {
if let Some(cell) = registry::where_is(SourceActor::name()) {
let actor: ActorRef = cell.into();
diff --git a/plugins/listener/src/actors/source.rs b/plugins/listener/src/actors/source.rs
index d3067654ab..36bbdba997 100644
--- a/plugins/listener/src/actors/source.rs
+++ b/plugins/listener/src/actors/source.rs
@@ -18,8 +18,6 @@ const SAMPLE_RATE: u32 = 16000;
pub enum SourceMsg {
SetMicMute(bool),
GetMicMute(RpcReplyPort),
- SetSpkMute(bool),
- GetSpkMute(RpcReplyPort),
SetMicDevice(Option),
GetMicDevice(RpcReplyPort>),
}
@@ -35,7 +33,6 @@ pub struct SourceState {
token: CancellationToken,
onboarding: bool,
mic_muted: Arc,
- spk_muted: Arc,
run_task: Option>,
stream_cancel_token: Option,
_device_monitor_handle: Option,
@@ -115,7 +112,6 @@ impl Actor for SourceActor {
token: args.token,
onboarding: args.onboarding,
mic_muted: Arc::new(AtomicBool::new(false)),
- spk_muted: Arc::new(AtomicBool::new(false)),
run_task: None,
stream_cancel_token: None,
_device_monitor_handle: Some(device_monitor_handle),
@@ -142,14 +138,6 @@ impl Actor for SourceActor {
let _ = reply.send(st.mic_muted.load(Ordering::Relaxed));
}
}
- SourceMsg::SetSpkMute(muted) => {
- st.spk_muted.store(muted, Ordering::Relaxed);
- }
- SourceMsg::GetSpkMute(reply) => {
- if !reply.is_closed() {
- let _ = reply.send(st.spk_muted.load(Ordering::Relaxed));
- }
- }
SourceMsg::GetMicDevice(reply) => {
if !reply.is_closed() {
let _ = reply.send(st.mic_device.clone());
@@ -195,7 +183,6 @@ async fn start_source_loop(
let myself2 = myself.clone();
let token = st.token.clone();
let mic_muted = st.mic_muted.clone();
- let spk_muted = st.spk_muted.clone();
let mic_device = st.mic_device.clone();
let stream_cancel_token = CancellationToken::new();
@@ -213,43 +200,58 @@ async fn start_source_loop(
#[cfg(target_os = "macos")]
{
tokio::spawn(async move {
- let mixed_stream = {
- let mut mixed_input = AudioInput::from_mic(mic_device).unwrap();
- ResampledAsyncSource::new(mixed_input.stream(), SAMPLE_RATE)
+ let mic_stream = {
+ let mut mic_input = AudioInput::from_mic(mic_device).unwrap();
+ ResampledAsyncSource::new(mic_input.stream(), SAMPLE_RATE)
+ .chunks(AEC_BLOCK_SIZE)
+ };
+ tokio::time::sleep(tokio::time::Duration::from_millis(50)).await;
+ let spk_stream = {
+ let mut spk_input = hypr_audio::AudioInput::from_speaker();
+ ResampledAsyncSource::new(spk_input.stream(), SAMPLE_RATE)
.chunks(AEC_BLOCK_SIZE)
};
- tokio::pin!(mixed_stream);
+ tokio::pin!(mic_stream);
+ tokio::pin!(spk_stream);
loop {
+ let Some(cell) = registry::where_is(ProcessorActor::name()) else {
+ tracing::warn!("processor_actor_not_found");
+ continue;
+ };
+ let proc: ActorRef = cell.into();
+
tokio::select! {
_ = token.cancelled() => {
- drop(mixed_stream);
+ drop(mic_stream);
+ drop(spk_stream);
myself2.stop(None);
return;
}
_ = stream_cancel_token.cancelled() => {
- drop(mixed_stream);
+ drop(mic_stream);
+ drop(spk_stream);
return;
}
- mixed_next = mixed_stream.next() => {
- if let Some(data) = mixed_next {
- // TODO: should be able to mute each stream
- let output_data = if mic_muted.load(Ordering::Relaxed) && spk_muted.load(Ordering::Relaxed) {
- vec![0.0; data.len()]
+ mic_next = mic_stream.next() => {
+ if let Some(data) = mic_next {
+ if mic_muted.load(Ordering::Relaxed) {
+ let msg = ProcMsg::Mic(AudioChunk{ data: vec![0.0; data.len()] });
+ let _ = proc.cast(msg);
} else {
- data
- };
- let msg = ProcMsg::Mixed(AudioChunk{ data: output_data });
-
- let Some(cell) = registry::where_is(ProcessorActor::name()) else {
- tracing::warn!("processor_actor_not_found");
- continue;
- };
-
- let actor: ActorRef = cell.into();
- if let Err(e) = actor.cast(msg) {
- tracing::error!(error = %e, "cast_error");
+ let msg = ProcMsg::Mixed(AudioChunk{ data });
+ let _ = proc.cast(msg);
+ }
+ } else {
+ break;
+ }
+ }
+ spk_next = spk_stream.next() => {
+ if let Some(data) = spk_next {
+ if mic_muted.load(Ordering::Relaxed) {
+ let msg = ProcMsg::Speaker(AudioChunk{ data });
+ let _ = proc.cast(msg);
}
} else {
break;
@@ -312,13 +314,7 @@ async fn start_source_loop(
}
spk_next = spk_stream.next() => {
if let Some(data) = spk_next {
- let output_data = if spk_muted.load(Ordering::Relaxed) {
- vec![0.0; data.len()]
- } else {
- data
- };
-
- let msg = ProcMsg::Speaker(AudioChunk{ data: output_data });
+ let msg = ProcMsg::Speaker(AudioChunk{ data });
let _ = proc.cast(msg);
} else {
break;
diff --git a/plugins/listener/src/commands.rs b/plugins/listener/src/commands.rs
index a532cb2028..50dee1e00d 100644
--- a/plugins/listener/src/commands.rs
+++ b/plugins/listener/src/commands.rs
@@ -1,4 +1,4 @@
-use crate::{actors::SessionParams, ListenerPluginExt, PermissionStatus};
+use crate::{actors::SessionParams, ListenerPluginExt};
#[tauri::command]
#[specta::specta]
@@ -31,80 +31,12 @@ pub async fn set_microphone_device(
.map_err(|e| e.to_string())
}
-#[tauri::command]
-#[specta::specta]
-pub async fn check_microphone_access(
- app: tauri::AppHandle,
-) -> Result {
- app.check_microphone_access()
- .await
- .map_err(|e| e.to_string())
-}
-
-#[tauri::command]
-#[specta::specta]
-pub async fn check_system_audio_access(
- app: tauri::AppHandle,
-) -> Result {
- app.check_system_audio_access()
- .await
- .map_err(|e| e.to_string())
-}
-
-#[tauri::command]
-#[specta::specta]
-pub async fn request_microphone_access(
- app: tauri::AppHandle,
-) -> Result<(), String> {
- app.request_microphone_access()
- .await
- .map_err(|e| e.to_string())
-}
-
-#[tauri::command]
-#[specta::specta]
-pub async fn request_system_audio_access(
- app: tauri::AppHandle,
-) -> Result<(), String> {
- app.request_system_audio_access()
- .await
- .map_err(|e| e.to_string())
-}
-
-#[tauri::command]
-#[specta::specta]
-pub async fn open_microphone_access_settings(
- app: tauri::AppHandle,
-) -> Result<(), String> {
- app.open_microphone_access_settings()
- .await
- .map_err(|e| e.to_string())
-}
-
-#[tauri::command]
-#[specta::specta]
-pub async fn open_system_audio_access_settings(
- app: tauri::AppHandle,
-) -> Result<(), String> {
- app.open_system_audio_access_settings()
- .await
- .map_err(|e| e.to_string())
-}
-
#[tauri::command]
#[specta::specta]
pub async fn get_mic_muted(app: tauri::AppHandle) -> Result {
Ok(app.get_mic_muted().await)
}
-#[tauri::command]
-#[specta::specta]
-pub async fn get_speaker_muted(
- app: tauri::AppHandle,
-) -> Result {
- Ok(app.get_speaker_muted().await)
-}
-
#[tauri::command]
#[specta::specta]
pub async fn set_mic_muted(
@@ -115,16 +47,6 @@ pub async fn set_mic_muted(
Ok(())
}
-#[tauri::command]
-#[specta::specta]
-pub async fn set_speaker_muted(
- app: tauri::AppHandle,
- muted: bool,
-) -> Result<(), String> {
- app.set_speaker_muted(muted).await;
- Ok(())
-}
-
#[tauri::command]
#[specta::specta]
pub async fn start_session(
diff --git a/plugins/listener/src/events.rs b/plugins/listener/src/events.rs
index dde66a3746..f46219036d 100644
--- a/plugins/listener/src/events.rs
+++ b/plugins/listener/src/events.rs
@@ -17,8 +17,6 @@ common_event_derives! {
AudioAmplitude { mic: u16, speaker: u16 },
#[serde(rename = "micMuted")]
MicMuted { value: bool },
- #[serde(rename = "speakerMuted")]
- SpeakerMuted { value: bool },
#[serde(rename = "streamResponse")]
StreamResponse { response: owhisper_interface::StreamResponse },
}
diff --git a/plugins/listener/src/ext.rs b/plugins/listener/src/ext.rs
index ae94a606d1..0947bd3223 100644
--- a/plugins/listener/src/ext.rs
+++ b/plugins/listener/src/ext.rs
@@ -1,15 +1,8 @@
use std::future::Future;
-use futures_util::StreamExt;
use ractor::{call_t, concurrency, registry, Actor, ActorRef};
use tauri_specta::Event;
-#[cfg(target_os = "macos")]
-use {
- block2::StackBlock,
- objc2_av_foundation::{AVAuthorizationStatus, AVCaptureDevice, AVMediaTypeAudio},
-};
-
use crate::{
actors::{SessionActor, SessionArgs, SessionMsg, SessionParams},
SessionEvent,
@@ -25,21 +18,8 @@ pub trait ListenerPluginExt {
device_name: impl Into,
) -> impl Future