mirror of
https://github.com/arabianq/pipewire-soundpad.git
synced 2026-04-28 06:21:23 +00:00
Compare commits
25 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| c649ef5410 | |||
| 0dfd841e6d | |||
| 89ce111542 | |||
| 80a8b1a45f | |||
| f5c7d9bb2c | |||
| bcd39eb6a2 | |||
| 47a7674c14 | |||
| d33ee0c69e | |||
| 624310eae5 | |||
| 92a576de37 | |||
| ce948ce678 | |||
| e72fc519a0 | |||
| 8126efe8d9 | |||
| a7dd0b97d1 | |||
| 5f9aad7fa2 | |||
| 7e66a9241b | |||
| 02ad7337a1 | |||
| c08898e4f2 | |||
| ed8b04caa9 | |||
| 58e5f039be | |||
| eb89733715 | |||
| 476fd325ef | |||
| da49c96e53 | |||
| f0e05379f7 | |||
| 3d3523fd7a |
@@ -1,4 +1,4 @@
|
||||
name: Git archive
|
||||
name: Build
|
||||
|
||||
permissions:
|
||||
contents: write
|
||||
@@ -7,10 +7,12 @@ permissions:
|
||||
on:
|
||||
push:
|
||||
branches: [main, master]
|
||||
pull_request:
|
||||
branches: [main, master]
|
||||
workflow_dispatch:
|
||||
|
||||
jobs:
|
||||
build-and-upload:
|
||||
linux-build:
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
@@ -39,7 +41,6 @@ jobs:
|
||||
set -euo pipefail
|
||||
BIN_NAMES=$(cargo metadata --no-deps --format-version 1 \
|
||||
| jq -r '.packages[0].targets[] | select(.kind[] | contains("bin")) | .name')
|
||||
# сохраним построчно в выход
|
||||
echo "bin_names<<EOF" >> $GITHUB_OUTPUT
|
||||
echo "$BIN_NAMES" >> $GITHUB_OUTPUT
|
||||
echo "EOF" >> $GITHUB_OUTPUT
|
||||
@@ -82,3 +83,37 @@ jobs:
|
||||
name: archive
|
||||
path: pwsp-*.zip
|
||||
retention-days: 7
|
||||
|
||||
- name: Install cargo-deb and create .deb
|
||||
shell: bash
|
||||
run: |
|
||||
set -euo pipefail
|
||||
cargo install --locked cargo-deb
|
||||
export PATH="$HOME/.cargo/bin:$PATH"
|
||||
|
||||
cargo-deb
|
||||
|
||||
- name: Upload .deb(s) as artifacts
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: deb-packages
|
||||
path: target/debian/*.deb
|
||||
retention-days: 7
|
||||
|
||||
flatpak-build:
|
||||
runs-on: ubuntu-latest
|
||||
container:
|
||||
image: bilelmoussaoui/flatpak-github-actions:freedesktop-24.08
|
||||
options: --privileged
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
- name: Build Flatpak
|
||||
uses: flatpak/flatpak-github-actions/flatpak-builder@v6
|
||||
with:
|
||||
bundle: ru.arabianq.pwsp.flatpak
|
||||
manifest-path: packages/flatpak/ru.arabianq.pwsp.yaml
|
||||
cache: true
|
||||
branch: master
|
||||
build-bundle: true
|
||||
@@ -1,53 +0,0 @@
|
||||
name: Git deb
|
||||
|
||||
permissions:
|
||||
contents: write
|
||||
packages: write
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [main, master]
|
||||
workflow_dispatch:
|
||||
|
||||
jobs:
|
||||
build-and-upload:
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- name: Install apt deps (jq/zip + dev-libs)
|
||||
run: |
|
||||
sudo apt-get update
|
||||
sudo apt-get install -y \
|
||||
zip jq \
|
||||
libpipewire-0.3-dev \
|
||||
libclang-dev \
|
||||
libasound2-dev
|
||||
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
fetch-depth: 0
|
||||
|
||||
- name: Setup Rust toolchain
|
||||
uses: actions-rs/toolchain@v1
|
||||
with:
|
||||
toolchain: stable
|
||||
|
||||
- name: Build all release binaries
|
||||
run: cargo build --release --locked
|
||||
|
||||
- name: Install cargo-deb and create .deb
|
||||
shell: bash
|
||||
run: |
|
||||
set -euo pipefail
|
||||
cargo install --locked cargo-deb
|
||||
export PATH="$HOME/.cargo/bin:$PATH"
|
||||
|
||||
cargo-deb
|
||||
|
||||
- name: Upload .deb(s) as artifacts
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: deb-packages
|
||||
path: target/debian/*.deb
|
||||
retention-days: 7
|
||||
@@ -1,27 +0,0 @@
|
||||
name: Git Flatpak
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [main, master]
|
||||
pull_request:
|
||||
branches: [main, master]
|
||||
workflow_dispatch:
|
||||
|
||||
jobs:
|
||||
flatpak-build:
|
||||
runs-on: ubuntu-latest
|
||||
container:
|
||||
image: bilelmoussaoui/flatpak-github-actions:freedesktop-24.08
|
||||
options: --privileged
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
- name: Build Flatpak
|
||||
uses: flatpak/flatpak-github-actions/flatpak-builder@v6
|
||||
with:
|
||||
bundle: ru.arabianq.pwsp.flatpak
|
||||
manifest-path: packages/flatpak/ru.arabianq.pwsp.yaml
|
||||
cache: true
|
||||
branch: master
|
||||
build-bundle: true
|
||||
@@ -1,102 +0,0 @@
|
||||
name: Release deb
|
||||
|
||||
permissions:
|
||||
contents: write
|
||||
packages: write
|
||||
|
||||
on:
|
||||
release:
|
||||
types: [created]
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
tag:
|
||||
description: "Tag to attach assets to (e.g. v1.0.0)"
|
||||
required: false
|
||||
|
||||
jobs:
|
||||
build-and-release:
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- name: Install apt deps (jq/zip + dev-libs)
|
||||
run: |
|
||||
sudo apt-get update
|
||||
sudo apt-get install -y \
|
||||
zip jq \
|
||||
libpipewire-0.3-dev \
|
||||
libclang-dev \
|
||||
libasound2-dev
|
||||
|
||||
- name: Determine tag to use
|
||||
id: tag
|
||||
run: |
|
||||
set -euo pipefail
|
||||
|
||||
INPUT_TAG="${{ github.event.inputs.tag || '' }}"
|
||||
if [ -n "$INPUT_TAG" ]; then
|
||||
echo "Using input tag: $INPUT_TAG"
|
||||
echo "tag=$INPUT_TAG" >> $GITHUB_OUTPUT
|
||||
exit 0
|
||||
fi
|
||||
|
||||
EVENT_TAG="${{ github.event.release.tag_name || '' }}"
|
||||
if [ -n "$EVENT_TAG" ]; then
|
||||
echo "Using event tag: $EVENT_TAG"
|
||||
echo "tag=$EVENT_TAG" >> $GITHUB_OUTPUT
|
||||
exit 0
|
||||
fi
|
||||
|
||||
if [[ "${GITHUB_REF:-}" =~ ^refs/tags/(.+)$ ]]; then
|
||||
echo "Using GITHUB_REF tag: ${BASH_REMATCH[1]}"
|
||||
echo "tag=${BASH_REMATCH[1]}" >> $GITHUB_OUTPUT
|
||||
exit 0
|
||||
fi
|
||||
|
||||
echo "No tag in input/event/GITHUB_REF — querying latest release via API..."
|
||||
LATEST_JSON=$(curl -sSf -H "Authorization: Bearer $GITHUB_TOKEN" -H "Accept: application/vnd.github+json" "https://api.github.com/repos/${{ github.repository }}/releases/latest" || true)
|
||||
TAG_NAME=$(echo "$LATEST_JSON" | jq -r '.tag_name // empty')
|
||||
if [ -n "$TAG_NAME" ]; then
|
||||
echo "Found latest release tag: $TAG_NAME"
|
||||
echo "tag=$TAG_NAME" >> $GITHUB_OUTPUT
|
||||
exit 0
|
||||
fi
|
||||
|
||||
echo "No tag found"
|
||||
echo "tag=" >> $GITHUB_OUTPUT
|
||||
|
||||
- name: Fail if no tag determined
|
||||
if: ${{ steps.tag.outputs.tag == '' }}
|
||||
run: |
|
||||
echo "ERROR: No tag determined. Provide a tag when running manually or ensure a release exists."
|
||||
exit 1
|
||||
|
||||
- name: Checkout code at tag
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
ref: ${{ steps.tag.outputs.tag || github.ref }}
|
||||
fetch-depth: 0
|
||||
|
||||
- name: Setup Rust toolchain
|
||||
uses: actions-rs/toolchain@v1
|
||||
with:
|
||||
toolchain: stable
|
||||
|
||||
- name: Build all release binaries
|
||||
run: cargo build --release --locked
|
||||
|
||||
- name: Install cargo-deb and create .deb
|
||||
shell: bash
|
||||
run: |
|
||||
set -euo pipefail
|
||||
cargo install --locked cargo-deb
|
||||
export PATH="$HOME/.cargo/bin:$PATH"
|
||||
|
||||
cargo-deb
|
||||
|
||||
- name: Upload .deb(s) to release
|
||||
uses: softprops/action-gh-release@v2
|
||||
with:
|
||||
token: ${{ secrets.GITHUB_TOKEN }}
|
||||
tag_name: ${{ steps.tag.outputs.tag }}
|
||||
files: |
|
||||
target/debian/*.deb
|
||||
@@ -1,72 +0,0 @@
|
||||
name: Release Flatpak
|
||||
|
||||
permissions:
|
||||
contents: write
|
||||
|
||||
on:
|
||||
release:
|
||||
types: [created]
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
tag:
|
||||
description: "Tag to attach assets to (e.g. v1.0.0)"
|
||||
required: false
|
||||
|
||||
jobs:
|
||||
flatpak-release:
|
||||
runs-on: ubuntu-latest
|
||||
container:
|
||||
image: bilelmoussaoui/flatpak-github-actions:freedesktop-24.08
|
||||
options: --privileged
|
||||
|
||||
steps:
|
||||
- name: Determine tag to use
|
||||
id: tag
|
||||
run: |
|
||||
set -euo pipefail
|
||||
|
||||
INPUT_TAG="${{ github.event.inputs.tag || '' }}"
|
||||
if [ -n "$INPUT_TAG" ]; then
|
||||
echo "tag=$INPUT_TAG" >> $GITHUB_OUTPUT
|
||||
exit 0
|
||||
fi
|
||||
|
||||
EVENT_TAG="${{ github.event.release.tag_name || '' }}"
|
||||
if [ -n "$EVENT_TAG" ]; then
|
||||
echo "tag=$EVENT_TAG" >> $GITHUB_OUTPUT
|
||||
exit 0
|
||||
fi
|
||||
|
||||
if [[ "${GITHUB_REF:-}" =~ ^refs/tags/(.+)$ ]]; then
|
||||
echo "tag=${BASH_REMATCH[1]}" >> $GITHUB_OUTPUT
|
||||
exit 0
|
||||
fi
|
||||
|
||||
echo "No tag found"
|
||||
echo "tag=" >> $GITHUB_OUTPUT
|
||||
|
||||
- name: Fail if no tag determined
|
||||
if: ${{ steps.tag.outputs.tag == '' }}
|
||||
run: |
|
||||
echo "ERROR: No tag determined."
|
||||
exit 1
|
||||
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
ref: ${{ steps.tag.outputs.tag }}
|
||||
|
||||
- name: Build Flatpak
|
||||
uses: flatpak/flatpak-github-actions/flatpak-builder@v6
|
||||
with:
|
||||
bundle: ru.arabianq.pwsp.flatpak
|
||||
manifest-path: packages/flatpak/ru.arabianq.pwsp.yaml
|
||||
cache: true
|
||||
branch: master
|
||||
build-bundle: true
|
||||
|
||||
- name: Upload Flatpak to release
|
||||
uses: softprops/action-gh-release@v2
|
||||
with:
|
||||
token: ${{ secrets.GITHUB_TOKEN }}
|
||||
tag_name: ${{ steps.tag.outputs.tag }}
|
||||
files: ru.arabianq.pwsp.flatpak
|
||||
@@ -1,4 +1,4 @@
|
||||
name: Release archive
|
||||
name: Release
|
||||
|
||||
permissions:
|
||||
contents: write
|
||||
@@ -14,19 +14,11 @@ on:
|
||||
required: false
|
||||
|
||||
jobs:
|
||||
build-and-release:
|
||||
prepare:
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
outputs:
|
||||
tag: ${{ steps.tag.outputs.tag }}
|
||||
steps:
|
||||
- name: Install apt deps (jq/zip + dev-libs)
|
||||
run: |
|
||||
sudo apt-get update
|
||||
sudo apt-get install -y \
|
||||
zip jq \
|
||||
libpipewire-0.3-dev \
|
||||
libclang-dev \
|
||||
libasound2-dev
|
||||
|
||||
- name: Determine tag to use
|
||||
id: tag
|
||||
run: |
|
||||
@@ -53,7 +45,7 @@ jobs:
|
||||
fi
|
||||
|
||||
echo "No tag in input/event/GITHUB_REF — querying latest release via API..."
|
||||
LATEST_JSON=$(curl -sSf -H "Authorization: Bearer $GITHUB_TOKEN" -H "Accept: application/vnd.github+json" "https://api.github.com/repos/${{ github.repository }}/releases/latest" || true)
|
||||
LATEST_JSON=$(curl -sSf -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" -H "Accept: application/vnd.github+json" "https://api.github.com/repos/${{ github.repository }}/releases/latest" || true)
|
||||
TAG_NAME=$(echo "$LATEST_JSON" | jq -r '.tag_name // empty')
|
||||
if [ -n "$TAG_NAME" ]; then
|
||||
echo "Found latest release tag: $TAG_NAME"
|
||||
@@ -70,10 +62,24 @@ jobs:
|
||||
echo "ERROR: No tag determined. Provide a tag when running manually or ensure a release exists."
|
||||
exit 1
|
||||
|
||||
linux-release:
|
||||
needs: prepare
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- name: Install apt deps (jq/zip + dev-libs)
|
||||
run: |
|
||||
sudo apt-get update
|
||||
sudo apt-get install -y \
|
||||
zip jq \
|
||||
libpipewire-0.3-dev \
|
||||
libclang-dev \
|
||||
libasound2-dev
|
||||
|
||||
- name: Checkout code at tag
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
ref: ${{ steps.tag.outputs.tag || github.ref }}
|
||||
ref: ${{ needs.prepare.outputs.tag }}
|
||||
fetch-depth: 0
|
||||
|
||||
- name: Setup Rust toolchain
|
||||
@@ -98,7 +104,7 @@ jobs:
|
||||
shell: bash
|
||||
run: |
|
||||
set -euo pipefail
|
||||
TAG="${{ steps.tag.outputs.tag }}"
|
||||
TAG="${{ needs.prepare.outputs.tag }}"
|
||||
ARCHIVE_NAME="pwsp-${TAG}-linux-x64.zip"
|
||||
echo "Creating archive: $ARCHIVE_NAME"
|
||||
|
||||
@@ -127,6 +133,51 @@ jobs:
|
||||
uses: softprops/action-gh-release@v2
|
||||
with:
|
||||
token: ${{ secrets.GITHUB_TOKEN }}
|
||||
tag_name: ${{ steps.tag.outputs.tag }}
|
||||
tag_name: ${{ needs.prepare.outputs.tag }}
|
||||
files: |
|
||||
pwsp-*.zip
|
||||
|
||||
- name: Install cargo-deb and create .deb
|
||||
shell: bash
|
||||
run: |
|
||||
set -euo pipefail
|
||||
cargo install --locked cargo-deb
|
||||
export PATH="$HOME/.cargo/bin:$PATH"
|
||||
|
||||
cargo-deb
|
||||
|
||||
- name: Upload .deb(s) to release
|
||||
uses: softprops/action-gh-release@v2
|
||||
with:
|
||||
token: ${{ secrets.GITHUB_TOKEN }}
|
||||
tag_name: ${{ needs.prepare.outputs.tag }}
|
||||
files: |
|
||||
target/debian/*.deb
|
||||
|
||||
flatpak-release:
|
||||
needs: prepare
|
||||
runs-on: ubuntu-latest
|
||||
container:
|
||||
image: bilelmoussaoui/flatpak-github-actions:freedesktop-24.08
|
||||
options: --privileged
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
ref: ${{ needs.prepare.outputs.tag }}
|
||||
|
||||
- name: Build Flatpak
|
||||
uses: flatpak/flatpak-github-actions/flatpak-builder@v6
|
||||
with:
|
||||
bundle: ru.arabianq.pwsp.flatpak
|
||||
manifest-path: packages/flatpak/ru.arabianq.pwsp.yaml
|
||||
cache: true
|
||||
branch: master
|
||||
build-bundle: true
|
||||
|
||||
- name: Upload Flatpak to release
|
||||
uses: softprops/action-gh-release@v2
|
||||
with:
|
||||
token: ${{ secrets.GITHUB_TOKEN }}
|
||||
tag_name: ${{ needs.prepare.outputs.tag }}
|
||||
files: ru.arabianq.pwsp.flatpak
|
||||
@@ -1,2 +1,4 @@
|
||||
/target
|
||||
.idea
|
||||
packages/aur/bin/.git
|
||||
packages/aur/standart/.git
|
||||
|
||||
@@ -1,9 +0,0 @@
|
||||
[submodule "packages/aur"]
|
||||
path = packages/aur
|
||||
url = ssh://aur@aur.archlinux.org/pwsp.git
|
||||
[submodule "packages/aur/standart"]
|
||||
path = packages/aur/standart
|
||||
url = ssh://aur@aur.archlinux.org/pwsp.git
|
||||
[submodule "packages/aur/bin"]
|
||||
path = packages/aur/bin
|
||||
url = ssh://aur@aur.archlinux.org/pwsp-bin.git
|
||||
|
||||
Generated
+306
-221
File diff suppressed because it is too large
Load Diff
+4
-4
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "pwsp"
|
||||
version = "1.6.0"
|
||||
version = "1.6.2"
|
||||
edition = "2024"
|
||||
authors = ["arabian"]
|
||||
description = "PWSP lets you play audio files through your microphone. Has both CLI and GUI clients."
|
||||
@@ -12,13 +12,13 @@ keywords = ["soundpad", "pipewire", "linux", "cli", "gui"]
|
||||
|
||||
|
||||
[dependencies]
|
||||
tokio = { version = "1.49.0", features = ["full"] }
|
||||
tokio = { version = "1.50.0", features = ["full"] }
|
||||
async-trait = "0.1.89"
|
||||
|
||||
serde = { version = "1.0.228", features = ["derive"] }
|
||||
serde_json = "1.0.149"
|
||||
|
||||
clap = { version = "4.5.58", default-features = false, features = [
|
||||
clap = { version = "4.5.60", default-features = false, features = [
|
||||
"std",
|
||||
"suggestions",
|
||||
"help",
|
||||
@@ -29,7 +29,7 @@ clap = { version = "4.5.58", default-features = false, features = [
|
||||
dirs = "6.0.0"
|
||||
itertools = "0.14.0"
|
||||
|
||||
rodio = { version = "0.21.1", default-features = false, features = [
|
||||
rodio = { version = "0.22.2", default-features = false, features = [
|
||||
"symphonia-all",
|
||||
"playback",
|
||||
] }
|
||||
|
||||
Submodule packages/aur/bin deleted from 534cbc33ba
@@ -0,0 +1,17 @@
|
||||
pkgbase = pwsp-bin
|
||||
pkgdesc = Lets you play audio files through your microphone (Pre-built binaries)
|
||||
pkgver = 1.6.2
|
||||
pkgrel = 2
|
||||
url = https://github.com/arabianq/pipewire-soundpad
|
||||
arch = x86_64
|
||||
license = MIT
|
||||
depends = pipewire
|
||||
depends = alsa-lib
|
||||
provides = pwsp
|
||||
conflicts = pwsp
|
||||
source = pwsp-bin-1.6.2.zip :: https://github.com/arabianq/pipewire-soundpad/releases/download/v1.6.2/pwsp-v1.6.2-linux-x64.zip
|
||||
source = pipewire-soundpad-1.6.2.tar.gz :: https://github.com/arabianq/pipewire-soundpad/archive/refs/tags/v1.6.2.tar.gz
|
||||
sha256sums = SKIP
|
||||
sha256sums = SKIP
|
||||
|
||||
pkgname = pwsp-bin
|
||||
@@ -0,0 +1,163 @@
|
||||
# Byte-compiled / optimized / DLL files
|
||||
__pycache__/
|
||||
*.py[cod]
|
||||
*$py.class
|
||||
|
||||
# C extensions
|
||||
*.so
|
||||
|
||||
# Distribution / packaging
|
||||
.Python
|
||||
build/
|
||||
develop-eggs/
|
||||
dist/
|
||||
downloads/
|
||||
eggs/
|
||||
.eggs/
|
||||
lib/
|
||||
lib64/
|
||||
parts/
|
||||
sdist/
|
||||
var/
|
||||
wheels/
|
||||
share/python-wheels/
|
||||
*.egg-info/
|
||||
.installed.cfg
|
||||
*.egg
|
||||
MANIFEST
|
||||
|
||||
# PyInstaller
|
||||
# Usually these files are written by a python script from a template
|
||||
# before PyInstaller builds the exe, so as to inject date/other infos into it.
|
||||
*.manifest
|
||||
*.spec
|
||||
|
||||
# Installer logs
|
||||
pip-log.txt
|
||||
pip-delete-this-directory.txt
|
||||
|
||||
# Unit test / coverage reports
|
||||
htmlcov/
|
||||
.tox/
|
||||
.nox/
|
||||
.coverage
|
||||
.coverage.*
|
||||
.cache
|
||||
nosetests.xml
|
||||
coverage.xml
|
||||
*.cover
|
||||
*.py,cover
|
||||
.hypothesis/
|
||||
.pytest_cache/
|
||||
cover/
|
||||
|
||||
# Translations
|
||||
*.mo
|
||||
*.pot
|
||||
|
||||
# Django stuff:
|
||||
*.log
|
||||
local_settings.py
|
||||
db.sqlite3
|
||||
db.sqlite3-journal
|
||||
*.db
|
||||
# Flask stuff:
|
||||
instance/
|
||||
.webassets-cache
|
||||
|
||||
# Scrapy stuff:
|
||||
.scrapy
|
||||
|
||||
# Sphinx documentation
|
||||
docs/_build/
|
||||
|
||||
# PyBuilder
|
||||
.pybuilder/
|
||||
target/
|
||||
|
||||
# Jupyter Notebook
|
||||
.ipynb_checkpoints
|
||||
|
||||
# IPython
|
||||
profile_default/
|
||||
ipython_config.py
|
||||
|
||||
# pyenv
|
||||
# For a library or package, you might want to ignore these files since the code is
|
||||
# intended to run in multiple environments; otherwise, check them in:
|
||||
# .python-version
|
||||
|
||||
# pipenv
|
||||
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
|
||||
# However, in case of collaboration, if having platform-specific dependencies or dependencies
|
||||
# having no cross-platform support, pipenv may install dependencies that don't work, or not
|
||||
# install all needed dependencies.
|
||||
#Pipfile.lock
|
||||
|
||||
# poetry
|
||||
# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
|
||||
# This is especially recommended for binary packages to ensure reproducibility, and is more
|
||||
# commonly ignored for libraries.
|
||||
# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
|
||||
poetry.lock
|
||||
|
||||
.poetry.lock
|
||||
|
||||
# pdm
|
||||
# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
|
||||
#pdm.lock
|
||||
# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
|
||||
# in version control.
|
||||
# https://pdm.fming.dev/#use-with-ide
|
||||
.pdm.toml
|
||||
|
||||
# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
|
||||
__pypackages__/
|
||||
|
||||
# Celery stuff
|
||||
celerybeat-schedule
|
||||
celerybeat.pid
|
||||
|
||||
# SageMath parsed files
|
||||
*.sage.py
|
||||
|
||||
# Environments
|
||||
.env
|
||||
.venv
|
||||
env/
|
||||
venv/
|
||||
ENV/
|
||||
env.bak/
|
||||
venv.bak/
|
||||
|
||||
# Spyder project settings
|
||||
.spyderproject
|
||||
.spyproject
|
||||
|
||||
# Rope project settings
|
||||
.ropeproject
|
||||
|
||||
# mkdocs documentation
|
||||
/site
|
||||
|
||||
# mypy
|
||||
.mypy_cache/
|
||||
.dmypy.json
|
||||
dmypy.json
|
||||
|
||||
# Pyre type checker
|
||||
.pyre/
|
||||
|
||||
# pytype static type analyzer
|
||||
.pytype/
|
||||
|
||||
# Cython debug symbols
|
||||
cythikaaryhon_debug/
|
||||
|
||||
# PyCharm
|
||||
# JetBrains specific template is maintained in a separate JetBrains.gitignore that can
|
||||
# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
|
||||
# and can be added to the global gitignore or merged into this file. For a more nuclear
|
||||
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
|
||||
#.idea/
|
||||
#.vscode/
|
||||
@@ -0,0 +1,32 @@
|
||||
# Maintainer: Alexander Tarasov <a.tevg@ya.ru>
|
||||
pkgname=pwsp-bin
|
||||
_pkgname=pipewire-soundpad
|
||||
pkgver=1.6.2
|
||||
pkgrel=2
|
||||
pkgdesc="Lets you play audio files through your microphone (Pre-built binaries)"
|
||||
arch=('x86_64')
|
||||
url="https://github.com/arabianq/pipewire-soundpad"
|
||||
license=('MIT')
|
||||
depends=('pipewire' 'alsa-lib')
|
||||
provides=('pwsp')
|
||||
conflicts=('pwsp')
|
||||
|
||||
source=("${pkgname}-${pkgver}.zip::https://github.com/arabianq/$_pkgname/releases/download/v$pkgver/pwsp-v$pkgver-linux-x64.zip"
|
||||
"${_pkgname}-${pkgver}.tar.gz::https://github.com/arabianq/$_pkgname/archive/refs/tags/v$pkgver.tar.gz")
|
||||
|
||||
sha256sums=('SKIP'
|
||||
'SKIP')
|
||||
|
||||
package() {
|
||||
_srcsrc="${srcdir}/${_pkgname}-${pkgver}"
|
||||
|
||||
install -Dm755 "${srcdir}/pwsp-cli" "${pkgdir}/usr/bin/pwsp-cli"
|
||||
install -Dm755 "${srcdir}/pwsp-daemon" "${pkgdir}/usr/bin/pwsp-daemon"
|
||||
install -Dm755 "${srcdir}/pwsp-gui" "${pkgdir}/usr/bin/pwsp-gui"
|
||||
|
||||
install -Dm644 "$_srcsrc/assets/pwsp-gui.desktop" "${pkgdir}/usr/share/applications/pwsp-gui.desktop"
|
||||
install -Dm644 "$_srcsrc/assets/icon.png" "${pkgdir}/usr/share/icons/hicolor/256x256/apps/icon.png"
|
||||
install -Dm644 "$_srcsrc/assets/pwsp-daemon.service" "${pkgdir}/usr/lib/systemd/user/pwsp-daemon.service"
|
||||
|
||||
install -Dm644 "$_srcsrc/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
|
||||
}
|
||||
Submodule packages/aur/standart deleted from b381a90a50
@@ -0,0 +1,16 @@
|
||||
pkgbase = pwsp
|
||||
pkgdesc = Lets you play audio files through your microphone
|
||||
pkgver = 1.6.2
|
||||
pkgrel = 1
|
||||
url = https://github.com/arabianq/pipewire-soundpad
|
||||
arch = any
|
||||
license = MIT
|
||||
makedepends = clang
|
||||
makedepends = rust
|
||||
makedepends = cargo
|
||||
makedepends = pipewire
|
||||
makedepends = alsa-lib
|
||||
source = https://github.com/arabianq/pipewire-soundpad/archive/refs/tags/v1.6.2.tar.gz
|
||||
sha256sums = SKIP
|
||||
|
||||
pkgname = pwsp
|
||||
@@ -0,0 +1,163 @@
|
||||
# Byte-compiled / optimized / DLL files
|
||||
__pycache__/
|
||||
*.py[cod]
|
||||
*$py.class
|
||||
|
||||
# C extensions
|
||||
*.so
|
||||
|
||||
# Distribution / packaging
|
||||
.Python
|
||||
build/
|
||||
develop-eggs/
|
||||
dist/
|
||||
downloads/
|
||||
eggs/
|
||||
.eggs/
|
||||
lib/
|
||||
lib64/
|
||||
parts/
|
||||
sdist/
|
||||
var/
|
||||
wheels/
|
||||
share/python-wheels/
|
||||
*.egg-info/
|
||||
.installed.cfg
|
||||
*.egg
|
||||
MANIFEST
|
||||
|
||||
# PyInstaller
|
||||
# Usually these files are written by a python script from a template
|
||||
# before PyInstaller builds the exe, so as to inject date/other infos into it.
|
||||
*.manifest
|
||||
*.spec
|
||||
|
||||
# Installer logs
|
||||
pip-log.txt
|
||||
pip-delete-this-directory.txt
|
||||
|
||||
# Unit test / coverage reports
|
||||
htmlcov/
|
||||
.tox/
|
||||
.nox/
|
||||
.coverage
|
||||
.coverage.*
|
||||
.cache
|
||||
nosetests.xml
|
||||
coverage.xml
|
||||
*.cover
|
||||
*.py,cover
|
||||
.hypothesis/
|
||||
.pytest_cache/
|
||||
cover/
|
||||
|
||||
# Translations
|
||||
*.mo
|
||||
*.pot
|
||||
|
||||
# Django stuff:
|
||||
*.log
|
||||
local_settings.py
|
||||
db.sqlite3
|
||||
db.sqlite3-journal
|
||||
*.db
|
||||
# Flask stuff:
|
||||
instance/
|
||||
.webassets-cache
|
||||
|
||||
# Scrapy stuff:
|
||||
.scrapy
|
||||
|
||||
# Sphinx documentation
|
||||
docs/_build/
|
||||
|
||||
# PyBuilder
|
||||
.pybuilder/
|
||||
target/
|
||||
|
||||
# Jupyter Notebook
|
||||
.ipynb_checkpoints
|
||||
|
||||
# IPython
|
||||
profile_default/
|
||||
ipython_config.py
|
||||
|
||||
# pyenv
|
||||
# For a library or package, you might want to ignore these files since the code is
|
||||
# intended to run in multiple environments; otherwise, check them in:
|
||||
# .python-version
|
||||
|
||||
# pipenv
|
||||
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
|
||||
# However, in case of collaboration, if having platform-specific dependencies or dependencies
|
||||
# having no cross-platform support, pipenv may install dependencies that don't work, or not
|
||||
# install all needed dependencies.
|
||||
#Pipfile.lock
|
||||
|
||||
# poetry
|
||||
# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
|
||||
# This is especially recommended for binary packages to ensure reproducibility, and is more
|
||||
# commonly ignored for libraries.
|
||||
# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
|
||||
poetry.lock
|
||||
|
||||
.poetry.lock
|
||||
|
||||
# pdm
|
||||
# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
|
||||
#pdm.lock
|
||||
# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
|
||||
# in version control.
|
||||
# https://pdm.fming.dev/#use-with-ide
|
||||
.pdm.toml
|
||||
|
||||
# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
|
||||
__pypackages__/
|
||||
|
||||
# Celery stuff
|
||||
celerybeat-schedule
|
||||
celerybeat.pid
|
||||
|
||||
# SageMath parsed files
|
||||
*.sage.py
|
||||
|
||||
# Environments
|
||||
.env
|
||||
.venv
|
||||
env/
|
||||
venv/
|
||||
ENV/
|
||||
env.bak/
|
||||
venv.bak/
|
||||
|
||||
# Spyder project settings
|
||||
.spyderproject
|
||||
.spyproject
|
||||
|
||||
# Rope project settings
|
||||
.ropeproject
|
||||
|
||||
# mkdocs documentation
|
||||
/site
|
||||
|
||||
# mypy
|
||||
.mypy_cache/
|
||||
.dmypy.json
|
||||
dmypy.json
|
||||
|
||||
# Pyre type checker
|
||||
.pyre/
|
||||
|
||||
# pytype static type analyzer
|
||||
.pytype/
|
||||
|
||||
# Cython debug symbols
|
||||
cythikaaryhon_debug/
|
||||
|
||||
# PyCharm
|
||||
# JetBrains specific template is maintained in a separate JetBrains.gitignore that can
|
||||
# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
|
||||
# and can be added to the global gitignore or merged into this file. For a more nuclear
|
||||
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
|
||||
#.idea/
|
||||
#.vscode/
|
||||
@@ -0,0 +1,47 @@
|
||||
# Maintainer: Alexander Tarasov <a.tevg@ya.ru>
|
||||
pkgsubn=pwsp
|
||||
pkgname=pwsp
|
||||
pkgver=1.6.2
|
||||
pkgrel=1
|
||||
pkgdesc="Lets you play audio files through your microphone"
|
||||
arch=('any')
|
||||
url="https://github.com/arabianq/pipewire-soundpad"
|
||||
license=('MIT')
|
||||
makedepends=(clang rust cargo pipewire alsa-lib)
|
||||
source=("$url/archive/refs/tags/v$pkgver.tar.gz")
|
||||
sha256sums=('SKIP')
|
||||
|
||||
|
||||
prepare() {
|
||||
cd "${srcdir}/pipewire-soundpad-${pkgver}"
|
||||
|
||||
export CARGO_HOME="${srcdir}/${pkgname%}/.cargo" # Download all to src directory, not in ~/.cargo
|
||||
|
||||
cargo fetch --locked --target "$(rustc -vV | sed -n 's/host: //p')"
|
||||
}
|
||||
|
||||
build() {
|
||||
cd "${srcdir}/pipewire-soundpad-${pkgver}"
|
||||
|
||||
export CARGO_ENCODED_RUSTFLAGS="--remap-path-prefix=${srcdir}=/" # Prevent warning: 'Package contains reference to $srcdir'
|
||||
[[ -n "${_sccache}" ]] && export RUSTC_WRAPPER=sccache # If $_sccache not empty, build using binary cache
|
||||
|
||||
export CARGO_HOME="${srcdir}/${pkgname%}/.cargo" # Use downloaded earlier from src directory, not from ~/.cargo
|
||||
export CARGO_TARGET_DIR=target # Place the output in target relative to the current directory
|
||||
|
||||
cargo build --frozen --release
|
||||
}
|
||||
|
||||
|
||||
package() {
|
||||
cd "${srcdir}/pipewire-soundpad-${pkgver}"
|
||||
|
||||
install -Dm755 "target/release/pwsp-cli" "${pkgdir}/usr/bin/pwsp-cli"
|
||||
install -Dm755 "target/release/pwsp-daemon" "${pkgdir}/usr/bin/pwsp-daemon"
|
||||
install -Dm755 "target/release/pwsp-gui" "${pkgdir}/usr/bin/pwsp-gui"
|
||||
|
||||
install -Dm644 "assets/pwsp-gui.desktop" "${pkgdir}/usr/share/applications/pwsp-gui.desktop"
|
||||
install -Dm644 "assets/icon.png" "${pkgdir}/usr/share/icons/hicolor/256x256/apps/icon.png"
|
||||
|
||||
install -Dm644 "assets/pwsp-daemon.service" "${pkgdir}/usr/lib/systemd/user/pwsp-daemon.service"
|
||||
}
|
||||
Executable
+35
@@ -0,0 +1,35 @@
|
||||
#!/usr/bin/env python3
|
||||
|
||||
import argparse
|
||||
import subprocess
|
||||
|
||||
if __name__ == "__main__":
|
||||
parser = argparse.ArgumentParser(
|
||||
prog="PWSP Flatpak",
|
||||
add_help=True,
|
||||
exit_on_error=True
|
||||
)
|
||||
subparsers = parser.add_subparsers(dest="command")
|
||||
|
||||
cli_parser = subparsers.add_parser("cli", add_help=False, prefix_chars=" ")
|
||||
cli_parser.add_argument("args", nargs=argparse.REMAINDER, help="Arguments for pwsp-cli")
|
||||
|
||||
daemon_parser = subparsers.add_parser("daemon", add_help=True)
|
||||
daemon_group = daemon_parser.add_mutually_exclusive_group(required=True)
|
||||
daemon_group.add_argument("--start", action="store_true", help="Start pwps-daemon")
|
||||
daemon_group.add_argument("--kill", action="store_true", help="Kill pwsp-daemon")
|
||||
|
||||
args = parser.parse_args()
|
||||
|
||||
command = args.command
|
||||
if not command:
|
||||
subprocess.Popen("pwsp-daemon")
|
||||
subprocess.Popen("pwsp-gui")
|
||||
else:
|
||||
if command == "cli":
|
||||
subprocess.Popen(["pwsp-cli"] + args.args)
|
||||
elif command == "daemon":
|
||||
if args.start:
|
||||
subprocess.Popen("pwsp-daemon")
|
||||
elif args.kill:
|
||||
subprocess.Popen(["pwsp-cli", "action", "kill"])
|
||||
@@ -1,4 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
pwsp-daemon &
|
||||
exec pwsp-gui "$@"
|
||||
@@ -1,7 +1,7 @@
|
||||
[Desktop Entry]
|
||||
Name=PWSP (Soundpad)
|
||||
Comment=Let's you play audio files through you microphone
|
||||
Exec=pwsp-wrapper.sh %u
|
||||
Exec=pwsp-wrapper.py %u
|
||||
Icon=ru.arabianq.pwsp
|
||||
Terminal=false
|
||||
Type=Application
|
||||
|
||||
@@ -5,7 +5,7 @@ sdk: org.freedesktop.Sdk
|
||||
sdk-extensions:
|
||||
- org.freedesktop.Sdk.Extension.rust-stable
|
||||
- org.freedesktop.Sdk.Extension.llvm20
|
||||
command: pwsp-wrapper.sh
|
||||
command: pwsp-wrapper.py
|
||||
finish-args:
|
||||
- --share=ipc
|
||||
- --socket=fallback-x11
|
||||
@@ -38,7 +38,7 @@ modules:
|
||||
- install -Dm755 target/release/pwsp-daemon /app/bin/pwsp-daemon
|
||||
- install -Dm755 target/release/pwsp-cli /app/bin/pwsp-cli
|
||||
- install -Dm755 target/release/pwsp-gui /app/bin/pwsp-gui
|
||||
- install -Dm755 packages/flatpak/pwsp-wrapper.sh /app/bin/pwsp-wrapper.sh
|
||||
- install -Dm755 packages/flatpak/pwsp-wrapper.py /app/bin/pwsp-wrapper.py
|
||||
- install -Dm644 assets/icon.png /app/share/icons/hicolor/256x256/apps/ru.arabianq.pwsp.png
|
||||
- install -Dm644 packages/flatpak/ru.arabianq.pwsp.desktop /app/share/applications/ru.arabianq.pwsp.desktop
|
||||
- install -Dm644 packages/flatpak/ru.arabianq.pwsp.metainfo.xml /app/share/metainfo/ru.arabianq.pwsp.metainfo.xml
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
%global cargo_install_lib 0
|
||||
|
||||
Name: pwsp
|
||||
Version: 1.6.0
|
||||
Version: 1.6.2
|
||||
Release: %autorelease
|
||||
Summary: Lets you play audio files through your microphone
|
||||
|
||||
|
||||
+9
-3
@@ -35,6 +35,8 @@ enum Commands {
|
||||
enum Actions {
|
||||
/// Ping the daemon
|
||||
Ping,
|
||||
/// Kill the daemon
|
||||
Kill,
|
||||
/// Pause audio playback
|
||||
Pause {
|
||||
#[clap(short, long)]
|
||||
@@ -73,7 +75,10 @@ enum GetCommands {
|
||||
/// Check if the player is paused
|
||||
IsPaused,
|
||||
/// Playback volume
|
||||
Volume,
|
||||
Volume {
|
||||
#[clap(short, long)]
|
||||
id: Option<u32>,
|
||||
},
|
||||
/// Playback position (in seconds)
|
||||
Position {
|
||||
#[clap(short, long)]
|
||||
@@ -131,6 +136,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
|
||||
let request = match cli.command {
|
||||
Commands::Action { action } => match action {
|
||||
Actions::Ping => Request::ping(),
|
||||
Actions::Kill => Request::kill(),
|
||||
Actions::Pause { id } => Request::pause(id),
|
||||
Actions::Resume { id } => Request::resume(id),
|
||||
Actions::TogglePause { id } => Request::toggle_pause(id),
|
||||
@@ -138,12 +144,12 @@ async fn main() -> Result<(), Box<dyn Error>> {
|
||||
Actions::Play {
|
||||
file_path,
|
||||
concurrent,
|
||||
} => Request::play(file_path.to_str().unwrap(), concurrent),
|
||||
} => Request::play(&file_path.to_string_lossy(), concurrent),
|
||||
Actions::ToggleLoop { id } => Request::toggle_loop(id),
|
||||
},
|
||||
Commands::Get { parameter } => match parameter {
|
||||
GetCommands::IsPaused => Request::get_is_paused(),
|
||||
GetCommands::Volume => Request::get_volume(),
|
||||
GetCommands::Volume { id } => Request::get_volume(id),
|
||||
GetCommands::Position { id } => Request::get_position(id),
|
||||
GetCommands::Duration { id } => Request::get_duration(id),
|
||||
GetCommands::State => Request::get_state(),
|
||||
|
||||
+36
-2
@@ -27,6 +27,16 @@ async fn main() -> Result<(), Box<dyn Error>> {
|
||||
get_daemon_config(); // Initialize daemon config
|
||||
create_virtual_mic()?;
|
||||
get_audio_player().await; // Initialize audio player
|
||||
|
||||
let max_retries = 5;
|
||||
for i in 0..=max_retries {
|
||||
match link_player_to_virtual_mic().await {
|
||||
Ok(_) => break,
|
||||
Err(e) => println!("{e}\t{i}/{max_retries}"),
|
||||
}
|
||||
|
||||
sleep(Duration::from_millis(300 * i)).await;
|
||||
}
|
||||
link_player_to_virtual_mic().await?;
|
||||
|
||||
let runtime_dir = get_runtime_dir();
|
||||
@@ -85,7 +95,21 @@ async fn commands_loop(listener: UnixListener) -> Result<(), Box<dyn Error>> {
|
||||
return;
|
||||
}
|
||||
|
||||
let request: Request = serde_json::from_slice(&buffer).unwrap();
|
||||
let request: Request = match serde_json::from_slice(&buffer) {
|
||||
Ok(req) => req,
|
||||
Err(err) => {
|
||||
let response =
|
||||
Response::new(false, format!("Failed to parse request: {}", err));
|
||||
let response_data = match serde_json::to_vec(&response) {
|
||||
Ok(data) => data,
|
||||
Err(_) => return, // Should not happen with this simple Response
|
||||
};
|
||||
let response_len = response_data.len() as u32;
|
||||
let _ = stream.write_all(&response_len.to_le_bytes()).await;
|
||||
let _ = stream.write_all(&response_data).await;
|
||||
return;
|
||||
}
|
||||
};
|
||||
// ---------- Read request (end) ----------
|
||||
|
||||
// ---------- Generate response (start) ----------
|
||||
@@ -99,7 +123,13 @@ async fn commands_loop(listener: UnixListener) -> Result<(), Box<dyn Error>> {
|
||||
// ---------- Generate response (end) ----------
|
||||
|
||||
// ---------- Send response (start) ----------
|
||||
let response_data = serde_json::to_vec(&response).unwrap();
|
||||
let response_data = match serde_json::to_vec(&response) {
|
||||
Ok(data) => data,
|
||||
Err(err) => {
|
||||
eprintln!("Failed to serialize response: {}", err);
|
||||
return;
|
||||
}
|
||||
};
|
||||
let response_len = response_data.len() as u32;
|
||||
|
||||
if stream.write_all(&response_len.to_le_bytes()).await.is_err() {
|
||||
@@ -111,6 +141,10 @@ async fn commands_loop(listener: UnixListener) -> Result<(), Box<dyn Error>> {
|
||||
return;
|
||||
}
|
||||
// ---------- Send response (end) ----------
|
||||
|
||||
if response.status && response.message.eq("killed") {
|
||||
std::process::exit(0);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
+25
-5
@@ -1,5 +1,5 @@
|
||||
use crate::gui::SoundpadGui;
|
||||
use egui::{Context, Key, Modifiers};
|
||||
use egui::{Context, Id, Key, Modifiers};
|
||||
|
||||
use std::path::PathBuf;
|
||||
|
||||
@@ -12,28 +12,48 @@ impl SoundpadGui {
|
||||
ctx.input(|i| i.modifiers)
|
||||
}
|
||||
|
||||
fn get_focused(&self, ctx: &Context) -> Option<Id> {
|
||||
ctx.memory(|m| m.focused())
|
||||
}
|
||||
|
||||
pub fn handle_input(&mut self, ctx: &Context) {
|
||||
let modifiers = self.modifiers(ctx);
|
||||
let search_focused = {
|
||||
if let Some(focused_id) = self.get_focused(ctx)
|
||||
&& let Some(search_id) = self.app_state.search_field_id
|
||||
&& focused_id.eq(&search_id)
|
||||
{
|
||||
true
|
||||
} else {
|
||||
false
|
||||
}
|
||||
};
|
||||
|
||||
// Open/close settings
|
||||
if self.key_pressed(ctx, Key::I) {
|
||||
if !search_focused && self.key_pressed(ctx, Key::I) {
|
||||
self.app_state.show_settings = !self.app_state.show_settings;
|
||||
}
|
||||
|
||||
if !self.app_state.show_settings {
|
||||
// Pause / resume audio on space
|
||||
if self.key_pressed(ctx, Key::Space) {
|
||||
if !search_focused && self.key_pressed(ctx, Key::Space) {
|
||||
self.play_toggle();
|
||||
}
|
||||
|
||||
// Stop all audio tracks on backspace
|
||||
if self.key_pressed(ctx, Key::Backspace) {
|
||||
if !search_focused && self.key_pressed(ctx, Key::Backspace) {
|
||||
self.stop(None);
|
||||
}
|
||||
|
||||
// Focus search field
|
||||
if self.key_pressed(ctx, Key::Slash) {
|
||||
self.app_state.force_focus_search = true;
|
||||
if search_focused {
|
||||
ctx.memory_mut(|m| {
|
||||
m.request_focus(Id::NULL);
|
||||
});
|
||||
} else {
|
||||
self.app_state.force_focus_search = true;
|
||||
}
|
||||
}
|
||||
|
||||
// Play selected file on Enter
|
||||
|
||||
+1
-1
@@ -113,7 +113,7 @@ impl SoundpadGui {
|
||||
}
|
||||
|
||||
pub fn play_file(&mut self, path: &PathBuf, concurrent: bool) {
|
||||
make_request_async(Request::play(path.to_str().unwrap(), concurrent));
|
||||
make_request_async(Request::play(&path.to_string_lossy(), concurrent));
|
||||
}
|
||||
|
||||
pub fn set_input(&mut self, name: String) {
|
||||
|
||||
@@ -5,7 +5,7 @@ use crate::{
|
||||
pipewire::{create_link, get_device},
|
||||
},
|
||||
};
|
||||
use rodio::{Decoder, OutputStream, OutputStreamBuilder, Sink, Source};
|
||||
use rodio::{Decoder, DeviceSinkBuilder, MixerDeviceSink, Player, Source};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use std::{
|
||||
collections::HashMap,
|
||||
@@ -45,7 +45,7 @@ pub struct FullState {
|
||||
|
||||
pub struct PlayingSound {
|
||||
pub id: u32,
|
||||
pub sink: Sink,
|
||||
pub sink: Player,
|
||||
pub path: PathBuf,
|
||||
pub duration: Option<f32>,
|
||||
pub looped: bool,
|
||||
@@ -53,7 +53,7 @@ pub struct PlayingSound {
|
||||
}
|
||||
|
||||
pub struct AudioPlayer {
|
||||
pub stream_handle: OutputStream,
|
||||
pub stream_handle: MixerDeviceSink,
|
||||
pub tracks: HashMap<u32, PlayingSound>,
|
||||
pub next_id: u32,
|
||||
|
||||
@@ -68,7 +68,7 @@ impl AudioPlayer {
|
||||
let daemon_config = get_daemon_config();
|
||||
let default_volume = daemon_config.default_volume.unwrap_or(1.0);
|
||||
|
||||
let stream_handle = OutputStreamBuilder::open_default_stream()?;
|
||||
let stream_handle = DeviceSinkBuilder::open_default_sink()?;
|
||||
|
||||
let mut audio_player = AudioPlayer {
|
||||
stream_handle,
|
||||
@@ -208,6 +208,18 @@ impl AudioPlayer {
|
||||
PlayerState::Stopped
|
||||
}
|
||||
|
||||
pub fn get_volume(&mut self, id: Option<u32>) -> Option<f32> {
|
||||
if let Some(id) = id {
|
||||
if let Some(sound) = self.tracks.get_mut(&id) {
|
||||
return Some(sound.sink.volume());
|
||||
} else {
|
||||
return None;
|
||||
}
|
||||
} else {
|
||||
return Some(self.volume);
|
||||
}
|
||||
}
|
||||
|
||||
pub fn set_volume(&mut self, volume: f32, id: Option<u32>) {
|
||||
if let Some(id) = id {
|
||||
if let Some(sound) = self.tracks.get_mut(&id) {
|
||||
@@ -282,7 +294,7 @@ impl AudioPlayer {
|
||||
|
||||
let duration = source.total_duration().map(|d| d.as_secs_f32());
|
||||
|
||||
let sink = Sink::connect_new(self.stream_handle.mixer());
|
||||
let sink = Player::connect_new(self.stream_handle.mixer());
|
||||
sink.set_volume(self.volume); // Default volume is 1.0 * master
|
||||
sink.append(source);
|
||||
sink.play();
|
||||
|
||||
+43
-11
@@ -18,6 +18,8 @@ pub trait Executable {
|
||||
|
||||
pub struct PingCommand {}
|
||||
|
||||
pub struct KillCommand {}
|
||||
|
||||
pub struct PauseCommand {
|
||||
pub id: Option<u32>,
|
||||
}
|
||||
@@ -38,7 +40,9 @@ pub struct IsPausedCommand {}
|
||||
|
||||
pub struct GetStateCommand {}
|
||||
|
||||
pub struct GetVolumeCommand {}
|
||||
pub struct GetVolumeCommand {
|
||||
pub id: Option<u32>,
|
||||
}
|
||||
|
||||
pub struct SetVolumeCommand {
|
||||
pub volume: Option<f32>,
|
||||
@@ -93,6 +97,13 @@ impl Executable for PingCommand {
|
||||
}
|
||||
}
|
||||
|
||||
#[async_trait]
|
||||
impl Executable for KillCommand {
|
||||
async fn execute(&self) -> Response {
|
||||
Response::new(true, "killed")
|
||||
}
|
||||
}
|
||||
|
||||
#[async_trait]
|
||||
impl Executable for PauseCommand {
|
||||
async fn execute(&self) -> Response {
|
||||
@@ -172,16 +183,24 @@ impl Executable for GetStateCommand {
|
||||
async fn execute(&self) -> Response {
|
||||
let audio_player = get_audio_player().await.lock().await;
|
||||
let state = audio_player.get_state();
|
||||
Response::new(true, serde_json::to_string(&state).unwrap())
|
||||
match serde_json::to_string(&state) {
|
||||
Ok(json) => Response::new(true, json),
|
||||
Err(err) => Response::new(false, format!("Failed to serialize state: {}", err)),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[async_trait]
|
||||
impl Executable for GetVolumeCommand {
|
||||
async fn execute(&self) -> Response {
|
||||
let audio_player = get_audio_player().await.lock().await;
|
||||
let volume = audio_player.volume;
|
||||
let mut audio_player = get_audio_player().await.lock().await;
|
||||
let volume = audio_player.get_volume(self.id);
|
||||
|
||||
if let Some(volume) = volume {
|
||||
Response::new(true, volume.to_string())
|
||||
} else {
|
||||
Response::new(false, "Failed to get volume")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -256,7 +275,10 @@ impl Executable for GetTracksCommand {
|
||||
async fn execute(&self) -> Response {
|
||||
let audio_player = get_audio_player().await.lock().await;
|
||||
let tracks = audio_player.get_tracks();
|
||||
Response::new(true, serde_json::to_string(&tracks).unwrap())
|
||||
match serde_json::to_string(&tracks) {
|
||||
Ok(json) => Response::new(true, json),
|
||||
Err(err) => Response::new(false, format!("Failed to serialize tracks: {}", err)),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -282,7 +304,10 @@ impl Executable for GetCurrentInputCommand {
|
||||
#[async_trait]
|
||||
impl Executable for GetAllInputsCommand {
|
||||
async fn execute(&self) -> Response {
|
||||
let (input_devices, _output_devices) = get_all_devices().await.unwrap();
|
||||
let (input_devices, _output_devices) = match get_all_devices().await {
|
||||
Ok(devices) => devices,
|
||||
Err(err) => return Response::new(false, format!("Failed to get devices: {}", err)),
|
||||
};
|
||||
let mut input_devices_strings = vec![];
|
||||
for device in input_devices {
|
||||
if device.name == "pwsp-virtual-mic" {
|
||||
@@ -359,18 +384,22 @@ impl Executable for GetDaemonVersionCommand {
|
||||
#[async_trait]
|
||||
impl Executable for GetFullStateCommand {
|
||||
async fn execute(&self) -> Response {
|
||||
let (input_devices, _output_devices) = get_all_devices().await.unwrap();
|
||||
let (input_devices, _output_devices) = match get_all_devices().await {
|
||||
Ok(devices) => devices,
|
||||
Err(err) => return Response::new(false, format!("Failed to get devices: {}", err)),
|
||||
};
|
||||
let mut all_inputs = HashMap::new();
|
||||
let mut current_input_nick = String::new();
|
||||
|
||||
let audio_player = get_audio_player().await.lock().await;
|
||||
let current_input_name = audio_player.input_device_name.as_deref();
|
||||
for device in input_devices {
|
||||
if device.name == "pwsp-virtual-mic" {
|
||||
continue;
|
||||
}
|
||||
|
||||
if let Some(current_input_name) = &audio_player.input_device_name {
|
||||
if device.name == *current_input_name {
|
||||
if let Some(name) = current_input_name {
|
||||
if device.name == name {
|
||||
current_input_nick = format!("{} - {}", device.name, device.nick);
|
||||
}
|
||||
}
|
||||
@@ -383,9 +412,12 @@ impl Executable for GetFullStateCommand {
|
||||
tracks: audio_player.get_tracks(),
|
||||
volume: audio_player.volume,
|
||||
current_input: current_input_nick,
|
||||
all_inputs: all_inputs,
|
||||
all_inputs,
|
||||
};
|
||||
|
||||
Response::new(true, serde_json::to_string(&full_state).unwrap())
|
||||
match serde_json::to_string(&full_state) {
|
||||
Ok(json) => Response::new(true, json),
|
||||
Err(err) => Response::new(false, format!("Failed to serialize full state: {}", err)),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+12
-2
@@ -24,6 +24,10 @@ impl Request {
|
||||
Request::new("ping", vec![])
|
||||
}
|
||||
|
||||
pub fn kill() -> Self {
|
||||
Request::new("kill", vec![])
|
||||
}
|
||||
|
||||
pub fn pause(id: Option<u32>) -> Self {
|
||||
let mut args = vec![];
|
||||
let id_str;
|
||||
@@ -78,8 +82,14 @@ impl Request {
|
||||
Request::new("is_paused", vec![])
|
||||
}
|
||||
|
||||
pub fn get_volume() -> Self {
|
||||
Request::new("get_volume", vec![])
|
||||
pub fn get_volume(id: Option<u32>) -> Self {
|
||||
let mut args = vec![];
|
||||
let id_str;
|
||||
if let Some(id) = id {
|
||||
id_str = id.to_string();
|
||||
args.push(("id", id_str.as_str()));
|
||||
}
|
||||
Request::new("get_volume", args)
|
||||
}
|
||||
|
||||
pub fn get_position(id: Option<u32>) -> Self {
|
||||
|
||||
@@ -7,13 +7,14 @@ pub fn parse_command(request: &Request) -> Option<Box<dyn Executable + Send>> {
|
||||
|
||||
match request.name.as_str() {
|
||||
"ping" => Some(Box::new(PingCommand {})),
|
||||
"kill" => Some(Box::new(KillCommand {})),
|
||||
"pause" => Some(Box::new(PauseCommand { id })),
|
||||
"resume" => Some(Box::new(ResumeCommand { id })),
|
||||
"toggle_pause" => Some(Box::new(TogglePauseCommand { id })),
|
||||
"stop" => Some(Box::new(StopCommand { id })),
|
||||
"is_paused" => Some(Box::new(IsPausedCommand {})),
|
||||
"get_state" => Some(Box::new(GetStateCommand {})),
|
||||
"get_volume" => Some(Box::new(GetVolumeCommand {})),
|
||||
"get_volume" => Some(Box::new(GetVolumeCommand { id })),
|
||||
"set_volume" => {
|
||||
let volume = request
|
||||
.args
|
||||
|
||||
+4
-4
@@ -39,16 +39,16 @@ pub async fn link_player_to_virtual_mic() -> Result<(), Box<dyn Error>> {
|
||||
if let Ok(device) = get_device("pwsp-daemon").await {
|
||||
pwsp_daemon_output = device;
|
||||
} else {
|
||||
eprintln!("Could not find alsa_playback.pwsp-daemon device, skipping device linking");
|
||||
return Ok(());
|
||||
return Err(
|
||||
"Could not find alsa_playback.pwsp-daemon device, skipping device linking".into(),
|
||||
);
|
||||
}
|
||||
|
||||
let pwsp_daemon_input;
|
||||
if let Ok(device) = get_device("pwsp-virtual-mic").await {
|
||||
pwsp_daemon_input = device;
|
||||
} else {
|
||||
eprintln!("Could not find pwsp-virtual-mic device, skipping device linking");
|
||||
return Ok(());
|
||||
return Err("Could not find pwsp-virtual-mic device, skipping device linking".into());
|
||||
}
|
||||
|
||||
let output_fl = pwsp_daemon_output
|
||||
|
||||
Reference in New Issue
Block a user