xlmnxp/blue-recorder
1
0
Fork 0
mirror of https://github.com/xlmnxp/blue-recorder.git synced 2025-04-04 00:34:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

look like fixed the video and audio merge

Browse Source
This commit is contained in:
Salem Yaslem 2022-10-18 14:55:09 +03:00
parent d9e7458725
commit a6ca6d3831
1 changed files with 36 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
src/ffmpeg_interface.rs
View File

@ -3,9 +3,8 @@ use chrono::prelude::*;
use gettextrs::gettext; use gettextrs::gettext;
use gio::File; use gio::File;
use gtk::prelude::*; use gtk::prelude::*;
use gtk::{Button, CheckButton, ComboBoxText, Entry, ProgressBar, SpinButton, Window};
use gtk::{ButtonsType, DialogFlags, MessageDialog, MessageType, ResponseType}; use gtk::{ButtonsType, DialogFlags, MessageDialog, MessageType, ResponseType};
use gtk::{
Button, CheckButton, ComboBoxText, Entry, ProgressBar, SpinButton, Window};
use std::path::PathBuf; use std::path::PathBuf;
use std::process::Command; use std::process::Command;
use std::sync::mpsc::Sender; use std::sync::mpsc::Sender;
@ -21,7 +20,11 @@ pub struct ProgressWidget {
} }
impl ProgressWidget { impl ProgressWidget {
pub fn new(progress_dialog: MessageDialog, progressbar: ProgressBar, progress_button: Button) -> ProgressWidget { pub fn new(
progress_dialog: MessageDialog,
progressbar: ProgressBar,
progress_button: Button,
) -> ProgressWidget {
ProgressWidget { ProgressWidget {
progress_dialog, progress_dialog,
progressbar, progressbar,
@ -33,6 +36,9 @@ impl ProgressWidget {
let progress_precentage: f64 = value as f64 / max as f64; let progress_precentage: f64 = value as f64 / max as f64;
self.progressbar.set_text(Some(&title)); self.progressbar.set_text(Some(&title));
self.progressbar.set_fraction(progress_precentage); self.progressbar.set_fraction(progress_precentage);
if value == max {
self.progress_dialog.hide();
}
} }
pub fn show(&self) { pub fn show(&self) {
@ -42,8 +48,8 @@ impl ProgressWidget {
pub fn hide(&self) { pub fn hide(&self) {
self.progress_button.set_sensitive(true); self.progress_button.set_sensitive(true);
self.progress_dialog.hide();
} }
} }
#[derive(Clone)] #[derive(Clone)]
@ -94,8 +100,7 @@ impl Ffmpeg {
); );
let is_file_already_exists = let is_file_already_exists =
std::path::Path::new(&self.saved_filename.clone().unwrap()) std::path::Path::new(&self.saved_filename.clone().unwrap()).exists();
.exists();
if !self.overwrite.is_active() && is_file_already_exists { if !self.overwrite.is_active() && is_file_already_exists {
let message_dialog = MessageDialog::new( let message_dialog = MessageDialog::new(
@ -106,12 +111,14 @@ impl Ffmpeg {
&gettext("File already exist."), &gettext("File already exist."),
); );
message_dialog.show(); message_dialog.show();
message_dialog.connect_response(glib::clone!(@strong message_dialog => move |_, response| { message_dialog.connect_response(
if response == ResponseType::Ok { glib::clone!(@strong message_dialog => move |_, response| {
if response == ResponseType::Ok {
message_dialog.hide();
}
message_dialog.hide(); message_dialog.hide();
} }),
message_dialog.hide(); );
}));
return (None, None); return (None, None);
} }
@ -181,29 +188,23 @@ impl Ffmpeg {
pub fn stop_record(&self) { pub fn stop_record(&self) {
self.progress_widget.show(); self.progress_widget.show();
// kill the process to stop recording // kill the process to stop recording
self self.progress_widget.set_progress("".to_string(), 1, 6);
.progress_widget
.set_progress("".to_string(), 1, 6);
if self.video_process_id.is_some() { if self.video_process_id.is_some() {
self self.progress_widget
.progress_widget
.set_progress("Stop Recording Video".to_string(), 1, 6); .set_progress("Stop Recording Video".to_string(), 1, 6);
Command::new("kill") Command::new("kill")
.arg(format!("{}", self.video_process_id.unwrap())) .arg(format!("{}", self.video_process_id.unwrap()))
.output() .output()
.unwrap(); .unwrap();
} }
self self.progress_widget.set_progress("".to_string(), 2, 6);
.progress_widget
.set_progress("".to_string(), 2, 6);
if self.audio_process_id.is_some() { if self.audio_process_id.is_some() {
self self.progress_widget
.progress_widget
.set_progress("Stop Recording Audio".to_string(), 2, 6); .set_progress("Stop Recording Audio".to_string(), 2, 6);
Command::new("kill") Command::new("kill")
.arg(format!("{}", self.audio_process_id.unwrap())) .arg(format!("{}", self.audio_process_id.unwrap()))
.output() .output()
.unwrap(); .unwrap();
@ -227,13 +228,11 @@ impl Ffmpeg {
) )
.exists(); .exists();
if is_video_record { if is_video_record {
let mut move_command = Command::new("mv"); let mut move_command = Command::new("mv");
move_command.arg(format!( move_command.arg(format!("{}{}", self.saved_filename.as_ref().unwrap(), {
"{}{}", ""
self.saved_filename.as_ref().unwrap(), }));
{ "" }
));
move_command.arg(format!( move_command.arg(format!(
"{}{}", "{}{}",
self.saved_filename.as_ref().unwrap_or(&String::new()), self.saved_filename.as_ref().unwrap_or(&String::new()),
@ -248,14 +247,11 @@ impl Ffmpeg {
)); ));
move_command.output().unwrap(); move_command.output().unwrap();
self self.progress_widget.set_progress("".to_string(), 4, 6);
.progress_widget
.set_progress("".to_string(), 4, 6);
// if audio record, then merge video with audio // if audio record, then merge video with audio
if is_audio_record && is_video_record { if is_audio_record {
self self.progress_widget
.progress_widget
.set_progress("Save Audio Recording".to_string(), 4, 6); .set_progress("Save Audio Recording".to_string(), 4, 6);
let mut ffmpeg_audio_merge_command = Command::new("ffmpeg"); let mut ffmpeg_audio_merge_command = Command::new("ffmpeg");
ffmpeg_audio_merge_command.arg("-i"); ffmpeg_audio_merge_command.arg("-i");
@ -290,10 +286,9 @@ impl Ffmpeg {
.unwrap(); .unwrap();
} }
} }
// if only audio is recording then convert it to chosen fromat // if only audio is recording then convert it to chosen format
else if is_audio_record && !is_video_record { else if is_audio_record {
self self.progress_widget
.progress_widget
.set_progress("Convert Audio to choosen format".to_string(), 4, 6); .set_progress("Convert Audio to choosen format".to_string(), 4, 6);
sleep(Duration::from_secs(1)); sleep(Duration::from_secs(1));
Command::new("ffmpeg") Command::new("ffmpeg")
@ -314,11 +309,7 @@ impl Ffmpeg {
.unwrap(); .unwrap();
} }
self.progress_widget.set_progress( self.progress_widget.set_progress("".to_string(), 5, 6);
"".to_string(),
5,
6,
);
// execute command after finish recording // execute command after finish recording
if self.command.text().trim() != "" { if self.command.text().trim() != "" {
@ -330,8 +321,7 @@ impl Ffmpeg {
Exec::shell(self.command.text().trim()).popen().unwrap(); Exec::shell(self.command.text().trim()).popen().unwrap();
} }
self self.progress_widget
.progress_widget
.set_progress("Finish".to_string(), 6, 6); .set_progress("Finish".to_string(), 6, 6);
self.progress_widget.hide(); self.progress_widget.hide();
} }