refactor: resync with qbqt baseline and restore genre browser

feat: most-popular search as default Top Results tab
Add /most-popular/get endpoint support (discovered via Burp): - Returns mixed artists/albums/tracks ordered by popularity for a query - New 'Top Results' tab shown first/default in the search panel - Badge column: A (artist, blue), H (hi-res album, gold), A (album, gray), T (track, green) - Full context menu support on all item types in the new tab - Both most-popular and regular search fire on submit in parallel Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-30 22:36:39 +02:00 · 2026-03-30 20:28:13 +02:00 · 2026-03-30 20:12:23 +02:00
31 changed files with 10006 additions and 556 deletions
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -0,0 +1,49 @@
+name: Build for Windows
+
+on:
+  push:
+    branches: [ "main", "feature/cross-platform" ]
+  pull_request:
+    branches: [ "main" ]
+  workflow_dispatch:
+
+jobs:
+  build-windows:
+    runs-on: windows-latest
+    
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+
+    - name: Setup Rust toolchain
+      uses: dtolnay/rust-toolchain@stable
+      with:
+        toolchain: stable
+        target: x86_64-pc-windows-msvc
+
+    - name: Install Qt 6
+      uses: jurplel/install-qt-action@v4
+      with:
+        version: '6.5.3'
+        host: 'windows'
+        target: 'desktop'
+        arch: 'win64_msvc2019_64'
+
+    - name: Configure CMake
+      run: cmake -B build -S . -DCMAKE_BUILD_TYPE=Release
+
+    - name: Build Application
+      run: cmake --build build --config Release -j %NUMBER_OF_PROCESSORS%
+
+    - name: Bundle Executable (windeployqt)
+      run: |
+        mkdir release
+        copy build\Release\qobuz-qt.exe release\
+        windeployqt release\qobuz-qt.exe
+      shell: cmd
+
+    - name: Upload Artifact
+      uses: actions/upload-artifact@v4
+      with:
+        name: qobuz-qt-windows-x64
+        path: release/
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,7 +38,11 @@ else()
    set(CARGO_PROFILE_FLAG "")
 endif()

-set(RUST_LIB "${CMAKE_SOURCE_DIR}/target/${CARGO_PROFILE}/libqobuz_backend.a")
+if(WIN32 AND MSVC)
+    set(RUST_LIB "${CMAKE_SOURCE_DIR}/target/${CARGO_PROFILE}/qobuz_backend.lib")
+else()
+    set(RUST_LIB "${CMAKE_SOURCE_DIR}/target/${CARGO_PROFILE}/libqobuz_backend.a")
+endif()

 add_custom_target(rust_backend ALL
    COMMAND ${CARGO_CMD} build ${CARGO_PROFILE_FLAG}
@@ -83,15 +87,26 @@ target_link_libraries(qobuz-qt PRIVATE
    qobuz_backend_lib
 )

-# Platform-specific system libs needed by the Rust audio stack (cpal/ALSA)
+# Platform-specific system libs needed by the Rust audio stack (cpal/backend internals)
 if (UNIX AND NOT APPLE)
    target_link_libraries(qobuz-qt PRIVATE asound)
+elseif (APPLE)
+    find_library(COREAUDIO CoreAudio)
+    find_library(AUDIOTOOLBOX AudioToolbox)
+    find_library(SECURITY Security)
+    find_library(COREFOUNDATION CoreFoundation)
+    target_link_libraries(qobuz-qt PRIVATE ${COREAUDIO} ${AUDIOTOOLBOX} ${SECURITY} ${COREFOUNDATION})
+elseif (WIN32)
+    target_link_libraries(qobuz-qt PRIVATE ws2_32 userenv bcrypt advapi32 ntdll ole32)
 endif ()

 # Compiler warnings + hardening
 if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
    target_compile_options(qobuz-qt PRIVATE
        -Wall -Wextra -Wno-unused-parameter
+    )
+    if (UNIX AND NOT APPLE)
+        target_compile_options(qobuz-qt PRIVATE
            -fstack-protector-strong
            -D_FORTIFY_SOURCE=2
            -fPIE
@@ -100,6 +115,9 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clan
            -pie
            -Wl,-z,relro,-z,now
        )
+    endif ()
+elseif (MSVC)
+    target_compile_options(qobuz-qt PRIVATE /W3 /Zc:__cplusplus /permissive-)
 endif ()

 # D-Bus
@@ -118,7 +136,7 @@ if (USE_LTO)
 endif ()

 # Install
-if (UNIX)
+if (UNIX AND NOT APPLE)
    install(FILES res/logo/qobuz-qt.svg DESTINATION share/icons/hicolor/scalable/apps)
    install(FILES res/app/qobuz-qt.desktop DESTINATION share/applications)
    install(TARGETS qobuz-qt RUNTIME DESTINATION bin)
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,6 +2,17 @@
 # It is not intended for manual editing.
 version = 4

+[[package]]
+name = "aes"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0"
+dependencies = [
+ "cfg-if",
+ "cipher",
+ "cpufeatures",
+]
+
 [[package]]
 name = "aho-corasick"
 version = "1.1.4"
@@ -93,6 +104,24 @@ version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "843867be96c8daad0d758b57df9392b6d8d271134fce549de6ce169ff98a92af"

+[[package]]
+name = "block-buffer"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "block-padding"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93"
+dependencies = [
+ "generic-array",
+]
+
 [[package]]
 name = "bumpalo"
 version = "3.20.2"
@@ -111,6 +140,15 @@ version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33"

+[[package]]
+name = "cbc"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6"
+dependencies = [
+ "cipher",
+]
+
 [[package]]
 name = "cc"
 version = "1.2.57"
@@ -150,6 +188,16 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"

+[[package]]
+name = "cipher"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
+dependencies = [
+ "crypto-common",
+ "inout",
+]
+
 [[package]]
 name = "clang-sys"
 version = "1.8.1"
@@ -221,12 +269,51 @@ dependencies = [
 "windows",
 ]

+[[package]]
+name = "cpufeatures"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "crypto-common"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a"
+dependencies = [
+ "generic-array",
+ "typenum",
+]
+
+[[package]]
+name = "ctr"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835"
+dependencies = [
+ "cipher",
+]
+
 [[package]]
 name = "dasp_sample"
 version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f"

+[[package]]
+name = "digest"
+version = "0.10.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
+dependencies = [
+ "block-buffer",
+ "crypto-common",
+ "subtle",
+]
+
 [[package]]
 name = "dirs"
 version = "5.0.1"
@@ -372,6 +459,16 @@ dependencies = [
 "slab",
 ]

+[[package]]
+name = "generic-array"
+version = "0.14.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+dependencies = [
+ "typenum",
+ "version_check",
+]
+
 [[package]]
 name = "getrandom"
 version = "0.2.17"
@@ -411,6 +508,30 @@ version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"

+[[package]]
+name = "hex"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+
+[[package]]
+name = "hkdf"
+version = "0.12.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7"
+dependencies = [
+ "hmac",
+]
+
+[[package]]
+name = "hmac"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
+dependencies = [
+ "digest",
+]
+
 [[package]]
 name = "http"
 version = "1.4.0"
@@ -623,6 +744,16 @@ dependencies = [
 "hashbrown",
 ]

+[[package]]
+name = "inout"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01"
+dependencies = [
+ "block-padding",
+ "generic-array",
+]
+
 [[package]]
 name = "ipnet"
 version = "2.12.0"
