fix pwsp.spec failed to build

fix .deb uploading

.github/FUNDING.yml

@@ -1 +0,0 @@
-custom: ['https://boosty.to/arabian']

.github/workflows/git-archive.yml

@@ -1,84 +0,0 @@
-name: Git archive
-
-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: Extract all binary names
-        id: cargo-meta
-        run: |
-          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
-
-      - name: Build all release binaries
-        run: cargo build --release --locked
-
-      - name: Package all binaries into one archive
-        shell: bash
-        run: |
-          set -euo pipefail
-          COMMIT_SHA="${{ github.sha }}"
-          ARCHIVE_NAME="pwsp-${COMMIT_SHA}-linux-x64.zip"
-          echo "Creating archive: $ARCHIVE_NAME"
-
-          FILES=()
-          while IFS= read -r BIN; do
-            [ -z "$BIN" ] && continue
-            FILES+=("target/release/$BIN")
-          done <<< "${{ steps.cargo-meta.outputs.bin_names }}"
-
-          if [ "${#FILES[@]}" -eq 0 ]; then
-            echo "Error: no binaries were discovered via cargo metadata." >&2
-            exit 1
-          fi
-
-          for f in "${FILES[@]}"; do
-            if [ ! -f "$f" ]; then
-              echo "Error: expected binary not found: $f" >&2
-              exit 1
-            fi
-            echo "Will add: $f"
-          done
-
-          zip -j "$ARCHIVE_NAME" "${FILES[@]}"
-
-      - name: Upload archive as artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: archive
-          path: pwsp-*.zip
-          retention-days: 7

.github/workflows/git-deb.yml

@@ -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

.github/workflows/git-flatpak.yml

@@ -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

.github/workflows/release-archive.yml

@@ -10,7 +10,7 @@ on:
   workflow_dispatch:
     inputs:
       tag:
-        description: "Tag to attach assets to (e.g. v1.0.0)"
+        description: 'Tag to attach assets to (e.g. v1.0.0)'
         required: false
 
 jobs:
@@ -32,6 +32,7 @@ jobs:
         run: |
           set -euo pipefail
 
+          # приоритет 1: входной параметр workflow_dispatch
           INPUT_TAG="${{ github.event.inputs.tag || '' }}"
           if [ -n "$INPUT_TAG" ]; then
             echo "Using input tag: $INPUT_TAG"
@@ -39,6 +40,7 @@ jobs:
             exit 0
           fi
 
+          # приоритет 2: если запущено событием release
           EVENT_TAG="${{ github.event.release.tag_name || '' }}"
           if [ -n "$EVENT_TAG" ]; then
             echo "Using event tag: $EVENT_TAG"
@@ -46,12 +48,14 @@ jobs:
             exit 0
           fi
 
+          # приоритет 3: если GITHUB_REF — refs/tags/...
           if [[ "${GITHUB_REF:-}" =~ ^refs/tags/(.+)$ ]]; then
             echo "Using GITHUB_REF tag: ${BASH_REMATCH[1]}"
             echo "tag=${BASH_REMATCH[1]}" >> $GITHUB_OUTPUT
             exit 0
           fi
 
+          # приоритет 4: пробуем получить последний релиз через API
           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')
@@ -87,6 +91,7 @@ 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
@@ -102,6 +107,7 @@ jobs:
           ARCHIVE_NAME="pwsp-${TAG}-linux-x64.zip"
           echo "Creating archive: $ARCHIVE_NAME"
 
+          # читаем построчно список бинарников и формируем массив файлов
           FILES=()
           while IFS= read -r BIN; do
             [ -z "$BIN" ] && continue
@@ -113,6 +119,7 @@ jobs:
             exit 1
           fi
 
+          # проверим, что все бинарники действительно есть
           for f in "${FILES[@]}"; do
             if [ ! -f "$f" ]; then
               echo "Error: expected binary not found: $f" >&2
@@ -121,6 +128,7 @@ jobs:
             echo "Will add: $f"
           done
 
+          # создаём архив с бинарниками внутри как просто pwsp-gui, pwsp-daemon, pwsp-cli
           zip -j "$ARCHIVE_NAME" "${FILES[@]}"
 
       - name: Upload release archive

.github/workflows/release-deb.yml

@@ -10,7 +10,7 @@ on:
   workflow_dispatch:
     inputs:
       tag:
-        description: "Tag to attach assets to (e.g. v1.0.0)"
+        description: 'Tag to attach assets to (e.g. v1.0.0)'
         required: false
 
 jobs:

.github/workflows/release-flatpak.yml

@@ -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

.gitmodules

@@ -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

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "pwsp"
-version = "1.6.1"
+version = "1.0.1"
 edition = "2024"
 authors = ["arabian"]
 description = "PWSP lets you play audio files through your microphone. Has both CLI and GUI clients."
@@ -12,45 +12,23 @@ keywords = ["soundpad", "pipewire", "linux", "cli", "gui"]
 
 
 [dependencies]
-tokio = { version = "1.49.0", features = ["full"] }
+tokio = { version = "1.47.1", features = ["full"] }
+futures = { version = "0.3.31", features = ["thread-pool"] }
 async-trait = "0.1.89"
 
-serde = { version = "1.0.228", features = ["derive"] }
+serde = { version = "1.0.227", features = ["derive"] }
-serde_json = "1.0.149"
+serde_json = "1.0.145"
 
-clap = { version = "4.5.60", default-features = false, features = [
+clap = { version = "4.5.48", default-features = false, features = ["std", "suggestions", "help", "usage", "error-context", "derive"] }
-    "std",
-    "suggestions",
-    "help",
-    "usage",
-    "error-context",
-    "derive",
-] }
 dirs = "6.0.0"
-itertools = "0.14.0"
 
-rodio = { version = "0.22.1", default-features = false, features = [
+rodio = { version = "0.21.1", default-features = false, features = ["symphonia-all", "playback"] }
-    "symphonia-all",
-    "playback",
-] }
 pipewire = "0.9.2"
-rfd = { version = "0.17.2", default-features = false, features = [
+rfd = "0.15.4"
-    "xdg-portal",
-] }
-opener = { version = "0.8.4", features = ["reveal"] }
 
-egui = { version = "0.33.3", default-features = false, features = [
+egui = { version = "0.32.3", default-features = false, features = ["default_fonts", "rayon"] }
-    "default_fonts",
+eframe = { version = "0.32.3", default-features = false, features = ["default_fonts", "glow", "x11", "wayland"] }
-    "rayon",
+egui_material_icons = "0.4.0"
-] }
-eframe = { version = "0.33.3", default-features = false, features = [
-    "default_fonts",
-    "glow",
-    "x11",
-    "wayland",
-] }
-egui_material_icons = "0.5.0"
-egui_dnd = "0.14.0"
 
 [[bin]]
 name = "pwsp-daemon"
@@ -73,34 +51,10 @@ panic = "abort"
 
 [package.metadata.deb]
 assets = [
-    [
+    ["target/release/pwsp-daemon", "usr/bin/", "755"],
-        "target/release/pwsp-daemon",
+    ["target/release/pwsp-cli", "usr/bin/", "755"],
-        "usr/bin/",
+    ["target/release/pwsp-gui", "usr/bin/", "755"],
-        "755",
+    ["assets/pwsp-gui.desktop", "usr/share/applications/pwsp.desktop", "644"],
-    ],
+    ["assets/icon.png", "usr/share/icons/hicolor/256x256/apps/pwsp.png", "644"],
-    [
+    ["assets/pwsp-daemon.service", "usr/lib/systemd/user/pwsp-daemon.service", "644"],
-        "target/release/pwsp-cli",
-        "usr/bin/",
-        "755",
-    ],
-    [
-        "target/release/pwsp-gui",
-        "usr/bin/",
-        "755",
-    ],
-    [
-        "assets/pwsp-gui.desktop",
-        "usr/share/applications/pwsp.desktop",
-        "644",
-    ],
-    [
-        "assets/icon.png",
-        "usr/share/icons/hicolor/256x256/apps/pwsp.png",
-        "644",
-    ],
-    [
-        "assets/pwsp-daemon.service",
-        "usr/lib/systemd/user/pwsp-daemon.service",
-        "644",
-    ],
 ]

README.md

@@ -24,9 +24,6 @@ chats on platforms like **Discord, Zoom, or Teamspeak**.
     * **Position slider** to fast-forward or rewind the audio.
 * **Persistent Configuration**: The list of added directories and your selected audio output device are saved
   automatically, so you won't need to reconfigure them every time you launch the application.
-* **Collapsible Audio Tracks**: You can collapse every audio track to save space.
-* **Drag and Drop Directories**: Reorder your sound directories easily using drag and drop.
-* **Automatic Device Detection**: PWSP automatically detects when an input device is connected or disconnected and handles linking/unlinking.
 
 # **⚙️ How It Works**
 
@@ -38,8 +35,8 @@ three main components:
     * Creating and managing virtual audio devices.
     * Linking these devices within the PipeWire graph.
     * Handling all audio playback.
-* **pwsp-gui**: This is the graphical user interface. It acts as a client that communicates with pwsp-daemon via a
+* **pwsp-gui**: This is the graphical user interface. It acts as a client that communicates with pwsp-daemon via a *
-  **UnixSocket**. This is how you interact with your sound collection, control playback, and configure settings.
+  *UnixSocket**. This is how you interact with your sound collection, control playback, and configure settings.
 * **pwsp-cli**: This is the command-line interface, also acting as a client. It provides a way to control the daemon
   without a GUI, allowing for scripting or quick command-based actions.
 
@@ -47,10 +44,10 @@ three main components:
 
 ## **Pre-built Packages**
 
