nydragon/nysh
1
Fork 0
Code Issues Pull requests Activity Actions

feat: add current playing song display

Browse source
This commit is contained in:
Nydragon 2024-09-27 19:20:19 +02:00
parent d94cc5573c
commit 37cc9423d7
Signed by: nydragon
SSH key fingerprint: SHA256:iQnIC12spf4QjWSbarmkD2No1cLMlu6TWoV7K6cYF5g
5 changed files with 108 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
flake.lock generated
View file

@ -2,11 +2,11 @@
"nodes": {
"nixpkgs": {
"locked": {
"lastModified": 1726755586,
"narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=",
"lastModified": 1727122398,
"narHash": "sha256-o8VBeCWHBxGd4kVMceIayf5GApqTavJbTa44Xcg5Rrk=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e",
"rev": "30439d93eb8b19861ccbe3e581abf97bdc91b093",
"type": "github"
},
"original": {
@ -23,11 +23,11 @@
]
},
"locked": {
"lastModified": 1726641881,
"narHash": "sha256-ee2YIeFbYhm/gGs26grUW37BxqqDoFNElW1Vy5PIuHA=",
"lastModified": 1727391151,
"narHash": "sha256-PIEJfHzze4MWwaS7Py+az0IL7A+bZd4pFTE/uAy1b70=",
"ref": "refs/heads/master",
"rev": "7f9762be5368ca33b84e7b2b3e23a626d432436d",
"revCount": 348,
"rev": "3ed39b2a798419a168e5c79a2db9f7ee20de70fa",
"revCount": 352,
"type": "git",
"url": "https://git.outfoxxed.me/outfoxxed/quickshell"
},

19
src/windows/audioman/AudioEntry.qml
View file

@ -41,6 +41,7 @@ RowLayout {
const app = root.node.isStream ? `[${root.node.properties["application.name"]}] ` : "";
return app + (root.node.properties["media.name"] ?? root.node.description);
}
color: "white"
// Cede space to other elements -> don't have stupidly long names destroying the layout
Layout.maximumWidth: 0
}
@ -64,27 +65,13 @@ RowLayout {
}
onClicked: root.node.audio.muted = !root.node.audio.muted
}
Button {
property bool isDefault: root.node?.id === Pipewire.defaultAudioSink?.id
checked: isDefault
checkable: false
visible: root.node.isSink
text: isDefault ? "default" : "not default"
onClicked: makeDefault.running = true
Process {
id: makeDefault
command: ["pactl", "set-default-sink", root.node?.name]
running: false
}
}
}
RowLayout {
Label {
Layout.preferredWidth: 50
text: `${Math.floor(root.node.audio.volume * 100)}%`
color: "white"
}
Slider {

54
src/windows/audioman/AudioManager.qml
View file

@ -3,41 +3,81 @@ import Quickshell.Services.Pipewire
import QtQuick
import QtQuick.Layouts
import QtQuick.Controls
import Quickshell.Services.Mpris
import "root:base"
import QtQuick.Effects
PopupWindow {
id: audioman
anchor {
rect.x: lbar.width * 1.2
rect.y: lbar.width * 0.2
window: lbar
}
//gravity: Edges.Bottom | Edges.Right
color: "transparent"
width: 500
height: 300
height: 600
visible: false
property var player: Mpris.players.values.find(p => p.playbackState == MprisPlaybackState.Playing) ?? Mpris.players.values[0]
BRectangle {
anchors.fill: parent
id: bn
//color: "transparent"
Image {
id: background
//anchors.margins: parent.border.width
anchors.fill: parent
source: audioman.player?.trackArtUrl
Layout.alignment: Qt.AlignHCenter
visible: true
}
MultiEffect {
autoPaddingEnabled: false
source: background
anchors.fill: background
blurEnabled: true
blurMax: 64
blurMultiplier: 2
blur: 1
brightness: -0.15
}
ScrollView {
id: test
anchors.fill: parent
contentWidth: availableWidth
ColumnLayout {
id: p
// BUG: We access nodes before they are initialized
anchors.fill: parent
anchors.margins: 10
Repeater {
model: Pipewire.nodes.values.filter(e => e.isSink)
ColumnLayout {
Layout.alignment: Qt.AlignHCenter
Label {
text: audioman.player.trackTitle
Layout.alignment: Qt.AlignHCenter
color: "white"
}
AudioEntry {
required property PwNode modelData
node: modelData
Image {
source: audioman.player.trackArtUrl
sourceSize.width: 300
sourceSize.height: 300
Layout.alignment: Qt.AlignHCenter
}
}
OutputSelector {}
Rectangle {
height: 2
color: "black"

12
src/windows/audioman/OutputElem.qml Normal file
View file

@ -0,0 +1,12 @@
import QtQuick
import Quickshell.Services.Pipewire
Item {
id: root
required property PwNode node
property string name: root.node.properties["media.name"] ?? root.node.description
PwObjectTracker {
objects: [root.node]
}
}

39
src/windows/audioman/OutputSelector.qml Normal file
View file

@ -0,0 +1,39 @@
import QtQuick.Layouts
import QtQuick.Controls
import Quickshell.Io
import Quickshell.Services.Pipewire
ColumnLayout {
ComboBox {
id: select
property var creator: Qt.createComponent("OutputElem.qml")
property var currentNode: select.model[select.currentIndex]
Layout.fillWidth: true
textRole: "name"
model: Pipewire.nodes.values.filter(e => e.isSink && !e.isStream).map(m => {
return creator.createObject(select, {
node: m
});
})
onActivated: i => {
Pipewire.preferredDefaultAudioSink = model[i].node;
//makeDefault.running = true;
}
currentIndex: select.model.findIndex(e => e?.node?.id == Pipewire.defaultAudioSink?.id)
Process {
id: makeDefault
command: ["pactl", "set-default-sink", select.model[select.currentIndex]?.node?.name]
running: false
}
}
Slider {
Layout.fillWidth: true
value: select.model[select.currentIndex]?.node.audio.volume ?? 0
onValueChanged: select.model[select.currentIndex].node.audio.volume = value
}
}