@@ -1054,14 +1185,21 @@ dependencies = [
 name = "qobuz-backend"
 version = "0.1.0"
 dependencies = [
+ "aes",
 "anyhow",
+ "base64",
+ "cbc",
 "cpal",
+ "ctr",
 "dirs",
+ "hex",
+ "hkdf",
 "md5",
 "rb",
 "reqwest",
 "serde",
 "serde_json",
+ "sha2",
 "symphonia",
 "thiserror 2.0.18",
 "tokio",
@@ -1410,6 +1548,17 @@ dependencies = [
 "serde",
 ]

+[[package]]
+name = "sha2"
+version = "0.10.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+]
+
 [[package]]
 name = "shlex"
 version = "1.3.0"
@@ -1943,6 +2092,12 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"

+[[package]]
+name = "typenum"
+version = "1.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb"
+
 [[package]]
 name = "unicode-ident"
 version = "1.0.24"
@@ -1973,6 +2128,12 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"

+[[package]]
+name = "version_check"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
+
 [[package]]
 name = "walkdir"
 version = "2.5.0"
--- a/openapi.json
+++ b/openapi.json
--- a/rust/Cargo.toml
+++ b/rust/Cargo.toml
@@ -28,6 +28,15 @@ md5 = "0.7"
 dirs = "5"
 toml = "0.8"

+# Crypto — qbz-1 key derivation + segment decryption
+aes   = "0.8"
+cbc   = { version = "0.1", features = ["alloc"] }
+ctr   = "0.9"
+hkdf  = "0.12"
+sha2  = "0.10"
+hex   = "0.4"
+base64 = "0.22"
+
 [profile.release]
 lto = "thin"
 opt-level = 3
--- a/rust/include/qobuz_backend.h
+++ b/rust/include/qobuz_backend.h
@@ -37,6 +37,8 @@ enum QobuzEvent {
    EV_USER_OK               = 23,
    EV_ARTIST_RELEASES_OK    = 24,
    EV_DEEP_SHUFFLE_OK       = 25,
+    EV_GENRES_OK             = 27,
+    EV_FEATURED_ALBUMS_OK    = 28,
 };

 // Callback signature
@@ -75,23 +77,23 @@ uint64_t qobuz_backend_get_duration(const QobuzBackendOpaque *backend);
 uint8_t  qobuz_backend_get_volume(const QobuzBackendOpaque *backend);
 int      qobuz_backend_get_state(const QobuzBackendOpaque *backend);
 int      qobuz_backend_take_track_finished(QobuzBackendOpaque *backend);
+int      qobuz_backend_take_track_transitioned(QobuzBackendOpaque *backend);

 // ReplayGain / Gapless
 void qobuz_backend_set_replaygain(QobuzBackendOpaque *backend, bool enabled);
 void qobuz_backend_set_gapless(QobuzBackendOpaque *backend, bool enabled);
 void qobuz_backend_prefetch_track(QobuzBackendOpaque *backend, int64_t track_id, int32_t format_id);

-// Visualizer PCM access
-uint32_t qobuz_backend_viz_read(QobuzBackendOpaque *backend, float *buf, uint32_t max_samples);
-uint32_t qobuz_backend_viz_sample_rate(const QobuzBackendOpaque *backend);
-uint32_t qobuz_backend_viz_channels(const QobuzBackendOpaque *backend);
-
 // Artist releases (auto-paginates to fetch all)
 void qobuz_backend_get_artist_releases(QobuzBackendOpaque *backend, int64_t artist_id, const char *release_type, uint32_t limit, uint32_t offset);

 // Deep shuffle: fetch tracks from multiple albums (album_ids_json is a JSON array of strings)
 void qobuz_backend_get_albums_tracks(QobuzBackendOpaque *backend, const char *album_ids_json);

+// Browse
+void qobuz_backend_get_genres(QobuzBackendOpaque *backend);
+void qobuz_backend_get_featured_albums(QobuzBackendOpaque *backend, int64_t genre_id, const char *kind, uint32_t limit, uint32_t offset);
+
 // Playlist management
 void qobuz_backend_create_playlist(QobuzBackendOpaque *backend, const char *name);
 void qobuz_backend_delete_playlist(QobuzBackendOpaque *backend, int64_t playlist_id);
--- a/rust/src/api/client.rs
+++ b/rust/src/api/client.rs
@@ -1,6 +1,10 @@
 use anyhow::{bail, Result};
+use base64::{engine::general_purpose::URL_SAFE_NO_PAD, Engine};
+use cbc::cipher::{block_padding::NoPadding, BlockDecryptMut, KeyIvInit};
+use hkdf::Hkdf;
 use reqwest::Client;
 use serde_json::Value;
+use sha2::Sha256;
 use std::time::{SystemTime, UNIX_EPOCH};

 use super::models::*;
@@ -15,10 +19,74 @@ pub const DEFAULT_APP_SECRET: &str = "e79f8b9be485692b0e5f9dd895826368";
 pub struct QobuzClient {
    http: Client,
    pub auth_token: Option<String>,
+    /// Playback session ID from POST /session/start — sent as X-Session-Id for /file/url.
+    session_id: Option<String>,
+    session_expires_at: Option<u64>,
+    /// `infos` field from the session/start response — used to derive the KEK for track key unwrapping.
+    session_infos: Option<String>,
    app_id: String,
    app_secret: String,
 }

+// ── qbz-1 key derivation helpers ─────────────────────────────────────────────
+
+type Aes128CbcDec = cbc::Decryptor<aes::Aes128>;
+
+/// Decode a base64url string (with or without padding).
+fn b64url_decode(s: &str) -> Result<Vec<u8>> {
+    Ok(URL_SAFE_NO_PAD.decode(s.trim_end_matches('='))?)
+}
+
+/// Full qbz-1 key derivation:
+///   Phase 1: HKDF-SHA256(ikm=hex(app_secret), salt=b64url(infos[0]), info=b64url(infos[1])) → 16-byte KEK
+///   Phase 2: AES-128-CBC/NoPadding(key=KEK, iv=b64url(key_field[2])).decrypt(b64url(key_field[1]))[..16]
+fn derive_track_key(
+    session_infos: &str,
+    app_secret_hex: &str,
+    key_field: &str,
+) -> Result<[u8; 16]> {
+    // Phase 1: HKDF
+    let infos_parts: Vec<&str> = session_infos.splitn(2, '.').collect();
+    if infos_parts.len() != 2 {
+        bail!("session_infos must be '<salt_b64>.<info_b64>', got: {session_infos}");
+    }
+    let salt = b64url_decode(infos_parts[0])?;
+    let info = b64url_decode(infos_parts[1])?;
+    let ikm = hex::decode(app_secret_hex)?;
+
+    let hk = Hkdf::<Sha256>::new(Some(&salt), &ikm);
+    let mut kek = [0u8; 16];
+    hk.expand(&info, &mut kek)
+        .map_err(|e| anyhow::anyhow!("HKDF expand failed: {e:?}"))?;
+
+    // Phase 2: AES-128-CBC/NoPadding
+    let key_parts: Vec<&str> = key_field.splitn(3, '.').collect();
+    if key_parts.len() != 3 || key_parts[0] != "qbz-1" {
+        bail!("unexpected key field format: {key_field}");
+    }
+    let ct = b64url_decode(key_parts[1])?;
+    let iv_bytes = b64url_decode(key_parts[2])?;
+    if ct.len() < 16 || iv_bytes.len() < 16 {
+        bail!(
+            "key field ciphertext/iv too short ({} / {} bytes)",
+            ct.len(),
+            iv_bytes.len()
+        );
+    }
+
+    let iv: [u8; 16] = iv_bytes[..16].try_into()?;
+    let mut buf = ct;
+    let decrypted = Aes128CbcDec::new(&kek.into(), &iv.into())
+        .decrypt_padded_mut::<NoPadding>(&mut buf)
+        .map_err(|e| anyhow::anyhow!("AES-CBC decrypt failed: {e:?}"))?;
+
+    let mut track_key = [0u8; 16];
+    track_key.copy_from_slice(&decrypted[..16]);
+    Ok(track_key)
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+
 impl QobuzClient {
    pub fn new() -> Result<Self> {
        Self::new_with_config(None, None)
@@ -44,6 +112,9 @@ impl QobuzClient {
        Ok(Self {
            http,
            auth_token: None,
+            session_id: None,
+            session_expires_at: None,
+            session_infos: None,
            app_id,
            app_secret,
        })
@@ -106,20 +177,16 @@ impl QobuzClient {
        if let Some(token) = &self.auth_token {
            builder = builder.header("Authorization", format!("Bearer {}", token));
        }
+        if let Some(sid) = &self.session_id {
+            builder = builder.header("X-Session-Id", sid.as_str());
+        }
        builder
    }

    // --- Auth ---

-    pub async fn login(&mut self, email: &str, password: &str) -> Result<OAuthLoginResponse> {
-        match self.oauth2_login(email, password).await {
-            Ok(r) => Ok(r),
-            Err(_) => self.legacy_login(email, password).await,
-        }
-    }
-
    /// NOTE: Qobuz API requires credentials as GET query params — not our choice.
-    async fn oauth2_login(&mut self, email: &str, password: &str) -> Result<OAuthLoginResponse> {
+    pub async fn login(&mut self, email: &str, password: &str) -> Result<OAuthLoginResponse> {
        let ts = Self::ts();
        let mut sign_params: Vec<(&str, String)> = vec![
            ("password", password.to_string()),
@@ -143,45 +210,18 @@ impl QobuzClient {
        let status = resp.status();
        let body: Value = resp.json().await?;
        if !status.is_success() {
-            let msg = body.get("message").and_then(|m| m.as_str()).unwrap_or("login failed");
-            bail!("oauth2 login failed ({}): {}", status, msg);
-        }
-
-        self.extract_and_store_token(serde_json::from_value(body)?)
-    }
-
-    async fn legacy_login(&mut self, email: &str, password: &str) -> Result<OAuthLoginResponse> {
-        let ts = Self::ts();
-        let mut sign_params: Vec<(&str, String)> = vec![
-            ("email", email.to_string()),
-            ("password", password.to_string()),
-        ];
-        let sig = self.request_sig("userlogin", &mut sign_params, ts);
-
-        let resp = self
-            .http
-            .get(self.url("user/login"))
-            .query(&[
-                ("app_id", self.app_id.as_str()),
-                ("email", email),
-                ("password", password),
-                ("request_ts", ts.to_string().as_str()),
-                ("request_sig", sig.as_str()),
-            ])
-            .send()
-            .await?;
-
-        let status = resp.status();
-        let body: Value = resp.json().await?;
-        if !status.is_success() {
-            let msg = body.get("message").and_then(|m| m.as_str()).unwrap_or("login failed");
-            bail!("user login failed ({}): {}", status, msg);
+            let msg = body
+                .get("message")
+                .and_then(|m| m.as_str())
+                .unwrap_or("login failed");
+            bail!("login failed ({}): {}", status, msg);
        }

        self.extract_and_store_token(serde_json::from_value(body)?)
    }

    fn extract_and_store_token(&mut self, login: OAuthLoginResponse) -> Result<OAuthLoginResponse> {
+        // auth_token = OAuth2 bearer (preferred) or legacy session token
        if let Some(token) = login
            .oauth2
            .as_ref()
@@ -190,9 +230,63 @@ impl QobuzClient {
        {
            self.auth_token = Some(token);
        }
+        // Reset any cached playback session — it belongs to a different auth context.
+        self.session_id = None;
+        self.session_expires_at = None;
+        self.session_infos = None;
        Ok(login)
    }

+    /// Start a playback session via POST /session/start.
+    /// The returned session_id is required as X-Session-Id when calling /file/url.
+    /// Sessions expire; we cache and reuse until 60s before expiry.
+    async fn ensure_session(&mut self) -> Result<()> {
+        let now = Self::ts();
+        if let (Some(_), Some(exp)) = (&self.session_id, self.session_expires_at) {
+            if now + 60 < exp {
+                return Ok(()); // still valid
+            }
+        }
+
+        let ts = Self::ts();
+        let mut sign_params: Vec<(&str, String)> = vec![("profile", "qbz-1".to_string())];
+        let sig = self.request_sig("sessionstart", &mut sign_params, ts);
+
+        let resp = self
+            .http
+            .post(self.url("session/start"))
+            .query(&[
+                ("app_id", self.app_id.as_str()),
+                ("request_ts", ts.to_string().as_str()),
+                ("request_sig", sig.as_str()),
+            ])
+            .header(
+                "Authorization",
+                format!("Bearer {}", self.auth_token.as_deref().unwrap_or("")),
+            )
+            .form(&[("profile", "qbz-1")])
+            .send()
+            .await?;
+
+        let body = Self::check_response(resp).await?;
+        let session_id = body["session_id"]
+            .as_str()
+            .ok_or_else(|| anyhow::anyhow!("session/start: no session_id in response"))?
+            .to_string();
+        let expires_at = body["expires_at"].as_u64().unwrap_or(now + 3600);
+        let infos = body["infos"].as_str().map(|s| s.to_string());
+        eprintln!(
+            "[session] started session_id={}... expires_at={} infos={:?}",
+            &session_id[..session_id.len().min(8)],
+            expires_at,
+            infos
+        );
+        self.session_id = Some(session_id);
+        self.session_expires_at = Some(expires_at);
+        self.session_infos = infos;
+        Ok(())
+    }
+
    // --- User ---

    pub async fn get_user(&self) -> Result<UserDto> {
@@ -215,7 +309,13 @@ impl QobuzClient {
        Ok(serde_json::from_value(body)?)
    }

-    pub async fn get_track_url(&self, track_id: i64, format: Format) -> Result<TrackFileUrlDto> {
+    pub async fn get_track_url(
+        &mut self,
+        track_id: i64,
+        format: Format,
+    ) -> Result<TrackFileUrlDto> {
+        self.ensure_session().await?;
+
        let ts = Self::ts();
        let intent = "stream";
        let mut sign_params: Vec<(&str, String)> = vec![
@@ -223,10 +323,10 @@ impl QobuzClient {
            ("intent", intent.to_string()),
            ("track_id", track_id.to_string()),
        ];
-        let sig = self.request_sig("trackgetFileUrl", &mut sign_params, ts);
+        let sig = self.request_sig("fileurl", &mut sign_params, ts);

        let resp = self
-            .get_request("track/getFileUrl")
+            .get_request("file/url")
            .query(&[
                ("track_id", track_id.to_string()),
                ("format_id", format.id().to_string()),
@@ -238,7 +338,28 @@ impl QobuzClient {
            .await?;

        let body = Self::check_response(resp).await?;
-        Ok(serde_json::from_value(body)?)
+        eprintln!(
+            "[file/url] response: {}",
+            serde_json::to_string(&body).unwrap_or_default()
+        );
+        let mut url_dto: TrackFileUrlDto = serde_json::from_value(body)?;
+
+        // Unwrap the per-track key: decrypt the CBC-wrapped key using HKDF-derived KEK.
+        if let (Some(key_field), Some(infos)) = (url_dto.key.clone(), self.session_infos.as_deref())
+        {
+            match derive_track_key(infos, &self.app_secret, &key_field) {
+                Ok(track_key) => {
+                    url_dto.key = Some(hex::encode(track_key));
+                    eprintln!("[key] track key unwrapped OK");
+                }
+                Err(e) => {
+                    eprintln!("[key] track key unwrap failed: {e}");
+                    url_dto.key = None; // disable decryption rather than play garbage
+                }
+            }
+        }
+
+        Ok(url_dto)
    }

    // --- Album ---
@@ -286,11 +407,60 @@ impl QobuzClient {
        Self::check_response(resp).await
    }

+    // --- Browse ---
+
+    pub async fn get_genres(&self) -> Result<Value> {
+        let resp = self.get_request("genre/list").send().await?;
+        Self::check_response(resp).await
+    }
+
+    pub async fn get_featured_albums(
+        &self,
+        genre_id: i64,
+        kind: &str,
+        limit: u32,
+        offset: u32,
+    ) -> Result<Value> {
+        let resp = self
+            .get_request("album/getFeatured")
+            .query(&[
+                ("type", kind.to_string()),
+                ("genre_id", genre_id.to_string()),
+                ("limit", limit.to_string()),
+                ("offset", offset.to_string()),
+            ])
+            .send()
+            .await?;
+        Self::check_response(resp).await
+    }
+
    // --- Search ---

    pub async fn search(&self, query: &str, offset: u32, limit: u32) -> Result<SearchCatalogDto> {
+        let (tracks_res, albums_res, artists_res) = tokio::join!(
+            self.search_tracks(query, offset, limit),
+            self.search_albums(query, offset, limit),
+            self.search_artists(query, offset, limit),
+        );
+
+        // Convert successful Results into Some(value) and Errors into None
+        Ok(SearchCatalogDto {
+            query: Some(query.to_string()),
+            tracks: tracks_res.ok(),
+            albums: albums_res.ok(),
+            artists: artists_res.ok(),
+            playlists: None,
+        })
+    }
+
+    async fn search_tracks(
+        &self,
+        query: &str,
+        offset: u32,
+        limit: u32,
+    ) -> Result<SearchResultItems<TrackDto>> {
        let resp = self
-            .get_request("catalog/search")
+            .get_request("track/search")
            .query(&[
                ("query", query),
                ("offset", &offset.to_string()),
@@ -299,22 +469,68 @@ impl QobuzClient {
            .send()
            .await?;
        let body = Self::check_response(resp).await?;
+        Ok(serde_json::from_value(body["tracks"].clone())?)
+    }
+
+    async fn search_albums(
+        &self,
+        query: &str,
+        offset: u32,
+        limit: u32,
+    ) -> Result<SearchResultItems<AlbumDto>> {
+        let resp = self
+            .get_request("album/search")
+            .query(&[
+                ("query", query),
+                ("offset", &offset.to_string()),
+                ("limit", &limit.to_string()),
+            ])
+            .send()
+            .await?;
+        let body = Self::check_response(resp).await?;
+        Ok(serde_json::from_value(body["albums"].clone())?)
+    }
+
+    async fn search_artists(
+        &self,
+        query: &str,
+        offset: u32,
+        limit: u32,
+    ) -> Result<SearchResultItems<ArtistDto>> {
+        let resp = self
+            .get_request("artist/search")
+            .query(&[
+                ("query", query),
+                ("offset", &offset.to_string()),
+                ("limit", &limit.to_string()),
+            ])
+            .send()
+            .await?;
+        let body = Self::check_response(resp).await?;
+        Ok(serde_json::from_value(body["artists"].clone())?)
+    }
+
+    // --- Favorites / Library ---
+
+    pub async fn get_user_playlists(&self, offset: u32, limit: u32) -> Result<UserPlaylistsDto> {
+        let resp = self
+            .get_request("playlist/getUserPlaylists")
+            .query(&[
+                ("offset", &offset.to_string()),
+                ("limit", &limit.to_string()),
+            ])
+            .send()
+            .await?;
+        let body = Self::check_response(resp).await?;
        Ok(serde_json::from_value(body)?)
    }

-    // --- Favorites / Library ---
-
-    pub async fn get_user_playlists(&self, offset: u32, limit: u32) -> Result<UserPlaylistsDto> {
-        let resp = self
-            .get_request("playlist/getUserPlaylists")
-            .query(&[("offset", &offset.to_string()), ("limit", &limit.to_string())])
-            .send()
-            .await?;
-        let body = Self::check_response(resp).await?;
-        Ok(serde_json::from_value(body)?)
-    }
-
-    pub async fn get_playlist(&self, playlist_id: i64, offset: u32, limit: u32) -> Result<PlaylistDto> {
+    pub async fn get_playlist(
+        &self,
+        playlist_id: i64,
+        offset: u32,
+        limit: u32,
+    ) -> Result<PlaylistDto> {
        let resp = self
            .get_request("playlist/get")
            .query(&[
@@ -329,34 +545,145 @@ impl QobuzClient {
        Ok(serde_json::from_value(body)?)
    }

-    pub async fn get_fav_tracks(&self, offset: u32, limit: u32) -> Result<SearchResultItems<TrackDto>> {
+    /// Fetch all favorite IDs (tracks, albums, artists) in one call.
+    async fn get_fav_ids(&self) -> Result<FavIdsDto> {
        let resp = self
-            .get_request("favorite/getUserFavorites")
-            .query(&[("type", "tracks"), ("offset", &offset.to_string()), ("limit", &limit.to_string())])
+            .get_request("favorite/getUserFavoriteIds")
            .send()
            .await?;
        let body = Self::check_response(resp).await?;
-        Ok(serde_json::from_value(body["tracks"].clone())?)
+        Ok(serde_json::from_value(body)?)
    }

-    pub async fn get_fav_albums(&self, offset: u32, limit: u32) -> Result<SearchResultItems<AlbumDto>> {
+    /// Batch-fetch tracks by ID via POST /track/getList.
+    async fn get_tracks_by_ids(&self, ids: &[i64]) -> Result<Vec<TrackDto>> {
+        if ids.is_empty() {
+            return Ok(vec![]);
+        }
        let resp = self
-            .get_request("favorite/getUserFavorites")
-            .query(&[("type", "albums"), ("offset", &offset.to_string()), ("limit", &limit.to_string())])
+            .post_request("track/getList")
+            .json(&serde_json::json!({ "tracks_id": ids }))
            .send()
            .await?;
        let body = Self::check_response(resp).await?;
-        Ok(serde_json::from_value(body["albums"].clone())?)
+        let items: Vec<TrackDto> =
+            serde_json::from_value(body["tracks"]["items"].clone()).unwrap_or_default();
+        Ok(items)
    }

-    pub async fn get_fav_artists(&self, offset: u32, limit: u32) -> Result<SearchResultItems<FavArtistDto>> {
-        let resp = self
-            .get_request("favorite/getUserFavorites")
-            .query(&[("type", "artists"), ("offset", &offset.to_string()), ("limit", &limit.to_string())])
-            .send()
-            .await?;
-        let body = Self::check_response(resp).await?;
-        Ok(serde_json::from_value(body["artists"].clone())?)
+    pub async fn get_fav_tracks(
+        &self,
+        offset: u32,
+        limit: u32,
+    ) -> Result<SearchResultItems<TrackDto>> {
+        let ids = self.get_fav_ids().await?;
+        let all_ids = ids.tracks.unwrap_or_default();
+        let total = all_ids.len() as i32;
+        let page: Vec<i64> = all_ids
+            .into_iter()
+            .skip(offset as usize)
+            .take(limit as usize)
+            .collect();
+        let items = self.get_tracks_by_ids(&page).await?;
+        Ok(SearchResultItems {
+            items: Some(items),
+            total: Some(total),
+            offset: Some(offset as i32),
+            limit: Some(limit as i32),
+        })
+    }
+
+    pub async fn get_fav_albums(
+        &self,
+        offset: u32,
+        limit: u32,
+    ) -> Result<SearchResultItems<AlbumDto>> {
+        let ids = self.get_fav_ids().await?;
+        let all_ids = ids.albums.unwrap_or_default();
+        let total = all_ids.len() as i32;
+        let page: Vec<&str> = all_ids
+            .iter()
+            .skip(offset as usize)
+            .take(limit as usize)
+            .map(|s| s.as_str())
+            .collect();
+        let mut items = Vec::with_capacity(page.len());
+        for album_id in page {
+            match self.get_album(album_id).await {
+                Ok(a) => items.push(a),
+                Err(e) => eprintln!("[fav] failed to fetch album {}: {}", album_id, e),
+            }
+        }
+        Ok(SearchResultItems {
+            items: Some(items),
+            total: Some(total),
+            offset: Some(offset as i32),
+            limit: Some(limit as i32),
+        })
+    }
+
+    pub async fn get_fav_artists(
+        &self,
+        offset: u32,
+        limit: u32,
+    ) -> Result<SearchResultItems<FavArtistDto>> {
+        let ids = self.get_fav_ids().await?;
+        let all_ids = ids.artists.unwrap_or_default();
+        let total = all_ids.len() as i32;
+        let page: Vec<i64> = all_ids
+            .into_iter()
+            .skip(offset as usize)
+            .take(limit as usize)
+            .collect();
+        let mut items = Vec::with_capacity(page.len());
+        for artist_id in page {
+            match self.get_artist_page(artist_id).await {
+                Ok(v) => {
+                    let id = v.get("id").and_then(|i| i.as_i64());
+                    let name = v
+                        .get("name")
+                        .and_then(|n| n.get("display"))
+                        .and_then(|d| d.as_str())
+                        .map(|s| s.to_string());
+
+                    let mut image_dto = None;
+                    if let Some(imgs) = v.get("images") {
+                        if let Some(portrait) = imgs.get("portrait") {
+                            if let (Some(hash), Some(format)) = (
+                                portrait.get("hash").and_then(|h| h.as_str()),
+                                portrait.get("format").and_then(|f| f.as_str()),
+                            ) {
+                                image_dto = Some(ImageDto {
+                                    small: Some(format!("https://static.qobuz.com/images/artists/covers/small/{}.{}", hash, format)),
+                                    thumbnail: Some(format!("https://static.qobuz.com/images/artists/covers/small/{}.{}", hash, format)),
+                                    large: Some(format!("https://static.qobuz.com/images/artists/covers/large/{}.{}", hash, format)),
+                                    back: None,
+                                });
+                            }
+                        }
+                    }
+
+                    if id.is_some() && name.is_some() {
+                        items.push(FavArtistDto {
+                            id,
+                            name,
+                            albums_count: v
+                                .get("albums_count")
+                                .and_then(|c| c.as_i64())
+                                .map(|c| c as i32),
+                            image: image_dto,
+                        });
+                    }
+                }
+                Err(e) => eprintln!("[fav] failed to fetch artist {}: {}", artist_id, e),
+            }
+        }
+        Ok(SearchResultItems {
+            items: Some(items),
+            total: Some(total),
+            offset: Some(offset as i32),
+            limit: Some(limit as i32),
+        })
    }

    // --- Playlist management ---
@@ -364,7 +691,11 @@ impl QobuzClient {
    pub async fn create_playlist(&self, name: &str) -> Result<PlaylistDto> {
        let resp = self
            .post_request("playlist/create")
-            .form(&[("name", name), ("is_public", "false"), ("is_collaborative", "false")])
+            .form(&[
+                ("name", name),
+                ("is_public", "false"),
+                ("is_collaborative", "false"),
+            ])
            .send()
            .await?;
        let body = Self::check_response(resp).await?;
@@ -395,7 +726,11 @@ impl QobuzClient {
        Ok(())
    }

-    pub async fn delete_track_from_playlist(&self, playlist_id: i64, playlist_track_id: i64) -> Result<()> {
+    pub async fn delete_track_from_playlist(
+        &self,
+        playlist_id: i64,
+        playlist_track_id: i64,
+    ) -> Result<()> {
        let resp = self
            .post_request("playlist/deleteTracks")
            .form(&[
--- a/rust/src/api/models.rs
+++ b/rust/src/api/models.rs
@@ -74,12 +74,16 @@ pub struct AudioInfoDto {
 #[derive(Debug, Deserialize, Clone, Serialize)]
 pub struct TrackFileUrlDto {
    pub track_id: Option<i64>,
-    pub duration: Option<i64>,
+    pub duration: Option<f64>,
    pub url: Option<String>,
+    pub url_template: Option<String>,
+    pub n_segments: Option<u32>,
    pub format_id: Option<i32>,
    pub mime_type: Option<String>,
    pub sampling_rate: Option<f64>,
    pub bit_depth: Option<i32>,
+    /// qbz-1 encryption key: "qbz-1.<base64url_aes_key>.<base64url_iv>"
+    pub key: Option<String>,
 }

 // --- Album ---
@@ -219,6 +223,15 @@ pub struct FavArtistDto {
    pub image: Option<ImageDto>,
 }

+// --- Favorite IDs ---
+
+#[derive(Debug, Deserialize, Serialize)]
+pub struct FavIdsDto {
+    pub tracks: Option<Vec<i64>>,
+    pub albums: Option<Vec<String>>,
+    pub artists: Option<Vec<i64>>,
+}
+
 // --- Format ---

 #[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
--- a/rust/src/lib.rs
+++ b/rust/src/lib.rs
@@ -1,26 +1,4 @@
 //! qobuz-backend: C-ABI library consumed by the Qt frontend.
-//!
-//! Event type constants – second argument of EventCallback:
-//!   0  EV_LOGIN_OK        { "token": "…", "user": { … } }
-//!   1  EV_LOGIN_ERR       { "error": "…" }
-//!   2  EV_SEARCH_OK       SearchCatalogDto
-//!   3  EV_SEARCH_ERR      { "error": "…" }
-//!   4  EV_ALBUM_OK        AlbumDto
-//!   5  EV_ALBUM_ERR       { "error": "…" }
-//!   6  EV_ARTIST_OK       ArtistDto
-//!   7  EV_ARTIST_ERR      { "error": "…" }
-//!   8  EV_PLAYLIST_OK     PlaylistDto
-//!   9  EV_PLAYLIST_ERR    { "error": "…" }
-//!  10  EV_FAV_TRACKS_OK   { "items": […], "total": N }
-//!  11  EV_FAV_ALBUMS_OK   { "items": […], "total": N }
-//!  12  EV_FAV_ARTISTS_OK  { "items": […], "total": N }
-//!  13  EV_PLAYLISTS_OK    { "items": […], "total": N }
-//!  14  EV_TRACK_CHANGED   TrackDto
-//!  15  EV_STATE_CHANGED   { "state": "playing"|"paused"|"idle"|"error" }
-//!  16  EV_POSITION        { "position": u64, "duration": u64 }
-//!  17  EV_TRACK_URL_OK    TrackFileUrlDto
-//!  18  EV_TRACK_URL_ERR   { "error": "…" }
-//!  19  EV_GENERIC_ERR     { "error": "…" }

 mod api;
 mod player;
@@ -38,9 +16,6 @@ use tokio::sync::Mutex;

 // ---------- Send-safe raw pointer wrapper ----------

-/// Wraps a `*mut c_void` so it can cross thread boundaries.
-/// SAFETY: The Qt QobuzBackend object is kept alive for the Backend's lifetime
-/// and callbacks only call QMetaObject::invokeMethod (thread-safe Qt API).
 #[derive(Clone, Copy)]
 struct SendPtr(*mut c_void);
 unsafe impl Send for SendPtr {}
@@ -70,6 +45,8 @@ pub const EV_TRACK_URL_ERR: c_int = 18;
 pub const EV_GENERIC_ERR: c_int = 19;
 pub const EV_ARTIST_RELEASES_OK: c_int = 24;
 pub const EV_DEEP_SHUFFLE_OK: c_int = 25;
+pub const EV_GENRES_OK: c_int = 27;
+pub const EV_FEATURED_ALBUMS_OK: c_int = 28;

 // ---------- Callback ----------

@@ -81,6 +58,9 @@ struct PrefetchedTrack {
    track_id: i64,
    track: api::models::TrackDto,
    url: String,
+    n_segments: u32,
+    encryption_key: Option<String>,
+    prefetch_data: Option<player::decoder::PrefetchData>,
 }

 struct BackendInner {
@@ -98,7 +78,6 @@ pub struct Backend(BackendInner);
 // ---------- Helpers ----------

 fn call_cb(cb: EventCallback, ud: SendPtr, ev: c_int, json: &str) {
-    // Strip null bytes that would cause CString::new to fail
    let safe = json.replace('\0', "");
    let cstr = CString::new(safe).unwrap_or_else(|_| CString::new("{}").unwrap());
    unsafe { cb(ud.0, ev, cstr.as_ptr()) };
@@ -108,7 +87,6 @@ fn err_json(msg: &str) -> String {
    serde_json::json!({ "error": msg }).to_string()
 }

-/// Spawn a Send + 'static future on the backend's Tokio runtime.
 fn spawn<F>(inner: &BackendInner, f: F)
 where
    F: std::future::Future<Output = ()> + Send + 'static,
@@ -171,14 +149,21 @@ pub unsafe extern "C" fn qobuz_backend_login(
        let (ev, json) = match result {
            Ok(resp) => {
                let token = resp
-                    .oauth2.as_ref().and_then(|o| o.access_token.as_deref())
+                    .oauth2
+                    .as_ref()
+                    .and_then(|o| o.access_token.as_deref())
                    .or(resp.user_auth_token.as_deref())
                    .unwrap_or("")
                    .to_string();
-                let user_val = resp.user.as_ref()
+                let user_val = resp
+                    .user
+                    .as_ref()
                    .map(|u| serde_json::to_value(u).unwrap_or_default())
                    .unwrap_or_default();
-                (EV_LOGIN_OK, serde_json::json!({"token": token, "user": user_val}).to_string())
+                (
+                    EV_LOGIN_OK,
+                    serde_json::json!({"token": token, "user": user_val}).to_string(),
+                )
            }
            Err(e) => (EV_LOGIN_ERR, err_json(&e.to_string())),
        };
@@ -190,8 +175,6 @@ pub unsafe extern "C" fn qobuz_backend_login(
 pub unsafe extern "C" fn qobuz_backend_set_token(ptr: *mut Backend, token: *const c_char) {
    let inner = &(*ptr).0;
    let token = CStr::from_ptr(token).to_string_lossy().into_owned();
-    // Use blocking_lock (called from Qt main thread, not a tokio thread) so the
-    // token is set before any subsequent getUser/library requests are spawned.
    inner.client.blocking_lock().set_auth_token(token);
 }

@@ -207,7 +190,8 @@ pub unsafe extern "C" fn qobuz_backend_search(
    let inner = &(*ptr).0;
    let query = CStr::from_ptr(query).to_string_lossy().into_owned();
    let client = inner.client.clone();
-    let cb = inner.cb; let ud = inner.ud;
+    let cb = inner.cb;
+    let ud = inner.ud;

    spawn(inner, async move {
        let result = client.lock().await.search(&query, offset, limit).await;
@@ -226,7 +210,8 @@ pub unsafe extern "C" fn qobuz_backend_get_album(ptr: *mut Backend, album_id: *c
    let inner = &(*ptr).0;
    let album_id = CStr::from_ptr(album_id).to_string_lossy().into_owned();
    let client = inner.client.clone();
-    let cb = inner.cb; let ud = inner.ud;
+    let cb = inner.cb;
+    let ud = inner.ud;

    spawn(inner, async move {
        let result = client.lock().await.get_album(&album_id).await;
@@ -244,7 +229,8 @@ pub unsafe extern "C" fn qobuz_backend_get_album(ptr: *mut Backend, album_id: *c
 pub unsafe extern "C" fn qobuz_backend_get_artist(ptr: *mut Backend, artist_id: i64) {
    let inner = &(*ptr).0;
    let client = inner.client.clone();
-    let cb = inner.cb; let ud = inner.ud;
+    let cb = inner.cb;
+    let ud = inner.ud;

    spawn(inner, async move {
        let result = client.lock().await.get_artist_page(artist_id).await;
@@ -268,15 +254,17 @@ pub unsafe extern "C" fn qobuz_backend_get_artist_releases(
 ) {
    let inner = &(*ptr).0;
    let client = inner.client.clone();
-    let cb = inner.cb; let ud = inner.ud;
+    let cb = inner.cb;
+    let ud = inner.ud;
    let rtype = CStr::from_ptr(release_type).to_string_lossy().into_owned();

    spawn(inner, async move {
-        // Auto-paginate: fetch all pages until has_more is false.
        let mut all_items: Vec<serde_json::Value> = Vec::new();
        let mut offset: u32 = 0;
        loop {
-            let result = client.lock().await
+            let result = client
+                .lock()
+                .await
                .get_artist_releases_list(artist_id, &rtype, limit, offset)
                .await;
            match result {
@@ -285,7 +273,10 @@ pub unsafe extern "C" fn qobuz_backend_get_artist_releases(
                    if let Some(items) = obj.get("items").and_then(|v| v.as_array()) {
                        all_items.extend(items.iter().cloned());
                    }
-                    let has_more = obj.get("has_more").and_then(|v| v.as_bool()).unwrap_or(false);
+                    let has_more = obj
+                        .get("has_more")
+                        .and_then(|v| v.as_bool())
+                        .unwrap_or(false);
                    if !has_more {
                        break;
                    }
@@ -303,7 +294,12 @@ pub unsafe extern "C" fn qobuz_backend_get_artist_releases(
            "has_more": false,
            "offset": 0
        });
-        call_cb(cb, ud, EV_ARTIST_RELEASES_OK, &serde_json::to_string(&result).unwrap_or_default());
+        call_cb(
+            cb,
+            ud,
+            EV_ARTIST_RELEASES_OK,
+            &serde_json::to_string(&result).unwrap_or_default(),
+        );
    });
 }

@@ -316,8 +312,11 @@ pub unsafe extern "C" fn qobuz_backend_get_albums_tracks(
 ) {
    let inner = &(*ptr).0;
    let client = inner.client.clone();
-    let cb = inner.cb; let ud = inner.ud;
-    let ids_str = CStr::from_ptr(album_ids_json).to_string_lossy().into_owned();
+    let cb = inner.cb;
+    let ud = inner.ud;
+    let ids_str = CStr::from_ptr(album_ids_json)
+        .to_string_lossy()
+        .into_owned();

    let album_ids: Vec<String> = match serde_json::from_str(&ids_str) {
        Ok(v) => v,
@@ -334,17 +333,18 @@ pub unsafe extern "C" fn qobuz_backend_get_albums_tracks(
            if let Ok(album) = result {
                if let Some(tracks) = album.tracks.as_ref().and_then(|t| t.items.as_ref()) {
                    for t in tracks {
-                        // Serialize track and inject album info for playback context
                        if let Ok(mut tv) = serde_json::to_value(t) {
                            if let Some(obj) = tv.as_object_mut() {
-                                // Ensure album context is present on each track
                                if obj.get("album").is_none() || obj["album"].is_null() {
-                                    obj.insert("album".to_string(), serde_json::json!({
+                                    obj.insert(
+                                        "album".to_string(),
+                                        serde_json::json!({
                                            "id": album.id,
                                            "title": album.title,
                                            "artist": album.artist,
                                            "image": album.image,
-                                    }));
+                                        }),
+                                    );
                                }
                            }
                            all_tracks.push(tv);
@@ -352,10 +352,86 @@ pub unsafe extern "C" fn qobuz_backend_get_albums_tracks(
                    }
                }
            }
-            // Skip albums that fail — don't abort the whole operation
        }
        let result = serde_json::json!({ "tracks": all_tracks });
-        call_cb(cb, ud, EV_DEEP_SHUFFLE_OK, &serde_json::to_string(&result).unwrap_or_default());
+        call_cb(
+            cb,
+            ud,
+            EV_DEEP_SHUFFLE_OK,
+            &serde_json::to_string(&result).unwrap_or_default(),
+        );
+    });
+}
+
+// ---------- Playlist ----------
+
+// ---------- Browse (genres / featured) ----------
+
+#[no_mangle]
+pub unsafe extern "C" fn qobuz_backend_get_genres(ptr: *mut Backend) {
+    let inner = &(*ptr).0;
+    let client = inner.client.clone();
+    let cb = inner.cb;
+    let ud = inner.ud;
+
+    spawn(inner, async move {
+        let result = client.lock().await.get_genres().await;
+        match result {
+            Ok(r) => {
+                let items = r["genres"]["items"].clone();
+                let total = r["genres"]["total"].as_i64().unwrap_or(0);
+                let out = serde_json::json!({"items": items, "total": total});
+                call_cb(
+                    cb,
+                    ud,
+                    EV_GENRES_OK,
+                    &serde_json::to_string(&out).unwrap_or_default(),
+                );
+            }
+            Err(e) => call_cb(cb, ud, EV_GENERIC_ERR, &err_json(&e.to_string())),
+        }
+    });
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn qobuz_backend_get_featured_albums(
+    ptr: *mut Backend,
+    genre_id: i64,
+    kind: *const c_char,
+    limit: u32,
+    offset: u32,
+) {
+    let inner = &(*ptr).0;
+    let client = inner.client.clone();
+    let cb = inner.cb;
+    let ud = inner.ud;
+    let kind_str = CStr::from_ptr(kind).to_string_lossy().into_owned();
+
+    spawn(inner, async move {
+        let result = client
+            .lock()
+            .await
+            .get_featured_albums(genre_id, &kind_str, limit, offset)
+            .await;
+        match result {
+            Ok(r) => {
+                let items = r["albums"]["items"].clone();
+                let total = r["albums"]["total"].as_i64().unwrap_or(0);
+                let out = serde_json::json!({
+                    "items": items,
+                    "total": total,
+                    "type": kind_str,
+                    "genre_id": genre_id,
+                });
+                call_cb(
+                    cb,
+                    ud,
+                    EV_FEATURED_ALBUMS_OK,
+                    &serde_json::to_string(&out).unwrap_or_default(),
+                );
+            }
+            Err(e) => call_cb(cb, ud, EV_GENERIC_ERR, &err_json(&e.to_string())),
+        }
    });
 }

@@ -370,12 +446,20 @@ pub unsafe extern "C" fn qobuz_backend_get_playlist(
 ) {
    let inner = &(*ptr).0;
    let client = inner.client.clone();
-    let cb = inner.cb; let ud = inner.ud;
+    let cb = inner.cb;
+    let ud = inner.ud;

    spawn(inner, async move {
-        let result = client.lock().await.get_playlist(playlist_id, offset, limit).await;
+        let result = client
+            .lock()
+            .await
+            .get_playlist(playlist_id, offset, limit)
+            .await;
        let (ev, json) = match result {
-            Ok(r)  => (EV_PLAYLIST_OK,  serde_json::to_string(&r).unwrap_or_default()),
+            Ok(r) => (
+                EV_PLAYLIST_OK,
+                serde_json::to_string(&r).unwrap_or_default(),
+            ),
            Err(e) => (EV_PLAYLIST_ERR, err_json(&e.to_string())),
        };
        call_cb(cb, ud, ev, &json);
@@ -388,11 +472,15 @@ pub unsafe extern "C" fn qobuz_backend_get_playlist(
 pub unsafe extern "C" fn qobuz_backend_get_fav_tracks(ptr: *mut Backend, offset: u32, limit: u32) {
    let inner = &(*ptr).0;
    let client = inner.client.clone();
-    let cb = inner.cb; let ud = inner.ud;
+    let cb = inner.cb;
+    let ud = inner.ud;
    spawn(inner, async move {
        let result = client.lock().await.get_fav_tracks(offset, limit).await;
        let (ev, json) = match result {
-            Ok(r)  => (EV_FAV_TRACKS_OK, serde_json::to_string(&r).unwrap_or_default()),
+            Ok(r) => (
+                EV_FAV_TRACKS_OK,
+                serde_json::to_string(&r).unwrap_or_default(),
+            ),
            Err(e) => (EV_GENERIC_ERR, err_json(&e.to_string())),
        };
        call_cb(cb, ud, ev, &json);
@@ -403,11 +491,15 @@ pub unsafe extern "C" fn qobuz_backend_get_fav_tracks(ptr: *mut Backend, offset:
 pub unsafe extern "C" fn qobuz_backend_get_fav_albums(ptr: *mut Backend, offset: u32, limit: u32) {
    let inner = &(*ptr).0;
    let client = inner.client.clone();
-    let cb = inner.cb; let ud = inner.ud;
+    let cb = inner.cb;
+    let ud = inner.ud;
    spawn(inner, async move {
        let result = client.lock().await.get_fav_albums(offset, limit).await;
        let (ev, json) = match result {
-            Ok(r)  => (EV_FAV_ALBUMS_OK, serde_json::to_string(&r).unwrap_or_default()),
+            Ok(r) => (
+                EV_FAV_ALBUMS_OK,
+                serde_json::to_string(&r).unwrap_or_default(),
+            ),
            Err(e) => (EV_GENERIC_ERR, err_json(&e.to_string())),
        };
        call_cb(cb, ud, ev, &json);
@@ -418,11 +510,15 @@ pub unsafe extern "C" fn qobuz_backend_get_fav_albums(ptr: *mut Backend, offset:
 pub unsafe extern "C" fn qobuz_backend_get_fav_artists(ptr: *mut Backend, offset: u32, limit: u32) {
    let inner = &(*ptr).0;
    let client = inner.client.clone();
-    let cb = inner.cb; let ud = inner.ud;
+    let cb = inner.cb;
+    let ud = inner.ud;
    spawn(inner, async move {
        let result = client.lock().await.get_fav_artists(offset, limit).await;
        let (ev, json) = match result {
-            Ok(r)  => (EV_FAV_ARTISTS_OK, serde_json::to_string(&r).unwrap_or_default()),
+            Ok(r) => (
+                EV_FAV_ARTISTS_OK,
+                serde_json::to_string(&r).unwrap_or_default(),
+            ),
            Err(e) => (EV_GENERIC_ERR, err_json(&e.to_string())),
        };
        call_cb(cb, ud, ev, &json);
@@ -430,17 +526,30 @@ pub unsafe extern "C" fn qobuz_backend_get_fav_artists(ptr: *mut Backend, offset
 }

 #[no_mangle]
-pub unsafe extern "C" fn qobuz_backend_get_user_playlists(ptr: *mut Backend, offset: u32, limit: u32) {
+pub unsafe extern "C" fn qobuz_backend_get_user_playlists(
+    ptr: *mut Backend,
+    offset: u32,
+    limit: u32,
+) {
    let inner = &(*ptr).0;
    let client = inner.client.clone();
-    let cb = inner.cb; let ud = inner.ud;
+    let cb = inner.cb;
+    let ud = inner.ud;
    spawn(inner, async move {
        let result = client.lock().await.get_user_playlists(offset, limit).await;
        let (ev, json) = match result {
            Ok(r) => {
-                let items = r.playlists.as_ref().and_then(|p| p.items.as_ref()).cloned().unwrap_or_default();
+                let items = r
+                    .playlists
+                    .as_ref()
+                    .and_then(|p| p.items.as_ref())
+                    .cloned()
+                    .unwrap_or_default();
                let total = r.playlists.as_ref().and_then(|p| p.total).unwrap_or(0);
-                (EV_PLAYLISTS_OK, serde_json::json!({"items": items, "total": total}).to_string())
+                (
+                    EV_PLAYLISTS_OK,
+                    serde_json::json!({"items": items, "total": total}).to_string(),
+                )
            }
            Err(e) => (EV_GENERIC_ERR, err_json(&e.to_string())),
        };
@@ -458,7 +567,8 @@ pub unsafe extern "C" fn qobuz_backend_play_track(
 ) {
    let inner = &(*ptr).0;
    let client = inner.client.clone();
-    let cb = inner.cb; let ud = inner.ud;
+    let cb = inner.cb;
+    let ud = inner.ud;
    let format = Format::from_id(format_id);
    let cmd_tx = inner.player.cmd_tx.clone();
    let status = inner.player.status.clone();
@@ -466,56 +576,86 @@ pub unsafe extern "C" fn qobuz_backend_play_track(
    let rg_enabled = inner.replaygain_enabled.clone();

    spawn(inner, async move {
-        // 1. Check prefetch cache first for zero-gap start
        let cached = {
            let mut lock = prefetch.lock().await;
-            if lock.as_ref().map(|p| p.track_id == track_id).unwrap_or(false) {
+            if lock
+                .as_ref()
+                .map(|p| p.track_id == track_id)
+                .unwrap_or(false)
+            {
                lock.take()
            } else {
                None
            }
        };

-        let (track, url) = if let Some(pf) = cached {
-            (pf.track, pf.url)
+        // Extract prefetch_data to embed directly into TrackInfo
+        let (track, url, n_segments, encryption_key, prefetch_data) = if let Some(pf) = cached {
+            (
+                pf.track,
+                pf.url,
+                pf.n_segments,
+                pf.encryption_key,
+                pf.prefetch_data,
+            )
        } else {
-            // Fetch track metadata
            let track = match client.lock().await.get_track(track_id).await {
                Ok(t) => t,
-                Err(e) => { call_cb(cb, ud, EV_TRACK_URL_ERR, &err_json(&e.to_string())); return; }
+                Err(e) => {
+                    call_cb(cb, ud, EV_TRACK_URL_ERR, &err_json(&e.to_string()));
+                    return;
+                }
            };
-            // Fetch stream URL
            let url_dto = match client.lock().await.get_track_url(track_id, format).await {
                Ok(u) => u,
-                Err(e) => { call_cb(cb, ud, EV_TRACK_URL_ERR, &err_json(&e.to_string())); return; }
+                Err(e) => {
+                    call_cb(cb, ud, EV_TRACK_URL_ERR, &err_json(&e.to_string()));
+                    return;
+                }
            };
-            let url = match url_dto.url {
-                Some(u) => u,
-                None => { call_cb(cb, ud, EV_TRACK_URL_ERR, &err_json("no stream URL")); return; }
+            let encryption_key = url_dto.key.clone();
+
+            let (url, n_segments) =
+                if let (Some(tmpl), Some(n)) = (url_dto.url_template, url_dto.n_segments) {
+                    (tmpl, n)
+                } else if let Some(u) = url_dto.url {
+                    (u, 0u32)
+                } else {
+                    call_cb(cb, ud, EV_TRACK_URL_ERR, &err_json("no stream URL"));
+                    return;
                };
-            (track, url)
+            (track, url, n_segments, encryption_key, None)
        };

-        // 2. Notify track change
        if let Ok(j) = serde_json::to_string(&track) {
            call_cb(cb, ud, EV_TRACK_CHANGED, &j);
        }

-        // 3. Compute ReplayGain if enabled
        let replaygain_db = if rg_enabled.load(std::sync::atomic::Ordering::Relaxed) {
-            track.audio_info.as_ref().and_then(|ai| ai.replaygain_track_gain)
+            track
+                .audio_info
+                .as_ref()
+                .and_then(|ai| ai.replaygain_track_gain)
        } else {
            None
        };

-        // 4. Update status + send play command
        *status.current_track.lock().unwrap() = Some(track.clone());
        if let Some(dur) = track.duration {
-            status.duration_secs.store(dur as u64, std::sync::atomic::Ordering::Relaxed);
+            status
+                .duration_secs
+                .store(dur as u64, std::sync::atomic::Ordering::Relaxed);
        }
-        let _ = cmd_tx.send(player::PlayerCommand::Play(player::TrackInfo { track, url, replaygain_db }));

-        // 5. State notification
+        let _ = cmd_tx.send(player::PlayerCommand::Play(player::TrackInfo {
+            track,
+            url,
+            n_segments,
+            encryption_key,
+            replaygain_db,
+            prefetch_data,
+        }));
+
        call_cb(cb, ud, EV_STATE_CHANGED, r#"{"state":"playing"}"#);
    });
 }
@@ -524,14 +664,24 @@ pub unsafe extern "C" fn qobuz_backend_play_track(
 pub unsafe extern "C" fn qobuz_backend_pause(ptr: *mut Backend) {
    let inner = &(*ptr).0;
    inner.player.pause();
-    call_cb(inner.cb, inner.ud, EV_STATE_CHANGED, r#"{"state":"paused"}"#);
+    call_cb(
+        inner.cb,
+        inner.ud,
+        EV_STATE_CHANGED,
+        r#"{"state":"paused"}"#,
+    );
 }

 #[no_mangle]
 pub unsafe extern "C" fn qobuz_backend_resume(ptr: *mut Backend) {
    let inner = &(*ptr).0;
    inner.player.resume();
-    call_cb(inner.cb, inner.ud, EV_STATE_CHANGED, r#"{"state":"playing"}"#);
+    call_cb(
+        inner.cb,
+        inner.ud,
+        EV_STATE_CHANGED,
+        r#"{"state":"playing"}"#,
+    );
 }

 #[no_mangle]
@@ -577,21 +727,59 @@ pub unsafe extern "C" fn qobuz_backend_get_state(ptr: *const Backend) -> c_int {

 #[no_mangle]
 pub unsafe extern "C" fn qobuz_backend_take_track_finished(ptr: *mut Backend) -> c_int {
-    let finished = (*ptr).0.player.status.track_finished
+    let finished = (*ptr)
+        .0
+        .player
+        .status
+        .track_finished
        .swap(false, std::sync::atomic::Ordering::SeqCst);
-    if finished { 1 } else { 0 }
+    if finished {
+        1
+    } else {
+        0
+    }
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn qobuz_backend_take_track_transitioned(ptr: *mut Backend) -> c_int {
+    let inner = &(*ptr).0;
+    let transitioned = inner
+        .player
+        .status
+        .track_transitioned
+        .swap(false, std::sync::atomic::Ordering::SeqCst);
+
+    if transitioned {
+        // Emit track changed so the Qt UI and Scrobbler automatically pick up the new song
+        if let Some(track) = inner.player.status.current_track.lock().unwrap().as_ref() {
+            if let Ok(j) = serde_json::to_string(track) {
+                call_cb(inner.cb, inner.ud, EV_TRACK_CHANGED, &j);
+            }
+        }
+        1
+    } else {
+        0
+    }
 }

 // ---------- ReplayGain / Gapless ----------

 #[no_mangle]
 pub unsafe extern "C" fn qobuz_backend_set_replaygain(ptr: *mut Backend, enabled: bool) {
-    (*ptr).0.replaygain_enabled.store(enabled, std::sync::atomic::Ordering::Relaxed);
+    (*ptr)
+        .0
+        .replaygain_enabled
+        .store(enabled, std::sync::atomic::Ordering::Relaxed);
 }

 #[no_mangle]
 pub unsafe extern "C" fn qobuz_backend_set_gapless(ptr: *mut Backend, enabled: bool) {
-    (*ptr).0.player.status.gapless.store(enabled, std::sync::atomic::Ordering::Relaxed);
+    (*ptr)
+        .0
+        .player
+        .status
+        .gapless
+        .store(enabled, std::sync::atomic::Ordering::Relaxed);
 }

 #[no_mangle]
@@ -602,8 +790,9 @@ pub unsafe extern "C" fn qobuz_backend_prefetch_track(
 ) {
    let inner = &(*ptr).0;
    let client = inner.client.clone();
-    let prefetch = inner.prefetch.clone();
    let format = Format::from_id(format_id);
+    let cmd_tx = inner.player.cmd_tx.clone();
+    let rg_enabled = inner.replaygain_enabled.clone();

    spawn(inner, async move {
        let track = match client.lock().await.get_track(track_id).await {
@@ -614,11 +803,45 @@ pub unsafe extern "C" fn qobuz_backend_prefetch_track(
            Ok(u) => u,
            Err(_) => return,
        };
-        let url = match url_dto.url {
-            Some(u) => u,
-            None => return,
+        let encryption_key = url_dto.key.clone();
+        let (url, n_segments) =
+            if let (Some(tmpl), Some(n)) = (url_dto.url_template, url_dto.n_segments) {
+                (tmpl, n)
+            } else if let Some(u) = url_dto.url {
+                (u, 0u32)
+            } else {
+                return;
            };
-        *prefetch.lock().await = Some(PrefetchedTrack { track_id, track, url });
+
+        // KICKSTART DOWNLOADING IMMEDIATELY
+        let prefetch_data = if n_segments > 0 {
+            Some(player::decoder::start_prefetch(
+                url.clone(),
+                n_segments,
+                encryption_key.as_deref(),
+                1,
+            ))
+        } else {
+            None
+        };
+
+        let replaygain_db = if rg_enabled.load(std::sync::atomic::Ordering::Relaxed) {
+            track
+                .audio_info
+                .as_ref()
+                .and_then(|ai| ai.replaygain_track_gain)
+        } else {
+            None
+        };
+
+        let _ = cmd_tx.send(player::PlayerCommand::QueueNext(player::TrackInfo {
+            track,
+            url,
+            n_segments,
+            encryption_key,
+            replaygain_db,
+            prefetch_data,
+        }));
    });
 }

@@ -628,7 +851,8 @@ pub unsafe extern "C" fn qobuz_backend_prefetch_track(
 pub unsafe extern "C" fn qobuz_backend_add_fav_track(ptr: *mut Backend, track_id: i64) {
    let inner = &(*ptr).0;
    let client = inner.client.clone();
-    let cb = inner.cb; let ud = inner.ud;
+    let cb = inner.cb;
+    let ud = inner.ud;
    spawn(inner, async move {
        if let Err(e) = client.lock().await.add_fav_track(track_id).await {
            call_cb(cb, ud, EV_GENERIC_ERR, &err_json(&e.to_string()));
@@ -640,7 +864,8 @@ pub unsafe extern "C" fn qobuz_backend_add_fav_track(ptr: *mut Backend, track_id
 pub unsafe extern "C" fn qobuz_backend_remove_fav_track(ptr: *mut Backend, track_id: i64) {
    let inner = &(*ptr).0;
    let client = inner.client.clone();
-    let cb = inner.cb; let ud = inner.ud;
+    let cb = inner.cb;
+    let ud = inner.ud;
    spawn(inner, async move {
        if let Err(e) = client.lock().await.remove_fav_track(track_id).await {
            call_cb(cb, ud, EV_GENERIC_ERR, &err_json(&e.to_string()));
@@ -653,7 +878,8 @@ pub unsafe extern "C" fn qobuz_backend_add_fav_album(ptr: *mut Backend, album_id
    let inner = &(*ptr).0;
    let album_id = CStr::from_ptr(album_id).to_string_lossy().into_owned();
    let client = inner.client.clone();
-    let cb = inner.cb; let ud = inner.ud;
+    let cb = inner.cb;
+    let ud = inner.ud;
    spawn(inner, async move {
        if let Err(e) = client.lock().await.add_fav_album(&album_id).await {
            call_cb(cb, ud, EV_GENERIC_ERR, &err_json(&e.to_string()));
@@ -662,11 +888,15 @@ pub unsafe extern "C" fn qobuz_backend_add_fav_album(ptr: *mut Backend, album_id
 }

 #[no_mangle]
-pub unsafe extern "C" fn qobuz_backend_remove_fav_album(ptr: *mut Backend, album_id: *const c_char) {
+pub unsafe extern "C" fn qobuz_backend_remove_fav_album(
+    ptr: *mut Backend,
+    album_id: *const c_char,
+) {
    let inner = &(*ptr).0;
    let album_id = CStr::from_ptr(album_id).to_string_lossy().into_owned();
    let client = inner.client.clone();
-    let cb = inner.cb; let ud = inner.ud;
+    let cb = inner.cb;
+    let ud = inner.ud;
    spawn(inner, async move {
        if let Err(e) = client.lock().await.remove_fav_album(&album_id).await {
            call_cb(cb, ud, EV_GENERIC_ERR, &err_json(&e.to_string()));
@@ -678,7 +908,8 @@ pub unsafe extern "C" fn qobuz_backend_remove_fav_album(ptr: *mut Backend, album
 pub unsafe extern "C" fn qobuz_backend_add_fav_artist(ptr: *mut Backend, artist_id: i64) {
    let inner = &(*ptr).0;
    let client = inner.client.clone();
-    let cb = inner.cb; let ud = inner.ud;
+    let cb = inner.cb;
+    let ud = inner.ud;
    spawn(inner, async move {
        if let Err(e) = client.lock().await.add_fav_artist(artist_id).await {
            call_cb(cb, ud, EV_GENERIC_ERR, &err_json(&e.to_string()));
@@ -690,7 +921,8 @@ pub unsafe extern "C" fn qobuz_backend_add_fav_artist(ptr: *mut Backend, artist_
 pub unsafe extern "C" fn qobuz_backend_remove_fav_artist(ptr: *mut Backend, artist_id: i64) {
    let inner = &(*ptr).0;
    let client = inner.client.clone();
-    let cb = inner.cb; let ud = inner.ud;
+    let cb = inner.cb;
+    let ud = inner.ud;
    spawn(inner, async move {
        if let Err(e) = client.lock().await.remove_fav_artist(artist_id).await {
            call_cb(cb, ud, EV_GENERIC_ERR, &err_json(&e.to_string()));
@@ -706,7 +938,8 @@ pub const EV_USER_OK: c_int = 23;
 pub unsafe extern "C" fn qobuz_backend_get_user(ptr: *mut Backend) {
    let inner = &(*ptr).0;
    let client = inner.client.clone();
-    let cb = inner.cb; let ud = inner.ud;
+    let cb = inner.cb;
+    let ud = inner.ud;
    spawn(inner, async move {
        let result = client.lock().await.get_user().await;
        let (ev, json) = match result {
@@ -717,34 +950,6 @@ pub unsafe extern "C" fn qobuz_backend_get_user(ptr: *mut Backend) {
    });
 }

-// ---------- Visualizer PCM access ----------
-
-/// Read up to `max_samples` f32 PCM values into `buf`.
-/// Returns the number of samples actually read.
-#[no_mangle]
-pub unsafe extern "C" fn qobuz_backend_viz_read(
-    ptr: *mut Backend,
-    buf: *mut f32,
-    max_samples: u32,
-) -> u32 {
-    let consumer = &(*ptr).0.player.status.viz_consumer;
-    let Ok(mut lock) = consumer.try_lock() else { return 0 };
-    let slice = std::slice::from_raw_parts_mut(buf, max_samples as usize);
-    rb::RbConsumer::read(&mut *lock, slice).unwrap_or(0) as u32
-}
-
-/// Returns current sample rate of the audio stream (0 if idle).
-#[no_mangle]
-pub unsafe extern "C" fn qobuz_backend_viz_sample_rate(ptr: *const Backend) -> u32 {
-    (*ptr).0.player.status.viz_sample_rate.load(std::sync::atomic::Ordering::Relaxed)
-}
-
-/// Returns current channel count (0 if idle).
-#[no_mangle]
-pub unsafe extern "C" fn qobuz_backend_viz_channels(ptr: *const Backend) -> u32 {
-    (*ptr).0.player.status.viz_channels.load(std::sync::atomic::Ordering::Relaxed)
-}
-
 // ---------- Playlist management ----------

 pub const EV_PLAYLIST_CREATED: c_int = 20;
@@ -756,10 +961,16 @@ pub unsafe extern "C" fn qobuz_backend_create_playlist(ptr: *mut Backend, name:
    let inner = &(*ptr).0;
    let name = CStr::from_ptr(name).to_string_lossy().into_owned();
    let client = inner.client.clone();
-    let cb = inner.cb; let ud = inner.ud;
+    let cb = inner.cb;
+    let ud = inner.ud;
    spawn(inner, async move {
        match client.lock().await.create_playlist(&name).await {
-            Ok(p)  => call_cb(cb, ud, EV_PLAYLIST_CREATED, &serde_json::to_string(&p).unwrap_or_default()),
+            Ok(p) => call_cb(
+                cb,
+                ud,
+                EV_PLAYLIST_CREATED,
+                &serde_json::to_string(&p).unwrap_or_default(),
+            ),
            Err(e) => call_cb(cb, ud, EV_GENERIC_ERR, &err_json(&e.to_string())),
        }
    });
@@ -769,11 +980,16 @@ pub unsafe extern "C" fn qobuz_backend_create_playlist(ptr: *mut Backend, name:
 pub unsafe extern "C" fn qobuz_backend_delete_playlist(ptr: *mut Backend, playlist_id: i64) {
    let inner = &(*ptr).0;
    let client = inner.client.clone();
-    let cb = inner.cb; let ud = inner.ud;
+    let cb = inner.cb;
+    let ud = inner.ud;
    spawn(inner, async move {
        match client.lock().await.delete_playlist(playlist_id).await {
-            Ok(()) => call_cb(cb, ud, EV_PLAYLIST_DELETED,
-                &serde_json::json!({"playlist_id": playlist_id}).to_string()),
+            Ok(()) => call_cb(
+                cb,
+                ud,
+                EV_PLAYLIST_DELETED,
+                &serde_json::json!({"playlist_id": playlist_id}).to_string(),
+            ),
            Err(e) => call_cb(cb, ud, EV_GENERIC_ERR, &err_json(&e.to_string())),
        }
    });
@@ -787,11 +1003,21 @@ pub unsafe extern "C" fn qobuz_backend_add_track_to_playlist(
 ) {
    let inner = &(*ptr).0;
    let client = inner.client.clone();
-    let cb = inner.cb; let ud = inner.ud;
+    let cb = inner.cb;
+    let ud = inner.ud;
    spawn(inner, async move {
-        match client.lock().await.add_track_to_playlist(playlist_id, track_id).await {
-            Ok(()) => call_cb(cb, ud, EV_PLAYLIST_TRACK_ADDED,
-                &serde_json::json!({"playlist_id": playlist_id}).to_string()),
+        match client
+            .lock()
+            .await
+            .add_track_to_playlist(playlist_id, track_id)
+            .await
+        {
+            Ok(()) => call_cb(
+                cb,
+                ud,
+                EV_PLAYLIST_TRACK_ADDED,
+                &serde_json::json!({"playlist_id": playlist_id}).to_string(),
+            ),
            Err(e) => call_cb(cb, ud, EV_GENERIC_ERR, &err_json(&e.to_string())),
        }
    });
@@ -805,9 +1031,15 @@ pub unsafe extern "C" fn qobuz_backend_delete_track_from_playlist(
 ) {
    let inner = &(*ptr).0;
    let client = inner.client.clone();
-    let cb = inner.cb; let ud = inner.ud;
+    let cb = inner.cb;
+    let ud = inner.ud;
    spawn(inner, async move {
-        if let Err(e) = client.lock().await.delete_track_from_playlist(playlist_id, playlist_track_id).await {
+        if let Err(e) = client
+            .lock()
+            .await
+            .delete_track_from_playlist(playlist_id, playlist_track_id)
+            .await
+        {
            call_cb(cb, ud, EV_GENERIC_ERR, &err_json(&e.to_string()));
        }
    });
--- a/rust/src/player/decoder.rs
+++ b/rust/src/player/decoder.rs
--- a/rust/src/player/mod.rs
+++ b/rust/src/player/mod.rs
@@ -1,33 +1,33 @@
-mod decoder;
+pub mod decoder;
 pub mod output;

-use rb::{SpscRb, RB};
 use std::sync::{
-    atomic::{AtomicBool, AtomicU32, AtomicU64, AtomicU8, Ordering},
+    atomic::{AtomicBool, AtomicU64, AtomicU8, Ordering},
    Arc,
 };
 use std::time::Duration;

 use crate::api::TrackDto;
+use decoder::NextAction;

-/// Size of the visualizer ring buffer in f32 samples (~180ms at 44.1kHz stereo).
-const VIZ_RING_SIZE: usize = 16 * 1024;
-
-#[derive(Debug, Clone)]
+#[derive(Clone)]
 pub enum PlayerCommand {
    Play(TrackInfo),
+    QueueNext(TrackInfo),
    Pause,
    Resume,
    Stop,
    SetVolume(u8),
 }

-#[derive(Debug, Clone)]
+#[derive(Clone)]
 pub struct TrackInfo {
    pub track: TrackDto,
    pub url: String,
-    /// ReplayGain track gain in dB, if enabled and available.
+    pub n_segments: u32,
+    pub encryption_key: Option<String>,
    pub replaygain_db: Option<f64>,
+    pub prefetch_data: Option<decoder::PrefetchData>,
 }

 #[derive(Debug, Clone, PartialEq)]
@@ -45,26 +45,16 @@ pub struct PlayerStatus {
    pub duration_secs: Arc<AtomicU64>,
    pub volume: Arc<AtomicU8>,
    pub current_track: Arc<std::sync::Mutex<Option<TrackDto>>>,
-    /// Set to true by the decode thread when a track finishes naturally.
    pub track_finished: Arc<AtomicBool>,
-    /// Set by the player loop when a seek command arrives; cleared by the decode thread.
+    pub track_transitioned: Arc<AtomicBool>,
    pub seek_requested: Arc<AtomicBool>,
    pub seek_target_secs: Arc<AtomicU64>,
-    /// Linear gain factor to apply (1.0 = unity). Updated each time a new track starts.
    pub replaygain_gain: Arc<std::sync::Mutex<f32>>,
-    /// When false the audio output is torn down after each track, producing a gap.
    pub gapless: Arc<AtomicBool>,
-    /// Visualizer ring buffer (consumer side, read by FFI).
-    pub viz_ring: Arc<SpscRb<f32>>,
-    pub viz_consumer: Arc<std::sync::Mutex<rb::Consumer<f32>>>,
-    pub viz_sample_rate: Arc<AtomicU32>,
-    pub viz_channels: Arc<AtomicU32>,
 }

 impl PlayerStatus {
    pub fn new() -> Self {
-        let viz_ring = Arc::new(SpscRb::new(VIZ_RING_SIZE));
-        let viz_consumer = Arc::new(std::sync::Mutex::new(viz_ring.consumer()));
        Self {
            state: Arc::new(std::sync::Mutex::new(PlayerState::Idle)),
            position_secs: Arc::new(AtomicU64::new(0)),
@@ -72,33 +62,26 @@ impl PlayerStatus {
            volume: Arc::new(AtomicU8::new(80)),
            current_track: Arc::new(std::sync::Mutex::new(None)),
            track_finished: Arc::new(AtomicBool::new(false)),
+            track_transitioned: Arc::new(AtomicBool::new(false)),
            seek_requested: Arc::new(AtomicBool::new(false)),
            seek_target_secs: Arc::new(AtomicU64::new(0)),
            replaygain_gain: Arc::new(std::sync::Mutex::new(1.0)),
            gapless: Arc::new(AtomicBool::new(false)),
-            viz_ring,
-            viz_consumer,
-            viz_sample_rate: Arc::new(AtomicU32::new(0)),
-            viz_channels: Arc::new(AtomicU32::new(0)),
        }
    }

    pub fn get_state(&self) -> PlayerState {
        self.state.lock().unwrap().clone()
    }
-
    pub fn get_position(&self) -> u64 {
        self.position_secs.load(Ordering::Relaxed)
    }
-
    pub fn get_duration(&self) -> u64 {
        self.duration_secs.load(Ordering::Relaxed)
    }
-
    pub fn get_volume(&self) -> u8 {
        self.volume.load(Ordering::Relaxed)
    }
-
 }

 pub struct Player {
@@ -122,51 +105,45 @@ impl Player {
    pub fn send(&self, cmd: PlayerCommand) {
        self.cmd_tx.send(cmd).ok();
    }
-
    pub fn pause(&self) {
        self.send(PlayerCommand::Pause);
    }
-
    pub fn resume(&self) {
        self.send(PlayerCommand::Resume);
    }
-
    pub fn stop(&self) {
        self.send(PlayerCommand::Stop);
    }
-
    pub fn set_volume(&self, vol: u8) {
        self.status.volume.store(vol, Ordering::Relaxed);
        self.send(PlayerCommand::SetVolume(vol));
    }
-
    pub fn seek(&self, secs: u64) {
        self.status.seek_target_secs.store(secs, Ordering::Relaxed);
        self.status.seek_requested.store(true, Ordering::SeqCst);
    }
 }

-/// The player loop runs on a single dedicated OS thread.
-/// It owns the `AudioOutput` locally so there are no Send constraints.
-/// Decoding is performed inline; the command channel is polled via try_recv
-/// inside the decode loop to handle Pause/Resume/Seek/Stop/Play without
-/// tearng down and re-opening the audio device between tracks.
 fn player_loop(rx: std::sync::mpsc::Receiver<PlayerCommand>, status: PlayerStatus) {
    use std::sync::mpsc::RecvTimeoutError;

    let mut audio_output: Option<output::AudioOutput> = None;
    let paused = Arc::new(AtomicBool::new(false));
-    // pending_info holds a Play command that interrupted an ongoing decode
-    let mut pending_info: Option<TrackInfo> = None;
+    let mut pending_action: Option<NextAction> = None;

    'outer: loop {
-        // Wait for a Play command (or use one that was interrupted)
-        let info = if let Some(p) = pending_info.take() {
-            p
+        let info = if let Some(action) = pending_action.take() {
+            match action {
+                NextAction::Play(info) | NextAction::Transition(info) => info,
+            }
        } else {
            loop {
                match rx.recv_timeout(Duration::from_millis(100)) {
                    Ok(PlayerCommand::Play(info)) => break info,
+                    Ok(PlayerCommand::QueueNext(info)) => {
+                        // If we are completely idle and get QueueNext, treat as Play
+                        break info;
+                    }
                    Ok(PlayerCommand::Stop) => {
                        audio_output = None;
                        paused.store(false, Ordering::SeqCst);
@@ -178,15 +155,15 @@ fn player_loop(rx: std::sync::mpsc::Receiver<PlayerCommand>, status: PlayerStatu
                    Ok(PlayerCommand::SetVolume(v)) => {
                        status.volume.store(v, Ordering::Relaxed);
                    }
-                    Ok(_) => {} // Pause/Resume ignored when idle
+                    Ok(_) => {} // Ignore Pause/Resume when idle
                    Err(RecvTimeoutError::Timeout) => {}
                    Err(RecvTimeoutError::Disconnected) => break 'outer,
                }
            }
        };

-        // Compute ReplayGain factor
-        let rg_factor = info.replaygain_db
+        let rg_factor = info
+            .replaygain_db
            .map(|db| 10f32.powf(db as f32 / 20.0))
            .unwrap_or(1.0);
        *status.replaygain_gain.lock().unwrap() = rg_factor;
@@ -199,13 +176,17 @@ fn player_loop(rx: std::sync::mpsc::Receiver<PlayerCommand>, status: PlayerStatu
        status.position_secs.store(0, Ordering::Relaxed);
        paused.store(false, Ordering::SeqCst);

-        match decoder::play_track_inline(&info.url, &status, &paused, &mut audio_output, &rx) {
-            Ok(Some(next_info)) => {
-                // Interrupted by a new Play — loop immediately with reused audio output
-                pending_info = Some(next_info);
+        // TrackInfo now directly passes the prefetch_data (if it exists) to the decoder
+        match decoder::play_track_inline(info, &status, &paused, &mut audio_output, &rx) {
+            Ok(Some(NextAction::Play(next_track))) => {
+                pending_action = Some(NextAction::Play(next_track));
+                // Interrupted by a manual play, no need to tell C++ to advance the queue
+            }
+            Ok(Some(NextAction::Transition(next_track))) => {
+                pending_action = Some(NextAction::Play(next_track));
+                status.track_transitioned.store(true, Ordering::SeqCst);
            }
            Ok(None) => {
-                // Track finished naturally — tear down audio output if gapless is off
                if !status.gapless.load(Ordering::Relaxed) {
                    audio_output = None;
                }
@@ -215,8 +196,6 @@ fn player_loop(rx: std::sync::mpsc::Receiver<PlayerCommand>, status: PlayerStatu
            Err(e) => {
                eprintln!("playback error: {e}");
                *status.state.lock().unwrap() = PlayerState::Error(e.to_string());
-                // Signal track end so the queue advances to the next track
-                // instead of stalling on an unplayable track.
                status.track_finished.store(true, Ordering::SeqCst);
            }
        }
--- a/rust/src/player/output.rs
+++ b/rust/src/player/output.rs
@@ -3,7 +3,7 @@ use cpal::{
    traits::{DeviceTrait, HostTrait, StreamTrait},
    StreamConfig,
 };
-use rb::{RbConsumer, RbProducer, SpscRb, RB};
+use rb::{RbConsumer, RbInspector, RbProducer, SpscRb, RB};
 use std::sync::{
    atomic::{AtomicBool, Ordering},
    Arc,
@@ -13,8 +13,8 @@ use symphonia::core::audio::AudioBufferRef;
 const RING_BUFFER_SIZE: usize = 32 * 1024;

 pub struct AudioOutput {
+    _ring: SpscRb<f32>,
    ring_buf_producer: rb::Producer<f32>,
-    viz_producer: Option<rb::Producer<f32>>,
    _stream: cpal::Stream,
    pub sample_rate: u32,
    pub channels: usize,
@@ -51,18 +51,14 @@ impl AudioOutput {
        stream.play()?;

        Ok(Self {
+            _ring: ring,
            ring_buf_producer: producer,
-            viz_producer: None,
            _stream: stream,
            sample_rate,
            channels,
        })
    }

-    pub fn set_viz_producer(&mut self, producer: rb::Producer<f32>) {
-        self.viz_producer = Some(producer);
-    }
-
    pub fn write(
        &mut self,
        decoded: AudioBufferRef<'_>,
@@ -75,13 +71,13 @@ impl AudioOutput {
        );
        sample_buf.copy_interleaved_ref(decoded);
        let samples: Vec<f32> = sample_buf.samples().iter().map(|s| s * volume).collect();
-
-        // Best-effort copy for visualizer (non-blocking, ok to drop samples)
-        if let Some(ref mut viz) = self.viz_producer {
-            let _ = viz.write(&samples);
+        self.write_samples(&samples, stop)
    }

-        let mut remaining = &samples[..];
+    /// Write pre-converted interleaved f32 samples directly to the ring buffer.
+    /// Returns early (without error) if `stop` is set.
+    pub fn write_samples(&mut self, samples: &[f32], stop: &Arc<AtomicBool>) -> Result<()> {
+        let mut remaining = samples;
        while !remaining.is_empty() {
            if stop.load(Ordering::SeqCst) {
                return Ok(());
@@ -93,4 +89,13 @@ impl AudioOutput {
        }
        Ok(())
    }
+
+    pub fn flush(&self) {
+        // Wait until the ring buffer is fully emptied by cpal
+        while !self._ring.is_empty() {
+            std::thread::sleep(std::time::Duration::from_millis(10));
+        }
+        // Give the physical DAC an extra 100ms to output the last samples
+        std::thread::sleep(std::time::Duration::from_millis(100));
+    }
 }
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -26,6 +26,8 @@ target_sources(qobuz-qt PRIVATE
    view/artistlistview.hpp
    view/artistview.hpp
    view/artistview.cpp
+    view/genrebrowser.hpp
+    view/genrebrowser.cpp
    view/sidepanel/view.hpp
    view/sidepanel/view.cpp

@@ -56,3 +58,10 @@ target_sources(qobuz-qt PRIVATE
    util/icon.hpp
    util/settings.hpp
 )
+
+if (USE_DBUS)
+    target_sources(qobuz-qt PRIVATE
+        backend/mpris.hpp
+        backend/mpris.cpp
+    )
+endif ()
--- a/src/backend/mpris.cpp
+++ b/src/backend/mpris.cpp
@@ -0,0 +1,29 @@
+#include "mpris.hpp"
+
+#include <QDBusConnection>
+#include <QCoreApplication>
+#include <QProcess>
+
+MprisRootAdaptor::MprisRootAdaptor(QObject *parent)
+    : QDBusAbstractAdaptor(parent)
+{
+}
+
+MprisPlayerAdaptor::MprisPlayerAdaptor(QObject *parent)
+    : QDBusAbstractAdaptor(parent)
+{
+}
+
+Mpris::Mpris(QObject *parent)
+    : QObject(parent)
+{
+    m_root = new MprisRootAdaptor(this);
+    m_player = new MprisPlayerAdaptor(this);
+
+    QDBusConnection dbus = QDBusConnection::sessionBus();
+    QString serviceName = QString("org.mpris.MediaPlayer2.qobuz_qt.instance%1").arg(QCoreApplication::applicationPid());
+    
+    dbus.registerService(serviceName);
+    dbus.registerObject("/org/mpris/MediaPlayer2", this, 
+                        QDBusConnection::ExportAdaptors);
+}
--- a/src/backend/mpris.hpp
+++ b/src/backend/mpris.hpp
@@ -0,0 +1,165 @@
+#pragma once
+
+#include <QObject>
+#include <QString>
+#include <QStringList>
+#include <QVariantMap>
+#include <QDBusAbstractAdaptor>
+#include <QDBusObjectPath>
+
+class MprisRootAdaptor : public QDBusAbstractAdaptor
+{
+    Q_OBJECT
+    Q_CLASSINFO("D-Bus Interface", "org.mpris.MediaPlayer2")
+    
+    Q_PROPERTY(bool CanQuit READ canQuit)
+    Q_PROPERTY(bool Fullscreen READ fullscreen WRITE setFullscreen)
+    Q_PROPERTY(bool CanSetFullscreen READ canSetFullscreen)
+    Q_PROPERTY(bool CanRaise READ canRaise)
+    Q_PROPERTY(bool HasTrackList READ hasTrackList)
+    Q_PROPERTY(QString Identity READ identity)
+    Q_PROPERTY(QString DesktopEntry READ desktopEntry)
+    Q_PROPERTY(QStringList SupportedUriSchemes READ supportedUriSchemes)
+    Q_PROPERTY(QStringList SupportedMimeTypes READ supportedMimeTypes)
+
+public:
+    explicit MprisRootAdaptor(QObject *parent);
+
+    bool canQuit() const { return true; }
+    bool fullscreen() const { return false; }
+    void setFullscreen(bool) {}
+    bool canSetFullscreen() const { return false; }
+    bool canRaise() const { return true; }
+    bool hasTrackList() const { return false; } 
+    QString identity() const { return "Qobuz"; }
+    QString desktopEntry() const { return "qobuz-qt"; }
+    QStringList supportedUriSchemes() const { return {}; }
+    QStringList supportedMimeTypes() const { return {}; }
+
+public slots:
+    void Quit() { emit quitRequested(); }
+    void Raise() { emit raiseRequested(); }
+
+signals:
+    void quitRequested();
+    void raiseRequested();
+};
+
+class MprisPlayerAdaptor : public QDBusAbstractAdaptor
+{
+    Q_OBJECT
+    Q_CLASSINFO("D-Bus Interface", "org.mpris.MediaPlayer2.Player")
+
+    Q_PROPERTY(QString PlaybackStatus READ playbackStatus NOTIFY playbackStatusChanged)
+    Q_PROPERTY(QString LoopStatus READ loopStatus WRITE setLoopStatus)
+    Q_PROPERTY(double Rate READ rate WRITE setRate)
+    Q_PROPERTY(bool Shuffle READ shuffle WRITE setShuffle)
+    Q_PROPERTY(QVariantMap Metadata READ metadata NOTIFY metadataChanged)
+    Q_PROPERTY(double Volume READ volume WRITE setVolume NOTIFY volumeChanged)
+    Q_PROPERTY(qlonglong Position READ position)
+    Q_PROPERTY(double MinimumRate READ minimumRate)
+    Q_PROPERTY(double MaximumRate READ maximumRate)
+    Q_PROPERTY(bool CanGoNext READ canGoNext)
+    Q_PROPERTY(bool CanGoPrevious READ canGoPrevious)
+    Q_PROPERTY(bool CanPlay READ canPlay)
+    Q_PROPERTY(bool CanPause READ canPause)
+    Q_PROPERTY(bool CanSeek READ canSeek)
+    Q_PROPERTY(bool CanControl READ canControl)
+
+public:
+    explicit MprisPlayerAdaptor(QObject *parent);
+
+    QString playbackStatus() const { return m_playbackStatus; }
+    void setPlaybackStatus(const QString &s) {
+        if (m_playbackStatus != s) {
+            m_playbackStatus = s;
+            emit playbackStatusChanged();
+        }
+    }
+
+    QString loopStatus() const { return "None"; }
+    void setLoopStatus(const QString &) {}
+
+    double rate() const { return 1.0; }
+    void setRate(double) {}
+
+    bool shuffle() const { return false; }
+    void setShuffle(bool) {}
+
+    QVariantMap metadata() const { return m_metadata; }
+    void setMetadata(const QVariantMap &m) { 
+        m_metadata = m; 
+        emit metadataChanged(); 
+    }
+
+    double volume() const { return m_volume; }
+    void setVolume(double v) { 
+        emit volumeChangeRequested(v); 
+    }
+    void updateVolume(double v) {
+        if (m_volume != v) {
+            m_volume = v;
+            emit volumeChanged();
+        }
+    }
+
+    qlonglong position() const { return m_positionMicro; }
+    void updatePosition(qlonglong posSecs) { m_positionMicro = posSecs * 1000000LL; }
+
+    double minimumRate() const { return 1.0; }
+    double maximumRate() const { return 1.0; }
+
+    bool canGoNext() const { return true; }
+    bool canGoPrevious() const { return true; }
+    bool canPlay() const { return true; }
+    bool canPause() const { return true; }
+    bool canSeek() const { return true; }
+    bool canControl() const { return true; }
+
+public slots:
+    void Next() { emit nextRequested(); }
+    void Previous() { emit previousRequested(); }
+    void Pause() { emit pauseRequested(); }
+    void PlayPause() { emit playPauseRequested(); }
+    void Stop() { emit stopRequested(); }
+    void Play() { emit playRequested(); }
+    void Seek(qlonglong offset) { emit seekRequested(offset); }
+    void SetPosition(const QDBusObjectPath &trackId, qlonglong position) { Q_UNUSED(trackId); emit seekToRequested(position); }
+    void OpenUri(const QString &uri) { Q_UNUSED(uri); }
+
+signals:
+    void playbackStatusChanged();
+    void metadataChanged();
+    void volumeChanged();
+
+    // Commands to MainWindow
+    void playRequested();
+    void pauseRequested();
+    void playPauseRequested();
+    void stopRequested();
+    void nextRequested();
+    void previousRequested();
+    void seekRequested(qlonglong offsetMicroseconds);
+    void seekToRequested(qlonglong positionMicroseconds);
+    void volumeChangeRequested(double volume);
+
+private:
+    QString m_playbackStatus = "Stopped";
+    QVariantMap m_metadata;
+    double m_volume = 1.0;
+    qlonglong m_positionMicro = 0;
+};
+
+class Mpris : public QObject
+{
+    Q_OBJECT
+public:
+    explicit Mpris(QObject *parent = nullptr);
+
+    MprisRootAdaptor *root() const { return m_root; }
+    MprisPlayerAdaptor *player() const { return m_player; }
+
+private:
+    MprisRootAdaptor *m_root;
+    MprisPlayerAdaptor *m_player;
+};
--- a/src/backend/qobuzbackend.cpp
+++ b/src/backend/qobuzbackend.cpp
@@ -79,6 +79,16 @@ void QobuzBackend::getPlaylist(qint64 playlistId, quint32 offset, quint32 limit)
    qobuz_backend_get_playlist(m_backend, playlistId, offset, limit);
 }

+void QobuzBackend::getGenres()
+{
+    qobuz_backend_get_genres(m_backend);
+}
+
+void QobuzBackend::getFeaturedAlbums(qint64 genreId, const QString &kind, quint32 limit, quint32 offset)
+{
+    qobuz_backend_get_featured_albums(m_backend, genreId, kind.toUtf8().constData(), limit, offset);
+}
+
 // ---- favorites ----

 void QobuzBackend::getFavTracks(quint32 offset, quint32 limit)
@@ -209,21 +219,6 @@ quint64 QobuzBackend::duration() const { return qobuz_backend_get_duration(m_bac
 int     QobuzBackend::volume()   const { return qobuz_backend_get_volume(m_backend); }
 int     QobuzBackend::state()    const { return qobuz_backend_get_state(m_backend); }

-quint32 QobuzBackend::vizRead(float *buf, quint32 maxSamples)
-{
-    return qobuz_backend_viz_read(m_backend, buf, maxSamples);
-}
-
-quint32 QobuzBackend::vizSampleRate() const
-{
-    return qobuz_backend_viz_sample_rate(m_backend);
-}
-
-quint32 QobuzBackend::vizChannels() const
-{
-    return qobuz_backend_viz_channels(m_backend);
-}
-
 // ---- private slots ----

 void QobuzBackend::onPositionTick()
@@ -232,6 +227,9 @@ void QobuzBackend::onPositionTick()

    if (qobuz_backend_take_track_finished(m_backend))
        emit trackFinished();
+        
+    if (qobuz_backend_take_track_transitioned(m_backend))
+        emit trackTransitioned();
 }

 void QobuzBackend::onEvent(int eventType, const QString &json)
@@ -276,6 +274,12 @@ void QobuzBackend::onEvent(int eventType, const QString &json)
    case 25: // EV_DEEP_SHUFFLE_OK
        emit deepShuffleTracksLoaded(obj["tracks"].toArray());
        break;
+    case 27: // EV_GENRES_OK
+        emit genresLoaded(obj);
+        break;
+    case 28: // EV_FEATURED_ALBUMS_OK
+        emit featuredAlbumsLoaded(obj);
+        break;
    case EV_ARTIST_ERR:
        emit error(obj["error"].toString());
        break;
--- a/src/backend/qobuzbackend.hpp
+++ b/src/backend/qobuzbackend.hpp
@@ -33,6 +33,8 @@ public:
    void getArtistReleases(qint64 artistId, const QString &releaseType, quint32 limit = 50, quint32 offset = 0);
    void getAlbumsTracks(const QStringList &albumIds);
    void getPlaylist(qint64 playlistId, quint32 offset = 0, quint32 limit = 500);
+    void getGenres();
+    void getFeaturedAlbums(qint64 genreId, const QString &kind, quint32 limit = 50, quint32 offset = 0);

    // --- favorites ---
    void getFavTracks(quint32 offset = 0, quint32 limit = 500);
@@ -73,11 +75,6 @@ public:
    /// 1 = playing, 2 = paused, 0 = idle
    int     state() const;

-    // --- visualizer PCM ---
-    quint32 vizRead(float *buf, quint32 maxSamples);
-    quint32 vizSampleRate() const;
-    quint32 vizChannels() const;
-
 signals:
    // auth
    void loginSuccess(const QString &token, const QJsonObject &user);
@@ -90,6 +87,8 @@ signals:
    void artistLoaded(const QJsonObject &artist);
    void artistReleasesLoaded(const QString &releaseType, const QJsonArray &items, bool hasMore, int offset);
    void deepShuffleTracksLoaded(const QJsonArray &tracks);
+    void genresLoaded(const QJsonObject &result);
+    void featuredAlbumsLoaded(const QJsonObject &result);
    void playlistLoaded(const QJsonObject &playlist);
    void playlistCreated(const QJsonObject &playlist);
    void playlistDeleted(const QJsonObject &result);
@@ -106,6 +105,7 @@ signals:
    void stateChanged(const QString &state);
    void positionChanged(quint64 position, quint64 duration);
    void trackFinished();
+    void trackTransitioned();

    // errors
    void error(const QString &message);
@@ -114,6 +114,11 @@ private slots:
    Q_INVOKABLE void onEvent(int eventType, const QString &json);
    void onPositionTick();

+public:
+    void manuallyEmitTrackChanged(const QJsonObject &track) {
+        emit trackChanged(track);
+    }
+
 private:
    QobuzBackendOpaque *m_backend = nullptr;
    QTimer *m_positionTimer = nullptr;
--- a/src/list/library.cpp
+++ b/src/list/library.cpp
@@ -20,6 +20,7 @@ enum NodeType {
    NodeFavAlbums,
    NodeFavArtists,
    NodePlaylist,
+    NodeBrowseGenres,
 };

 Library::Library(QobuzBackend *backend, QWidget *parent)
@@ -71,6 +72,13 @@ void Library::buildStaticNodes()
    // Playlists
    m_playlistsNode = new QTreeWidgetItem(this, QStringList{tr("Playlists")});
    m_playlistsNode->setExpanded(true);
+
+    // Browse
+    m_browseNode = new QTreeWidgetItem(this, QStringList{tr("Browse")});
+    m_browseNode->setExpanded(true);
+
+    auto *genresItem = new QTreeWidgetItem(m_browseNode, QStringList{tr("Genres")});
+    genresItem->setData(0, TypeRole, NodeBrowseGenres);
 }

 void Library::refresh()
@@ -167,6 +175,7 @@ void Library::onItemClicked(QTreeWidgetItem *item, int)
    case NodeFavTracks:  emit favTracksRequested();  break;
    case NodeFavAlbums:  emit favAlbumsRequested();  break;
    case NodeFavArtists: emit favArtistsRequested(); break;
+    case NodeBrowseGenres: emit browseGenresRequested(); break;
    case NodePlaylist: {
        const qint64  id   = item->data(0, IdRole).toLongLong();
        const QString name = item->data(0, NameRole).toString();
--- a/src/list/library.hpp
+++ b/src/list/library.hpp
@@ -26,6 +26,7 @@ namespace List
        void favTracksRequested();
        void favAlbumsRequested();
        void favArtistsRequested();
+        void browseGenresRequested();
        void playlistRequested(qint64 playlistId, const QString &name);
        /// Emitted after playlists are loaded so others can cache the list.
        void userPlaylistsChanged(const QVector<QPair<qint64, QString>> &playlists);
@@ -43,6 +44,7 @@ namespace List

        QTreeWidgetItem *m_myLibNode     = nullptr;
        QTreeWidgetItem *m_playlistsNode = nullptr;
+        QTreeWidgetItem *m_browseNode    = nullptr;
        qint64           m_openPlaylistId = 0;

        void buildStaticNodes();
--- a/src/list/tracks.cpp
+++ b/src/list/tracks.cpp
@@ -189,7 +189,7 @@ void Tracks::onContextMenu(const QPoint &pos)
        menu.addSeparator();
        auto *openAlbum = menu.addAction(
            QIcon(":/res/icons/view-media-album-cover.svg"),
-            tr("Open album: %1").arg(m_model->trackAt(index.row()).album));
+            tr("Open album: %1").arg(QString(m_model->trackAt(index.row()).album).replace(QLatin1Char('&'), QStringLiteral("&&"))));
        connect(openAlbum, &QAction::triggered, this, [this, albumId] {
            m_backend->getAlbum(albumId);
        });
@@ -202,7 +202,7 @@ void Tracks::onContextMenu(const QPoint &pos)
        const QString artistName = trackJson["performer"].toObject()["name"].toString();
        auto *openArtist = menu.addAction(
            QIcon(":/res/icons/view-media-artist.svg"),
-            tr("Open artist: %1").arg(artistName));
+            tr("Open artist: %1").arg(QString(artistName).replace(QLatin1Char('&'), QStringLiteral("&&"))));
        connect(openArtist, &QAction::triggered, this, [this, artistId] {
            m_backend->getArtist(artistId);
        });
@@ -216,7 +216,7 @@ void Tracks::onContextMenu(const QPoint &pos)
        for (const auto &pl : m_userPlaylists) {
            const qint64  plId   = pl.first;
            const QString plName = pl.second;
-            auto *act = addToPlMenu->addAction(plName);
+            auto *act = addToPlMenu->addAction(QString(plName).replace(QLatin1Char('&'), QStringLiteral("&&")));
            connect(act, &QAction::triggered, this, [this, id, plId] {
                emit addToPlaylistRequested(id, plId);
            });
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -4,6 +4,10 @@
 #include "util/settings.hpp"
 #include "util/icon.hpp"

+#ifdef USE_DBUS
+#include "backend/mpris.hpp"
+#endif
+
 #include <QApplication>
 #include <QMenuBar>
 #include <QMenu>
@@ -40,8 +44,7 @@ MainWindow::MainWindow(QobuzBackend *backend, QWidget *parent)
    m_libraryDock->setObjectName(QStringLiteral("libraryDock"));
    m_libraryDock->setFeatures(QDockWidget::DockWidgetMovable);
    m_libraryDock->setWidget(m_library);
-    m_libraryDock->setMinimumWidth(180);
-    m_library->setFixedWidth(220);
+    m_libraryDock->setMinimumWidth(150);
    addDockWidget(Qt::LeftDockWidgetArea, m_libraryDock);

    // ---- Now-playing context dock (left, below library) ----
@@ -70,6 +73,30 @@ MainWindow::MainWindow(QobuzBackend *backend, QWidget *parent)
        connect(m_backend, &QobuzBackend::trackFinished,
                m_scrobbler, &LastFmScrobbler::onTrackFinished);

+        // 1. Scrobble the finished track during a gapless transition
+        connect(m_backend, &QobuzBackend::trackTransitioned,
+                m_scrobbler, &LastFmScrobbler::onTrackFinished);
+
+    // ---- Gapless Signal ----
+        connect(m_backend, &QobuzBackend::positionChanged, this, [this](quint64 pos, quint64 dur) {
+            if (!AppSettings::instance().gaplessEnabled() || dur == 0) return;
+
+            // Trigger prefetch if we pass the 50% mark OR are within 60 seconds of the end
+            if ((pos > dur / 2) || (dur > 60 && (dur - pos) <= 60)) {
+                if (!m_nextTrackPrefetched && m_queue->canGoNext()) {
+                    m_nextTrackPrefetched = true; // Lock it so it only fires once
+
+                    const auto upcoming = m_queue->upcomingTracks(1);
+                    if (!upcoming.isEmpty()) {
+                        const qint64 nextId = static_cast<qint64>(upcoming.first()["id"].toDouble());
+                        if (nextId > 0) {
+                            m_backend->prefetchTrack(nextId, AppSettings::instance().preferredFormat());
+                        }
+                    }
+                }
+            }
+        });
+
    // ---- Backend signals ----
    connect(m_backend, &QobuzBackend::loginSuccess,   this, &MainWindow::onLoginSuccess);
    connect(m_backend, &QobuzBackend::loginError,     this, &MainWindow::onLoginError);
@@ -119,6 +146,52 @@ MainWindow::MainWindow(QobuzBackend *backend, QWidget *parent)
        m_backend->getFavTracks();
        statusBar()->showMessage(tr("Loading favorite tracks…"));
    });
+
+#ifdef USE_DBUS
+    m_mpris = new Mpris(this);
+    connect(m_mpris->player(), &MprisPlayerAdaptor::playRequested, m_backend, [this] {
+        if (m_backend->state() == 2) m_backend->resume();
+    });
+    connect(m_mpris->player(), &MprisPlayerAdaptor::pauseRequested, m_backend, &QobuzBackend::pause);
+    connect(m_mpris->player(), &MprisPlayerAdaptor::playPauseRequested, m_backend, [this] {
+        if (m_backend->state() == 1)
+            m_backend->pause();
+        else
+            m_backend->resume();
+    });
+    connect(m_mpris->player(), &MprisPlayerAdaptor::stopRequested, m_backend, &QobuzBackend::stop);
+    connect(m_mpris->player(), &MprisPlayerAdaptor::nextRequested, this, [this] {
+        if (!m_queue->canGoNext()) return;
+        const qint64 id = static_cast<qint64>(m_queue->advance()["id"].toDouble());
+        if (id > 0) m_backend->playTrack(id);
+    });
+    connect(m_mpris->player(), &MprisPlayerAdaptor::previousRequested, this, [this] {
+        if (!m_queue->canGoPrev()) return;
+        const qint64 id = static_cast<qint64>(m_queue->stepBack()["id"].toDouble());
+        if (id > 0) m_backend->playTrack(id);
+    });
+    connect(m_mpris->player(), &MprisPlayerAdaptor::seekRequested, m_backend, [this](qlonglong offsetMicroseconds) {
+        qint64 newPos = m_backend->position() + (offsetMicroseconds / 1000000LL);
+        if (newPos < 0) newPos = 0;
+        m_backend->seek(newPos);
+    });
+    connect(m_mpris->player(), &MprisPlayerAdaptor::seekToRequested, m_backend, [this](qlonglong positionMicroseconds) {
+        m_backend->seek(positionMicroseconds / 1000000LL);
+    });
+    connect(m_mpris->player(), &MprisPlayerAdaptor::volumeChangeRequested, m_backend, [this](double vol) {
+        m_backend->setVolume(vol * 100);
+    });
+
+    connect(m_backend, &QobuzBackend::stateChanged, this, [this](const QString &state) {
+        if (state == "playing") m_mpris->player()->setPlaybackStatus("Playing");
+        else if (state == "paused") m_mpris->player()->setPlaybackStatus("Paused");
+        else m_mpris->player()->setPlaybackStatus("Stopped");
+    });
+    connect(m_backend, &QobuzBackend::positionChanged, this, [this](quint64 pos) {
+        m_mpris->player()->updatePosition(pos);
+    });
+#endif
+
    connect(m_library, &List::Library::favAlbumsRequested, this, [this] {
        m_backend->getFavAlbums();
        statusBar()->showMessage(tr("Loading favorite albums…"));
@@ -133,6 +206,10 @@ MainWindow::MainWindow(QobuzBackend *backend, QWidget *parent)
        m_backend->getPlaylist(id);
        statusBar()->showMessage(tr("Loading playlist: %1…").arg(name));
    });
+    connect(m_library, &List::Library::browseGenresRequested, this, [this] {
+        m_content->showGenreBrowser();
+        statusBar()->showMessage(tr("Browse Genres"));
+    });

    // ---- Track list → playback / playlist management ----
    connect(m_content->tracksList(), &List::Tracks::playTrackRequested,
@@ -286,6 +363,7 @@ void MainWindow::onLoginError(const QString &error)

 void MainWindow::onTrackChanged(const QJsonObject &track)
 {
+    m_nextTrackPrefetched = false;
    // Update playing row highlight in the track list
    const qint64 id = static_cast<qint64>(track["id"].toDouble());
    m_content->tracksList()->setPlayingTrackId(id);
@@ -298,15 +376,25 @@ void MainWindow::onTrackChanged(const QJsonObject &track)
    statusBar()->showMessage(
        artist.isEmpty() ? title : QStringLiteral("▶  %1 — %2").arg(artist, title));

-    // Prefetch next track URL when gapless is enabled
-    if (AppSettings::instance().gaplessEnabled() && m_queue->canGoNext()) {
-        const auto upcoming = m_queue->upcomingTracks(1);
-        if (!upcoming.isEmpty()) {
-            const qint64 nextId = static_cast<qint64>(upcoming.first()["id"].toDouble());
-            if (nextId > 0)
-                m_backend->prefetchTrack(nextId, AppSettings::instance().preferredFormat());
+#ifdef USE_DBUS
+    QVariantMap metadata;
+    metadata["mpris:trackid"] = QVariant::fromValue(QDBusObjectPath(QString("/org/qobuz/track/%1").arg(id)));
+    metadata["mpris:length"] = QVariant::fromValue(qlonglong(track["duration"].toDouble() * 1000000LL));
+    metadata["xesam:title"]  = title;
+
+    QJsonObject album = track["album"].toObject();
+    metadata["xesam:album"]  = album["title"].toString();
+
+    if (!artist.isEmpty()) {
+        metadata["xesam:artist"] = QStringList{artist};
    }
+
+    if (album.contains("image") && album["image"].toObject().contains("large")) {
+        metadata["mpris:artUrl"] = album["image"].toObject()["large"].toString();
    }
+
+    m_mpris->player()->setMetadata(metadata);
+#endif
 }

 void MainWindow::onFavTracksLoaded(const QJsonObject &result)
@@ -417,4 +505,3 @@ void MainWindow::onUserPlaylistsChanged(const QVector<QPair<qint64, QString>> &p
    m_content->tracksList()->setUserPlaylists(playlists);
    m_sidePanel->searchTab()->setUserPlaylists(playlists);
 }
-
--- a/src/mainwindow.hpp
+++ b/src/mainwindow.hpp
@@ -19,6 +19,8 @@
 #include <QPair>
 #include <QString>

+class Mpris;
+
 class MainWindow : public QMainWindow
 {
    Q_OBJECT
@@ -63,6 +65,8 @@ private:
    SidePanel::View *m_sidePanel   = nullptr;
    QDockWidget     *m_libraryDock = nullptr;
    LastFmScrobbler *m_scrobbler   = nullptr;
+    Mpris           *m_mpris       = nullptr;
+    bool m_nextTrackPrefetched = false;

    void setupMenuBar();
    void tryRestoreSession();
--- a/src/scrobbler/lastfm.hpp
+++ b/src/scrobbler/lastfm.hpp
@@ -80,6 +80,8 @@ public slots:
        m_duration = static_cast<qint64>(track["duration"].toDouble());
        m_startTime       = QDateTime::currentSecsSinceEpoch();
        m_playedSecs      = 0;
+        m_lastPosition    = 0;
+        m_accumulatedSecs = 0;
        m_scrobbled       = false;

        if (!isEnabled() || m_title.isEmpty() || m_duration < 30) return;
@@ -88,18 +90,29 @@ public slots:

    void onPositionChanged(quint64 positionSecs, quint64 /*duration*/)
    {
+        // Accumulate actual listening time to prevent false scrobbles from seeking
+        if (positionSecs > m_lastPosition && (positionSecs - m_lastPosition) <= 2) {
+            m_accumulatedSecs += (positionSecs - m_lastPosition);
+        }
+        m_lastPosition = positionSecs;
        m_playedSecs = positionSecs;
+
        if (!isEnabled() || m_scrobbled || m_title.isEmpty() || m_duration < 30) return;
+
        // Scrobble after 50% or 240 seconds played, whichever comes first, min 30 seconds.
        const quint64 threshold = static_cast<quint64>(qMin((qint64)240, m_duration / 2));
-        if (positionSecs >= 30 && positionSecs >= threshold)
+        if (m_accumulatedSecs >= 30 && m_accumulatedSecs >= threshold)
            scrobble();
    }

    void onTrackFinished()
    {
        if (!isEnabled() || m_scrobbled || m_title.isEmpty() || m_duration < 30) return;
-        if (m_playedSecs >= 30) scrobble();
+
+        const quint64 threshold = static_cast<quint64>(qMin((qint64)240, m_duration / 2));
+        if (m_accumulatedSecs >= 30 && m_accumulatedSecs >= threshold) {
+            scrobble();
+        }
    }

 private:
@@ -111,6 +124,8 @@ private:
    qint64  m_duration        = 0;
    qint64  m_startTime       = 0;
    quint64 m_playedSecs      = 0;
+    quint64 m_lastPosition    = 0;
+    quint64 m_accumulatedSecs = 0;
    bool    m_scrobbled       = false;

    void updateNowPlaying()
@@ -137,11 +152,13 @@ private:
        params["method"]       = QStringLiteral("track.scrobble");
        params["api_key"]      = AppSettings::instance().lastFmApiKey();
        params["sk"]           = AppSettings::instance().lastFmSessionKey();
-        params["artist"]    = m_artist;
-        params["track"]     = m_title;
-        params["album"]     = m_album;
-        params["timestamp"] = QString::number(m_startTime);
-        params["duration"]  = QString::number(m_duration);
+
+        params["artist[0]"]    = m_artist;
+        params["track[0]"]     = m_title;
+        params["album[0]"]     = m_album;
+        params["timestamp[0]"] = QString::number(m_startTime);
+        params["duration[0]"]  = QString::number(m_duration);
+
        params["api_sig"]      = buildSig(params, AppSettings::instance().lastFmApiSecret());
        params["format"]       = QStringLiteral("json");

--- a/src/view/albumlistview.hpp
+++ b/src/view/albumlistview.hpp
@@ -80,6 +80,7 @@ public:
            const QString year = date.isEmpty()
                ? a["dates"].toObject()["original"].toString().left(4)
                : date.left(4);
+            const qint64 artistId = static_cast<qint64>(a["artist"].toObject()["id"].toDouble());

            const int tracks  = a["tracks_count"].toInt();
            const bool hiRes  = a["hires_streamable"].toBool()
@@ -97,6 +98,7 @@ public:
            item->setText(3, year);
            item->setText(4, tracks > 0 ? QString::number(tracks) : QString());
            item->setData(1, Qt::UserRole, id);
+            item->setData(2, Qt::UserRole, artistId);
        }
    }

--- a/src/view/genrebrowser.cpp
+++ b/src/view/genrebrowser.cpp
@@ -0,0 +1,122 @@
+#include "genrebrowser.hpp"
+
+#include <QAction>
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QMenu>
+#include <QTreeWidgetItem>
+#include <QVBoxLayout>
+
+GenreBrowserView::GenreBrowserView(QobuzBackend *backend, QWidget *parent)
+    : QWidget(parent)
+    , m_backend(backend)
+{
+    auto *layout = new QVBoxLayout(this);
+    layout->setContentsMargins(0, 0, 0, 0);
+    layout->setSpacing(0);
+
+    auto *topBar = new QWidget(this);
+    auto *topLayout = new QHBoxLayout(topBar);
+    topLayout->setContentsMargins(8, 6, 8, 6);
+
+    topLayout->addWidget(new QLabel(tr("Genre:"), this));
+    m_genreCombo = new QComboBox(this);
+    m_genreCombo->setMinimumWidth(160);
+    topLayout->addWidget(m_genreCombo);
+
+    topLayout->addSpacing(16);
+
+    topLayout->addWidget(new QLabel(tr("Type:"), this));
+    m_typeCombo = new QComboBox(this);
+    m_typeCombo->addItem(tr("New Releases"), QStringLiteral("new-releases"));
+    m_typeCombo->addItem(tr("Best Sellers"), QStringLiteral("best-sellers"));
+    m_typeCombo->addItem(tr("Most Streamed"), QStringLiteral("most-streamed"));
+    m_typeCombo->addItem(tr("Editor Picks"), QStringLiteral("editor-picks"));
+    m_typeCombo->addItem(tr("Press Awards"), QStringLiteral("press-awards"));
+    topLayout->addWidget(m_typeCombo);
+
+    topLayout->addStretch();
+    layout->addWidget(topBar);
+
+    m_albumList = new AlbumListView(this);
+    m_albumList->setContextMenuPolicy(Qt::CustomContextMenu);
+    layout->addWidget(m_albumList, 1);
+
+    connect(m_backend, &QobuzBackend::genresLoaded,
+            this, &GenreBrowserView::onGenresLoaded);
+    connect(m_backend, &QobuzBackend::featuredAlbumsLoaded,
+            this, &GenreBrowserView::onFeaturedAlbumsLoaded);
+    connect(m_genreCombo, QOverload<int>::of(&QComboBox::currentIndexChanged),
+            this, &GenreBrowserView::onSelectionChanged);
+    connect(m_typeCombo, QOverload<int>::of(&QComboBox::currentIndexChanged),
+            this, &GenreBrowserView::onSelectionChanged);
+    connect(m_albumList, &AlbumListView::albumSelected,
+            this, &GenreBrowserView::albumSelected);
+    connect(m_albumList, &QTreeWidget::customContextMenuRequested,
+            this, &GenreBrowserView::onAlbumContextMenu);
+}
+
+void GenreBrowserView::ensureGenresLoaded()
+{
+    if (!m_genresLoaded)
+        m_backend->getGenres();
+}
+
+void GenreBrowserView::onGenresLoaded(const QJsonObject &result)
+{
+    m_genresLoaded = true;
+    m_genreCombo->blockSignals(true);
+    m_genreCombo->clear();
+
+    const QJsonArray items = result["items"].toArray();
+    for (const auto &value : items) {
+        const QJsonObject genre = value.toObject();
+        m_genreCombo->addItem(
+            genre["name"].toString(),
+            static_cast<qint64>(genre["id"].toDouble()));
+    }
+
+    m_genreCombo->blockSignals(false);
+    onSelectionChanged();
+}
+
+void GenreBrowserView::onFeaturedAlbumsLoaded(const QJsonObject &result)
+{
+    m_albumList->setAlbums(result["items"].toArray());
+}
+
+void GenreBrowserView::onSelectionChanged()
+{
+    if (m_genreCombo->count() == 0)
+        return;
+
+    const qint64 genreId = m_genreCombo->currentData().toLongLong();
+    const QString type = m_typeCombo->currentData().toString();
+    m_backend->getFeaturedAlbums(genreId, type, 50, 0);
+}
+
+void GenreBrowserView::onAlbumContextMenu(const QPoint &pos)
+{
+    QTreeWidgetItem *item = m_albumList->itemAt(pos);
+    if (!item)
+        return;
+
+    const QString albumId = item->data(1, Qt::UserRole).toString();
+    const qint64 artistId = item->data(2, Qt::UserRole).toLongLong();
+
+    QMenu menu(this);
+
+    auto *openAlbum = menu.addAction(tr("Open Album"));
+    connect(openAlbum, &QAction::triggered, this, [this, albumId] {
+        emit albumSelected(albumId);
+    });
+
+    if (artistId > 0) {
+        auto *openArtist = menu.addAction(tr("Open Artist"));
+        connect(openArtist, &QAction::triggered, this, [this, artistId] {
+            emit artistSelected(artistId);
+        });
+    }
+
+    menu.exec(m_albumList->viewport()->mapToGlobal(pos));
+}
--- a/src/view/genrebrowser.hpp
+++ b/src/view/genrebrowser.hpp
@@ -0,0 +1,36 @@
+#pragma once
+
+#include "../backend/qobuzbackend.hpp"
+#include "albumlistview.hpp"
+
+#include <QComboBox>
+#include <QJsonArray>
+#include <QJsonObject>
+#include <QWidget>
+
+class GenreBrowserView : public QWidget
+{
+    Q_OBJECT
+
+public:
+    explicit GenreBrowserView(QobuzBackend *backend, QWidget *parent = nullptr);
+
+    void ensureGenresLoaded();
+
+signals:
+    void albumSelected(const QString &albumId);
+    void artistSelected(qint64 artistId);
+
+private slots:
+    void onGenresLoaded(const QJsonObject &result);
+    void onFeaturedAlbumsLoaded(const QJsonObject &result);
+    void onSelectionChanged();
+    void onAlbumContextMenu(const QPoint &pos);
+
+private:
+    QobuzBackend *m_backend = nullptr;
+    QComboBox *m_genreCombo = nullptr;
+    QComboBox *m_typeCombo = nullptr;
+    AlbumListView *m_albumList = nullptr;
+    bool m_genresLoaded = false;
+};
--- a/src/view/maincontent.cpp
+++ b/src/view/maincontent.cpp
@@ -45,12 +45,14 @@ MainContent::MainContent(QobuzBackend *backend, PlayQueue *queue, QWidget *paren
    m_albumList  = new AlbumListView(this);
    m_artistList = new ArtistListView(this);
    m_artistView = new ArtistView(backend, queue, this);
+    m_genreBrowser = new GenreBrowserView(backend, this);

    m_stack->addWidget(m_welcome);    // 0
    m_stack->addWidget(tracksPage);   // 1
    m_stack->addWidget(m_albumList);  // 2
    m_stack->addWidget(m_artistList); // 3
    m_stack->addWidget(m_artistView); // 4
+    m_stack->addWidget(m_genreBrowser); // 5

    m_stack->setCurrentIndex(0);

@@ -58,6 +60,8 @@ MainContent::MainContent(QobuzBackend *backend, PlayQueue *queue, QWidget *paren
    connect(m_artistList, &ArtistListView::artistSelected, this, &MainContent::artistRequested);
    connect(m_artistView, &ArtistView::albumSelected,      this, &MainContent::albumRequested);
    connect(m_artistView, &ArtistView::playTrackRequested, this, &MainContent::playTrackRequested);
+    connect(m_genreBrowser, &GenreBrowserView::albumSelected, this, &MainContent::albumRequested);
+    connect(m_genreBrowser, &GenreBrowserView::artistSelected, this, &MainContent::artistRequested);
 }

 void MainContent::showWelcome()       { m_stack->setCurrentIndex(0); }
@@ -122,3 +126,9 @@ void MainContent::onDeepShuffleTracks(const QJsonArray &tracks)
 {
    m_artistView->onDeepShuffleTracks(tracks);
 }
+
+void MainContent::showGenreBrowser()
+{
+    m_genreBrowser->ensureGenresLoaded();
+    m_stack->setCurrentIndex(5);
+}
--- a/src/view/maincontent.hpp
+++ b/src/view/maincontent.hpp
@@ -6,6 +6,7 @@
 #include "albumlistview.hpp"
 #include "artistlistview.hpp"
 #include "artistview.hpp"
+#include "genrebrowser.hpp"
 #include "trackcontextheader.hpp"

 #include <QWidget>
@@ -34,6 +35,7 @@ public:
    void updateArtistReleases(const QString &releaseType, const QJsonArray &items, bool hasMore, int offset);
    void setFavArtistIds(const QSet<qint64> &ids);
    void onDeepShuffleTracks(const QJsonArray &tracks);
+    void showGenreBrowser();

    ArtistView *artistView() const { return m_artistView; }

@@ -51,4 +53,5 @@ private:
    AlbumListView       *m_albumList  = nullptr;
    ArtistListView      *m_artistList = nullptr;
    ArtistView          *m_artistView = nullptr;
+    GenreBrowserView    *m_genreBrowser = nullptr;
 };
--- a/src/view/maintoolbar.cpp
+++ b/src/view/maintoolbar.cpp
@@ -96,9 +96,11 @@ MainToolBar::MainToolBar(QobuzBackend *backend, PlayQueue *queue, QWidget *paren

    // ---- Volume ----
    m_volume = new VolumeButton(this);
-    m_volume->setValue(AppSettings::instance().volume());
    addWidget(m_volume);
    connect(m_volume, &VolumeButton::volumeChanged, this, &MainToolBar::onVolumeChanged);
+    // Set volume after connecting so the backend receives the initial value
+    m_volume->setValue(AppSettings::instance().volume());
+    m_backend->setVolume(AppSettings::instance().volume());

    // ---- Queue toggle ----
    m_queueBtn = addAction(Icon::queue(), tr("Queue"));
@@ -115,6 +117,7 @@ MainToolBar::MainToolBar(QobuzBackend *backend, PlayQueue *queue, QWidget *paren
    connect(m_backend, &QobuzBackend::trackChanged,    this, &MainToolBar::onTrackChanged);
    connect(m_backend, &QobuzBackend::positionChanged, this, &MainToolBar::onPositionChanged);
    connect(m_backend, &QobuzBackend::trackFinished,   this, &MainToolBar::onTrackFinished);
+    connect(m_backend, &QobuzBackend::trackTransitioned, this, &MainToolBar::onTrackTransitioned);

    // ---- Queue signals ----
    connect(m_queue, &PlayQueue::queueChanged, this, &MainToolBar::onQueueChanged);
@@ -247,6 +250,17 @@ void MainToolBar::onTrackFinished()
    }
 }

+void MainToolBar::onTrackTransitioned()
+{
+    if (m_queue->canGoNext()) {
+        const QJsonObject track = m_queue->advance();
+        setCurrentTrack(track);
+        m_backend->manuallyEmitTrackChanged(track);
+    } else {
+        onTrackFinished();
+    }
+}
+
 void MainToolBar::onQueueChanged()
 {
    m_previous->setEnabled(m_queue->canGoPrev());
--- a/src/view/maintoolbar.hpp
+++ b/src/view/maintoolbar.hpp
@@ -44,6 +44,7 @@ private slots:
    void onTrackChanged(const QJsonObject &track);
    void onPositionChanged(quint64 position, quint64 duration);
    void onTrackFinished();
+    void onTrackTransitioned();
    void onQueueChanged();
    void onShuffleToggled(bool checked);

--- a/src/view/sidepanel/view.cpp
+++ b/src/view/sidepanel/view.cpp
@@ -186,13 +186,13 @@ void SearchTab::onTrackContextMenu(const QPoint &pos)

    menu.addSeparator();
    if (!albumId.isEmpty()) {
-        auto *openAlbum = menu.addAction(tr("Go to album: %1").arg(albumTitle));
+        auto *openAlbum = menu.addAction(tr("Go to album: %1").arg(QString(albumTitle).replace(QLatin1Char('&'), QStringLiteral("&&"))));
        connect(openAlbum, &QAction::triggered, this, [this, albumId] {
            emit albumSelected(albumId);
        });
    }
    if (artistId > 0) {
-        auto *openArtist = menu.addAction(tr("Go to artist: %1").arg(artistName));
+        auto *openArtist = menu.addAction(tr("Go to artist: %1").arg(QString(artistName).replace(QLatin1Char('&'), QStringLiteral("&&"))));
        connect(openArtist, &QAction::triggered, this, [this, artistId] {
            emit artistSelected(artistId);
        });
@@ -252,7 +252,7 @@ void SearchTab::onAlbumContextMenu(const QPoint &pos)
    const QString artistName = albumJson["artist"].toObject()["name"].toString();
    if (artistId > 0) {
        menu.addSeparator();
-        auto *openArtist = menu.addAction(tr("Go to artist: %1").arg(artistName));
+        auto *openArtist = menu.addAction(tr("Go to artist: %1").arg(QString(artistName).replace(QLatin1Char('&'), QStringLiteral("&&"))));
        connect(openArtist, &QAction::triggered, this, [this, artistId] {
            emit artistSelected(artistId);
        });