gtk-adwaita: Seek bar

Changes

3 changed files (+103/-57)

• core/src/plac.vapi
  • @@ -93,6 +93,10 @@ public string? two_line_line2;
    public string three_line_line1; public string? three_line_line2; public string? three_line_line3; + public uint64 seek_position; + public uint64 length; + public bool has_seek_position; + public bool has_length; } [CCode (
  • @@ -171,6 +175,13 @@ array_length_cname = "removed_zone_ids_len",
    array_length_type = "size_t" )] public string[] removed; + + [CCode ( + cname = "seek_changes_ptr", + array_length_cname = "seek_changes_len", + array_length_type = "size_t" + )] + public SeekChange[] seek_changed; } [CCode (cname = "PLAC_TRANSPORT_ACTION_NEXT")]
• gtk-adwaita/data/ui/playback-toolbar.ui
  • @@ -18,7 +18,7 @@ SPDX-License-Identifier: Apache-2.0
    --> <interface> <template class="PlacGtkAdwaitaPlaybackToolbar" parent="GtkBox"> - <property name="orientation">horizontal</property> + <property name="orientation">vertical</property> <property name="halign">center</property> <property name="valign">end</property> <style>
  • @@ -26,75 +26,85 @@ <class name="toolbar" />
    </style> <child> <object class="GtkBox"> - <property name="orientation">vertical</property> - <property name="valign">center</property> - <property name="hexpand">true</property> - <child> - <object class="GtkLabel" id="playing_line1"> - <property name="halign">start</property> - <property name="label"></property> - </object> - </child> - <child> - <object class="GtkLabel" id="playing_line2"> - <style> - <class name="dimmed" /> - <!-- ~libadwaita@1.7 --> - <class name="dim-label" /> - </style> - <property name="halign">start</property> - <property name="label"></property> - </object> - </child> - </object> - </child> - <child> - <object class="GtkBox"> <property name="orientation">horizontal</property> <child> - <object class="GtkButton" id="prev"> - <property name="label">Previous</property> - <property name="icon-name">skip-backward-large-symbolic</property> - <property name="action-name">prev_current_zone</property> - </object> - </child> - <child> - <object class="GtkButton" id="play"> - <property name="label">Play</property> - <property name="icon-name">play-large-symbolic</property> - <property name="action-name">play_current_zone</property> + <object class="GtkBox"> + <property name="orientation">vertical</property> + <property name="valign">center</property> + <property name="hexpand">true</property> + <child> + <object class="GtkLabel" id="playing_line1"> + <property name="halign">start</property> + <property name="label"></property> + </object> + </child> + <child> + <object class="GtkLabel" id="playing_line2"> + <style> + <class name="dimmed" /> + <!-- ~libadwaita@1.7 --> + <class name="dim-label" /> + </style> + <property name="halign">start</property> + <property name="label"></property> + </object> + </child> </object> </child> <child> - <object class="GtkButton" id="pause"> - <property name="label">Pause</property> - <property name="icon-name">pause-large-symbolic</property> - <property name="action-name">pause_current_zone</property> + <object class="GtkBox"> + <property name="orientation">horizontal</property> + <child> + <object class="GtkButton" id="prev"> + <property name="label">Previous</property> + <property name="icon-name">skip-backward-large-symbolic</property> + <property name="action-name">prev_current_zone</property> + </object> + </child> + <child> + <object class="GtkButton" id="play"> + <property name="label">Play</property> + <property name="icon-name">play-large-symbolic</property> + <property name="action-name">play_current_zone</property> + </object> + </child> + <child> + <object class="GtkButton" id="pause"> + <property name="label">Pause</property> + <property name="icon-name">pause-large-symbolic</property> + <property name="action-name">pause_current_zone</property> + </object> + </child> + <child> + <object class="GtkButton" id="next"> + <property name="label">Skip Next</property> + <property name="icon-name">skip-forward-large-symbolic</property> + <property name="action-name">next_current_zone</property> + </object> + </child> </object> </child> <child> - <object class="GtkButton" id="next"> - <property name="label">Skip Next</property> - <property name="icon-name">skip-forward-large-symbolic</property> - <property name="action-name">next_current_zone</property> + <object class="GtkMenuButton"> + <property name="label">Zone</property> + <property name="popover"> + <object class="GtkPopover" id="zone_list_popover"> + <child> + <object class="GtkListBox" id="zone_list"> + <style> + <class name="navigation-sidebar" /> + </style> + </object> + </child> + </object> + </property> </object> </child> </object> </child> <child> - <object class="GtkMenuButton"> - <property name="label">Zone</property> - <property name="popover"> - <object class="GtkPopover" id="zone_list_popover"> - <child> - <object class="GtkListBox" id="zone_list"> - <style> - <class name="navigation-sidebar" /> - </style> - </object> - </child> - </object> - </property> + <object class="GtkScale" id="seek"> + <property name="orientation">horizontal</property> </object> </child> </template>
• gtk-adwaita/src/Widgets/PlaybackToolbar.vala
  • @@ -30,6 +30,9 @@ [GtkChild]
    private unowned Gtk.Button next; [GtkChild] + private unowned Gtk.Scale seek; + + [GtkChild] private unowned Gtk.Label playing_line1; [GtkChild]
  • @@ -141,6 +144,16 @@ }
    } } + foreach (Plac.Transport.SeekChange change in event.seek_changed) { + if (zone_rows.has_key(change.zone_id)) { + var zone = zone_rows[change.zone_id].zone; + if (zone.now_playing != null) { + zone.now_playing.seek_position = change.seek_position; + zone.now_playing.has_seek_position = true; + } + } + } + // Selected zone has been removed. if (zone_id != null && !zone_rows.has_key(zone_id)) { zone_id = null;
  • @@ -178,6 +191,18 @@ : "";
    } else { playing_line1.label = ""; playing_line2.label = ""; + } + + if ( + zone.now_playing != null && + zone.now_playing.has_length && + zone.now_playing.has_seek_position + ) { + seek.sensitive = true; + seek.set_range(0, zone.now_playing.length); + seek.set_value(zone.now_playing.seek_position); + } else { + seek.sensitive = false; } switch (zone.playback) {