leyoda/cosmic-player
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add playback speed controls & minor UI \ UX improvements

Browse source
This commit is contained in:
Andrei Ivanou 2026-06-01 14:22:27 +02:00 • committed by Ashley Wulber
parent ddf43efc48
commit 8ad4f00c26
4 changed files with 167 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -6,3 +6,4 @@
/target/ /target/
/vendor/ /vendor/
/vendor.tar /vendor.tar
.idea/

4
res/icons/hicolor/16x16/apps/playback-speed-symbolic.svg Normal file
View file

@ -0,0 +1,4 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M6 8C6 6.96533 6.94659 6.18931 7.96116 6.39223L14.0388 7.60776C14.4676 7.69351 14.4676 8.30648 14.0388 8.39223L7.96116 9.60776C6.94659 9.81068 6 9.03467 6 8Z" fill="#232323"/>
<path d="M11.9727 4.96582L11.9717 4.96484C11.0579 3.77097 9.61954 3 8 3C5.23858 3 3 5.23858 3 8C3 10.7614 5.23858 13 8 13C9.58934 13 11.0568 12.1775 11.9727 11.0215C12.3575 10.4961 13.0321 10.3355 13.4795 10.6631C13.9268 10.9907 13.9775 11.6826 13.5928 12.208C12.3112 13.8352 10.232 15 8 15C4.13401 15 1 11.866 1 8C1 4.13401 4.13401 1 8 1C10.2173 1 12.3105 2.17054 13.5928 3.7793C13.9775 4.30475 13.9268 4.99657 13.4795 5.32422C13.0321 5.65182 12.3575 5.49119 11.9727 4.96582Z" fill="#232323"/>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 782 B

199
src/main.rs
View file

