Compare commits

..

No commits in common. "75e2b891a7ffeda6c89b1ae4d511bc68140773f2" and "ff94308bd9590a75a2fbbdd6dee889b3db511e26" have entirely different histories.

2 changed files with 11 additions and 9 deletions

View File

@ -81,7 +81,7 @@ pub fn get(selection: &str, key: &str) -> String {
.join("blue-recorder")
.join("config.ini");
String::from(
Ini::load_from_file(config_path)
Ini::load_from_file(&config_path)
.unwrap()
.with_section(Some(selection))
.get(key)

View File

@ -6,8 +6,8 @@ mod area_capture;
mod config_management;
mod ffmpeg_interface;
mod timer;
mod utils;
mod wayland_record;
mod utils;
use ffmpeg_interface::Ffmpeg;
use gettextrs::{bindtextdomain, gettext, setlocale, textdomain, LocaleCategory};
@ -15,17 +15,19 @@ use gtk::glib;
use gtk::prelude::*;
use gtk::{
AboutDialog, Application, Builder, Button, CheckButton, ComboBoxText, CssProvider, Entry,
FileChooserAction, FileChooserNative, Image, Label, SpinButton, ToggleButton, Window,
FileChooserAction, FileChooserNative, Image, Label, SpinButton,
ToggleButton, Window,
};
use utils::is_wayland;
use std::cell::RefCell;
use std::ops::Add;
use std::path::Path;
use std::process::{Command, Stdio};
use std::rc::Rc;
use timer::{recording_delay, start_timer, stop_timer};
use utils::is_wayland;
use wayland_record::WaylandRecorder;
#[async_std::main]
async fn main() {
// Create new application
@ -105,7 +107,7 @@ pub fn build_ui(application: &Application) {
main_window.set_title(Some(&gettext("Blue Recorder")));
main_window.set_application(Some(application));
area_chooser_window.set_title(Some(&gettext("Area Chooser"))); // Title is hidden
// disable interaction with main window
// main_window.set_can_focus(false);
// main_window.set_can_target(false);
@ -144,12 +146,12 @@ pub fn build_ui(application: &Application) {
// Get audio sources
let sources_descriptions: Vec<String> = {
let list_sources_child = Command::new("pactl")
.args(["list", "sources"])
.args(&["list", "sources"])
.stdout(Stdio::piped())
.spawn();
let sources_descriptions = String::from_utf8(if let Ok(..) = list_sources_child {
Command::new("grep")
.args(["-e", "device.description"])
.args(&["-e", "device.description"])
.stdin(list_sources_child.unwrap().stdout.take().unwrap())
.output()
.unwrap()
@ -282,7 +284,7 @@ pub fn build_ui(application: &Application) {
area_grab_icon.set_from_file(Some(area_icon_path));
screen_grab_icon.set_from_file(Some(screen_icon_path));
window_grab_icon.set_from_file(Some(&window_icon_path));
window_grab_icon.set_from_file(Some(&window_icon_path));
}
// any theme
_ => {
@ -337,7 +339,7 @@ pub fn build_ui(application: &Application) {
area_grab_icon.set_from_file(Some(area_icon_path));
screen_grab_icon.set_from_file(Some(screen_icon_path));
window_grab_icon.set_from_file(Some(&window_icon_path));
window_grab_icon.set_from_file(Some(&window_icon_path));
}
}
// Labels