-You can download pre-built binaries and .deb packages from
+You can download pre-built binaries, .deb and .rpm packages from
 the [releases page](https://github.com/arabianq/pipewire-soundpad/releases).
 
-## **Fedora Linux (and derivatives)**
+## **Fedora Linux**
 
 If you're using Fedora, you can install PWSP from a dedicated repository using DNF.
 
@@ -76,7 +73,7 @@ sudo dnf install pwsp
 There is pwsp package in AUR.
 You can install it using yay, paru or any other AUR helper.
 ```bash
-paru pwsp-bin # or paru pwsp to build it locally
+paru pwsp
 ```
 
 ## **Installing using cargo**
@@ -140,12 +137,12 @@ You can start the daemon from the terminal or enable the systemd service for aut
 
 ### **Using the GUI**
 
-1. **Add Sounds**: Click the **"+"** button and select a folder containing your audio files. The application
+1. **Add Sounds**: Click the **"Add Directory"** button and select a folder containing your audio files. The application
    will automatically list all supported files.
-2. **Select Microphone**: In the main application window, select your microphone. PWSP will automatically
+2. **Select Microphone**: In the main application window, select your **physical microphone**. PWSP will automatically
    create a virtual microphone and feed it sound from two sources: **your microphone** and the **audio files**.
 3. **Playback**: Click on a file in the list to load it, then use the **"Play"** and **"Pause"** buttons to control
-   playback. You can also play single file once using **"Play File"** button.
+   playback.
 
 ### **Using the CLI**
 
@@ -176,28 +173,6 @@ pwsp-cli --help
       pwsp-cli set position 20
       ```
 
-### **Hotkeys & Controls**
-
-#### **Keyboard Shortcuts**
-
-| Key                      | Action                                               |
-| :----------------------- | :--------------------------------------------------- |
-| **Space**                | Pause / Resume audio                                 |
-| **Backspace**            | Stop all audio tracks                                |
-| **Enter**                | Play selected file (stops all other tracks)          |
-| **Ctrl + Enter**         | Add selected file to playback (plays simultaneously) |
-| **Shift + Enter**        | Replace the last added track with the selected one   |
-| **I**                    | Open / Close settings                                |
-| **/**                    | Focus search field                                   |
-| **Ctrl + ↑ / ↓**         | Navigate through files                               |
-| **Ctrl + Shift + ↑ / ↓** | Navigate through directories                         |
-
-#### **Mouse Controls**
-
-* **Left Click**: Play track (stops all other tracks).
-* **Ctrl + Left Click**: Add track (plays simultaneously with current tracks).
-* **Shift + Left Click**: Replace the last added track with the selected one.
-
 # **🤝 Contributing**
 
 Contributions are welcome\! If you have ideas for improvements or find a bug, feel free to create
@@ -208,6 +183,3 @@ a [pull request](https://github.com/arabianq/pipewire-soundpad/pulls).
 
 This project is licensed under
 the [MIT License](https://github.com/arabianq/pipewire-soundpad/blob/main/LICENSE).
-
-# **🤖 AI Wiki**
-[![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/arabianq/pipewire-soundpad)

assets/pwsp-daemon.service

@@ -1,6 +1,5 @@
 [Unit]
 Description=Pipewire Soundpad Daemon
-After=pipewire.service
 
 [Service]
 ExecStart=/usr/bin/pwsp-daemon

packages/flatpak/pwsp-wrapper.py

@@ -1,35 +0,0 @@
-#!/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"])

packages/flatpak/ru.arabianq.pwsp.desktop

@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=PWSP (Soundpad)
-Comment=Let's you play audio files through you microphone
-Exec=pwsp-wrapper.py %u
-Icon=ru.arabianq.pwsp
-Terminal=false
-Type=Application
-Categories=Audio;Utility;
-Keywords=soundpad;pipewire;audio;

packages/flatpak/ru.arabianq.pwsp.metainfo.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component type="desktop-application">
-    <id>ru.arabianq.pwsp</id>
-    <metadata_license>CC0-1.0</metadata_license>
-    <project_license>MIT</project_license>
-    <name>PWSP</name>
-    <summary>Play audio files through your microphone using PipeWire</summary>
-    <description>
-        <p>
-            PWSP (PipeWire Soundpad) is a tool that allows you to play audio files through your
-            microphone.
-            It features both a graphical user interface and a command-line interface.
-        </p>
-    </description>
-    <launchable type="desktop-id">ru.arabianq.pwsp.desktop</launchable>
-    <screenshots>
-        <screenshot type="default">
-            <image>
-                https://raw.githubusercontent.com/arabianq/pipewire-soundpad/master/assets/screenshot.png</image>
-        </screenshot>
-    </screenshots>
-    <url type="homepage">https://pwsp.arabianq.ru</url>
-    <developer_name>arabian</developer_name>
-    <content_rating type="oars-1.1" />
-</component>

packages/flatpak/ru.arabianq.pwsp.yaml

@@ -1,47 +0,0 @@
-app-id: ru.arabianq.pwsp
-runtime: org.freedesktop.Platform
-runtime-version: "24.08"
-sdk: org.freedesktop.Sdk
-sdk-extensions:
-  - org.freedesktop.Sdk.Extension.rust-stable
-  - org.freedesktop.Sdk.Extension.llvm20
-command: pwsp-wrapper.py
-finish-args:
-  - --share=ipc
-  - --socket=fallback-x11
-  - --socket=wayland
-  - --socket=pulseaudio
-  - --filesystem=xdg-run/pipewire-0
-  - --filesystem=xdg-run/pwsp:create
-  - --filesystem=xdg-run/app/ru.arabianq.pwsp:create
-  - --filesystem=host
-  - --device=all
-  - --device=dri
-  - --share=network
-  - --talk-name=org.freedesktop.portal.Desktop
-  - --talk-name=org.freedesktop.portal.Documents
-
-build-options:
-  append-path: /usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/llvm20/bin
-  env:
-    CARGO_HOME: /run/build/pwsp/cargo
-    LIBCLANG_PATH: /usr/lib/sdk/llvm20/lib
-
-modules:
-  - name: pwsp
-    buildsystem: simple
-    build-options:
-      build-args:
-        - --share=network
-    build-commands:
-      - cargo build --release
-      - 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.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
-    sources:
-      - type: dir
-        path: ../../

pwsp.spec

@@ -4,7 +4,7 @@
 %global cargo_install_lib 0
 
 Name:            pwsp
-Version:         1.6.1
+Version:         1.0.1
 Release:         %autorelease
 Summary:         Lets you play audio files through your microphone
 

src/bin/cli.rs

@@ -14,17 +14,17 @@ struct Cli {
 
 #[derive(Subcommand, Debug)]
 enum Commands {
-    /// Perform an action (ping, pause, resume, toggle-pause, stop, play)
+    /// Perform an action (ping, pause, resume, stop, play)
     Action {
         #[clap(subcommand)]
         action: Actions,
     },
-    /// Get information from the player (is paused, volume, position, duration, state, current-file-path, input, inputs)
+    /// Get information from the player (is paused, volume, position, state)
     Get {
         #[clap(subcommand)]
         parameter: GetCommands,
     },
-    /// Set information in the player (volume, position, input)
+    /// Set information in the player (volume, position)
     Set {
         #[clap(subcommand)]
         parameter: SetCommands,
@@ -35,39 +35,14 @@ enum Commands {
 enum Actions {
     /// Ping the daemon
     Ping,
-    /// Kill the daemon
-    Kill,
     /// Pause audio playback
-    Pause {
+    Pause,
-        #[clap(short, long)]
-        id: Option<u32>,
-    },
     /// Resume audio playback
-    Resume {
+    Resume,
-        #[clap(short, long)]
-        id: Option<u32>,
-    },
-    /// Toggle pause
-    TogglePause {
-        #[clap(short, long)]
-        id: Option<u32>,
-    },
     /// Stop audio playback and clear the queue
-    Stop {
+    Stop,
-        #[clap(short, long)]
-        id: Option<u32>,
-    },
     /// Play a file
-    Play {
+    Play { file_path: PathBuf },
-        file_path: PathBuf,
-        #[clap(short, long)]
-        concurrent: bool,
-    },
-    /// Toggle loop
-    ToggleLoop {
-        #[clap(short, long)]
-        id: Option<u32>,
-    },
 }
 
 #[derive(Subcommand, Debug)]
@@ -76,52 +51,28 @@ enum GetCommands {
     IsPaused,
     /// Playback volume
     Volume,
-    /// Playback position (in seconds)
+    /// Playback position
-    Position {
+    Position,
-        #[clap(short, long)]
-        id: Option<u32>,
-    },
     /// Duration of the current file
-    Duration {
+    Duration,
-        #[clap(short, long)]
+    /// Player state
-        id: Option<u32>,
-    },
-    /// Player state (Playing, Paused or Stopped)
     State,
-    /// Get all playing tracks
+    /// Current playing file path
-    Tracks,
+    CurrentFilePath,
     /// Current audio input
     Input,
     /// All audio inputs
     Inputs,
-    /// Version of the daemon
-    DaemonVersion,
-    /// Full player state
-    FullState,
 }
 
 #[derive(Subcommand, Debug)]
 enum SetCommands {
     /// Playback volume
-    Volume {
+    Volume { volume: f32 },
-        volume: f32,
+    /// Playback position
-        #[clap(short, long)]
+    Position { position: f32 },
-        id: Option<u32>,
+    /// Input
-    },
+    Input { id: u32 },
-    /// Playback position (in seconds)
-    Position {
-        position: f32,
-        #[clap(short, long)]
-        id: Option<u32>,
-    },
-    /// Audio input id (see pwsp-cli get inputs)
-    Input { name: String },
-    /// Enable or disable loop (true or false)
-    Loop {
-        enabled: String,
-        #[clap(short, long)]
-        id: Option<u32>,
-    },
 }
 
 #[tokio::main]
@@ -133,40 +84,29 @@ 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 => Request::pause(),
-            Actions::Pause { id } => Request::pause(id),
+            Actions::Resume => Request::resume(),
-            Actions::Resume { id } => Request::resume(id),
+            Actions::Stop => Request::stop(),
-            Actions::TogglePause { id } => Request::toggle_pause(id),
+            Actions::Play { file_path } => Request::play(file_path.to_str().unwrap()),
-            Actions::Stop { id } => Request::stop(id),
-            Actions::Play {
-                file_path,
-                concurrent,
-            } => Request::play(file_path.to_str().unwrap(), 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::Position { id } => Request::get_position(id),
+            GetCommands::Position => Request::get_position(),
-            GetCommands::Duration { id } => Request::get_duration(id),
+            GetCommands::Duration => Request::get_duration(),
             GetCommands::State => Request::get_state(),
-            GetCommands::Tracks => Request::get_tracks(),
+            GetCommands::CurrentFilePath => Request::get_current_file_path(),
             GetCommands::Input => Request::get_input(),
             GetCommands::Inputs => Request::get_inputs(),
-            GetCommands::DaemonVersion => Request::get_daemon_version(),
-            GetCommands::FullState => Request::get_full_state(),
         },
         Commands::Set { parameter } => match parameter {
-            SetCommands::Volume { volume, id } => Request::set_volume(volume, id),
+            SetCommands::Volume { volume } => Request::set_volume(volume),
-            SetCommands::Position { position, id } => Request::seek(position, id),
+            SetCommands::Position { position } => Request::seek(position),
-            SetCommands::Input { name } => Request::set_input(&name),
+            SetCommands::Input { id } => Request::set_input(id),
-            SetCommands::Loop { enabled, id } => Request::set_loop(&enabled, id),
         },
     };
 
-    let response = make_request(request)
+    let response = make_request(request).await?;
-        .await
-        .map_err(|e| e as Box<dyn Error>)?;
     println!("{} : {}", response.status, response.message);
 
     Ok(())

src/bin/daemon.rs

@@ -9,11 +9,10 @@ use pwsp::{
         pipewire::create_virtual_mic,
     },
 };
-use std::{error::Error, fs, time::Duration};
+use std::{error::Error, fs};
 use tokio::{
     io::{AsyncReadExt, AsyncWriteExt},
     net::UnixListener,
-    time::sleep,
 };
 
 #[tokio::main]
@@ -45,27 +44,6 @@ async fn main() -> Result<(), Box<dyn Error>> {
         socket_path.to_str().unwrap_or_default()
     );
 
-    let commands_loop_handle = tokio::spawn(async {
-        commands_loop(listener).await.ok();
-    });
-
-    let player_loop_handle = tokio::spawn(async {
-        player_loop().await;
-    });
-
-    tokio::select! {
-        _ = commands_loop_handle => {
-            eprint!("Commands loop was finished, stopping program...");
-        }
-        _ = player_loop_handle => {
-            eprint!("Audio Player loop was finished, stopping program...");
-        }
-    }
-
-    Ok(())
-}
-
-async fn commands_loop(listener: UnixListener) -> Result<(), Box<dyn Error>> {
     loop {
         let (mut stream, _addr) = listener.accept().await?;
 
@@ -86,6 +64,7 @@ async fn commands_loop(listener: UnixListener) -> Result<(), Box<dyn Error>> {
             }
 
             let request: Request = serde_json::from_slice(&buffer).unwrap();
+            println!("Received request: {:?}", request);
             // ---------- Read request (end) ----------
 
             // ---------- Generate response (start) ----------
@@ -110,21 +89,8 @@ async fn commands_loop(listener: UnixListener) -> Result<(), Box<dyn Error>> {
                 eprintln!("Failed to write response to client!");
                 return;
             }
+            println!("Sent response: {:?}", response);
             // ---------- Send response (end) ----------
-
-            if response.status && response.message.eq("killed") {
-                std::process::exit(0);
-            }
         });
     }
 }
-
-async fn player_loop() {
-    loop {
-        let mut audio_player = get_audio_player().await.lock().await;
-
-        audio_player.update().await;
-
-        sleep(Duration::from_millis(100)).await;
-    }
-}

src/gui/draw.rs

@@ -1,34 +1,14 @@
 use crate::gui::SoundpadGui;
 use egui::{
-    Align, AtomExt, Button, CollapsingHeader, Color32, ComboBox, CursorIcon, FontFamily, Label,
+    AtomExt, Button, Color32, ComboBox, FontFamily, Label, RichText, ScrollArea, Slider, TextEdit,
-    Layout, RichText, ScrollArea, Sense, Slider, TextEdit, Ui, Vec2,
+    Ui, Vec2,
 };
-use egui_dnd::dnd;
+use egui_material_icons::icons;
-use egui_material_icons::icons::*;
+use pwsp::types::audio_player::PlayerState;
-use pwsp::types::{audio_player::TrackInfo, gui::AppState};
 use pwsp::utils::gui::format_time_pair;
-use std::{error::Error, time::Instant};
+use std::{error::Error, path::PathBuf};
-
-enum TrackAction {
-    Pause(u32),
-    Resume(u32),
-    ToggleLoop(u32),
-    Stop(u32),
-}
 
 impl SoundpadGui {
-    fn get_volume_icon(volume: f32) -> &'static str {
-        if volume > 0.7 {
-            ICON_VOLUME_UP
-        } else if volume <= 0.0 {
-            ICON_VOLUME_OFF
-        } else if volume < 0.3 {
-            ICON_VOLUME_MUTE
-        } else {
-            ICON_VOLUME_DOWN
-        }
-    }
-
     pub fn draw_waiting_for_daemon(&mut self, ui: &mut Ui) {
         ui.centered_and_justified(|ui| {
             ui.label(
@@ -44,7 +24,7 @@ impl SoundpadGui {
             ui.spacing_mut().item_spacing.y = 5.0;
             // --------- Back Button and Title ----------
             ui.horizontal_top(|ui| {
-                let back_button = Button::new(ICON_ARROW_BACK).frame(false);
+                let back_button = Button::new(icons::ICON_ARROW_BACK).frame(false);
                 let back_button_response = ui.add(back_button);
                 if back_button_response.clicked() {
                     self.app_state.show_settings = false;
@@ -68,23 +48,14 @@ impl SoundpadGui {
                 &mut self.config.save_scale_factor,
                 "Always remember UI scale factor",
             );
-            let pause_on_exit_response = ui.checkbox(
-                &mut self.config.pause_on_exit,
-                "Pause audio playback when the window is closed",
-            );
 
             if save_volume_response.changed()
                 || save_input_response.changed()
                 || save_scale_response.changed()
-                || pause_on_exit_response.changed()
             {
                 self.config.save_to_file().ok();
             }
             // --------------------------------
-
-            ui.with_layout(Layout::bottom_up(Align::Min), |ui| {
-                ui.label(format!("GUI version: {}", env!("CARGO_PKG_VERSION")));
-            });
         });
     }
 
@@ -98,19 +69,11 @@ impl SoundpadGui {
 
     fn draw_header(&mut self, ui: &mut Ui) {
         ui.vertical_centered_justified(|ui| {
-            if self.audio_player_state.tracks.is_empty() {
+            // Current file name
-                ui.label("No tracks playing");
+            ui.label(
-                return;
-            }
-
-            let tracks = self.audio_player_state.tracks.clone();
-            let mut action = None;
-
-            for track in tracks {
-                CollapsingHeader::new(
                 RichText::new(
-                        track
+                    self.audio_player_state
-                            .path
+                        .current_file_path
                         .file_stem()
                         .unwrap_or_default()
                         .to_str()
@@ -118,181 +81,95 @@ impl SoundpadGui {
                 )
                 .color(Color32::WHITE)
                 .family(FontFamily::Monospace),
-                )
+            );
-                .default_open(true)
+            // Media controls
-                .show(ui, |ui| {
+            self.draw_controls(ui);
-                    if let Some(act) = Self::draw_track_control(ui, &mut self.app_state, &track) {
-                        action = Some(act);
-                    }
-                });
             ui.separator();
-            }
-
-            if let Some(action) = action {
-                match action {
-                    TrackAction::Pause(id) => self.pause(Some(id)),
-                    TrackAction::Resume(id) => self.resume(Some(id)),
-                    TrackAction::ToggleLoop(id) => self.toggle_loop(Some(id)),
-                    TrackAction::Stop(id) => self.stop(Some(id)),
-                }
-            }
         });
     }
 
-    fn draw_track_control(
+    fn draw_controls(&mut self, ui: &mut Ui) {
-        ui: &mut Ui,
-        app_state: &mut AppState,
-        track: &TrackInfo,
-    ) -> Option<TrackAction> {
-        let ui_state = app_state.track_ui_states.entry(track.id).or_default();
-
-        let should_update_position = !ui_state.position_dragged
-            && ui_state
-                .ignore_position_update_until
-                .map(|t| Instant::now() > t)
-                .unwrap_or(true);
-
-        if should_update_position {
-            ui_state.position_slider_value = track.position;
-        }
-
-        let should_update_volume = !ui_state.volume_dragged
-            && ui_state
-                .ignore_volume_update_until
-                .map(|t| Instant::now() > t)
-                .unwrap_or(true);
-
-        if should_update_volume {
-            ui_state.volume_slider_value = track.volume;
-        }
-
-        let mut action = None;
-
         ui.horizontal_top(|ui| {
             // ---------- Play Button ----------
-            let play_button = Button::new(if track.paused {
+            let play_button = Button::new(match self.audio_player_state.state {
-                ICON_PLAY_ARROW
+                PlayerState::Playing => icons::ICON_PAUSE,
-            } else {
+                PlayerState::Paused | PlayerState::Stopped => icons::ICON_PLAY_ARROW,
-                ICON_PAUSE
             })
             .corner_radius(15.0);
 
             let play_button_response = ui.add_sized([30.0, 30.0], play_button);
             if play_button_response.clicked() {
-                if track.paused {
+                self.play_toggle();
-                    action = Some(TrackAction::Resume(track.id));
-                } else {
-                    action = Some(TrackAction::Pause(track.id));
-                }
-            }
-            // --------------------------------
-
-            // ---------- Loop Button ----------
-            let loop_button = Button::new(
-                RichText::new(if track.looped {
-                    ICON_REPEAT_ONE
-                } else {
-                    ICON_REPEAT
-                })
-                .size(18.0),
-            )
-            .frame(false);
-
-            let loop_button_response = ui.add_sized([15.0, 30.0], loop_button);
-            if loop_button_response.clicked() {
-                action = Some(TrackAction::ToggleLoop(track.id));
             }
             // --------------------------------
 
             // ---------- Position Slider ----------
-            let duration = track.duration.unwrap_or(1.0);
+            let position_slider = Slider::new(
-            let position_slider = Slider::new(&mut ui_state.position_slider_value, 0.0..=duration)
+                &mut self.app_state.position_slider_value,
+                0.0..=self.audio_player_state.duration,
+            )
             .show_value(false)
-                .step_by(0.01);
+            .step_by(1.0);
 
             let default_slider_width = ui.spacing().slider_width;
             let position_slider_width = ui.available_width()
                 - (30.0 * 3.0)
                 - default_slider_width
-                - (ui.spacing().item_spacing.x * 6.0);
+                - (ui.spacing().item_spacing.x * 5.0);
             ui.spacing_mut().slider_width = position_slider_width;
             let position_slider_response = ui.add_sized([30.0, 30.0], position_slider);
             if position_slider_response.drag_stopped() {
-                ui_state.position_dragged = true;
+                self.app_state.position_dragged = true;
             }
             // --------------------------------
 
             // ---------- Time Label ----------
-            let time_label =
+            let time_label = Label::new(
-                Label::new(RichText::new(format_time_pair(track.position, duration)).monospace());
+                RichText::new(format_time_pair(
+                    self.audio_player_state.position,
+                    self.audio_player_state.duration,
+                ))
+                .monospace(),
+            );
             ui.add_sized([30.0, 30.0], time_label);
             // --------------------------------
 
             // ---------- Volume Icon ----------
-            let volume_icon = Self::get_volume_icon(track.volume);
+            let volume_icon = if self.audio_player_state.volume > 0.7 {
-            let volume_label = Label::new(RichText::new(volume_icon).size(18.0));
+                icons::ICON_VOLUME_UP
-            ui.add_sized([30.0, 30.0], volume_label)
+            } else if self.audio_player_state.volume == 0.0 {
-                .on_hover_text(format!("Volume: {:.0}%", track.volume * 100.0));
+                icons::ICON_VOLUME_OFF
+            } else if self.audio_player_state.volume < 0.3 {
+                icons::ICON_VOLUME_MUTE
+            } else {
+                icons::ICON_VOLUME_DOWN
+            };
+            let volume_icon = Label::new(RichText::new(volume_icon).size(18.0));
+            ui.add_sized([30.0, 25.0], volume_icon);
             // --------------------------------
 
             // ---------- Volume Slider ----------
-            let volume_slider = Slider::new(&mut ui_state.volume_slider_value, 0.0..=1.0)
+            let volume_slider = Slider::new(&mut self.app_state.volume_slider_value, 0.0..=1.0)
                 .show_value(false)
                 .step_by(0.01);
 
-            ui.spacing_mut().slider_width = default_slider_width - 30.0;
+            ui.spacing_mut().slider_width = default_slider_width;
             ui.spacing_mut().item_spacing.x = 0.0;
 
             let volume_slider_response = ui.add_sized([30.0, 30.0], volume_slider);
             if volume_slider_response.drag_stopped() {
-                ui_state.volume_dragged = true;
+                self.app_state.volume_dragged = true;
-            }
-            // --------------------------------
-
-            // ---------- Stop Button ---------
-            let stop_button = Button::new(ICON_CLOSE).frame(false);
-            let stop_button_response = ui.add_sized([30.0, 30.0], stop_button);
-            if stop_button_response.clicked() {
-                action = Some(TrackAction::Stop(track.id));
             }
             // --------------------------------
         });
-
-        action
     }
 
     fn draw_body(&mut self, ui: &mut Ui) {
-        let left_panel_width = self
+        let dirs_size = Vec2::new(ui.available_width() / 4.0, ui.available_height() - 40.0);
-            .config
-            .left_panel_width
-            .max(100.0)
-            .min(ui.available_width() - 100.0);
-        let dirs_size = Vec2::new(left_panel_width, ui.available_height() - 40.0);
 
         ui.horizontal(|ui| {
             self.draw_dirs(ui, dirs_size);
-
+            ui.separator();
-            let (rect, response) = ui.allocate_at_least(
-                Vec2::new(ui.spacing().item_spacing.x, ui.available_height()),
-                Sense::click_and_drag(),
-            );
-
-            if ui.is_rect_visible(rect) {
-                let stroke = ui.visuals().widgets.noninteractive.bg_stroke;
-                ui.painter().vline(rect.center().x, rect.y_range(), stroke);
-            }
-
-            let vertical_separator_response =
-                response.on_hover_and_drag_cursor(CursorIcon::ResizeHorizontal);
-
-            if vertical_separator_response.dragged() {
-                self.config.left_panel_width += vertical_separator_response.drag_delta().x;
-                self.config.left_panel_width = self.config.left_panel_width.clamp(100.0, 500.0);
-            }
-
-            if vertical_separator_response.drag_stopped() {
-                self.config.save_to_file().ok();
-            }
 
             let files_size = Vec2::new(ui.available_width(), ui.available_height() - 40.0);
             self.draw_files(ui, files_size);
@@ -305,87 +182,37 @@ impl SoundpadGui {
             ui.set_min_height(area_size.y);
 
             ScrollArea::vertical().id_salt(0).show(ui, |ui| {
-                ui.set_min_width(area_size.x);
+                let mut dirs: Vec<PathBuf> = self.app_state.dirs.iter().cloned().collect();
-
+                dirs.sort();
-                let mut dirs = self.app_state.dirs.clone();
+                for path in dirs.iter() {
-
-                dnd(ui, "dnd_directories").show_vec(&mut dirs, |ui, item, handle, _state| {
-                    let path = item.clone();
                     ui.horizontal(|ui| {
-                        handle.ui(ui, |ui| {
-                            ui.label(ICON_DRAG_INDICATOR);
-                        });
                         let name = path
                             .file_name()
                             .map(|s| s.to_string_lossy().to_string())
                             .unwrap_or_else(|| path.to_string_lossy().to_string());
 
-                        let mut dir_button_text = RichText::new(name.clone());
-                        if let Some(current_dir) = &self.app_state.current_dir {
-                            if current_dir.eq(&path) {
-                                dir_button_text = dir_button_text.color(Color32::WHITE);
-                            }
-                        }
-
                         let dir_button =
-                            Button::new(dir_button_text.atom_max_width(area_size.x)).frame(false);
+                            Button::new(RichText::new(name).atom_max_width(area_size.x))
-
+                                .frame(false);
                         let dir_button_response = ui.add(dir_button);
                         if dir_button_response.clicked() {
-                            self.open_dir(&path);
+                            self.app_state.current_dir = Some(path.clone());
                         }
 
-                        let delete_dir_button = Button::new(ICON_DELETE).frame(false);
+                        let delete_dir_button = Button::new(icons::ICON_DELETE).frame(false);
                         let delete_dir_button_response =
                             ui.add_sized([18.0, 18.0], delete_dir_button);
                         if delete_dir_button_response.clicked() {
-                            self.app_state.dirs_to_remove.insert(path.clone());
+                            self.remove_dir(path.clone());
-                        }
-
-                        // Context menu
-                        dir_button_response.context_menu(|ui| {
-                            if ui
-                                .button(format!("{} {}", ICON_OPEN_IN_NEW, "Show"))
-                                .clicked()
-                            {
-                                self.open_dir(&path);
-                            }
-
-                            if ui
-                                .button(format!(
-                                    "{} {}",
-                                    ICON_OPEN_IN_BROWSER, "Open in File Manager"
-                                ))
-                                .clicked()
-                            {
-                                if let Err(e) = opener::open(&path) {
-                                    eprintln!("Failed to open file manager: {}", e);
-                                }
-                            }
-
-                            ui.separator();
-
-                            if ui.button(format!("{} {}", ICON_DELETE, "Remove")).clicked() {
-                                self.app_state.dirs_to_remove.insert(path.clone());
                         }
                     });
-                    });
+                }
-                });
-                self.app_state.dirs = dirs;
 
                 ui.horizontal(|ui| {
-                    let add_dirs_button = Button::new(ICON_ADD).frame(false);
+                    let add_dir_button = egui::Button::new(icons::ICON_ADD).frame(false);
-                    let add_dirs_button_response = ui.add_sized([18.0, 18.0], add_dirs_button);
+                    let add_dir_button_response = ui.add_sized([18.0, 18.0], add_dir_button);
-                    if add_dirs_button_response.clicked() {
+                    if add_dir_button_response.clicked() {
-                        self.add_dirs();
+                        self.add_dir();
-                    }
-                });
-
-                ui.with_layout(Layout::bottom_up(Align::Min), |ui| {
-                    let play_file_button = Button::new("Play file");
-                    let play_file_button_response = ui.add(play_file_button);
-                    if play_file_button_response.clicked() {
-                        self.open_file();
                     }
                 });
             });
@@ -393,19 +220,16 @@ impl SoundpadGui {
     }
 
     fn draw_files(&mut self, ui: &mut Ui, area_size: Vec2) {
+        let extensions = [
+            "mp3", "wav", "ogg", "flac", "mp4", "m4a", "aac", "mov", "mkv", "webm", "avi",
+        ];
+
         ui.vertical(|ui| {
             ui.horizontal(|ui| {
-                let search_field_response = ui.add_sized(
+                ui.add_sized(
                     [ui.available_width(), 22.0],
                     TextEdit::singleline(&mut self.app_state.search_query).hint_text("Search..."),
                 );
-
-                if self.app_state.force_focus_search {
-                    search_field_response.request_focus();
-                    self.app_state.force_focus_search = false;
-                }
-
-                self.app_state.search_field_id = Some(search_field_response.id);
             });
 
             ui.separator();
@@ -415,79 +239,44 @@ impl SoundpadGui {
                 ui.set_min_height(area_size.y);
 
                 ui.vertical(|ui| {
-                    let files = self.get_filtered_files();
+                    if let Some(path) = self.app_state.current_dir.clone() {
+                        for entry in path.read_dir().unwrap() {
+                            let entry = entry.unwrap();
+                            let entry_path = entry.path();
+
+                            if entry_path.is_dir() {
+                                continue;
+                            }
+
+                            if !extensions.contains(
+                                &entry_path.extension().unwrap_or_default().to_str().unwrap(),
+                            ) {
+                                continue;
+                            }
 
-                    for entry_path in files {
                             let file_name = entry_path
                                 .file_name()
                                 .unwrap()
                                 .to_string_lossy()
                                 .to_string();
 
-                        let mut file_button_text = RichText::new(file_name);
+                            let search_query = self
-                        if let Some(current_file) = &self.app_state.selected_file {
+                                .app_state
-                            if current_file.eq(&entry_path) {
+                                .search_query
-                                file_button_text = file_button_text.color(Color32::WHITE);
+                                .to_lowercase()
-                            }
+                                .trim()
+                                .to_string();
+
+                            if !file_name.to_lowercase().contains(search_query.as_str()) {
+                                continue;
                             }
 
-                        let file_button = Button::new(file_button_text).frame(false);
+                            let file_button = Button::new(file_name).frame(false);
                             let file_button_response = ui.add(file_button);
                             if file_button_response.clicked() {
-                            ui.input(|i| {
+                                self.play_file(entry_path);
-                                if i.modifiers.ctrl {
-                                    self.play_file(&entry_path, true);
-                                } else if i.modifiers.shift
-                                    && let Some(last_track) = self.audio_player_state.tracks.last()
-                                {
-                                    self.stop(Some(last_track.id));
-                                    self.play_file(&entry_path, true);
-                                } else {
-                                    self.play_file(&entry_path, false);
-                                }
-                            });
-                            self.app_state.selected_file = Some(entry_path.clone());
-                        }
-
-                        // Context menu
-                        file_button_response.context_menu(|ui| {
-                            if ui
-                                .button(format!("{} {}", ICON_BOLT, "Play Solo"))
-                                .clicked()
-                            {
-                                self.play_file(&entry_path, false);
-                                self.app_state.selected_file = Some(entry_path.clone());
-                            }
-
-                            if ui.button(format!("{} {}", ICON_ADD, "Add New")).clicked() {
-                                self.play_file(&entry_path, true);
-                                self.app_state.selected_file = Some(entry_path.clone());
-                            }
-
-                            if ui
-                                .button(format!("{} {}", ICON_SWAP_HORIZ, "Replace Last"))
-                                .clicked()
-                                && let Some(last_track) = self.audio_player_state.tracks.last()
-                            {
-                                self.stop(Some(last_track.id));
-                                self.play_file(&entry_path, true);
-                                self.app_state.selected_file = Some(entry_path.clone());
-                            }
-
-                            ui.separator();
-
-                            if ui
-                                .button(format!(
-                                    "{} {}",
-                                    ICON_OPEN_IN_BROWSER, "Show in File Manager"
-                                ))
-                                .clicked()
-                            {
-                                if let Err(e) = opener::reveal(&entry_path) {
-                                    eprintln!("Failed to open file manager: {}", e);
                             }
                         }
-                        });
                     }
                 });
             });
@@ -496,16 +285,15 @@ impl SoundpadGui {
 
     fn draw_footer(&mut self, ui: &mut Ui) {
         ui.add_space(5.0);
-        ui.horizontal(|ui| {
+        ui.horizontal_top(|ui| {
             // ---------- Microphone selection ----------
-            let mut mics: Vec<(&String, &String)> =
+            let mut mics: Vec<(&u32, &String)> =
                 self.audio_player_state.all_inputs.iter().collect();
             mics.sort_by_key(|(k, _)| *k);
 
             let mut selected_input = self.audio_player_state.current_input.to_owned();
             let prev_input = selected_input.to_owned();
             ComboBox::from_label("Choose microphone")
-                .height(30.0)
                 .selected_text(
                     self.audio_player_state
                         .all_inputs
@@ -513,8 +301,8 @@ impl SoundpadGui {
                         .unwrap_or(&String::new()),
                 )
                 .show_ui(ui, |ui| {
-                    for (name, nick) in mics {
+                    for (index, device) in mics {
-                        ui.selectable_value(&mut selected_input, name.to_owned(), nick);
+                        ui.selectable_value(&mut selected_input, index.to_owned(), device);
                     }
                 });
 
@@ -523,40 +311,10 @@ impl SoundpadGui {
             }
             // --------------------------------
 
-            // ---------- Master Volume Slider ----------
-            let volume_icon = Self::get_volume_icon(self.audio_player_state.volume);
-            let volume_label = Label::new(RichText::new(volume_icon).size(18.0));
-            ui.add_sized([18.0, 18.0], volume_label)
-                .on_hover_text(format!(
-                    "Master Volume: {:.0}%",
-                    self.audio_player_state.volume * 100.0
-                ));
-
-            let should_update_volume = !self.app_state.volume_dragged
-                && self
-                    .app_state
-                    .ignore_volume_update_until
-                    .map(|t| Instant::now() > t)
-                    .unwrap_or(true);
-
-            if should_update_volume {
-                self.app_state.volume_slider_value = self.audio_player_state.volume;
-            }
-
-            let volume_slider = Slider::new(&mut self.app_state.volume_slider_value, 0.0..=1.0)
-                .show_value(false)
-                .step_by(0.01);
-            let volume_slider_response = ui.add_sized([150.0, 18.0], volume_slider);
-            if volume_slider_response.drag_stopped() {
-                self.app_state.volume_dragged = true;
-            }
-            // ------------------------------------------
-
             ui.add_space(ui.available_width() - 18.0 - ui.spacing().item_spacing.x);
 
             // ---------- Settings button ----------
-            let settings_button =
+            let settings_button = Button::new(icons::ICON_SETTINGS).frame(false);
-                Button::new(ICON_SETTINGS.atom_size(Vec2::new(18.0, 18.0))).frame(false);
             let settings_button_response = ui.add_sized([18.0, 18.0], settings_button);
             if settings_button_response.clicked() {
                 self.app_state.show_settings = true;

src/gui/input.rs

@@ -1,115 +1,24 @@
 use crate::gui::SoundpadGui;
-use egui::{Context, Key, Modifiers};
+use egui::{Context, Key};
-
-use std::path::PathBuf;
 
 impl SoundpadGui {
-    fn key_pressed(&self, ctx: &Context, key: Key) -> bool {
-        ctx.input(|i| i.key_pressed(key))
-    }
-
-    fn modifiers(&self, ctx: &Context) -> Modifiers {
-        ctx.input(|i| i.modifiers)
-    }
-
     pub fn handle_input(&mut self, ctx: &Context) {
-        let modifiers = self.modifiers(ctx);
+        ctx.input(|i| {
-
+            if i.key_pressed(Key::Escape) {
-        // Open/close settings
+                std::process::exit(0);
-        if self.key_pressed(ctx, Key::I) {
-            self.app_state.show_settings = !self.app_state.show_settings;
             }
 
-        if !self.app_state.show_settings {
+            if !self.app_state.show_settings && i.key_pressed(Key::Space) {
-            // Pause / resume audio on space
-            if self.key_pressed(ctx, Key::Space) {
                 self.play_toggle();
             }
 
-            // Stop all audio tracks on backspace
+            if i.key_pressed(Key::Slash) {
-            if self.key_pressed(ctx, Key::Backspace) {
+                self.app_state.show_settings = !self.app_state.show_settings;
-                self.stop(None);
             }
 
-            // Focus search field
+            if self.app_state.show_settings && i.key_pressed(Key::Backspace) {
-            if self.key_pressed(ctx, Key::Slash) {
+                self.app_state.show_settings = false;
-                self.app_state.force_focus_search = true;
             }
-
+        });
-            // Play selected file on Enter
-            if self.key_pressed(ctx, Key::Enter) && self.app_state.selected_file.is_some() {
-                let path = &self.app_state.selected_file.clone().unwrap();
-                if modifiers.ctrl {
-                    self.play_file(path, true);
-                } else if modifiers.shift
-                    && let Some(last_track) = self.audio_player_state.tracks.last()
-                {
-                    self.stop(Some(last_track.id));
-                    self.play_file(path, true);
-                } else {
-                    self.play_file(path, false);
-                }
-            }
-
-            // Iterate through dirs and files with Ctrl + Up/Down
-            let arrow_up_pressed = self.key_pressed(ctx, Key::ArrowUp);
-            let arrow_down_pressed = self.key_pressed(ctx, Key::ArrowDown);
-            if modifiers.ctrl && (arrow_up_pressed || arrow_down_pressed) {
-                if modifiers.shift && !self.app_state.dirs.is_empty() {
-                    let mut dirs: Vec<PathBuf> = self.app_state.dirs.iter().cloned().collect();
-                    dirs.sort();
-
-                    let current_dir_index: i8;
-                    if let Some(current_dir) = &self.app_state.current_dir {
-                        if let Some(index) = dirs.iter().position(|x| x == current_dir) {
-                            current_dir_index = index as i8;
-                        } else {
-                            current_dir_index = -1;
-                        }
-                    } else {
-                        current_dir_index = -1;
-                    }
-
-                    let mut new_dir_index: i8;
-
-                    new_dir_index =
-                        current_dir_index - arrow_up_pressed as i8 + arrow_down_pressed as i8;
-
-                    if new_dir_index < 0 {
-                        new_dir_index = (dirs.len() - 1) as i8;
-                    } else if new_dir_index >= dirs.len() as i8 {
-                        new_dir_index = 0;
-                    }
-
-                    self.open_dir(&dirs[new_dir_index as usize]);
-                } else if self.app_state.current_dir.is_some() {
-                    let files = self.get_filtered_files();
-
-                    if files.is_empty() {
-                        return;
-                    }
-
-                    let current_files_index = self
-                        .app_state
-                        .selected_file
-                        .as_ref()
-                        .and_then(|f| files.iter().position(|x| x == f))
-                        .map(|i| i as i64)
-                        .unwrap_or(-1);
-
-                    let mut new_files_index =
-                        current_files_index - arrow_up_pressed as i64 + arrow_down_pressed as i64;
-
-                    if new_files_index < 0 {
-                        new_files_index = (files.len() - 1) as i64;
-                    } else if new_files_index >= files.len() as i64 {
-                        new_files_index = 0;
-                    }
-
-                    self.app_state.selected_file = Some(files[new_files_index as usize].clone());
-                }
-            }
-        }
-        // });
     }
 }

src/gui/mod.rs

@@ -4,7 +4,6 @@ mod update;
 
 use eframe::{HardwareAcceleration, NativeOptions, icon_data::from_png_bytes, run_native};
 use egui::{Context, Vec2, ViewportBuilder};
-use itertools::Itertools;
 use pwsp::{
     types::{
         audio_player::PlayerState,
@@ -14,20 +13,16 @@ use pwsp::{
     },
     utils::{
         daemon::get_daemon_config,
-        gui::{get_gui_config, make_request_async, make_request_sync, start_app_state_thread},
+        gui::{get_gui_config, make_request_sync, start_app_state_thread},
     },
 };
 use rfd::FileDialog;
+use std::path::PathBuf;
 use std::{
     error::Error,
-    path::PathBuf,
     sync::{Arc, Mutex},
 };
 
-const SUPPORTED_EXTENSIONS: [&str; 11] = [
-    "mp3", "wav", "ogg", "flac", "mp4", "m4a", "aac", "mov", "mkv", "webm", "avi",
-];
-
 struct SoundpadGui {
     pub app_state: AppState,
     pub config: GuiConfig,
@@ -57,131 +52,55 @@ impl SoundpadGui {
     }
 
     pub fn play_toggle(&mut self) {
-        let (new_state, request) = {
-            let guard = self.audio_player_state_shared.lock().unwrap();
-            match guard.state {
-                PlayerState::Playing => (Some(PlayerState::Paused), Some(Request::pause(None))),
-                PlayerState::Paused => (Some(PlayerState::Playing), Some(Request::resume(None))),
-                PlayerState::Stopped => (None, None),
-            }
-        };
-
-        if let Some(req) = request {
-            make_request_async(req);
-        }
-
-        if let Some(state) = new_state {
         let mut guard = self.audio_player_state_shared.lock().unwrap();
-            guard.new_state = Some(state.clone());
+        guard.state = match guard.state {
-            guard.state = state;
+            PlayerState::Playing => {
+                make_request_sync(Request::pause()).ok();
+                guard.new_state = Some(PlayerState::Paused);
+                PlayerState::Paused
             }
+            PlayerState::Paused => {
+                make_request_sync(Request::resume()).ok();
+                guard.new_state = Some(PlayerState::Playing);
+                PlayerState::Playing
+            }
+            PlayerState::Stopped => PlayerState::Stopped,
+        };
     }
 
-    pub fn open_file(&mut self) {
+    pub fn add_dir(&mut self) {
-        let file_dialog = FileDialog::new().add_filter("Audio File", &SUPPORTED_EXTENSIONS);
-        if let Some(path) = file_dialog.pick_file() {
-            self.play_file(&path, false);
-        }
-    }
-
-    pub fn add_dirs(&mut self) {
         let file_dialog = FileDialog::new();
-        if let Some(paths) = file_dialog.pick_folders() {
+        if let Some(path) = file_dialog.pick_folder() {
-            for path in paths {
+            self.app_state.dirs.insert(path);
-                self.app_state.dirs.push(path);
-            }
-            self.app_state.dirs = self.app_state.dirs.iter().unique().cloned().collect();
             self.config.dirs = self.app_state.dirs.clone();
             self.config.save_to_file().ok();
         }
     }
 
-    pub fn open_dir(&mut self, path: &PathBuf) {
+    pub fn remove_dir(&mut self, path: PathBuf) {
-        self.app_state.current_dir = Some(path.clone());
+        self.app_state.dirs.remove(&path);
-        match path.read_dir() {
+        if let Some(current_dir) = &self.app_state.current_dir
-            Ok(read_dir) => {
+            && current_dir == &path
-                self.app_state.files = read_dir
+        {
-                    .filter_map(|res| res.ok())
+            self.app_state.current_dir = None;
-                    .map(|entry| entry.path())
-                    .collect();
-            }
-            Err(e) => {
-                eprintln!("Failed to read directory {:?}: {}", path, e);
-                self.app_state.files.clear();
-            }
         }
+        self.config.dirs = self.app_state.dirs.clone();
+        self.config.save_to_file().ok();
     }
 
-    pub fn play_file(&mut self, path: &PathBuf, concurrent: bool) {
+    pub fn play_file(&mut self, path: PathBuf) {
-        make_request_async(Request::play(path.to_str().unwrap(), concurrent));
+        make_request_sync(Request::play(path.to_str().unwrap())).ok();
     }
 
-    pub fn set_input(&mut self, name: String) {
+    pub fn set_input(&mut self, id: u32) {
-        make_request_async(Request::set_input(&name));
+        make_request_sync(Request::set_input(id)).ok();
 
         if self.config.save_input {
             let mut daemon_config = get_daemon_config();
-            daemon_config.default_input_name = Some(name);
+            daemon_config.default_input_id = Some(id);
             daemon_config.save_to_file().ok();
         }
     }
-
-    pub fn toggle_loop(&mut self, id: Option<u32>) {
-        make_request_async(Request::toggle_loop(id));
-    }
-
-    pub fn pause(&mut self, id: Option<u32>) {
-        make_request_async(Request::pause(id));
-    }
-
-    pub fn resume(&mut self, id: Option<u32>) {
-        make_request_async(Request::resume(id));
-    }
-
-    pub fn stop(&mut self, id: Option<u32>) {
-        make_request_async(Request::stop(id));
-    }
-
-    pub fn get_filtered_files(&self) -> Vec<PathBuf> {
-        let mut files: Vec<PathBuf> = self.app_state.files.iter().cloned().collect();
-        files.sort();
-
-        let search_query = self.app_state.search_query.to_lowercase();
-        let search_query = search_query.trim();
-
-        files
-            .into_iter()
-            .filter(|entry_path| {
-                if entry_path.is_dir() {
-                    return false;
-                }
-
-                if !SUPPORTED_EXTENSIONS.contains(
-                    &entry_path
-                        .extension()
-                        .unwrap_or_default()
-                        .to_str()
-                        .unwrap_or_default(),
-                ) {
-                    return false;
-                }
-
-                if !search_query.is_empty() {
-                    let file_name = entry_path
-                        .file_name()
-                        .unwrap_or_default()
-                        .to_string_lossy()
-                        .to_string();
-
-                    if !file_name.to_lowercase().contains(search_query) {
-                        return false;
-                    }
-                }
-
-                true
-            })
-            .collect()
-    }
 }
 
 pub async fn run() -> Result<(), Box<dyn Error>> {
@@ -209,13 +128,7 @@ pub async fn run() -> Result<(), Box<dyn Error>> {
             Ok(Box::new(SoundpadGui::new(&cc.egui_ctx)))
         }),
     ) {
-        Ok(_) => {
+        Ok(_) => Ok(()),
-            let config = get_gui_config();
-            if config.pause_on_exit {
-                make_request_sync(Request::pause(None)).ok();
-            }
-            Ok(())
-        }
         Err(e) => Err(e.into()),
     }
 }

src/gui/update.rs

@@ -3,85 +3,19 @@ use eframe::{App, Frame as EFrame};
 use egui::{CentralPanel, Context};
 use pwsp::{
     types::socket::Request,
-    utils::{daemon::get_daemon_config, gui::make_request_async},
+    utils::{
+        daemon::{get_daemon_config, is_daemon_running},
+        gui::make_request_sync,
+    },
 };
-use std::time::{Duration, Instant};
 
 impl App for SoundpadGui {
     fn update(&mut self, ctx: &Context, _frame: &mut EFrame) {
-        // Remove directories
-        for path in self.app_state.dirs_to_remove.drain() {
-            self.app_state.dirs.retain(|x| x != &path);
-            if let Some(current_dir) = &self.app_state.current_dir
-                && current_dir == &path
-            {
-                self.app_state.current_dir = None;
-                self.app_state.files.clear();
-            }
-        }
-
-        // Save directories if changed
-        if !self.config.dirs.eq(&self.app_state.dirs) {
-            self.config.dirs = self.app_state.dirs.clone();
-            self.config.save_to_file().ok();
-        }
-
-        // Seek and volume requests
-        let mut seek_requests = vec![];
-        let mut volume_requests = vec![];
-
-        for (id, ui_state) in &mut self.app_state.track_ui_states {
-            if ui_state.position_dragged {
-                seek_requests.push((*id, ui_state.position_slider_value));
-            }
-            if ui_state.volume_dragged {
-                volume_requests.push((*id, ui_state.volume_slider_value));
-                ui_state.volume_dragged = false;
-            }
-        }
-
-        for (id, pos) in seek_requests {
-            make_request_async(Request::seek(pos, Some(id)));
-            if let Some(ui_state) = self.app_state.track_ui_states.get_mut(&id) {
-                ui_state.position_dragged = false;
-                ui_state.ignore_position_update_until =
-                    Some(Instant::now() + Duration::from_millis(300));
-            }
-        }
-
-        for (id, vol) in volume_requests {
-            make_request_async(Request::set_volume(vol, Some(id)));
-            if let Some(ui_state) = self.app_state.track_ui_states.get_mut(&id) {
-                ui_state.volume_dragged = false;
-                ui_state.ignore_volume_update_until =
-                    Some(Instant::now() + Duration::from_millis(300));
-            }
-        }
-
-        if self.app_state.volume_dragged {
-            make_request_async(Request::set_volume(
-                self.app_state.volume_slider_value,
-                None,
-            ));
-
-            self.app_state.volume_dragged = false;
-            self.app_state.ignore_volume_update_until =
-                Some(Instant::now() + Duration::from_millis(300));
-
-            if self.config.save_volume {
-                let mut daemon_config = get_daemon_config();
-                daemon_config.default_volume = Some(self.app_state.volume_slider_value);
-                daemon_config.save_to_file().ok();
-            }
-        }
-
-        // Sync audio player state
         {
             let guard = self.audio_player_state_shared.lock().unwrap();
             self.audio_player_state = guard.clone();
         }
 
-        // Handle scale factor changes
         let old_scale_factor = self.config.scale_factor;
         let new_scale_factor = ctx.zoom_factor().clamp(0.5, 2.0);
 
@@ -92,12 +26,10 @@ impl App for SoundpadGui {
             self.config.save_to_file().ok();
         }
 
-        // Handle input
         self.handle_input(ctx);
 
-        // Draw UI
         CentralPanel::default().show(ctx, |ui| {
-            if !self.audio_player_state.is_daemon_running {
+            if !is_daemon_running().unwrap() {
                 self.draw_waiting_for_daemon(ui);
                 return;
             }
@@ -110,7 +42,36 @@ impl App for SoundpadGui {
             self.draw(ui).ok();
         });
 
-        // Request repaint
+        if self.app_state.position_dragged {
+            make_request_sync(Request::seek(self.app_state.position_slider_value)).ok();
+            let mut guard = self.audio_player_state_shared.lock().unwrap();
+            guard.new_position = Some(self.app_state.position_slider_value);
+            guard.position = self.app_state.position_slider_value;
+            self.app_state.position_dragged = false;
+        } else {
+            self.app_state.position_slider_value = self.audio_player_state.position;
+        }
+
+        if self.app_state.volume_dragged {
+            let new_volume = self.app_state.volume_slider_value;
+
+            make_request_sync(Request::set_volume(new_volume)).ok();
+
+            let mut guard = self.audio_player_state_shared.lock().unwrap();
+            guard.new_volume = Some(self.app_state.volume_slider_value);
+            guard.volume = self.app_state.volume_slider_value;
+
+            self.app_state.volume_dragged = false;
+
+            if self.config.save_volume {
+                let mut daemon_config = get_daemon_config();
+                daemon_config.default_volume = Some(new_volume);
+                daemon_config.save_to_file().ok();
+            }
+        } else {
+            self.app_state.volume_slider_value = self.audio_player_state.volume;
+        }
+
         ctx.request_repaint_after_secs(1.0 / 60.0);
     }
 }

src/types/audio_player.rs

@@ -1,14 +1,13 @@
 use crate::{
-    types::pipewire::{DeviceType, Terminate},
+    types::pipewire::{AudioDevice, DeviceType, Terminate},
     utils::{
         daemon::get_daemon_config,
-        pipewire::{create_link, get_device},
+        pipewire::{create_link, get_all_devices, get_device},
     },
 };
-use rodio::{Decoder, DeviceSinkBuilder, MixerDeviceSink, Player, Source};
+use rodio::{Decoder, OutputStream, OutputStreamBuilder, Sink, Source};
 use serde::{Deserialize, Serialize};
 use std::{
-    collections::HashMap,
     error::Error,
     fs,
     path::{Path, PathBuf},
@@ -23,65 +22,49 @@ pub enum PlayerState {
     Playing,
 }
 
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct TrackInfo {
-    pub id: u32,
-    pub path: PathBuf,
-    pub duration: Option<f32>,
-    pub position: f32,
-    pub volume: f32,
-    pub looped: bool,
-    pub paused: bool,
-}
-
-#[derive(Default, Debug, Clone, Serialize, Deserialize)]
-pub struct FullState {
-    pub state: PlayerState,
-    pub tracks: Vec<TrackInfo>,
-    pub volume: f32,
-    pub current_input: String,
-    pub all_inputs: HashMap<String, String>,
-}
-
-pub struct PlayingSound {
-    pub id: u32,
-    pub sink: Player,
-    pub path: PathBuf,
-    pub duration: Option<f32>,
-    pub looped: bool,
-    pub volume: f32,
-}
-
 pub struct AudioPlayer {
-    pub stream_handle: MixerDeviceSink,
+    _stream_handle: OutputStream,
-    pub tracks: HashMap<u32, PlayingSound>,
+    sink: Sink,
-    pub next_id: u32,
 
     input_link_sender: Option<pipewire::channel::Sender<Terminate>>,
-    pub input_device_name: Option<String>,
+    pub current_input_device: Option<AudioDevice>,
 
-    pub volume: f32, // Master volume
+    pub volume: f32,
+    pub duration: Option<f32>,
+
+    pub current_file_path: Option<PathBuf>,
 }
 
 impl AudioPlayer {
     pub async fn new() -> Result<Self, Box<dyn Error>> {
         let daemon_config = get_daemon_config();
         let default_volume = daemon_config.default_volume.unwrap_or(1.0);
+        let mut default_input_device: Option<AudioDevice> = None;
+        if let Some(id) = daemon_config.default_input_id
+            && let Ok(device) = get_device(id).await
+            && device.device_type == DeviceType::Input
+        {
+            default_input_device = Some(device);
+        }
 
-        let stream_handle = DeviceSinkBuilder::open_default_sink()?;
+        let stream_handle = OutputStreamBuilder::open_default_stream()?;
+        let sink = Sink::connect_new(stream_handle.mixer());
+        sink.set_volume(default_volume);
 
         let mut audio_player = AudioPlayer {
-            stream_handle,
+            _stream_handle: stream_handle,
-            tracks: HashMap::new(),
+            sink,
-            next_id: 1,
 
             input_link_sender: None,
-            input_device_name: daemon_config.default_input_name.clone(),
+            current_input_device: default_input_device.clone(),
 
             volume: default_volume,
+            duration: None,
+
+            current_file_path: None,
         };
 
-        if audio_player.input_device_name.is_some() {
+        if default_input_device.is_some() {
             audio_player.link_devices().await?;
         }
 
@@ -91,11 +74,8 @@ impl AudioPlayer {
     fn abort_link_thread(&mut self) {
         if let Some(sender) = &self.input_link_sender {
             match sender.send(Terminate {}) {
-                Ok(_) => {
+                Ok(_) => println!("Sent terminate signal to link thread"),
-                    println!("Sent terminate signal to link thread");
+                Err(_) => println!("Failed to send terminate signal to link thread"),
-                    self.input_link_sender = None;
-                }
-                Err(_) => eprintln!("Failed to send terminate signal to link thread"),
             }
         }
     }
@@ -103,169 +83,114 @@ impl AudioPlayer {
     async fn link_devices(&mut self) -> Result<(), Box<dyn Error>> {
         self.abort_link_thread();
 
-        let input_device;
+        if self.current_input_device.is_none() {
-        if let Some(input_device_name) = &self.input_device_name {
+            println!("No input device selected, skipping device linking");
-            if let Ok(device) = get_device(input_device_name).await {
-                input_device = device;
-            } else {
-                eprintln!(
-                    "Could not find selected input device {}, skipping device linking",
-                    input_device_name
-                );
-                return Ok(());
-            }
-        } else {
-            eprintln!("No input device selected, skipping device linking");
             return Ok(());
         }
 
-        let daemon_input;
+        let (input_devices, _) = get_all_devices().await?;
-        if let Ok(device) = get_device("pwsp-virtual-mic").await {
+
-            daemon_input = device;
+        let mut pwsp_daemon_input: Option<AudioDevice> = None;
-        } else {
+        for input_device in input_devices {
-            eprintln!("Could not find pwsp-virtual-mic device, skipping device linking");
+            if input_device.name == "pwsp-virtual-mic" {
+                pwsp_daemon_input = Some(input_device);
+                break;
+            }
+        }
+
+        if pwsp_daemon_input.is_none() {
+            println!("Could not find pwsp-daemon input device, skipping device linking");
             return Ok(());
         }
 
-        let Some(output_fl) = input_device.output_fl.clone() else {
+        let pwsp_daemon_input = pwsp_daemon_input.unwrap();
-            eprintln!("Failed to get pwsp-daemon output_fl");
-            return Ok(());
-        };
-        let Some(output_fr) = input_device.output_fr.clone() else {
-            eprintln!("Failed to get pwsp-daemon output_fr");
-            return Ok(());
-        };
-        let Some(input_fl) = daemon_input.input_fl.clone() else {
-            eprintln!("Failed to get pwsp-daemon input_fl");
-            return Ok(());
-        };
-        let Some(input_fr) = daemon_input.input_fr.clone() else {
-            eprintln!("Failed to get pwsp-daemon input_fr");
-            return Ok(());
-        };
 
+        let current_input_device = self.current_input_device.clone().unwrap();
+        let output_fl = current_input_device
+            .clone()
+            .output_fl
+            .expect("Failed to get pwsp-daemon output_fl");
+        let output_fr = current_input_device
+            .clone()
+            .output_fr
+            .expect("Failed to get pwsp-daemon output_fl");
+        let input_fl = pwsp_daemon_input
+            .clone()
+            .input_fl
+            .expect("Failed to get pwsp-daemon input_fl");
+        let input_fr = pwsp_daemon_input
+            .clone()
+            .input_fr
+            .expect("Failed to get pwsp-daemon input_fr");
         self.input_link_sender = Some(create_link(output_fl, output_fr, input_fl, input_fr)?);
 
         Ok(())
     }
 
-    pub fn pause(&mut self, id: Option<u32>) {
+    pub fn pause(&mut self) {
-        if let Some(id) = id {
+        if self.get_state() == PlayerState::Playing {
-            if let Some(sound) = self.tracks.get_mut(&id) {
+            self.sink.pause();
-                sound.sink.pause();
-            }
-        } else {
-            for sound in self.tracks.values_mut() {
-                sound.sink.pause();
-            }
         }
     }
 
-    pub fn resume(&mut self, id: Option<u32>) {
+    pub fn resume(&mut self) {
-        if let Some(id) = id {
+        if self.get_state() == PlayerState::Paused {
-            if let Some(sound) = self.tracks.get_mut(&id) {
+            self.sink.play();
-                sound.sink.play();
-            }
-        } else {
-            for sound in self.tracks.values_mut() {
-                sound.sink.play();
-            }
         }
     }
 
-    pub fn stop(&mut self, id: Option<u32>) {
+    pub fn stop(&mut self) {
-        if let Some(id) = id {
+        self.sink.stop();
-            self.tracks.remove(&id);
-        } else {
-            self.tracks.clear();
-        }
     }
 
     pub fn is_paused(&self) -> bool {
-        if self.tracks.is_empty() {
+        self.sink.is_paused()
-            return false;
-        }
-        self.tracks.values().all(|s| s.sink.is_paused())
     }
 
-    pub fn get_state(&self) -> PlayerState {
+    pub fn get_state(&mut self) -> PlayerState {
-        if self.tracks.is_empty() {
+        if self.sink.len() == 0 {
             return PlayerState::Stopped;
         }
 
-        if self
+        if self.sink.is_paused() {
-            .tracks
-            .values()
-            .any(|s| !s.sink.is_paused() && !s.sink.empty())
-        {
-            return PlayerState::Playing;
-        }
-
-        if self.is_paused() {
             return PlayerState::Paused;
         }
 
-        PlayerState::Stopped
+        PlayerState::Playing
     }
 
-    pub fn set_volume(&mut self, volume: f32, id: Option<u32>) {
+    pub fn set_volume(&mut self, volume: f32) {
-        if let Some(id) = id {
-            if let Some(sound) = self.tracks.get_mut(&id) {
-                sound.volume = volume;
-                sound.sink.set_volume(self.volume * volume);
-            }
-        } else {
         self.volume = volume;
-            for sound in self.tracks.values_mut() {
+        self.sink.set_volume(volume);
-                sound.sink.set_volume(self.volume * sound.volume);
     }
+
+    pub fn get_position(&mut self) -> f32 {
+        if self.get_state() == PlayerState::Stopped {
+            return 0.0;
+        }
+
+        self.sink.get_pos().as_secs_f32()
+    }
+
+    pub fn seek(&mut self, position: f32) -> Result<(), Box<dyn Error>> {
+        match self.sink.try_seek(Duration::from_secs_f32(position)) {
+            Ok(_) => Ok(()),
+            Err(err) => Err(err.into()),
         }
     }
 
-    pub fn get_position(&self, id: Option<u32>) -> f32 {
+    pub fn get_duration(&mut self) -> Result<f32, Box<dyn Error>> {
-        if let Some(id) = id {
+        if self.get_state() == PlayerState::Stopped {
-            if let Some(sound) = self.tracks.get(&id) {
+            Err("Nothing is playing right now".into())
-                return sound.sink.get_pos().as_secs_f32();
-            }
-        } else if let Some(sound) = self.tracks.values().last() {
-            // Fallback to last added track if no ID
-            return sound.sink.get_pos().as_secs_f32();
-        }
-        0.0
-    }
-
-    pub fn seek(&mut self, position: f32, id: Option<u32>) -> Result<(), Box<dyn Error>> {
-        let position = if position < 0.0 { 0.0 } else { position };
-
-        if let Some(id) = id {
-            if let Some(sound) = self.tracks.get_mut(&id) {
-                sound.sink.try_seek(Duration::from_secs_f32(position))?;
-            }
         } else {
-            // Seek all? Or last? Let's seek all for now if no ID provided
+            match self.duration {
-            for sound in self.tracks.values_mut() {
+                Some(duration) => Ok(duration),
-                sound.sink.try_seek(Duration::from_secs_f32(position)).ok();
+                None => Err("Couldn't determine duration for current file".into()),
             }
         }
-        Ok(())
     }
 
-    pub fn get_duration(&mut self, id: Option<u32>) -> Result<f32, Box<dyn Error>> {
+    pub async fn play(&mut self, file_path: &Path) -> Result<(), Box<dyn Error>> {
-        if let Some(id) = id {
-            if let Some(sound) = self.tracks.get(&id) {
-                return sound.duration.ok_or("Unknown duration".into());
-            }
-        } else if let Some(sound) = self.tracks.values().last() {
-            return sound.duration.ok_or("Unknown duration".into());
-        }
-        Err("No track playing".into())
-    }
-
-    pub async fn play(
-        &mut self,
-        file_path: &Path,
-        concurrent: bool,
-    ) -> Result<u32, Box<dyn Error>> {
         if !file_path.exists() {
             return Err(format!("File does not exist: {}", file_path.display()).into());
         }
@@ -273,118 +198,40 @@ impl AudioPlayer {
         let file = fs::File::open(file_path)?;
         match Decoder::try_from(file) {
             Ok(source) => {
-                if !concurrent {
+                self.current_file_path = Some(file_path.to_path_buf());
-                    self.tracks.clear();
+
+                if let Some(duration) = source.total_duration() {
+                    self.duration = Some(duration.as_secs_f32());
+                } else {
+                    self.duration = None;
                 }
 
-                let id = self.next_id;
+                self.sink.stop();
-                self.next_id += 1;
+                self.sink.append(source);
+                self.sink.play();
+                self.link_devices().await?;
 
-                let duration = source.total_duration().map(|d| d.as_secs_f32());
+                Ok(())
-
-                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();
-
-                let sound = PlayingSound {
-                    id,
-                    sink,
-                    path: file_path.to_path_buf(),
-                    duration,
-                    looped: false,
-                    volume: 1.0,
-                };
-
-                self.tracks.insert(id, sound);
-
-                Ok(id)
             }
             Err(err) => Err(err.into()),
         }
     }
 
-    pub fn set_loop(&mut self, enabled: bool, id: Option<u32>) {
+    pub fn get_current_file_path(&mut self) -> &Option<PathBuf> {
-        if let Some(id) = id {
+        if self.get_state() == PlayerState::Stopped {
-            if let Some(sound) = self.tracks.get_mut(&id) {
+            self.current_file_path = None;
-                sound.looped = enabled;
-            }
-        } else {
-            // Set loop for all? Or just last?
-            // Let's set for all.
-            for sound in self.tracks.values_mut() {
-                sound.looped = enabled;
-            }
         }
+        &self.current_file_path
     }
 
-    pub fn get_tracks(&self) -> Vec<TrackInfo> {
+    pub async fn set_current_input_device(&mut self, id: u32) -> Result<(), Box<dyn Error>> {
-        let mut tracks: Vec<_> = self
+        let input_device = get_device(id).await?;
-            .tracks
-            .values()
-            .map(|sound| TrackInfo {
-                id: sound.id,
-                path: sound.path.clone(),
-                duration: sound.duration,
-                position: sound.sink.get_pos().as_secs_f32(),
-                volume: sound.volume,
-                looped: sound.looped,
-                paused: sound.sink.is_paused(),
-            })
-            .collect();
-        tracks.sort_by_key(|t| t.id);
-        tracks
-    }
-
-    pub async fn update(&mut self) {
-        if let Some(input_device_name) = &self.input_device_name {
-            // Unlink devices if selected input device was removed
-            if self.input_link_sender.is_some() && get_device(input_device_name).await.is_err() {
-                // Selected input device was removed
-                eprintln!(
-                    "Selected input device {} was removed, unlinking devices",
-                    input_device_name
-                );
-                self.abort_link_thread();
-            }
-            // Link devices if not linked
-            else if self.input_link_sender.is_none() {
-                self.link_devices().await.ok();
-            }
-        }
-
-        // Handle looped sounds
-        let mut restarts = vec![];
-
-        for (id, sound) in &self.tracks {
-            if sound.sink.empty() && sound.looped {
-                restarts.push(*id);
-            }
-        }
-
-        for id in restarts {
-            if let Some(sound) = self.tracks.get_mut(&id) {
-                if let Ok(file) = fs::File::open(&sound.path) {
-                    if let Ok(source) = Decoder::try_from(file) {
-                        sound.sink.append(source);
-                        sound.sink.play();
-                    }
-                }
-            }
-        }
-
-        self.tracks
-            .retain(|_, sound| !sound.sink.empty() || sound.looped);
-    }
-
-    pub async fn set_current_input_device(&mut self, name: &str) -> Result<(), Box<dyn Error>> {
-        let input_device = get_device(name).await?;
 
         if input_device.device_type != DeviceType::Input {
             return Err("Selected device is not an input device".into());
         }
 
-        self.input_device_name = Some(name.to_string());
+        self.current_input_device = Some(input_device);
 
         self.link_devices().await?;
 

src/types/commands.rs

@@ -1,15 +1,9 @@
 use crate::{
-    types::{
+    types::socket::Response,
-        audio_player::{FullState, PlayerState},
+    utils::{daemon::get_audio_player, pipewire::get_all_devices},
-        socket::Response,
-    },
-    utils::{
-        daemon::get_audio_player,
-        pipewire::{get_all_devices, get_device},
-    },
 };
 use async_trait::async_trait;
-use std::{collections::HashMap, path::PathBuf};
+use std::path::PathBuf;
 
 #[async_trait]
 pub trait Executable {
@@ -18,23 +12,11 @@ pub trait Executable {
 
 pub struct PingCommand {}
 
-pub struct KillCommand {}
+pub struct PauseCommand {}
 
-pub struct PauseCommand {
+pub struct ResumeCommand {}
-    pub id: Option<u32>,
-}
 
-pub struct ResumeCommand {
+pub struct StopCommand {}
-    pub id: Option<u32>,
-}
-
-pub struct TogglePauseCommand {
-    pub id: Option<u32>,
-}
-
-pub struct StopCommand {
-    pub id: Option<u32>,
-}
 
 pub struct IsPausedCommand {}
 
@@ -44,50 +26,30 @@ pub struct GetVolumeCommand {}
 
 pub struct SetVolumeCommand {
     pub volume: Option<f32>,
-    pub id: Option<u32>,
 }
 
-pub struct GetPositionCommand {
+pub struct GetPositionCommand {}
-    pub id: Option<u32>,
-}
 
 pub struct SeekCommand {
     pub position: Option<f32>,
-    pub id: Option<u32>,
 }
 
-pub struct GetDurationCommand {
+pub struct GetDurationCommand {}
-    pub id: Option<u32>,
-}
 
 pub struct PlayCommand {
     pub file_path: Option<PathBuf>,
-    pub concurrent: Option<bool>,
 }
 
-pub struct GetTracksCommand {}
+pub struct GetCurrentFilePathCommand {}
 
 pub struct GetCurrentInputCommand {}
 
 pub struct GetAllInputsCommand {}
 
 pub struct SetCurrentInputCommand {
-    pub name: Option<String>,
-}
-
-pub struct SetLoopCommand {
-    pub enabled: Option<bool>,
     pub id: Option<u32>,
 }
 
-pub struct ToggleLoopCommand {
-    pub id: Option<u32>,
-}
-
-pub struct GetDaemonVersionCommand {}
-
-pub struct GetFullStateCommand {}
-
 #[async_trait]
 impl Executable for PingCommand {
     async fn execute(&self) -> Response {
@@ -95,18 +57,11 @@ 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 {
         let mut audio_player = get_audio_player().await.lock().await;
-        audio_player.pause(self.id);
+        audio_player.pause();
         Response::new(true, "Audio was paused")
     }
 }
@@ -115,54 +70,16 @@ impl Executable for PauseCommand {
 impl Executable for ResumeCommand {
     async fn execute(&self) -> Response {
         let mut audio_player = get_audio_player().await.lock().await;
-        audio_player.resume(self.id);
+        audio_player.resume();
         Response::new(true, "Audio was resumed")
     }
 }
 
-#[async_trait]
-impl Executable for TogglePauseCommand {
-    async fn execute(&self) -> Response {
-        let mut audio_player = get_audio_player().await.lock().await;
-
-        if audio_player.get_state() == PlayerState::Stopped {
-            return Response::new(false, "Audio is not playing");
-        }
-
-        // This logic is a bit tricky with multiple tracks.
-        // If ID is provided, toggle that track.
-        // If not, toggle global pause state?
-        // For now, let's just use pause/resume based on global state if no ID.
-
-        if let Some(id) = self.id {
-            if let Some(track) = audio_player.tracks.get(&id) {
-                if track.sink.is_paused() {
-                    audio_player.resume(Some(id));
-                    Response::new(true, "Audio was resumed")
-                } else {
-                    audio_player.pause(Some(id));
-                    Response::new(true, "Audio was paused")
-                }
-            } else {
-                Response::new(false, "Track not found")
-            }
-        } else {
-            if audio_player.is_paused() {
-                audio_player.resume(None);
-                Response::new(true, "Audio was resumed")
-            } else {
-                audio_player.pause(None);
-                Response::new(true, "Audio was paused")
-            }
-        }
-    }
-}
-
 #[async_trait]
 impl Executable for StopCommand {
     async fn execute(&self) -> Response {
         let mut audio_player = get_audio_player().await.lock().await;
-        audio_player.stop(self.id);
+        audio_player.stop();
         Response::new(true, "Audio was stopped")
     }
 }
@@ -179,7 +96,7 @@ impl Executable for IsPausedCommand {
 #[async_trait]
 impl Executable for GetStateCommand {
     async fn execute(&self) -> Response {
-        let audio_player = get_audio_player().await.lock().await;
+        let mut audio_player = get_audio_player().await.lock().await;
         let state = audio_player.get_state();
         Response::new(true, serde_json::to_string(&state).unwrap())
     }
@@ -199,7 +116,7 @@ impl Executable for SetVolumeCommand {
     async fn execute(&self) -> Response {
         if let Some(volume) = self.volume {
             let mut audio_player = get_audio_player().await.lock().await;
-            audio_player.set_volume(volume, self.id);
+            audio_player.set_volume(volume);
             Response::new(true, format!("Audio volume was set to {}", volume))
         } else {
             Response::new(false, "Invalid volume value")
@@ -210,8 +127,8 @@ impl Executable for SetVolumeCommand {
 #[async_trait]
 impl Executable for GetPositionCommand {
     async fn execute(&self) -> Response {
-        let audio_player = get_audio_player().await.lock().await;
+        let mut audio_player = get_audio_player().await.lock().await;
-        let position = audio_player.get_position(self.id);
+        let position = audio_player.get_position();
         Response::new(true, position.to_string())
     }
 }
@@ -221,7 +138,7 @@ impl Executable for SeekCommand {
     async fn execute(&self) -> Response {
         if let Some(position) = self.position {
             let mut audio_player = get_audio_player().await.lock().await;
-            match audio_player.seek(position, self.id) {
+            match audio_player.seek(position) {
                 Ok(_) => Response::new(true, format!("Audio position was set to {}", position)),
                 Err(err) => Response::new(false, err.to_string()),
             }
@@ -235,7 +152,7 @@ impl Executable for SeekCommand {
 impl Executable for GetDurationCommand {
     async fn execute(&self) -> Response {
         let mut audio_player = get_audio_player().await.lock().await;
-        match audio_player.get_duration(self.id) {
+        match audio_player.get_duration() {
             Ok(duration) => Response::new(true, duration.to_string()),
             Err(err) => Response::new(false, err.to_string()),
         }
@@ -247,11 +164,8 @@ impl Executable for PlayCommand {
     async fn execute(&self) -> Response {
         if let Some(file_path) = &self.file_path {
             let mut audio_player = get_audio_player().await.lock().await;
-            match audio_player
+            match audio_player.play(file_path).await {
-                .play(file_path, self.concurrent.unwrap_or(false))
+                Ok(_) => Response::new(true, format!("Now playing {}", file_path.display())),
-                .await
-            {
-                Ok(id) => Response::new(true, id.to_string()),
                 Err(err) => Response::new(false, err.to_string()),
             }
         } else {
@@ -261,11 +175,15 @@ impl Executable for PlayCommand {
 }
 
 #[async_trait]
-impl Executable for GetTracksCommand {
+impl Executable for GetCurrentFilePathCommand {
     async fn execute(&self) -> Response {
-        let audio_player = get_audio_player().await.lock().await;
+        let mut audio_player = get_audio_player().await.lock().await;
-        let tracks = audio_player.get_tracks();
+        let current_file_path = audio_player.get_current_file_path();
-        Response::new(true, serde_json::to_string(&tracks).unwrap())
+        if let Some(current_file_path) = current_file_path {
+            Response::new(true, current_file_path.to_str().unwrap())
+        } else {
+            Response::new(false, "No file is playing")
+        }
     }
 }
 
@@ -273,15 +191,8 @@ impl Executable for GetTracksCommand {
 impl Executable for GetCurrentInputCommand {
     async fn execute(&self) -> Response {
         let audio_player = get_audio_player().await.lock().await;
-        if let Some(input_device_name) = &audio_player.input_device_name {
+        if let Some(input_device) = &audio_player.current_input_device {
-            if let Ok(input_device) = get_device(input_device_name).await {
+            Response::new(true, format!("{} - {}", input_device.id, input_device.nick))
-                Response::new(
-                    true,
-                    format!("{} - {}", input_device.name, input_device.nick),
-                )
-            } else {
-                Response::new(false, "Failed to get current input device")
-            }
         } else {
             Response::new(false, "No input device selected")
         }
@@ -298,7 +209,7 @@ impl Executable for GetAllInputsCommand {
                 continue;
             }
 
-            let string = format!("{} - {}", device.name, device.nick);
+            let string = format!("{} - {}", device.id, device.nick);
             input_devices_strings.push(string);
         }
         let response_message = input_devices_strings.join("; ");
@@ -310,9 +221,9 @@ impl Executable for GetAllInputsCommand {
 #[async_trait]
 impl Executable for SetCurrentInputCommand {
     async fn execute(&self) -> Response {
-        if let Some(name) = &self.name {
+        if let Some(id) = self.id {
             let mut audio_player = get_audio_player().await.lock().await;
-            match audio_player.set_current_input_device(name).await {
+            match audio_player.set_current_input_device(id).await {
                 Ok(_) => Response::new(true, "Input device was set"),
                 Err(err) => Response::new(false, err.to_string()),
             }
@@ -321,80 +232,3 @@ impl Executable for SetCurrentInputCommand {
         }
     }
 }
-
-#[async_trait]
-impl Executable for SetLoopCommand {
-    async fn execute(&self) -> Response {
-        let mut audio_player = get_audio_player().await.lock().await;
-
-        match self.enabled {
-            Some(enabled) => {
-                audio_player.set_loop(enabled, self.id);
-                Response::new(true, format!("Loop was set to {}", enabled))
-            }
-            None => Response::new(false, "Invalid enabled value"),
-        }
-    }
-}
-
-#[async_trait]
-impl Executable for ToggleLoopCommand {
-    async fn execute(&self) -> Response {
-        let mut audio_player = get_audio_player().await.lock().await;
-        if let Some(id) = self.id {
-            if let Some(track) = audio_player.tracks.get_mut(&id) {
-                track.looped = !track.looped;
-                Response::new(true, format!("Loop was set to {}", track.looped))
-            } else {
-                Response::new(false, "Track not found")
-            }
-        } else {
-            // Toggle all?
-            for track in audio_player.tracks.values_mut() {
-                track.looped = !track.looped;
-            }
-            Response::new(true, "Loop toggled for all tracks")
-        }
-    }
-}
-
-#[async_trait]
-impl Executable for GetDaemonVersionCommand {
-    async fn execute(&self) -> Response {
-        Response::new(true, env!("CARGO_PKG_VERSION"))
-    }
-}
-
-#[async_trait]
-impl Executable for GetFullStateCommand {
-    async fn execute(&self) -> Response {
-        let (input_devices, _output_devices) = get_all_devices().await.unwrap();
-        let mut all_inputs = HashMap::new();
-        let mut current_input_nick = String::new();
-
-        let audio_player = get_audio_player().await.lock().await;
-        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 {
-                    current_input_nick = format!("{} - {}", device.name, device.nick);
-                }
-            }
-
-            all_inputs.insert(device.name, device.nick);
-        }
-
-        let full_state = FullState {
-            state: audio_player.get_state(),
-            tracks: audio_player.get_tracks(),
-            volume: audio_player.volume,
-            current_input: current_input_nick,
-            all_inputs: all_inputs,
-        };
-
-        Response::new(true, serde_json::to_string(&full_state).unwrap())
-    }
-}

src/types/config.rs

@@ -1,11 +1,10 @@
 use crate::utils::config::get_config_path;
 use serde::{Deserialize, Serialize};
-use std::{error::Error, fs, path::PathBuf};
+use std::{collections::HashSet, error::Error, fs, path::PathBuf};
 
 #[derive(Default, Clone, Serialize, Deserialize)]
-#[serde(default)]
 pub struct DaemonConfig {
-    pub default_input_name: Option<String>,
+    pub default_input_id: Option<u32>,
     pub default_volume: Option<f32>,
 }
 
@@ -31,31 +30,26 @@ impl DaemonConfig {
 }
 
 #[derive(Clone, Serialize, Deserialize)]
-#[serde(default)]
 pub struct GuiConfig {
     pub scale_factor: f32,
-    pub left_panel_width: f32,
 
     pub save_volume: bool,
     pub save_input: bool,
     pub save_scale_factor: bool,
-    pub pause_on_exit: bool,
 
-    pub dirs: Vec<PathBuf>,
+    pub dirs: HashSet<PathBuf>,
 }
 
 impl Default for GuiConfig {
     fn default() -> Self {
         GuiConfig {
             scale_factor: 1.0,
-            left_panel_width: 280.0,
 
             save_volume: false,
             save_input: false,
             save_scale_factor: false,
-            pause_on_exit: false,
 
-            dirs: vec![],
+            dirs: HashSet::default(),
         }
     }
 }

src/types/gui.rs

@@ -1,60 +1,39 @@
-use crate::types::audio_player::{PlayerState, TrackInfo};
+use crate::types::audio_player::PlayerState;
-
-use egui::Id;
-
 use std::{
     collections::{HashMap, HashSet},
     path::PathBuf,
-    time::Instant,
 };
 
 #[derive(Default, Debug)]
-pub struct TrackUiState {
+pub struct AppState {
+    pub search_query: String,
+
     pub position_slider_value: f32,
     pub volume_slider_value: f32,
 
     pub position_dragged: bool,
     pub volume_dragged: bool,
 
-    pub ignore_position_update_until: Option<Instant>,
-    pub ignore_volume_update_until: Option<Instant>,
-}
-
-#[derive(Default, Debug)]
-pub struct AppState {
-    pub search_query: String,
-
-    pub track_ui_states: HashMap<u32, TrackUiState>,
-
     pub show_settings: bool,
-    pub volume_dragged: bool,
-    pub force_focus_search: bool,
-
-    pub volume_slider_value: f32,
-
-    pub search_field_id: Option<Id>,
-
-    pub ignore_volume_update_until: Option<Instant>,
 
     pub current_dir: Option<PathBuf>,
-    pub dirs: Vec<PathBuf>,
+    pub dirs: HashSet<PathBuf>,
-    pub dirs_to_remove: HashSet<PathBuf>,
-
-    pub selected_file: Option<PathBuf>,
-    pub files: HashSet<PathBuf>,
 }
 
 #[derive(Default, Debug, Clone)]
 pub struct AudioPlayerState {
     pub state: PlayerState,
     pub new_state: Option<PlayerState>,
+    pub current_file_path: PathBuf,
 
-    pub tracks: Vec<TrackInfo>,
+    pub is_paused: bool,
 
-    pub volume: f32, // Master volume
+    pub volume: f32,
+    pub new_volume: Option<f32>,
+    pub position: f32,
+    pub new_position: Option<f32>,
+    pub duration: f32,
 
-    pub current_input: String,
+    pub current_input: u32,
-    pub all_inputs: HashMap<String, String>,
+    pub all_inputs: HashMap<u32, String>,
-
-    pub is_daemon_running: bool,
 }

src/types/socket.rs

@@ -24,58 +24,20 @@ impl Request {
         Request::new("ping", vec![])
     }
 
-    pub fn kill() -> Self {
+    pub fn pause() -> Self {
-        Request::new("kill", vec![])
+        Request::new("pause", vec![])
     }
 
-    pub fn pause(id: Option<u32>) -> Self {
+    pub fn resume() -> Self {
-        let mut args = vec![];
+        Request::new("resume", vec![])
-        let id_str;
-        if let Some(id) = id {
-            id_str = id.to_string();
-            args.push(("id", id_str.as_str()));
-        }
-        Request::new("pause", args)
     }
 
-    pub fn resume(id: Option<u32>) -> Self {
+    pub fn stop() -> Self {
-        let mut args = vec![];
+        Request::new("stop", vec![])
-        let id_str;
-        if let Some(id) = id {
-            id_str = id.to_string();
-            args.push(("id", id_str.as_str()));
-        }
-        Request::new("resume", args)
     }
 
-    pub fn toggle_pause(id: Option<u32>) -> Self {
+    pub fn play(file_path: &str) -> Self {
-        let mut args = vec![];
+        Request::new("play", vec![("file_path", file_path)])
-        let id_str;
-        if let Some(id) = id {
-            id_str = id.to_string();
-            args.push(("id", id_str.as_str()));
-        }
-        Request::new("toggle_pause", args)
-    }
-
-    pub fn stop(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("stop", args)
-    }
-
-    pub fn play(file_path: &str, concurrent: bool) -> Self {
-        Request::new(
-            "play",
-            vec![
-                ("file_path", file_path),
-                ("concurrent", &concurrent.to_string()),
-            ],
-        )
     }
 
     pub fn get_is_paused() -> Self {
@@ -86,32 +48,20 @@ impl Request {
         Request::new("get_volume", vec![])
     }
 
-    pub fn get_position(id: Option<u32>) -> Self {
+    pub fn get_position() -> Self {
-        let mut args = vec![];
+        Request::new("get_position", vec![])
-        let id_str;
-        if let Some(id) = id {
-            id_str = id.to_string();
-            args.push(("id", id_str.as_str()));
-        }
-        Request::new("get_position", args)
     }
 
-    pub fn get_duration(id: Option<u32>) -> Self {
+    pub fn get_duration() -> Self {
-        let mut args = vec![];
+        Request::new("get_duration", vec![])
-        let id_str;
-        if let Some(id) = id {
-            id_str = id.to_string();
-            args.push(("id", id_str.as_str()));
-        }
-        Request::new("get_duration", args)
     }
 
     pub fn get_state() -> Self {
         Request::new("get_state", vec![])
     }
 
-    pub fn get_tracks() -> Self {
+    pub fn get_current_file_path() -> Self {
-        Request::new("get_tracks", vec![])
+        Request::new("get_current_file_path", vec![])
     }
 
     pub fn get_input() -> Self {
@@ -122,50 +72,16 @@ impl Request {
         Request::new("get_inputs", vec![])
     }
 
-    pub fn set_volume(volume: f32, id: Option<u32>) -> Self {
+    pub fn set_volume(volume: f32) -> Self {
-        let mut args = vec![("volume".to_string(), volume.to_string())];
+        Request::new("set_volume", vec![("volume", &volume.to_string())])
-        if let Some(id) = id {
-            args.push(("id".to_string(), id.to_string()));
-        }
-        Request::new("set_volume".to_string(), args)
     }
 
-    pub fn seek(position: f32, id: Option<u32>) -> Self {
+    pub fn seek(position: f32) -> Self {
-        let mut args = vec![("position".to_string(), position.to_string())];
+        Request::new("seek", vec![("position", &position.to_string())])
-        if let Some(id) = id {
-            args.push(("id".to_string(), id.to_string()));
-        }
-        Request::new("seek".to_string(), args)
     }
 
-    pub fn set_input(name: &str) -> Self {
+    pub fn set_input(id: u32) -> Self {
-        Request::new("set_input", vec![("input_name", name)])
+        Request::new("set_input", vec![("input_id", &id.to_string())])
-    }
-
-    pub fn set_loop(enabled: &str, id: Option<u32>) -> Self {
-        let mut args = vec![("enabled".to_string(), enabled.to_string())];
-        if let Some(id) = id {
-            args.push(("id".to_string(), id.to_string()));
-        }
-        Request::new("set_loop".to_string(), args)
-    }
-
-    pub fn toggle_loop(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("toggle_loop", args)
-    }
-
-    pub fn get_daemon_version() -> Self {
-        Request::new("get_daemon_version", vec![])
-    }
-
-    pub fn get_full_state() -> Self {
-        Request::new("get_full_state", vec![])
     }
 }
 

src/utils/commands.rs

@@ -3,15 +3,11 @@ use crate::types::{commands::*, socket::Request};
 use std::path::PathBuf;
 
 pub fn parse_command(request: &Request) -> Option<Box<dyn Executable + Send>> {
-    let id = request.args.get("id").and_then(|s| s.parse::<u32>().ok());
-
     match request.name.as_str() {
         "ping" => Some(Box::new(PingCommand {})),
-        "kill" => Some(Box::new(KillCommand {})),
+        "pause" => Some(Box::new(PauseCommand {})),
-        "pause" => Some(Box::new(PauseCommand { id })),
+        "resume" => Some(Box::new(ResumeCommand {})),
-        "resume" => Some(Box::new(ResumeCommand { id })),
+        "stop" => Some(Box::new(StopCommand {})),
-        "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 {})),
@@ -22,9 +18,9 @@ pub fn parse_command(request: &Request) -> Option<Box<dyn Executable + Send>> {
                 .unwrap_or(&String::new())
                 .parse::<f32>()
                 .ok();
-            Some(Box::new(SetVolumeCommand { volume, id }))
+            Some(Box::new(SetVolumeCommand { volume }))
         }
-        "get_position" => Some(Box::new(GetPositionCommand { id })),
+        "get_position" => Some(Box::new(GetPositionCommand {})),
         "seek" => {
             let position = request
                 .args
@@ -32,9 +28,9 @@ pub fn parse_command(request: &Request) -> Option<Box<dyn Executable + Send>> {
                 .unwrap_or(&String::new())
                 .parse::<f32>()
                 .ok();
-            Some(Box::new(SeekCommand { position, id }))
+            Some(Box::new(SeekCommand { position }))
         }
-        "get_duration" => Some(Box::new(GetDurationCommand { id })),
+        "get_duration" => Some(Box::new(GetDurationCommand {})),
         "play" => {
             let file_path = request
                 .args
@@ -42,36 +38,20 @@ pub fn parse_command(request: &Request) -> Option<Box<dyn Executable + Send>> {
                 .unwrap_or(&String::new())
                 .parse::<PathBuf>()
                 .ok();
-            let concurrent = request
+            Some(Box::new(PlayCommand { file_path }))
-                .args
-                .get("concurrent")
-                .unwrap_or(&String::new())
-                .parse::<bool>()
-                .ok();
-            Some(Box::new(PlayCommand {
-                file_path,
-                concurrent,
-            }))
         }
-        "get_tracks" => Some(Box::new(GetTracksCommand {})),
+        "get_current_file_path" => Some(Box::new(GetCurrentFilePathCommand {})),
         "get_input" => Some(Box::new(GetCurrentInputCommand {})),
         "get_inputs" => Some(Box::new(GetAllInputsCommand {})),
         "set_input" => {
-            let name = Some(request.args.get("input_name").unwrap_or(&String::new())).cloned();
+            let id = request
-            Some(Box::new(SetCurrentInputCommand { name }))
-        }
-        "set_loop" => {
-            let enabled = request
                 .args
-                .get("enabled")
+                .get("input_id")
                 .unwrap_or(&String::new())
-                .parse::<bool>()
+                .parse::<u32>()
                 .ok();
-            Some(Box::new(SetLoopCommand { enabled, id }))
+            Some(Box::new(SetCurrentInputCommand { id }))
         }
-        "toggle_loop" => Some(Box::new(ToggleLoopCommand { id })),
-        "get_daemon_version" => Some(Box::new(GetDaemonVersionCommand {})),
-        "get_full_state" => Some(Box::new(GetFullStateCommand {})),
         _ => None,
     }
 }

src/utils/daemon.rs

@@ -2,9 +2,10 @@ use crate::{
     types::{
         audio_player::AudioPlayer,
         config::DaemonConfig,
+        pipewire::AudioDevice,
         socket::{Request, Response},
     },
-    utils::pipewire::{create_link, get_device},
+    utils::pipewire::{create_link, get_all_devices},
 };
 use std::path::PathBuf;
 use std::{error::Error, fs};
@@ -35,22 +36,37 @@ pub fn get_daemon_config() -> DaemonConfig {
 }
 
 pub async fn link_player_to_virtual_mic() -> Result<(), Box<dyn Error>> {
-    let pwsp_daemon_output;
+    let (input_devices, output_devices) = get_all_devices().await?;
-    if let Ok(device) = get_device("pwsp-daemon").await {
+
-        pwsp_daemon_output = device;
+    let mut pwsp_daemon_output: Option<AudioDevice> = None;
-    } else {
+    for output_device in output_devices {
-        eprintln!("Could not find alsa_playback.pwsp-daemon device, skipping device linking");
+        if output_device.name == "alsa_playback.pwsp-daemon" {
+            pwsp_daemon_output = Some(output_device);
+            break;
+        }
+    }
+
+    if pwsp_daemon_output.is_none() {
+        println!("Could not find pwsp-daemon output device, skipping device linking");
         return Ok(());
     }
 
-    let pwsp_daemon_input;
+    let mut pwsp_daemon_input: Option<AudioDevice> = None;
-    if let Ok(device) = get_device("pwsp-virtual-mic").await {
+    for input_device in input_devices {
-        pwsp_daemon_input = device;
+        if input_device.name == "pwsp-virtual-mic" {
-    } else {
+            pwsp_daemon_input = Some(input_device);
-        eprintln!("Could not find pwsp-virtual-mic device, skipping device linking");
+            break;
+        }
+    }
+
+    if pwsp_daemon_input.is_none() {
+        println!("Could not find pwsp-daemon input device, skipping device linking");
         return Ok(());
     }
 
+    let pwsp_daemon_output = pwsp_daemon_output.unwrap();
+    let pwsp_daemon_input = pwsp_daemon_input.unwrap();
+
     let output_fl = pwsp_daemon_output
         .clone()
         .output_fl
@@ -108,7 +124,7 @@ pub async fn wait_for_daemon() -> Result<(), Box<dyn Error>> {
     Ok(())
 }
 
-pub async fn make_request(request: Request) -> Result<Response, Box<dyn Error + Send + Sync>> {
+pub async fn make_request(request: Request) -> Result<Response, Box<dyn Error>> {
     let socket_path = get_runtime_dir().join("daemon.sock");
     let mut stream = UnixStream::connect(socket_path).await?;
 

src/utils/gui.rs

@@ -1,14 +1,16 @@
 use crate::{
     types::{
-        audio_player::FullState,
+        audio_player::PlayerState,
         config::GuiConfig,
         gui::AudioPlayerState,
         socket::{Request, Response},
     },
-    utils::daemon::{is_daemon_running, make_request},
+    utils::daemon::{make_request, wait_for_daemon},
 };
 use std::{
+    collections::HashMap,
     error::Error,
+    path::PathBuf,
     sync::{Arc, Mutex},
 };
 use tokio::time::{Duration, sleep};
@@ -22,17 +24,7 @@ pub fn get_gui_config() -> GuiConfig {
 }
 
 pub fn make_request_sync(request: Request) -> Result<Response, Box<dyn Error>> {
-    tokio::task::block_in_place(|| {
+    futures::executor::block_on(make_request(request))
-        tokio::runtime::Handle::current()
-            .block_on(make_request(request))
-            .map_err(|e| e as Box<dyn Error>)
-    })
-}
-
-pub fn make_request_async(request: Request) {
-    tokio::spawn(async move {
-        make_request(request).await.ok();
-    });
 }
 
 pub fn format_time_pair(position: f32, duration: f32) -> String {
@@ -48,46 +40,117 @@ pub fn format_time_pair(position: f32, duration: f32) -> String {
 
 pub fn start_app_state_thread(audio_player_state_shared: Arc<Mutex<AudioPlayerState>>) {
     tokio::spawn(async move {
-        let sleep_duration = Duration::from_secs_f32(1.0 / 60.0);
+        let sleep_duration = Duration::from_millis(100);
 
         loop {
-            let is_running = is_daemon_running().unwrap_or(false);
+            wait_for_daemon().await.ok();
+
+            let state_req = Request::get_state();
+            let file_path_req = Request::get_current_file_path();
+            let is_paused_req = Request::get_is_paused();
+            let volume_req = Request::get_volume();
+            let position_req = Request::get_position();
+            let duration_req = Request::get_duration();
+            let current_input_req = Request::get_input();
+            let all_inputs_req = Request::get_inputs();
+
+            let state_res = make_request(state_req).await.unwrap_or_default();
+            let file_path_res = make_request(file_path_req).await.unwrap_or_default();
+            let is_paused_res = make_request(is_paused_req).await.unwrap_or_default();
+            let volume_res = make_request(volume_req).await.unwrap_or_default();
+            let position_res = make_request(position_req).await.unwrap_or_default();
+            let duration_res = make_request(duration_req).await.unwrap_or_default();
+            let current_input_res = make_request(current_input_req).await.unwrap_or_default();
+            let all_inputs_res = make_request(all_inputs_req).await.unwrap_or_default();
+
+            let state = match state_res.status {
+                true => serde_json::from_str::<PlayerState>(&state_res.message).unwrap(),
+                false => PlayerState::default(),
+            };
+
+            let file_path = match file_path_res.status {
+                true => PathBuf::from(file_path_res.message),
+                false => PathBuf::new(),
+            };
+            let is_paused = match is_paused_res.status {
+                true => is_paused_res.message == "true",
+                false => false,
+            };
+            let volume = match volume_res.status {
+                true => volume_res.message.parse::<f32>().unwrap(),
+                false => 0.0,
+            };
+            let position = match position_res.status {
+                true => position_res.message.parse::<f32>().unwrap(),
+                false => 0.0,
+            };
+            let duration = match duration_res.status {
+                true => duration_res.message.parse::<f32>().unwrap(),
+                false => 0.0,
+            };
+            let current_input = match current_input_res.status {
+                true => current_input_res
+                    .message
+                    .as_str()
+                    .split(" - ")
+                    .collect::<Vec<&str>>()
+                    .first()
+                    .unwrap()
+                    .to_string()
+                    .parse::<u32>()
+                    .unwrap_or_default(),
+                false => 0,
+            };
+            let all_inputs = match all_inputs_res.status {
+                true => all_inputs_res
+                    .message
+                    .as_str()
+                    .split(';')
+                    .filter_map(|entry| {
+                        let entry = entry.trim();
+                        if entry.is_empty() {
+                            return None;
+                        }
+                        entry.split_once(" - ").and_then(|(k, v)| {
+                            k.trim()
+                                .parse::<u32>()
+                                .ok()
+                                .map(|key| (key, v.trim().to_string()))
+                        })
+                    })
+                    .collect(),
+                false => HashMap::new(),
+            };
 
-            if !is_running {
             {
                 let mut guard = audio_player_state_shared.lock().unwrap();
-                    guard.is_daemon_running = false;
-                }
-                sleep(Duration::from_millis(500)).await;
-                continue;
-            }
-
-            let full_state_req = Request::get_full_state();
-            let full_state_res = make_request(full_state_req).await.unwrap_or_default();
-
-            if full_state_res.status {
-                let full_state: FullState =
-                    serde_json::from_str(&full_state_res.message).unwrap_or_default();
-
-                let mut guard = audio_player_state_shared.lock().unwrap();
 
                 guard.state = match guard.new_state.clone() {
                     Some(new_state) => {
                         guard.new_state = None;
                         new_state
                     }
-                    None => full_state.state,
+                    None => state,
                 };
-                guard.tracks = full_state.tracks;
+                guard.current_file_path = file_path;
-                guard.volume = full_state.volume;
+                guard.is_paused = is_paused;
-                guard.current_input = full_state
+                guard.volume = match guard.new_volume {
-                    .current_input
+                    Some(new_volume) => {
-                    .split(" - ")
+                        guard.new_volume = None;
-                    .next()
+                        new_volume
-                    .unwrap_or_default()
+                    }
-                    .to_string();
+                    None => volume,
-                guard.all_inputs = full_state.all_inputs;
+                };
-                guard.is_daemon_running = true;
+                guard.position = match guard.new_position {
+                    Some(new_position) => {
+                        guard.new_position = None;
+                        new_position
+                    }
+                    None => position,
+                };
+                guard.duration = if duration > 0.0 { duration } else { 1.0 };
+                guard.current_input = current_input;
+                guard.all_inputs = all_inputs;
             }
 
             sleep(sleep_duration).await;

src/utils/pipewire.rs

@@ -77,8 +77,6 @@ async fn pw_get_global_objects_thread(
     main_sender: mpsc::Sender<(Option<AudioDevice>, Option<Port>)>,
     pw_receiver: pipewire::channel::Receiver<Terminate>,
 ) {
-    pipewire::init();
-
     let main_loop = MainLoopRc::new(None).expect("Failed to initialize pipewire main loop");
 
     // Stop main loop on Terminate message
@@ -164,10 +162,6 @@ pub async fn get_all_devices() -> Result<(Vec<AudioDevice>, Vec<AudioDevice>), B
                                 input_device.input_fl = Some(port.clone());
                                 input_device.input_fr = Some(port)
                             }
-                            "capture_MONO" => {
-                                input_device.output_fl = Some(port.clone());
-                                input_device.output_fr = Some(port);
-                            }
                             _ => {}
                         }
                     } else if output_devices.contains_key(&node_id) {
@@ -205,16 +199,12 @@ pub async fn get_all_devices() -> Result<(Vec<AudioDevice>, Vec<AudioDevice>), B
     }
 }
 
-pub async fn get_device(device_name: &str) -> Result<AudioDevice, Box<dyn Error>> {
+pub async fn get_device(node_id: u32) -> Result<AudioDevice, Box<dyn Error>> {
     let (mut input_devices, output_devices) = get_all_devices().await?;
     input_devices.extend(output_devices);
 
     for device in input_devices {
-        if device.name == device_name
+        if device.id == node_id {
-            || device.nick == device_name
-            || device.name.contains(device_name)
-            || device.nick.contains(device_name)
-        {
             return Ok(device);
         }
     }
@@ -226,8 +216,6 @@ pub fn create_virtual_mic() -> Result<pipewire::channel::Sender<Terminate>, Box<
     let (pw_sender, pw_receiver) = pipewire::channel::channel::<Terminate>();
 
     let _pw_thread = thread::spawn(move || {
-        pipewire::init();
-
         let main_loop = MainLoopRc::new(None).expect("Failed to initialize pipewire main loop");
         let context = ContextRc::new(&main_loop, None).expect("Failed to create pipewire context");
         let core = context
@@ -269,8 +257,6 @@ pub fn create_link(
     let (pw_sender, pw_receiver) = pipewire::channel::channel::<Terminate>();
 
     let _pw_thread = thread::spawn(move || {
-        pipewire::init();
-
         let main_loop = MainLoopRc::new(None).expect("Failed to initialize pipewire main loop");
         let context = ContextRc::new(&main_loop, None).expect("Failed to create pipewire context");
         let core = context