zerica/audrey
1
1
Fork 0
Code Issues 3 Pull requests Projects Releases Packages Wiki Activity Actions

allow play to be pressed if stopped but playlist not empty

Browse source
This commit is contained in:
Erica Z 2024-10-26 17:46:15 +02:00
parent a82b5b0475
commit f240424774
3 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/playbin.vala
View file

@ -237,12 +237,18 @@ public class Playbin : GLib.Object {
} }
public void play () { public void play () {
assert (this.state != PlaybinState.STOPPED); if (this.state == PlaybinState.STOPPED) {
this.state = PlaybinState.PLAYING; // allow only when playlist is not empty
debug ("setting state to playing"); // and start from the top
var ret = this.mpv.set_property_flag("pause", false); assert (this._play_queue.get_n_items () > 0);
if (ret != 0) { this.select_track (0);
debug (@"failed to set state to playing ($(ret)): $(ret.to_string())"); } else {
this.state = PlaybinState.PLAYING;
debug ("setting state to playing");
var ret = this.mpv.set_property_flag("pause", false);
if (ret != 0) {
debug (@"failed to set state to playing ($(ret)): $(ret.to_string())");
}
} }
} }

2
src/ui/playbar.blp
View file

@ -119,7 +119,7 @@ template $UiPlaybar: Box {
Button { Button {
icon-name: bind $play_pause_icon_name (template.playbin as <$Playbin>.state as <$PlaybinState>) as <string>; icon-name: bind $play_pause_icon_name (template.playbin as <$Playbin>.state as <$PlaybinState>) as <string>;
valign: center; valign: center;
sensitive: bind $playbin_active (template.playbin as <$Playbin>.state as <$PlaybinState>) as <bool>; sensitive: bind $can_press_play (template.playbin as <$Playbin>.state as <$PlaybinState>, template.playbin as <$Playbin>.play_queue_position) as <bool>;
clicked => $on_play_pause_clicked (); clicked => $on_play_pause_clicked ();
} }

4
src/ui/playbar.vala
View file

@ -41,6 +41,10 @@ class Ui.Playbar : Gtk.Box {
return state != PlaybinState.STOPPED; return state != PlaybinState.STOPPED;
} }
[GtkCallback] private bool can_press_play (PlaybinState state, uint n_items) {
return state != PlaybinState.STOPPED || n_items > 0;
}
[GtkCallback] private string mute_button_icon_name (bool mute) { [GtkCallback] private string mute_button_icon_name (bool mute) {
return mute ? "audio-volume-muted" : "audio-volume-high"; return mute ? "audio-volume-muted" : "audio-volume-high";
} }