diff --git a/Cargo.lock b/Cargo.lock index 0320db9..aa04ba2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -821,6 +821,15 @@ version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc" +[[package]] +name = "memoffset" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9" +dependencies = [ + "autocfg", +] + [[package]] name = "nb-connect" version = "1.2.0" @@ -833,15 +842,15 @@ dependencies = [ [[package]] name = "nix" -version = "0.17.0" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50e4785f2c3b7589a0d0c1dd60285e1188adac4006e8abd6dd578e1567027363" +checksum = "f5e06129fb611568ef4e868c14b326274959aa70ff7776e9d55323531c374945" dependencies = [ "bitflags", "cc", - "cfg-if 0.1.10", + "cfg-if 1.0.0", "libc", - "void", + "memoffset", ] [[package]] @@ -1377,12 +1386,6 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" -[[package]] -name = "void" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" - [[package]] name = "waker-fn" version = "1.1.0" @@ -1446,9 +1449,9 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "zbus" -version = "1.9.1" +version = "1.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2326acc379a3ac4e34b794089f5bdb17086bf29a5fdf619b7b4cc772dc2e9dad" +checksum = "e5983c3d035549ab80db67c844ec83ed271f7c1f2546fd9577c594d34c1b6c85" dependencies = [ "async-io", "byteorder", @@ -1469,9 +1472,9 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "1.9.1" +version = "1.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a482c56029e48681b89b92b5db3c446db0915e8dd1052c0328a574eda38d5f93" +checksum = "bce54ac7b2150a2fa21ad5842a7470ce2288158d7da1f9bfda8ad455a1c59a97" dependencies = [ "proc-macro-crate 0.1.5", "proc-macro2", @@ -1481,12 +1484,13 @@ dependencies = [ [[package]] name = "zvariant" -version = "2.8.0" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4b785b8b32b0f8433b4474e6bb4ea77b37c1960e84d7598e01dd199b2b23ef" +checksum = "a68c7b55f2074489b7e8e07d2d0a6ee6b4f233867a653c664d8020ba53692525" dependencies = [ "byteorder", "enumflags2", + "libc", "serde", "static_assertions", "zvariant_derive", @@ -1494,9 +1498,9 @@ dependencies = [ [[package]] name = "zvariant_derive" -version = "2.8.0" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42af4ee88fb928781391216c34be77ec7cdb3546042b2947ce38d86aa5f37dd" +checksum = "e4ca5e22593eb4212382d60d26350065bf2a02c34b85bc850474a74b589a3de9" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2", diff --git a/src/ffmpeg_interface.rs b/src/ffmpeg_interface.rs index e312f76..5209eac 100644 --- a/src/ffmpeg_interface.rs +++ b/src/ffmpeg_interface.rs @@ -167,7 +167,7 @@ impl Ffmpeg { x, y, width, - height, + height ); } @@ -308,7 +308,8 @@ impl Ffmpeg { } } } - if is_video_record { + + if is_video_record && !is_wayland() { let mut move_command = Command::new("mv"); move_command.arg(format!( "{}{}", @@ -330,7 +331,7 @@ impl Ffmpeg { move_command.output().unwrap(); // if audio record, then merge video with audio - if is_audio_record { + if is_audio_record && is_video_record { &self .progress_widget .set_progress("Save Audio Recording".to_string(), 4, 6); @@ -369,7 +370,7 @@ impl Ffmpeg { } } // if only audio is recording then convert it to chosen fromat - else if is_audio_record { + else if is_audio_record && !is_video_record { &self .progress_widget .set_progress("Convert Audio to choosen format".to_string(), 4, 6);