@ -54,6 +54,9 @@ const JUMP_BACKWARD_ICON: &[u8] =
const JUMP_FORWARD_ICON: &[u8] = const JUMP_FORWARD_ICON: &[u8] =
include_bytes!("../res/icons/hicolor/16x16/apps/jump-forward-10-symbolic.svg"); include_bytes!("../res/icons/hicolor/16x16/apps/jump-forward-10-symbolic.svg");
const PLAYBACK_SPEED_ICON: &[u8] =
include_bytes!("../res/icons/hicolor/16x16/apps/playback-speed-symbolic.svg");
use std::error::Error; use std::error::Error;
fn language_name(code: &str) -> Option<String> { fn language_name(code: &str) -> Option<String> {
@ -226,6 +229,7 @@ pub struct Flags {
#[derive(Clone, Copy, Debug, Eq, PartialEq)] #[derive(Clone, Copy, Debug, Eq, PartialEq)]
pub enum DropdownKind { pub enum DropdownKind {
Audio, Audio,
Speed,
Subtitle, Subtitle,
} }
@ -312,6 +316,8 @@ pub enum Message {
NewFrame, NewFrame,
Reload, Reload,
AbRepeat, AbRepeat,
VideoAreaClick,
PlaybackSpeed(f64),
ShowControls, ShowControls,
SystemThemeModeChange(cosmic_theme::ThemeMode), SystemThemeModeChange(cosmic_theme::ThemeMode),
WindowClose, WindowClose,
@ -342,6 +348,7 @@ pub struct App {
text_codes: Vec<TextCode>, text_codes: Vec<TextCode>,
current_text: Option<i32>, current_text: Option<i32>,
ab_repeat: Option<(Option<f64>, Option<f64>)>, ab_repeat: Option<(Option<f64>, Option<f64>)>,
playback_speed: f64,
#[cfg(feature = "xdg-portal")] #[cfg(feature = "xdg-portal")]
inhibit: tokio::sync::watch::Sender<bool>, inhibit: tokio::sync::watch::Sender<bool>,
} }
@ -456,6 +463,9 @@ impl App {
self.set_looping_from_repeat_state(); self.set_looping_from_repeat_state();
self.update_flags(); self.update_flags();
self.update_mpris_meta(); self.update_mpris_meta();
if self.playback_speed != 1.0 {
self.apply_playback_speed();
}
self.update_title() self.update_title()
} }
@ -848,6 +858,22 @@ impl App {
video.set_looping(self.flags.config_state.player_state.repeat == RepeatState::Track); video.set_looping(self.flags.config_state.player_state.repeat == RepeatState::Track);
} }
} }
fn apply_playback_speed(&self) {
let Some(video) = &self.video_opt else { return };
let pipeline = video.pipeline();
let position = gst::ClockTime::from_nseconds(video.position().as_nanos() as u64);
if let Err(err) = pipeline.seek(
self.playback_speed,
gst::SeekFlags::FLUSH | gst::SeekFlags::ACCURATE,
gst::SeekType::Set,
position,
gst::SeekType::None,
gst::ClockTime::NONE,
) {
log::warn!("failed to set playback speed {}: {}", self.playback_speed, err);
}
}
} }
/// Implement [`cosmic::Application`] to integrate with COSMIC. /// Implement [`cosmic::Application`] to integrate with COSMIC.
@ -907,6 +933,7 @@ impl Application for App {
text_codes: Vec::new(), text_codes: Vec::new(),
current_text: None, current_text: None,
ab_repeat: None, ab_repeat: None,
playback_speed: 1.0,
#[cfg(feature = "xdg-portal")] #[cfg(feature = "xdg-portal")]
inhibit, inhibit,
}; };
@ -1481,6 +1508,19 @@ impl Application for App {
self.update_controls(true); self.update_controls(true);
} }
} }
Message::PlaybackSpeed(speed) => {
self.playback_speed = speed;
self.dropdown_opt = None;
self.apply_playback_speed();
self.update_controls(true);
}
Message::VideoAreaClick => {
if self.dropdown_opt.is_some() {
self.dropdown_opt = None;
} else {
return self.update(Message::PlayPause);
}
}
Message::AbRepeat => { Message::AbRepeat => {
let current_opt = self.video_opt.as_ref().map(|v| v.position().as_secs_f64()); let current_opt = self.video_opt.as_ref().map(|v| v.position().as_secs_f64());
if let Some(current) = current_opt { if let Some(current) = current_opt {
@ -1742,7 +1782,7 @@ impl Application for App {
} }
let mouse_area = widget::mouse_area(video_player) let mouse_area = widget::mouse_area(video_player)
.on_press(Message::PlayPause) .on_press(Message::VideoAreaClick)
.on_double_press(Message::Fullscreen); .on_double_press(Message::Fullscreen);
let mut popover = widget::popover(mouse_area).position(widget::popover::Position::Bottom); let mut popover = widget::popover(mouse_area).position(widget::popover::Position::Bottom);
@ -1779,6 +1819,61 @@ impl Application for App {
.into(), .into(),
); );
} }
DropdownKind::Speed => {
for &speed in &[0.75f64, 1.0, 1.25, 1.5, 1.75, 2.0, 2.25] {
let s = format!("{:.2}", speed);
let speed_str = format!(
"{}x",
s.trim_end_matches('0').trim_end_matches('.')
);
let is_active = (self.playback_speed - speed).abs() < 0.01;
let icon: Element<_> = if is_active {
widget::icon::from_name("object-select-symbolic")
.size(16)
.into()
} else {
widget::container(widget::space::horizontal())
.width(Length::Fixed(16.0))
.into()
};
let label: Element<_> = if is_active {
widget::text(speed_str).font(font::bold()).into()
} else {
widget::text(speed_str).into()
};
let row_content = widget::row::with_children(vec![icon, label])
.spacing(space_xs)
.align_y(Alignment::Center);
let content: Element<_> = if is_active {
widget::container(row_content)
.class(theme::Container::custom(|theme| {
let accent: Color =
theme.cosmic().accent_color().into();
widget::container::Style {
icon_color: Some(accent),
text_color: Some(accent),
..Default::default()
}
}))
.into()
} else {
row_content.into()
};
items.push(
widget::button::custom(content)
.width(Length::Fill)
.padding([12.0f32, 8.0f32])
.class(theme::Button::MenuItem)
.on_press(Message::PlaybackSpeed(speed))
.into(),
);
}
}
DropdownKind::Subtitle => { DropdownKind::Subtitle => {
if !self.audio_codes.is_empty() { if !self.audio_codes.is_empty() {
items.push(widget::text::heading(fl!("audio")).into()); items.push(widget::text::heading(fl!("audio")).into());
@ -1807,34 +1902,42 @@ impl Application for App {
} }
} }
let use_padding = !matches!(dropdown, DropdownKind::Speed);
let mut column = widget::column::with_capacity(items.len()); let mut column = widget::column::with_capacity(items.len());
for item in items { for item in items {
column = column.push(widget::container(item).padding([space_xxs, space_m])); column = column.push(if use_padding {
widget::container(item).padding([space_xxs, space_m]).into()
} else {
item
});
} }
popup_items.push( popup_items.push(
widget::row::with_children(vec![ widget::row::with_children(vec![
widget::space::horizontal().into(), widget::space::horizontal().into(),
widget::container(column) widget::mouse_area(
.padding(1) widget::container(column)
//TODO: move style to libcosmic .padding(1)
.class(theme::Container::custom(|theme| { //TODO: move style to libcosmic
let cosmic = theme.cosmic(); .class(theme::Container::custom(|theme| {
let component = &cosmic.background.component; let cosmic = theme.cosmic();
widget::container::Style { let component = &cosmic.background.component;
icon_color: Some(component.on.into()), widget::container::Style {
text_color: Some(component.on.into()), icon_color: Some(component.on.into()),
background: Some(Background::Color(component.base.into())), text_color: Some(component.on.into()),
border: Border { background: Some(Background::Color(component.base.into())),
radius: 8.0.into(), border: Border {
width: 1.0, radius: 8.0.into(),
color: component.divider.into(), width: 1.0,
}, color: component.divider.into(),
..Default::default() },
} ..Default::default()
})) }
.width(Length::Fixed(240.0)) }))
.into(), .width(Length::Fixed(240.0)),
)
.on_press(Message::ShowControls)
.into(),
]) ])
.into(), .into(),
); );
@ -1930,6 +2033,12 @@ impl Application for App {
) )
.on_press(Message::DropdownToggle(DropdownKind::Subtitle)), .on_press(Message::DropdownToggle(DropdownKind::Subtitle)),
) )
.push(
widget::button::icon(
widget::icon::from_svg_bytes(PLAYBACK_SPEED_ICON).symbolic(true),
)
.on_press(Message::DropdownToggle(DropdownKind::Speed)),
)
.push( .push(
widget::button::icon( widget::button::icon(
widget::icon::from_name("view-fullscreen-symbolic").size(16), widget::icon::from_name("view-fullscreen-symbolic").size(16),
@ -1957,31 +2066,37 @@ impl Application for App {
.on_press(Message::DropdownToggle(DropdownKind::Audio)), .on_press(Message::DropdownToggle(DropdownKind::Audio)),
); );
popup_items.push( popup_items.push(
widget::container(row) widget::mouse_area(
.padding([space_xxs, space_xs]) widget::container(row)
.class(theme::Container::WindowBackground) .padding([space_xxs, space_xs])
.into(), .class(theme::Container::WindowBackground),
)
.on_press(Message::ShowControls)
.into(),
); );
if self.core.is_condensed() { if self.core.is_condensed() {
popup_items.push( popup_items.push(
widget::container( widget::mouse_area(
widget::row::with_capacity(3) widget::container(
.align_y(Alignment::Center) widget::row::with_capacity(3)
.spacing(space_xxs) .align_y(Alignment::Center)
.push(widget::text(format_time(self.position)).font(font::mono())) .spacing(space_xxs)
.push( .push(widget::text(format_time(self.position)).font(font::mono()))
Slider::new(0.0..=self.duration, self.position, Message::Seek) .push(
.step(0.1) Slider::new(0.0..=self.duration, self.position, Message::Seek)
.on_release(Message::SeekRelease), .step(0.1)
) .on_release(Message::SeekRelease),
.push( )
widget::text(format_time(self.duration - self.position)) .push(
.font(font::mono()), widget::text(format_time(self.duration - self.position))
), .font(font::mono()),
),
)
.padding([space_xxs, space_xs])
.class(theme::Container::WindowBackground),
) )
.padding([space_xxs, space_xs]) .on_press(Message::ShowControls)
.class(theme::Container::WindowBackground)
.into(), .into(),
); );
} }

5
src/video.rs
View file

@ -27,6 +27,11 @@ pub fn new_video(
.downcast::<gst::Pipeline>() .downcast::<gst::Pipeline>()
.map_err(|_| iced_video_player::Error::Cast) .map_err(|_| iced_video_player::Error::Cast)
.unwrap(); .unwrap();
if let Ok(scaletempo) = gst::ElementFactory::make("scaletempo").build() {
pipeline.set_property("audio-filter", &scaletempo);
} else {
log::warn!("scaletempo element not available; speed changes will affect pitch");
}
pipeline.connect("element-setup", false, |vals| { pipeline.connect("element-setup", false, |vals| {
let Ok(elem) = vals[1].get::<gst::Element>() else { let Ok(elem) = vals[1].get::<gst::Element>() else {
return None; return None;