mirror of
https://github.com/xlmnxp/blue-recorder.git
synced 2025-04-02 07:44:54 +03:00
intial merge request
This commit is contained in:
parent
51b8fe7082
commit
6de786bd71
@ -634,6 +634,7 @@ impl Ffmpeg {
|
|||||||
ffmpeg_command.args(["-map_metadata", "-1"]);
|
ffmpeg_command.args(["-map_metadata", "-1"]);
|
||||||
ffmpeg_command.arg(&self.temp_output_audio_filename);
|
ffmpeg_command.arg(&self.temp_output_audio_filename);
|
||||||
ffmpeg_command.overwrite();
|
ffmpeg_command.overwrite();
|
||||||
|
ffmpeg_command.print_command();
|
||||||
|
|
||||||
// Sleep for delay
|
// Sleep for delay
|
||||||
if !is_video_record(&self.temp_video_filename) && !is_input_audio_record(&self.temp_input_audio_filename) {
|
if !is_video_record(&self.temp_video_filename) && !is_input_audio_record(&self.temp_input_audio_filename) {
|
||||||
|
@ -11,6 +11,8 @@
|
|||||||
<property name="deletable">False</property>
|
<property name="deletable">False</property>
|
||||||
<property name="hexpand">True</property>
|
<property name="hexpand">True</property>
|
||||||
<property name="vexpand">True</property>
|
<property name="vexpand">True</property>
|
||||||
|
<property name="modal">True</property>
|
||||||
|
<property name="destroy-with-parent">True</property>
|
||||||
<child type="title">
|
<child type="title">
|
||||||
<object class="GtkHeaderBar" id="headerbar2">
|
<object class="GtkHeaderBar" id="headerbar2">
|
||||||
<property name="visible">True</property>
|
<property name="visible">True</property>
|
||||||
|
@ -18,6 +18,8 @@ use std::cell::RefCell;
|
|||||||
use std::ops::Add;
|
use std::ops::Add;
|
||||||
use std::path::Path;
|
use std::path::Path;
|
||||||
use std::rc::Rc;
|
use std::rc::Rc;
|
||||||
|
use std::sync::mpsc;
|
||||||
|
use std::thread;
|
||||||
|
|
||||||
use crate::{area_capture, config_management, fluent::get_bundle};
|
use crate::{area_capture, config_management, fluent::get_bundle};
|
||||||
use crate::timer::{RecordClick, recording_delay, start_timer, stop_timer};
|
use crate::timer::{RecordClick, recording_delay, start_timer, stop_timer};
|
||||||
@ -138,6 +140,7 @@ fn build_ui(application: &Application, error_dialog: MessageDialog, error_messag
|
|||||||
|
|
||||||
// --- default properties
|
// --- default properties
|
||||||
// Windows
|
// Windows
|
||||||
|
area_chooser_window.set_transient_for(Some(&main_window));
|
||||||
area_chooser_window.set_title(Some(&get_bundle("area-chooser", None))); // Title is hidden
|
area_chooser_window.set_title(Some(&get_bundle("area-chooser", None))); // Title is hidden
|
||||||
error_dialog.set_transient_for(Some(&main_window));
|
error_dialog.set_transient_for(Some(&main_window));
|
||||||
select_window.set_transient_for(Some(&main_window));
|
select_window.set_transient_for(Some(&main_window));
|
||||||
@ -985,7 +988,9 @@ fn build_ui(application: &Application, error_dialog: MessageDialog, error_messag
|
|||||||
let _stop_button = stop_button.clone();
|
let _stop_button = stop_button.clone();
|
||||||
let _video_switch = video_switch.clone();
|
let _video_switch = video_switch.clone();
|
||||||
let mut _ffmpeg_record_interface = ffmpeg_record_interface.clone();
|
let mut _ffmpeg_record_interface = ffmpeg_record_interface.clone();
|
||||||
|
let (tx, rx) = mpsc::channel::<Result<()>>();
|
||||||
stop_button.connect_clicked(move |_| {
|
stop_button.connect_clicked(move |_| {
|
||||||
|
let _tx = tx.clone();
|
||||||
let mut show_play = true;
|
let mut show_play = true;
|
||||||
_record_time_label.set_visible(false);
|
_record_time_label.set_visible(false);
|
||||||
stop_timer(_record_time_label.clone());
|
stop_timer(_record_time_label.clone());
|
||||||
@ -1065,6 +1070,10 @@ fn build_ui(application: &Application, error_dialog: MessageDialog, error_messag
|
|||||||
if show_play {
|
if show_play {
|
||||||
_play_button.show();
|
_play_button.show();
|
||||||
}
|
}
|
||||||
|
let merge_request = _ffmpeg_record_interface.borrow_mut().merge();
|
||||||
|
thread::spawn(move || {
|
||||||
|
_tx.send(merge_request).unwrap();
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
// Delay window button
|
// Delay window button
|
||||||
|
Loading…
Reference in New Issue
Block a user