gilles/asusctl
1
0
Fork 0
mirror of https://gitlab.com/asus-linux/asusctl.git synced 2026-02-06 00:15:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

anime: tweak gif animation time types

Browse Source
This commit is contained in:
Luke D Jones
2021-04-09 23:15:56 +12:00
parent eb83d1a835
commit ece565de1c
7 changed files with 124 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
asusctl/examples/animatrix-gif.rs
View File

@@ -15,7 +15,7 @@ fn main() {
let path = Path::new(&args[1]);
let brightness = args[2].parse::<f32>().unwrap();
let mut seq = Sequences::new();
seq.add_asus_gif(path, None, brightness).unwrap();
seq.add_asus_gif(path, rog_anime::AnimTime::Infinite, brightness).unwrap();
loop {
for action in seq.iter() {

22
asusctl/examples/animatrix-png-gif.rs
View File

@@ -6,7 +6,7 @@ use std::{
};
use glam::Vec2;
use rog_anime::{Action, Sequences};
use rog_anime::{Action, AnimTime, Sequences};
use rog_dbus::AuraDbusClient;
fn main() {
@@ -32,12 +32,12 @@ fn main() {
),
if let Ok(time) = args[7].parse::<u64>() {
if time != 0 {
Some(Duration::from_secs(time))
AnimTime::Time(Duration::from_secs(time))
} else {
None
AnimTime::Infinite
}
} else {
None
AnimTime::Infinite
},
args[6].parse::<f32>().unwrap(),
)
@@ -54,12 +54,12 @@ fn main() {
),
if let Ok(time) = args[7].parse::<u64>() {
if time != 0 {
Some(Duration::from_secs(time))
AnimTime::Time(Duration::from_secs(time))
} else {
None
AnimTime::Infinite
}
} else {
None
AnimTime::Infinite
},
args[6].parse::<f32>().unwrap(),
)
@@ -69,6 +69,7 @@ fn main() {
loop {
for action in seq.iter() {
if let Action::Animation(frames) = action {
let mut count = 0;
let start = Instant::now();
'outer: loop {
for frame in frames.frames() {
@@ -77,13 +78,18 @@ fn main() {
.anime()
.write(frame.frame().clone())
.unwrap();
if let Some(time) = frames.duration() {
if let AnimTime::Time(time) = frames.duration() {
if Instant::now().duration_since(start) > time {
break 'outer;
}
} else if let AnimTime::Cycles(times) = frames.duration() {
if count == times {
break 'outer;
}
}
sleep(frame.delay());
}
count +=1;
}
}
}