Skip to content

Commit

Permalink
Merge pull request #72 from hamirmahal/refactor/remove-redundant-refe…
Browse files Browse the repository at this point in the history
…rences

refactor: remove redundant references
  • Loading branch information
xlmnxp authored Jun 7, 2024
2 parents ff94308 + 57fab3a commit 75e2b89
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 11 deletions.
2 changes: 1 addition & 1 deletion src/config_management.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
18 changes: 8 additions & 10 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,28 +6,26 @@ mod area_capture;
mod config_management;
mod ffmpeg_interface;
mod timer;
mod wayland_record;
mod utils;
mod wayland_record;

use ffmpeg_interface::Ffmpeg;
use gettextrs::{bindtextdomain, gettext, setlocale, textdomain, LocaleCategory};
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
Expand Down Expand Up @@ -107,7 +105,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);
Expand Down Expand Up @@ -146,12 +144,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()
Expand Down Expand Up @@ -284,7 +282,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
_ => {
Expand Down Expand Up @@ -339,7 +337,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
Expand Down

0 comments on commit 75e2b89

Please sign in to comment.