Tahinli/radioxide
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #52 from Tahinli/dev

Browse source 
perf: ⚡ now communication channels define once
This commit is contained in:
Ahmet Kaan GÜMÜŞ 2024-08-16 22:57:12 +00:00 • committed by GitHub
commit 5e48eb2077
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 14 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

59
streamer/src/gui.rs
View file

@ -18,6 +18,7 @@ use crate::{
gui_utils::{self, change_audio_volume, change_microphone_volume},
utils::get_config,
Config, AUDIO_BUFFER_SIZE, AUDIO_PATH, AUDIO_SCROLLABLE_BUTTON_SIZE, BUFFER_LENGTH,
WINDOW_SIZE_WIDTH,
};
#[derive(Debug, Clone)]
@ -128,11 +129,6 @@ pub struct Streamer {
audio_miscellaneous: AudioMiscellaneous,
gui_status: GUIStatus,
}
impl Default for Streamer {
fn default() -> Self {
Self::new()
}
}
impl Streamer {
pub fn new_with_load() -> (Self, Task<Message>) {
@ -182,44 +178,7 @@ impl Streamer {
),
)
}
fn new() -> Self {
Self {
config: None,
data_channel: DataChannel {
microphone_stream_sender: channel(BUFFER_LENGTH).0,
audio_stream_sender: channel(BUFFER_LENGTH).0,
},
communication_channel: CommunicationChannel {
base_to_streaming_sender: channel(1).0,
streaming_to_base_sender: channel(1).0,
streaming_to_base_is_finished: channel(1).0,
base_to_recording_sender: channel(1).0,
recording_to_base_sender: channel(1).0,
base_to_playing_sender: channel(1).0,
playing_to_base_sender: channel(1).0,
},
audio_miscellaneous: AudioMiscellaneous {
file: None,
selected_file_name: String::new(),
playing_file_name: String::new(),
files: None,
decoded_to_playing_sender: Some(channel(AUDIO_BUFFER_SIZE).0),
should_decode_now_sender: Some(channel(1).0),
},
gui_status: GUIStatus {
are_we_connect: Condition::Passive,
are_we_record: Condition::Passive,
are_we_play_audio: Condition::Passive,
are_we_paused_audio: Condition::Passive,
microphone_volume: ChangeableValue {
value: Arc::new(1.0.into()),
},
audio_volume: ChangeableValue {
value: Arc::new(1.0.into()),
},
},
}
}
pub fn update(&mut self, message: Message) -> Task<Message> {
match message {
Message::Event(event) => match event {
@ -782,11 +741,13 @@ impl Streamer {
audio_scrollable_content.push(button.height(AUDIO_SCROLLABLE_BUTTON_SIZE));
}
}
let audios_scrollable = scrollable(audio_scrollable_content).height(200).width(350);
let audios_scrollable = scrollable(audio_scrollable_content)
.height(200)
.width(WINDOW_SIZE_WIDTH);
let audio_info_content = column![audio_selected, audio_playing,]
.height(100)
.width(longest_audio_name);
let header_content = row![header].width(350).height(50);
let header_content = row![header].width(WINDOW_SIZE_WIDTH).height(50);
let text_content = row![
connection_text,
Rule::vertical(1),
@ -797,7 +758,7 @@ impl Streamer {
pause_audio_text,
]
.spacing(5)
.width(350)
.width(WINDOW_SIZE_WIDTH)
.height(35);
let status_content = row![
@ -810,7 +771,7 @@ impl Streamer {
paused_audio_status_text,
]
.spacing(5)
.width(350)
.width(WINDOW_SIZE_WIDTH)
.height(35);
let button_content = row![
connect_button,
@ -819,11 +780,11 @@ impl Streamer {
pause_audio_button,
]
.spacing(5)
.width(350)
.width(WINDOW_SIZE_WIDTH)
.height(35);
let volume_content = row![microphone_volume_slider, audio_volume_slider,]
.spacing(5)
.width(350)
.width(WINDOW_SIZE_WIDTH)
.height(35);
let content = column![
header_content,

2
streamer/src/lib.rs
View file

@ -10,6 +10,8 @@ pub const BUFFER_LENGTH: usize = 1000000;
pub const AUDIO_PATH: &str = "audio";
pub const AUDIO_BUFFER_SIZE: usize = 1048576;
pub const AUDIO_SCROLLABLE_BUTTON_SIZE: u16 = 35;
pub const WINDOW_SIZE_WIDTH: u16 = 450;
pub const WINDOW_SIZE_HEIGHT: u16 = 650;
#[derive(Debug, Clone)]
pub struct Config {

25
streamer/src/main.rs
View file

@ -1,4 +1,4 @@
use streamer::gui::Streamer;
use streamer::{gui::Streamer, WINDOW_SIZE_HEIGHT, WINDOW_SIZE_WIDTH};
#[tokio::main]
async fn main() {
@ -6,31 +6,10 @@ async fn main() {
iced::application("Streamer GUI", Streamer::update, Streamer::view)
.centered()
.window_size((350.0, 650.0))
.window_size((WINDOW_SIZE_WIDTH as f32, WINDOW_SIZE_HEIGHT as f32))
.antialiasing(true)
.subscription(Streamer::subscription)
.exit_on_close_request(false)
.run_with(|| Streamer::new_with_load())
.unwrap()
// tokio::task::spawn_blocking(|| {
// iced::application("Streamer GUI", Streamer::update, Streamer::view)
// .centered()
// .window_size((350.0, 650.0))
// .antialiasing(true)
// .subscription(Streamer::subscription)
// .exit_on_close_request(false)
// .run_with(|| Streamer::new_with_load())
// .unwrap()
// });
// tokio::task::block_in_place(|| {
// iced::application("Streamer GUI", Streamer::update, Streamer::view)
// .centered()
// .window_size((350.0, 650.0))
// .antialiasing(true)
// .subscription(Streamer::subscription)
// .exit_on_close_request(false)
// .run_with(|| Streamer::new_with_load())
// .unwrap()
// });
}