Fix STA thread blocking crash on album art loading

Replace async GetFileFromPathAsync().get() with synchronous CreateFromUri() to avoid blocking STA thread. This prevents the "sta thread blocking wait" assertion failure.

Co-authored-by: jonaski <10343810+jonaski@users.noreply.github.com>

.github/workflows/build.yml

@@ -747,7 +747,7 @@ jobs:
         df -h
     - name: Build FreeBSD
       id: build-freebsd
-      uses: vmactions/freebsd-vm@v1.3.5
+      uses: vmactions/freebsd-vm@v1.3.2
       with:
         usesh: true
         mem: 8192
@@ -772,7 +772,7 @@ jobs:
         submodules: recursive
     - name: Build OpenBSD
       id: build-openbsd
-      uses: vmactions/openbsd-vm@v1.3.1
+      uses: vmactions/openbsd-vm@v1.2.9
       with:
         usesh: true
         mem: 4096
@@ -845,7 +845,7 @@ jobs:
           p12-password: ${{ secrets.APPLE_DEVELOPER_ID_CERTIFICATE_PASSWORD }}
 
       - name: Download macOS dependencies
-        run: curl -f -O -L https://github.com/strawberrymusicplayer/strawberry-macos-dependencies/releases/latest/download/strawberry-macos-${{env.arch}}-${{env.buildtype}}.tar.xz
+        run: curl -f -O -L https://github.com/strawberrymusicplayer/strawberry-macos-dependencies$(test "${{env.arch}}" = "x86_64" && echo "-intel" || echo "")/releases/latest/download/strawberry-macos-${{env.arch}}-${{env.buildtype}}.tar.xz
 
       - name: Extract macOS dependencies
         run: sudo tar -C / -xf strawberry-macos-${{env.arch}}-${{env.buildtype}}.tar.xz
@@ -898,7 +898,7 @@ jobs:
       - name: Manually Codesign
         if: github.repository == 'strawberrymusicplayer/strawberry' && github.event.pull_request.head.repo.fork == false && matrix.runner == 'macos-15-intel'
         working-directory: build
-        run: codesign -s 383J84DVB6 -f strawberry.app/Contents/Frameworks/{libpcre2-8.0.dylib,libpcre2-16.0.dylib,libpng16.16.dylib,libfreetype.6.dylib,libzstd.1.dylib,libbrotlicommon.1.dylib,libbrotlienc.1.dylib,libbrotlidec.1.dylib,libsoup-3.0.0.dylib,libnghttp2.14.dylib,libpsl.5.dylib} strawberry.app/Contents/Frameworks/png.framework/png strawberry.app
+        run: codesign -s 383J84DVB6 -f strawberry.app/Contents/Frameworks/{libpcre2-8.0.dylib,libpcre2-16.0.dylib,libpng16.16.dylib,libfreetype.6.dylib,libzstd.1.dylib,libbrotlicommon.1.dylib,libbrotlienc.1.dylib} strawberry.app/Contents/Frameworks/png.framework/png strawberry.app
 
       - name: Manually Codesign
         if: github.repository == 'strawberrymusicplayer/strawberry' && github.event.pull_request.head.repo.fork == false && matrix.runner == 'macos-15'

CMakeLists.txt

@@ -295,6 +295,12 @@ if(UNIX AND NOT APPLE)
   )
 endif()
 
+if(MSVC)
+  optional_component(WINDOWS_MEDIA_CONTROLS ON "Windows Media Transport Controls"
+    DEPENDS "MSVC compiler" MSVC
+  )
+endif()
+
 optional_component(SONGFINGERPRINTING ON "Song fingerprinting and tracking"
   DEPENDS "chromaprint" CHROMAPRINT_FOUND
 )
@@ -823,8 +829,6 @@ set(SOURCES
 
   src/fileview/fileview.cpp
   src/fileview/fileviewlist.cpp
-  src/fileview/fileviewtree.cpp
-  src/fileview/fileviewtreemodel.cpp
 
   src/device/devicemanager.cpp
   src/device/devicelister.cpp
@@ -1114,8 +1118,6 @@ set(HEADERS
 
   src/fileview/fileview.h
   src/fileview/fileviewlist.h
-  src/fileview/fileviewtree.h
-  src/fileview/fileviewtreemodel.h
 
   src/device/devicemanager.h
   src/device/devicelister.h
@@ -1298,6 +1300,7 @@ endif()
 optional_source(HAVE_ALSA SOURCES src/engine/alsadevicefinder.cpp src/engine/alsapcmdevicefinder.cpp)
 optional_source(HAVE_PULSE SOURCES src/engine/pulsedevicefinder.cpp)
 optional_source(MSVC SOURCES src/engine/uwpdevicefinder.cpp src/engine/asiodevicefinder.cpp)
+optional_source(HAVE_WINDOWS_MEDIA_CONTROLS SOURCES src/core/windowsmediacontroller.cpp HEADERS src/core/windowsmediacontroller.h)
 optional_source(HAVE_CHROMAPRINT SOURCES src/engine/chromaprinter.cpp)
 
 optional_source(HAVE_MUSICBRAINZ

src/collection/collectionview.cpp

@@ -383,7 +383,7 @@ void CollectionView::keyPressEvent(QKeyEvent *e) {
     case Qt::Key_Enter:
     case Qt::Key_Return:
       if (currentIndex().isValid()) {
-        Q_EMIT doubleClicked(currentIndex());
+        AddToPlaylist();
       }
       e->accept();
       break;

src/config.h.in

@@ -14,6 +14,7 @@
 #cmakedefine HAVE_GIO_UNIX
 #cmakedefine HAVE_DBUS
 #cmakedefine HAVE_MPRIS2
+#cmakedefine HAVE_WINDOWS_MEDIA_CONTROLS
 #cmakedefine HAVE_UDISKS2
 #cmakedefine HAVE_AUDIOCD
 #cmakedefine HAVE_MTP

src/core/filesystemmusicstorage.cpp

@@ -110,32 +110,21 @@ bool FilesystemMusicStorage::CopyToStorage(const CopyJob &job, QString &error_te
 
 bool FilesystemMusicStorage::DeleteFromStorage(const DeleteJob &job) {
 
-  const QString path = job.metadata_.url().toLocalFile();
-  const QFileInfo fileInfo(path);
+  QString path = job.metadata_.url().toLocalFile();
+  QFileInfo fileInfo(path);
 
 #if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0)
   if (job.use_trash_ && QFile::supportsMoveToTrash()) {
 #else
   if (job.use_trash_) {
 #endif
-    if (QFile::moveToTrash(path)) {
-      return true;
-    }
-    qLog(Warning) << "Moving file to trash failed for" << path << ", falling back to direct deletion";
+    return QFile::moveToTrash(path);
   }
 
-  bool success = false;
   if (fileInfo.isDir()) {
-    success = Utilities::RemoveRecursive(path);
-  }
-  else {
-    success = QFile::remove(path);
+    return Utilities::RemoveRecursive(path);
   }
 
-  if (!success) {
-    qLog(Error) << "Failed to delete file" << path;
-  }
-
-  return success;
+  return QFile::remove(path);
 
 }

src/core/mainwindow.cpp

@@ -447,14 +447,6 @@ MainWindow::MainWindow(Application *app,
   ui_->tabs->SetBackgroundPixmap(QPixmap(u":/pictures/sidebar-background.png"_s));
   ui_->tabs->LoadSettings(QLatin1String(MainWindowSettings::kSettingsGroup));
 
-  // Save tab mode immediately when changed to avoid losing the setting
-  QObject::connect(ui_->tabs, &FancyTabWidget::ModeChanged, this, [this](FancyTabWidget::Mode mode) {
-    Settings s;
-    s.beginGroup(MainWindowSettings::kSettingsGroup);
-    s.setValue("tab_mode", static_cast<int>(mode));
-    s.endGroup();
-  });
-
   track_position_timer_->setInterval(kTrackPositionUpdateTimeMs);
   QObject::connect(track_position_timer_, &QTimer::timeout, this, &MainWindow::UpdateTrackPosition);
   track_slider_timer_->setInterval(kTrackSliderUpdateTimeMs);

src/core/mainwindow.h

@@ -43,6 +43,7 @@
 #include <QString>
 #include <QUrl>
 #include <QImage>
+#include <QPixmap>
 #include <QTimer>
 #include <QtEvents>
 
@@ -289,6 +290,9 @@ class MainWindow : public QMainWindow, public PlatformInterface {
 
   void CheckFullRescanRevisions();
 
+  // creates the icon by painting the full one depending on the current position
+  QPixmap CreateOverlayedIcon(const int position, const int scrobble_point);
+
   void GetCoverAutomatically();
 
   void SetToggleScrobblingIcon(const bool value);

src/core/song.cpp

@@ -1668,24 +1668,12 @@ void Song::InitArtManual() {
 void Song::InitArtAutomatic() {
 
   if (d->art_automatic_.isEmpty() && d->source_ == Source::LocalFile && d->url_.isLocalFile()) {
-    const QFileInfo fileinfo(d->url_.toLocalFile());
-    const QDir dir(fileinfo.path());
-    const QStringList cover_files = dir.entryList(QStringList() << u"*.jpg"_s << u"*.png"_s << u"*.gif"_s << u"*.jpeg"_s, QDir::Files|QDir::Readable, QDir::Name);
-    QString best_cover_file;
-    for (const QString &cover_file : cover_files) {
-      if (cover_file.contains("back"_L1, Qt::CaseInsensitive)) {
-        continue;
-      }
-      if (cover_file.contains("front"_L1, Qt::CaseInsensitive) || cover_file.startsWith("cover"_L1, Qt::CaseInsensitive)) {
-        best_cover_file = cover_file;
-        break;
-      }
-      if (best_cover_file.isEmpty()) {
-        best_cover_file = cover_file;
-      }
-    }
-    if (!best_cover_file.isEmpty()) {
-      d->art_automatic_ = QUrl::fromLocalFile(fileinfo.path() + QDir::separator() + best_cover_file);
+    // Pick the first image file in the album directory.
+    QFileInfo file(d->url_.toLocalFile());
+    QDir dir(file.path());
+    QStringList files = dir.entryList(QStringList() << u"*.jpg"_s << u"*.png"_s << u"*.gif"_s << u"*.jpeg"_s, QDir::Files|QDir::Readable, QDir::Name);
+    if (files.count() > 0) {
+      d->art_automatic_ = QUrl::fromLocalFile(file.path() + QDir::separator() + files.first());
     }
   }
 

src/core/songloader.cpp

@@ -98,9 +98,6 @@ SongLoader::SongLoader(const SharedPtr<UrlHandlers> url_handlers,
 
   QObject::connect(timeout_timer_, &QTimer::timeout, this, &SongLoader::Timeout);
 
-  QObject::connect(playlist_parser_, &PlaylistParser::Error, this, &SongLoader::ParserError);
-  QObject::connect(cue_parser_, &CueParser::Error, this, &SongLoader::ParserError);
-
 }
 
 SongLoader::~SongLoader() {
@@ -109,10 +106,6 @@ SongLoader::~SongLoader() {
 
 }
 
-void SongLoader::ParserError(const QString &error) {
-  errors_ << error;
-}
-
 SongLoader::Result SongLoader::Load(const QUrl &url) {
 
   if (url.isEmpty()) return Result::Error;
@@ -294,7 +287,6 @@ SongLoader::Result SongLoader::LoadLocalAsync(const QString &filename) {
   }
 
   if (parser) {  // It's a playlist!
-    QObject::connect(parser, &ParserBase::Error, this, &SongLoader::ParserError, static_cast<Qt::ConnectionType>(Qt::QueuedConnection | Qt::UniqueConnection));
     qLog(Debug) << "Parsing using" << parser->name();
     LoadPlaylist(parser, filename);
     return Result::Success;
@@ -714,10 +706,6 @@ void SongLoader::MagicReady() {
     StopTypefindAsync(true);
   }
 
-  if (parser_) {
-    QObject::connect(parser_, &ParserBase::Error, this, &SongLoader::ParserError, static_cast<Qt::ConnectionType>(Qt::QueuedConnection | Qt::UniqueConnection));
-  }
-
   state_ = State::WaitingForData;
 
   if (!IsPipelinePlaying()) {

src/core/songloader.h

@@ -99,7 +99,6 @@ class SongLoader : public QObject {
   void ScheduleTimeout();
   void Timeout();
   void StopTypefind();
-  void ParserError(const QString &error);
 
 #ifdef HAVE_AUDIOCD
   void AudioCDTracksLoadErrorSlot(const QString &error);

src/core/windowsmediacontroller.cpp

@@ -0,0 +1,303 @@
+/*
+ * Strawberry Music Player
+ * Copyright 2025, Jonas Kvinge <jonas@jkvinge.net>
+ *
+ * Strawberry is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Strawberry is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "config.h"
+
+#include <windows.h>
+
+#include <QObject>
+#include <QString>
+#include <QUrl>
+
+// Undefine 'interface' macro from windows.h before including WinRT headers
+#pragma push_macro("interface")
+#undef interface
+
+#include <winrt/Windows.Foundation.h>
+#include <winrt/Windows.Media.h>
+#include <winrt/Windows.Storage.h>
+#include <winrt/Windows.Storage.Streams.h>
+
+#pragma pop_macro("interface")
+
+// Include the interop header for ISystemMediaTransportControlsInterop
+#include <systemmediatransportcontrolsinterop.h>
+
+#include "core/logging.h"
+#include "windowsmediacontroller.h"
+
+#include "core/song.h"
+#include "core/player.h"
+#include "engine/enginebase.h"
+#include "playlist/playlistmanager.h"
+#include "covermanager/currentalbumcoverloader.h"
+#include "covermanager/albumcoverloaderresult.h"
+
+using namespace winrt;
+using namespace Windows::Foundation;
+using namespace Windows::Media;
+using namespace Windows::Storage;
+using namespace Windows::Storage::Streams;
+
+// Helper struct to hold the WinRT object
+struct WindowsMediaControllerPrivate {
+  SystemMediaTransportControls smtc{nullptr};
+};
+
+WindowsMediaController::WindowsMediaController(HWND hwnd,
+                                               const SharedPtr<Player> player,
+                                               const SharedPtr<PlaylistManager> playlist_manager,
+                                               const SharedPtr<CurrentAlbumCoverLoader> current_albumcover_loader,
+                                               QObject *parent)
+    : QObject(parent),
+      player_(player),
+      playlist_manager_(playlist_manager),
+      current_albumcover_loader_(current_albumcover_loader),
+      smtc_(nullptr),
+      apartment_initialized_(false) {
+
+  try {
+    // Initialize WinRT apartment if not already initialized
+    // Qt or other components may have already initialized it
+    try {
+      winrt::init_apartment(winrt::apartment_type::single_threaded);
+      apartment_initialized_ = true;
+    }
+    catch (const hresult_error &e) {
+      // Apartment already initialized - this is fine, continue
+      if (e.code() != RPC_E_CHANGED_MODE) {
+        throw;
+      }
+    }
+
+    // Create private implementation
+    auto *priv = new WindowsMediaControllerPrivate();
+    smtc_ = priv;
+
+    // Get the SystemMediaTransportControls instance for this window
+    // Use the interop interface
+    auto interop = winrt::get_activation_factory<SystemMediaTransportControls, ISystemMediaTransportControlsInterop>();
+
+    if (!interop) {
+      qLog(Warning) << "Failed to get ISystemMediaTransportControlsInterop";
+      delete priv;
+      smtc_ = nullptr;
+      return;
+    }
+
+    // Get SMTC for the window
+    winrt::com_ptr<IInspectable> inspectable;
+    HRESULT hr = interop->GetForWindow(hwnd, winrt::guid_of<SystemMediaTransportControls>(), inspectable.put_void());
+    
+    if (FAILED(hr) || !inspectable) {
+      qLog(Warning) << "Failed to get SystemMediaTransportControls for window, HRESULT:" << Qt::hex << static_cast<unsigned int>(hr);
+      delete priv;
+      smtc_ = nullptr;
+      return;
+    }
+
+    // Convert to SystemMediaTransportControls
+    priv->smtc = inspectable.as<SystemMediaTransportControls>();
+    
+    if (!priv->smtc) {
+      qLog(Warning) << "Failed to cast to SystemMediaTransportControls";
+      delete priv;
+      smtc_ = nullptr;
+      return;
+    }
+    
+    // Enable the controls
+    priv->smtc.IsEnabled(true);
+    priv->smtc.IsPlayEnabled(true);
+    priv->smtc.IsPauseEnabled(true);
+    priv->smtc.IsStopEnabled(true);
+    priv->smtc.IsNextEnabled(true);
+    priv->smtc.IsPreviousEnabled(true);
+
+    // Setup button handlers
+    SetupButtonHandlers();
+
+    // Connect signals from Player
+    QObject::connect(&*player_->engine(), &EngineBase::StateChanged, this, &WindowsMediaController::EngineStateChanged);
+    QObject::connect(&*playlist_manager_, &PlaylistManager::CurrentSongChanged, this, &WindowsMediaController::CurrentSongChanged);
+    QObject::connect(&*current_albumcover_loader_, &CurrentAlbumCoverLoader::AlbumCoverLoaded, this, &WindowsMediaController::AlbumCoverLoaded);
+
+    qLog(Info) << "Windows Media Transport Controls initialized successfully";
+  }
+  catch (const hresult_error &e) {
+    qLog(Warning) << "Failed to initialize Windows Media Transport Controls:" << QString::fromWCharArray(e.message().c_str());
+    if (smtc_) {
+      delete static_cast<WindowsMediaControllerPrivate*>(smtc_);
+      smtc_ = nullptr;
+    }
+  }
+  catch (...) {
+    qLog(Warning) << "Failed to initialize Windows Media Transport Controls: unknown error";
+    if (smtc_) {
+      delete static_cast<WindowsMediaControllerPrivate*>(smtc_);
+      smtc_ = nullptr;
+    }
+  }
+}
+
+WindowsMediaController::~WindowsMediaController() {
+  if (smtc_) {
+    auto *priv = static_cast<WindowsMediaControllerPrivate*>(smtc_);
+    if (priv->smtc) {
+      priv->smtc.IsEnabled(false);
+    }
+    delete priv;
+    smtc_ = nullptr;
+  }
+  // Only uninit if we initialized the apartment
+  if (apartment_initialized_) {
+    winrt::uninit_apartment();
+  }
+}
+
+void WindowsMediaController::SetupButtonHandlers() {
+  if (!smtc_) return;
+
+  auto *priv = static_cast<WindowsMediaControllerPrivate*>(smtc_);
+  if (!priv->smtc) return;
+
+  // Handle button pressed events
+  priv->smtc.ButtonPressed([this](const SystemMediaTransportControls &, const SystemMediaTransportControlsButtonPressedEventArgs &args) {
+    switch (args.Button()) {
+      case SystemMediaTransportControlsButton::Play:
+        player_->Play();
+        break;
+      case SystemMediaTransportControlsButton::Pause:
+        player_->Pause();
+        break;
+      case SystemMediaTransportControlsButton::Stop:
+        player_->Stop();
+        break;
+      case SystemMediaTransportControlsButton::Next:
+        player_->Next();
+        break;
+      case SystemMediaTransportControlsButton::Previous:
+        player_->Previous();
+        break;
+      default:
+        break;
+    }
+  });
+}
+
+void WindowsMediaController::EngineStateChanged(EngineBase::State newState) {
+  UpdatePlaybackStatus(newState);
+}
+
+void WindowsMediaController::UpdatePlaybackStatus(EngineBase::State state) {
+  if (!smtc_) return;
+
+  auto *priv = static_cast<WindowsMediaControllerPrivate*>(smtc_);
+  if (!priv->smtc) return;
+
+  try {
+    switch (state) {
+      case EngineBase::State::Playing:
+        priv->smtc.PlaybackStatus(MediaPlaybackStatus::Playing);
+        break;
+      case EngineBase::State::Paused:
+        priv->smtc.PlaybackStatus(MediaPlaybackStatus::Paused);
+        break;
+      case EngineBase::State::Empty:
+      case EngineBase::State::Idle:
+        priv->smtc.PlaybackStatus(MediaPlaybackStatus::Stopped);
+        break;
+    }
+  }
+  catch (const hresult_error &e) {
+    qLog(Warning) << "Failed to update playback status:" << QString::fromWCharArray(e.message().c_str());
+  }
+}
+
+void WindowsMediaController::CurrentSongChanged(const Song &song) {
+  if (!song.is_valid()) {
+    return;
+  }
+  
+  // Update metadata immediately with what we have
+  UpdateMetadata(song, QUrl());
+  
+  // Album cover will be updated via AlbumCoverLoaded signal
+}
+
+void WindowsMediaController::AlbumCoverLoaded(const Song &song, const AlbumCoverLoaderResult &result) {
+  if (!song.is_valid()) {
+    return;
+  }
+
+  // Update metadata with album cover
+  UpdateMetadata(song, result.temp_cover_url.isEmpty() ? result.album_cover.cover_url : result.temp_cover_url);
+}
+
+void WindowsMediaController::UpdateMetadata(const Song &song, const QUrl &art_url) {
+  if (!smtc_) return;
+
+  auto *priv = static_cast<WindowsMediaControllerPrivate*>(smtc_);
+  if (!priv->smtc) return;
+
+  try {
+    // Get the updater
+    SystemMediaTransportControlsDisplayUpdater updater = priv->smtc.DisplayUpdater();
+    updater.Type(MediaPlaybackType::Music);
+
+    // Get the music properties
+    auto musicProperties = updater.MusicProperties();
+
+    // Set basic metadata
+    if (!song.title().isEmpty()) {
+      musicProperties.Title(winrt::hstring(song.title().toStdWString()));
+    }
+    if (!song.artist().isEmpty()) {
+      musicProperties.Artist(winrt::hstring(song.artist().toStdWString()));
+    }
+    if (!song.album().isEmpty()) {
+      musicProperties.AlbumTitle(winrt::hstring(song.album().toStdWString()));
+    }
+
+    // Set album art if available
+    if (art_url.isValid() && art_url.isLocalFile()) {
+      QString artPath = art_url.toLocalFile();
+      if (!artPath.isEmpty()) {
+        try {
+          // Use file:// URI to avoid async blocking in STA thread
+          QString fileUri = QUrl::fromLocalFile(artPath).toString();
+          auto thumbnailStream = RandomAccessStreamReference::CreateFromUri(
+            winrt::Windows::Foundation::Uri(winrt::hstring(fileUri.toStdWString()))
+          );
+          updater.Thumbnail(thumbnailStream);
+          current_song_art_url_ = artPath;
+        }
+        catch (const hresult_error &e) {
+          qLog(Debug) << "Failed to set album art:" << QString::fromWCharArray(e.message().c_str());
+        }
+      }
+    }
+
+    // Update the display
+    updater.Update();
+  }
+  catch (const hresult_error &e) {
+    qLog(Warning) << "Failed to update metadata:" << QString::fromWCharArray(e.message().c_str());
+  }
+}

src/core/windowsmediacontroller.h

@@ -0,0 +1,69 @@
+/*
+ * Strawberry Music Player
+ * Copyright 2025, Jonas Kvinge <jonas@jkvinge.net>
+ *
+ * Strawberry is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Strawberry is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef WINDOWSMEDIACONTROLLER_H
+#define WINDOWSMEDIACONTROLLER_H
+
+#include "config.h"
+
+#include <windows.h>
+
+#include <QObject>
+#include <QString>
+
+#include "includes/shared_ptr.h"
+#include "engine/enginebase.h"
+#include "covermanager/albumcoverloaderresult.h"
+
+class Player;
+class PlaylistManager;
+class CurrentAlbumCoverLoader;
+class Song;
+
+class WindowsMediaController : public QObject {
+  Q_OBJECT
+
+ public:
+  explicit WindowsMediaController(HWND hwnd,
+                                   const SharedPtr<Player> player,
+                                   const SharedPtr<PlaylistManager> playlist_manager,
+                                   const SharedPtr<CurrentAlbumCoverLoader> current_albumcover_loader,
+                                   QObject *parent = nullptr);
+  ~WindowsMediaController() override;
+
+ private Q_SLOTS:
+  void AlbumCoverLoaded(const Song &song, const AlbumCoverLoaderResult &result = AlbumCoverLoaderResult());
+  void EngineStateChanged(EngineBase::State newState);
+  void CurrentSongChanged(const Song &song);
+
+ private:
+  void UpdatePlaybackStatus(EngineBase::State state);
+  void UpdateMetadata(const Song &song, const QUrl &art_url);
+  void SetupButtonHandlers();
+
+ private:
+  const SharedPtr<Player> player_;
+  const SharedPtr<PlaylistManager> playlist_manager_;
+  const SharedPtr<CurrentAlbumCoverLoader> current_albumcover_loader_;
+  void *smtc_;  // Pointer to SystemMediaTransportControls (opaque to avoid WinRT headers in public header)
+  QString current_song_art_url_;
+  bool apartment_initialized_;  // Track if we initialized the WinRT apartment
+};
+
+#endif  // WINDOWSMEDIACONTROLLER_H

src/engine/gstenginepipeline.cpp

@@ -178,6 +178,7 @@ GstEnginePipeline::GstEnginePipeline(QObject *parent)
       audiobin_(nullptr),
       audiosink_(nullptr),
       audioqueue_(nullptr),
+      audioqueueconverter_(nullptr),
       volume_(nullptr),
       volume_sw_(nullptr),
       volume_fading_(nullptr),
@@ -186,7 +187,6 @@ GstEnginePipeline::GstEnginePipeline(QObject *parent)
       equalizer_(nullptr),
       equalizer_preamp_(nullptr),
       eventprobe_(nullptr),
-      bufferprobe_(nullptr),
       logged_unsupported_analyzer_format_(false),
       about_to_finish_(false),
       finish_requested_(false),
@@ -436,7 +436,7 @@ void GstEnginePipeline::Disconnect() {
     }
 
     if (buffer_probe_cb_id_.has_value()) {
-      GstPad *pad = gst_element_get_static_pad(bufferprobe_, "src");
+      GstPad *pad = gst_element_get_static_pad(audioqueueconverter_, "src");
       if (pad) {
         gst_pad_remove_probe(pad, buffer_probe_cb_id_.value());
         gst_object_unref(pad);
@@ -674,13 +674,8 @@ bool GstEnginePipeline::InitAudioBin(QString &error) {
     return false;
   }
 
-  GstElement *audioqueueconverter = CreateElement(u"audioconvert"_s, u"audioqueueconverter"_s, audiobin_, error);
-  if (!audioqueueconverter) {
-    return false;
-  }
-
-  GstElement *audioqueueresampler = CreateElement(u"audioresample"_s, u"audioqueueresampler"_s, audiobin_, error);
-  if (!audioqueueresampler) {
+  audioqueueconverter_ = CreateElement(u"audioconvert"_s, u"audioqueueconverter"_s, audiobin_, error);
+  if (!audioqueueconverter_) {
     return false;
   }
 
@@ -689,11 +684,6 @@ bool GstEnginePipeline::InitAudioBin(QString &error) {
     return false;
   }
 
-  GstElement *audiosinkresampler = CreateElement(u"audioresample"_s, u"audiosinkresampler"_s, audiobin_, error);
-  if (!audiosinkresampler) {
-    return false;
-  }
-
   // Create the volume element if it's enabled.
   if (volume_enabled_ && !volume_) {
     volume_sw_ = CreateElement(u"volume"_s, u"volume_sw"_s, audiobin_, error);
@@ -771,8 +761,7 @@ bool GstEnginePipeline::InitAudioBin(QString &error) {
 
   }
 
-  eventprobe_ = audioqueueconverter;
-  bufferprobe_ = audioqueueconverter;
+  eventprobe_ = audioqueueconverter_;
 
   // Create the replaygain elements if it's enabled.
   GstElement *rgvolume = nullptr;
@@ -858,17 +847,12 @@ bool GstEnginePipeline::InitAudioBin(QString &error) {
 
   // Link all elements
 
-  if (!gst_element_link(audioqueue_, audioqueueconverter)) {
+  if (!gst_element_link(audioqueue_, audioqueueconverter_)) {
     error = u"Failed to link audio queue to audio queue converter."_s;
     return false;
   }
 
-  if (!gst_element_link(audioqueueconverter, audioqueueresampler)) {
-    error = u"Failed to link audio queue converter to audio queue resampler."_s;
-    return false;
-  }
-
-  GstElement *element_link = audioqueueresampler;  // The next element to link from.
+  GstElement *element_link = audioqueueconverter_;  // The next element to link from.
 
   // Link replaygain elements if enabled.
   if (rg_enabled_ && rgvolume && rglimiter && rgconverter) {
@@ -944,11 +928,6 @@ bool GstEnginePipeline::InitAudioBin(QString &error) {
     return false;
   }
 
-  if (!gst_element_link(audiosinkconverter, audiosinkresampler)) {
-    error = "Failed to link audio sink converter to audio sink resampler."_L1;
-    return false;
-  }
-
   {
     GstCaps *caps = gst_caps_new_empty_simple("audio/x-raw");
     if (!caps) {
@@ -959,16 +938,16 @@ bool GstEnginePipeline::InitAudioBin(QString &error) {
       qLog(Debug) << "Setting channels to" << channels_;
       gst_caps_set_simple(caps, "channels", G_TYPE_INT, channels_, nullptr);
     }
-    const bool link_filtered_result = gst_element_link_filtered(audiosinkresampler, audiosink_, caps);
+    const bool link_filtered_result = gst_element_link_filtered(audiosinkconverter, audiosink_, caps);
     gst_caps_unref(caps);
     if (!link_filtered_result) {
-      error = "Failed to link audio sink resampler to audio sink with filter for "_L1 + output_;
+      error = "Failed to link audio sink converter to audio sink with filter for "_L1 + output_;
       return false;
     }
   }
 
   {  // Add probes and handlers.
-    GstPad *pad = gst_element_get_static_pad(bufferprobe_, "src");
+    GstPad *pad = gst_element_get_static_pad(audioqueueconverter_, "src");
     if (pad) {
       buffer_probe_cb_id_ = gst_pad_add_probe(pad, GST_PAD_PROBE_TYPE_BUFFER, BufferProbeCallback, this, nullptr);
       gst_object_unref(pad);

src/engine/gstenginepipeline.h

@@ -355,6 +355,7 @@ class GstEnginePipeline : public QObject {
   GstElement *audiobin_;
   GstElement *audiosink_;
   GstElement *audioqueue_;
+  GstElement *audioqueueconverter_;
   GstElement *volume_;
   GstElement *volume_sw_;
   GstElement *volume_fading_;
@@ -363,7 +364,6 @@ class GstEnginePipeline : public QObject {
   GstElement *equalizer_;
   GstElement *equalizer_preamp_;
   GstElement *eventprobe_;
-  GstElement *bufferprobe_;
 
   std::optional<gulong> upstream_events_probe_cb_id_;
   std::optional<gulong> buffer_probe_cb_id_;

src/fileview/fileview.cpp

@@ -29,17 +29,13 @@
 #include <QString>
 #include <QStringList>
 #include <QUrl>
-#include <QStandardPaths>
+#include <QSettings>
 #include <QMessageBox>
 #include <QScrollBar>
 #include <QLineEdit>
 #include <QToolButton>
-#include <QFileDialog>
-#include <QSpacerItem>
 #include <QtEvents>
 
-#include "constants/appearancesettings.h"
-#include "constants/filefilterconstants.h"
 #include "includes/shared_ptr.h"
 #include "core/deletefiles.h"
 #include "core/filesystemmusicstorage.h"
@@ -49,11 +45,10 @@
 #include "dialogs/deleteconfirmationdialog.h"
 #include "fileview.h"
 #include "fileviewlist.h"
-#include "fileviewtree.h"
-#include "fileviewtreemodel.h"
-#include "fileviewtreeitem.h"
 #include "ui_fileview.h"
 #include "organize/organizeerrordialog.h"
+#include "constants/appearancesettings.h"
+#include "constants/filefilterconstants.h"
 
 using std::make_unique;
 using namespace Qt::Literals::StringLiterals;
@@ -62,12 +57,9 @@ FileView::FileView(QWidget *parent)
     : QWidget(parent),
       ui_(new Ui_FileView),
       model_(nullptr),
-      tree_model_(nullptr),
       undo_stack_(new QUndoStack(this)),
       task_manager_(nullptr),
-      storage_(new FilesystemMusicStorage(Song::Source::LocalFile, u"/"_s)),
-      tree_view_active_(false),
-      view_mode_spacer_(nullptr) {
+      storage_(new FilesystemMusicStorage(Song::Source::LocalFile, u"/"_s)) {
 
   ui_->setupUi(this);
 
@@ -76,14 +68,12 @@ FileView::FileView(QWidget *parent)
   ui_->forward->setIcon(IconLoader::Load(u"go-next"_s));
   ui_->home->setIcon(IconLoader::Load(u"go-home"_s));
   ui_->up->setIcon(IconLoader::Load(u"go-up"_s));
-  ui_->toggle_view->setIcon(IconLoader::Load(u"view-choose"_s));
 
   QObject::connect(ui_->back, &QToolButton::clicked, undo_stack_, &QUndoStack::undo);
   QObject::connect(ui_->forward, &QToolButton::clicked, undo_stack_, &QUndoStack::redo);
   QObject::connect(ui_->home, &QToolButton::clicked, this, &FileView::FileHome);
   QObject::connect(ui_->up, &QToolButton::clicked, this, &FileView::FileUp);
   QObject::connect(ui_->path, &QLineEdit::textChanged, this, &FileView::ChangeFilePath);
-  QObject::connect(ui_->toggle_view, &QToolButton::clicked, this, &FileView::ToggleViewMode);
 
   QObject::connect(undo_stack_, &QUndoStack::canUndoChanged, ui_->back, &FileView::setEnabled);
   QObject::connect(undo_stack_, &QUndoStack::canRedoChanged, ui_->forward, &FileView::setEnabled);
@@ -97,22 +87,6 @@ FileView::FileView(QWidget *parent)
   QObject::connect(ui_->list, &FileViewList::Delete, this, &FileView::Delete);
   QObject::connect(ui_->list, &FileViewList::EditTags, this, &FileView::EditTags);
 
-  // Connect tree view signals
-  QObject::connect(ui_->tree, &FileViewTree::AddToPlaylist, this, &FileView::AddToPlaylist);
-  QObject::connect(ui_->tree, &FileViewTree::CopyToCollection, this, &FileView::CopyToCollection);
-  QObject::connect(ui_->tree, &FileViewTree::MoveToCollection, this, &FileView::MoveToCollection);
-  QObject::connect(ui_->tree, &FileViewTree::CopyToDevice, this, &FileView::CopyToDevice);
-  QObject::connect(ui_->tree, &FileViewTree::Delete, this, &FileView::Delete);
-  QObject::connect(ui_->tree, &FileViewTree::EditTags, this, &FileView::EditTags);
-  QObject::connect(ui_->tree, &FileViewTree::activated, this, &FileView::ItemActivated);
-  QObject::connect(ui_->tree, &FileViewTree::doubleClicked, this, &FileView::ItemDoubleClick);
-
-  // Setup tree root management buttons
-  ui_->add_tree_root->setIcon(IconLoader::Load(u"folder-new"_s));
-  ui_->remove_tree_root->setIcon(IconLoader::Load(u"list-remove"_s));
-  QObject::connect(ui_->add_tree_root, &QToolButton::clicked, this, &FileView::AddRootButtonClicked);
-  QObject::connect(ui_->remove_tree_root, &QToolButton::clicked, this, &FileView::RemoveRootButtonClicked);
-
   QString filter = QLatin1String(kFileFilter);
   filter_list_ << filter.split(u' ');
 
@@ -135,19 +109,6 @@ void FileView::ReloadSettings() {
   ui_->forward->setIconSize(QSize(iconsize, iconsize));
   ui_->home->setIconSize(QSize(iconsize, iconsize));
   ui_->up->setIconSize(QSize(iconsize, iconsize));
-  ui_->toggle_view->setIconSize(QSize(iconsize, iconsize));
-  ui_->add_tree_root->setIconSize(QSize(iconsize, iconsize));
-  ui_->remove_tree_root->setIconSize(QSize(iconsize, iconsize));
-
-  // Load tree root paths setting
-  Settings file_settings;
-  file_settings.beginGroup(u"FileView"_s);
-  tree_root_paths_ = file_settings.value(u"tree_root_paths"_s, QStandardPaths::standardLocations(QStandardPaths::StandardLocation::MusicLocation)).toStringList();
-  tree_view_active_ = file_settings.value(u"tree_view_active"_s, false).toBool();
-  file_settings.endGroup();
-
-  // Set initial view mode
-  UpdateViewModeUI();
 
 }
 
@@ -219,46 +180,24 @@ void FileView::ChangeFilePathWithoutUndo(const QString &new_path) {
 }
 
 void FileView::ItemActivated(const QModelIndex &idx) {
-  // Only handle activation for list view (not tree view)
-  if (!tree_view_active_ && model_->isDir(idx)) {
+  if (model_->isDir(idx))
     ChangeFilePath(model_->filePath(idx));
-  }
 }
 
 void FileView::ItemDoubleClick(const QModelIndex &idx) {
 
-  QString file_path;
-  bool is_file = false;
-
-  // Handle tree view with virtual roots
-  if (tree_view_active_ && tree_model_) {
-    QVariant type_var = tree_model_->data(idx, FileViewTreeModel::Role_Type);
-    if (type_var.isValid()) {
-      FileViewTreeItem::Type item_type = type_var.value<FileViewTreeItem::Type>();
-      // Only handle files, ignore directories and virtual roots
-      if (item_type == FileViewTreeItem::Type::File) {
-        file_path = tree_model_->data(idx, FileViewTreeModel::Role_FilePath).toString();
-        is_file = true;
-      }
-    }
-  }
-  // Handle list view with filesystem model
-  else if (!tree_view_active_ && model_) {
-    if (!model_->isDir(idx)) {
-      file_path = model_->filePath(idx);
-      is_file = true;
-    }
+  if (model_->isDir(idx)) {
+    return;
   }
 
-  // Add file to playlist if it's a valid file
-  if (is_file && !file_path.isEmpty()) {
-    MimeData *mimedata = new MimeData;
-    mimedata->from_doubleclick_ = true;
-    mimedata->setUrls(QList<QUrl>() << QUrl::fromLocalFile(file_path));
-    mimedata->name_for_new_playlist_ = file_path;
+  QString file_path = model_->filePath(idx);
 
-    Q_EMIT AddToPlaylist(mimedata);
-  }
+  MimeData *mimedata = new MimeData;
+  mimedata->from_doubleclick_ = true;
+  mimedata->setUrls(QList<QUrl>() << QUrl::fromLocalFile(file_path));
+  mimedata->name_for_new_playlist_ = file_path;
+
+  Q_EMIT AddToPlaylist(mimedata);
 
 }
 
@@ -333,156 +272,12 @@ void FileView::showEvent(QShowEvent *e) {
   model_->setNameFilterDisables(false);
 
   ui_->list->setModel(model_);
-
-  // Create tree model
-  tree_model_ = new FileViewTreeModel(this);
-  tree_model_->SetNameFilters(filter_list_);
-
-  SetupTreeView();
-
   ChangeFilePathWithoutUndo(QDir::homePath());
 
   if (!lazy_set_path_.isEmpty()) ChangeFilePathWithoutUndo(lazy_set_path_);
 
 }
 
-void FileView::SetupTreeView() {
-
-  // Use the new tree model with virtual roots
-  ui_->tree->setModel(tree_model_);
-
-  // Set the root paths in the model
-  tree_model_->SetRootPaths(tree_root_paths_);
-
-  // No need to set root index - the model handles virtual roots
-
-}
-
-void FileView::ToggleViewMode() {
-
-  tree_view_active_ = !tree_view_active_;
-  UpdateViewModeUI();
-
-  // Save the preference
-  Settings s;
-  s.beginGroup(u"FileView"_s);
-  s.setValue(u"tree_view_active"_s, tree_view_active_);
-  s.endGroup();
-
-}
-
-void FileView::UpdateViewModeUI() {
-
-  if (tree_view_active_) {
-    ui_->view_stack->setCurrentWidget(ui_->tree_page);
-    // Hide navigation controls in tree view mode
-    ui_->back->setVisible(false);
-    ui_->forward->setVisible(false);
-    ui_->up->setVisible(false);
-    ui_->home->setVisible(false);
-    ui_->path->setVisible(false);
-    // Show tree root management buttons
-    ui_->add_tree_root->setVisible(true);
-    ui_->remove_tree_root->setVisible(true);
-    // Insert spacer in tree view if not already present
-    if (!view_mode_spacer_) {
-      view_mode_spacer_ = new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum);
-      ui_->horizontalLayout->insertSpacerItem(ui_->horizontalLayout->indexOf(ui_->toggle_view), view_mode_spacer_);
-    }
-  }
-  else {
-    ui_->view_stack->setCurrentWidget(ui_->list_page);
-    // Show navigation controls in list view mode
-    ui_->back->setVisible(true);
-    ui_->forward->setVisible(true);
-    ui_->up->setVisible(true);
-    ui_->home->setVisible(true);
-    ui_->path->setVisible(true);
-    // Hide tree root management buttons in list view
-    ui_->add_tree_root->setVisible(false);
-    ui_->remove_tree_root->setVisible(false);
-    // Remove spacer in list view
-    if (view_mode_spacer_) {
-      ui_->horizontalLayout->removeItem(view_mode_spacer_);
-      delete view_mode_spacer_;
-      view_mode_spacer_ = nullptr;
-    }
-  }
-
-}
-
-void FileView::AddTreeRootPath(const QString &path) {
-
-  if (!tree_root_paths_.contains(path)) {
-    tree_root_paths_.append(path);
-    SaveTreeRootPaths();
-
-    // Refresh the tree view to show the new root
-    if (tree_model_) {
-      SetupTreeView();
-    }
-  }
-
-}
-
-void FileView::RemoveTreeRootPath(const QString &path) {
-
-  tree_root_paths_.removeAll(path);
-  SaveTreeRootPaths();
-
-  // Refresh the tree view
-  if (tree_model_) {
-    SetupTreeView();
-  }
-
-}
-
-void FileView::SaveTreeRootPaths() {
-
-  Settings s;
-  s.beginGroup(u"FileView"_s);
-  s.setValue(u"tree_root_paths"_s, tree_root_paths_);
-  s.endGroup();
-
-}
-
-void FileView::AddRootButtonClicked() {
-
-  const QString dir = QFileDialog::getExistingDirectory(this, tr("Select folder to add as tree root"), tree_root_paths_.isEmpty() ? QDir::homePath() : tree_root_paths_.first(), QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks);
-  if (!dir.isEmpty()) {
-    AddTreeRootPath(dir);
-  }
-
-}
-
-void FileView::RemoveRootButtonClicked() {
-
-  // Get currently selected item in tree
-  QModelIndex current = ui_->tree->currentIndex();
-  if (!current.isValid()) return;
-
-  QString path;
-
-  // Get the file path from the appropriate model
-  if (tree_model_) {
-    path = tree_model_->data(current, FileViewTreeModel::Role_FilePath).toString();
-  }
-
-  if (path.isEmpty()) return;
-
-  const QString clean_path = QDir::cleanPath(path);
-
-  // Check if this path or any parent is a configured root
-  for (const QString &root : std::as_const(tree_root_paths_)) {
-    const QString clean_root = QDir::cleanPath(root);
-    if (clean_path == clean_root || clean_path.startsWith(clean_root + QDir::separator())) {
-      RemoveTreeRootPath(root);
-      return;
-    }
-  }
-
-}
-
 void FileView::keyPressEvent(QKeyEvent *e) {
 
   switch (e->key()) {

src/fileview/fileview.h

@@ -40,12 +40,10 @@ class QFileIconProvider;
 class QUndoStack;
 class QKeyEvent;
 class QShowEvent;
-class QSpacerItem;
 
 class MusicStorage;
 class TaskManager;
 class Ui_FileView;
-class FileViewTreeModel;
 
 class FileView : public QWidget {
   Q_OBJECT
@@ -78,22 +76,12 @@ class FileView : public QWidget {
   void ChangeFilePath(const QString &new_path);
   void ItemActivated(const QModelIndex &idx);
   void ItemDoubleClick(const QModelIndex &idx);
-  void ToggleViewMode();
 
   void Delete(const QStringList &filenames);
   void DeleteFinished(const SongList &songs_with_errors);
 
- public Q_SLOTS:
-  void AddTreeRootPath(const QString &path);
-  void RemoveTreeRootPath(const QString &path);
-
  private:
   void ChangeFilePathWithoutUndo(const QString &new_path);
-  void SetupTreeView();
-  void SaveTreeRootPaths();
-  void AddRootButtonClicked();
-  void RemoveRootButtonClicked();
-  void UpdateViewModeUI();
 
  private:
   class UndoCommand : public QUndoCommand {
@@ -122,21 +110,16 @@ class FileView : public QWidget {
   Ui_FileView *ui_;
 
   QFileSystemModel *model_;
-  FileViewTreeModel *tree_model_;
   QUndoStack *undo_stack_;
 
   SharedPtr<TaskManager> task_manager_;
   SharedPtr<MusicStorage> storage_;
 
   QString lazy_set_path_;
-  QStringList tree_root_paths_;
 
   QStringList filter_list_;
 
   ScopedPtr<QFileIconProvider> file_icon_provider_;
-
-  bool tree_view_active_;
-  QSpacerItem *view_mode_spacer_;
 };
 
 #endif  // FILEVIEW_H

src/fileview/fileview.ui

@@ -95,143 +95,28 @@
      <item>
       <widget class="QLineEdit" name="path"/>
      </item>
-     <item>
-      <widget class="QToolButton" name="add_tree_root">
-       <property name="toolTip">
-        <string>Add root directory</string>
-       </property>
-       <property name="iconSize">
-        <size>
-         <width>22</width>
-         <height>22</height>
-        </size>
-       </property>
-       <property name="autoRaise">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QToolButton" name="remove_tree_root">
-       <property name="toolTip">
-        <string>Remove selected root directory</string>
-       </property>
-       <property name="iconSize">
-        <size>
-         <width>22</width>
-         <height>22</height>
-        </size>
-       </property>
-       <property name="autoRaise">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QToolButton" name="toggle_view">
-       <property name="iconSize">
-        <size>
-         <width>22</width>
-         <height>22</height>
-        </size>
-       </property>
-       <property name="autoRaise">
-        <bool>true</bool>
-       </property>
-       <property name="toolTip">
-        <string>Toggle between list and tree view</string>
-       </property>
-      </widget>
-     </item>
     </layout>
    </item>
    <item>
-    <widget class="QStackedWidget" name="view_stack">
-     <property name="currentIndex">
-      <number>0</number>
+    <widget class="FileViewList" name="list">
+     <property name="dragEnabled">
+      <bool>true</bool>
+     </property>
+     <property name="dragDropMode">
+      <enum>QAbstractItemView::DragOnly</enum>
+     </property>
+     <property name="selectionMode">
+      <enum>QAbstractItemView::ExtendedSelection</enum>
+     </property>
+     <property name="selectionBehavior">
+      <enum>QAbstractItemView::SelectRows</enum>
+     </property>
+     <property name="iconSize">
+      <size>
+       <width>16</width>
+       <height>16</height>
+      </size>
      </property>
-     <widget class="QWidget" name="list_page">
-      <layout class="QVBoxLayout" name="list_layout">
-       <property name="spacing">
-        <number>0</number>
-       </property>
-       <property name="leftMargin">
-        <number>0</number>
-       </property>
-       <property name="topMargin">
-        <number>0</number>
-       </property>
-       <property name="rightMargin">
-        <number>0</number>
-       </property>
-       <property name="bottomMargin">
-        <number>0</number>
-       </property>
-       <item>
-        <widget class="FileViewList" name="list">
-         <property name="dragEnabled">
-          <bool>true</bool>
-         </property>
-         <property name="dragDropMode">
-          <enum>QAbstractItemView::DragOnly</enum>
-         </property>
-         <property name="selectionMode">
-          <enum>QAbstractItemView::ExtendedSelection</enum>
-         </property>
-         <property name="selectionBehavior">
-          <enum>QAbstractItemView::SelectRows</enum>
-         </property>
-         <property name="iconSize">
-          <size>
-           <width>16</width>
-           <height>16</height>
-          </size>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="tree_page">
-      <layout class="QVBoxLayout" name="tree_layout">
-       <property name="spacing">
-        <number>0</number>
-       </property>
-       <property name="leftMargin">
-        <number>0</number>
-       </property>
-       <property name="topMargin">
-        <number>0</number>
-       </property>
-       <property name="rightMargin">
-        <number>0</number>
-       </property>
-       <property name="bottomMargin">
-        <number>0</number>
-       </property>
-       <item>
-        <widget class="FileViewTree" name="tree">
-         <property name="dragEnabled">
-          <bool>true</bool>
-         </property>
-         <property name="dragDropMode">
-          <enum>QAbstractItemView::DragOnly</enum>
-         </property>
-         <property name="selectionMode">
-          <enum>QAbstractItemView::ExtendedSelection</enum>
-         </property>
-         <property name="selectionBehavior">
-          <enum>QAbstractItemView::SelectRows</enum>
-         </property>
-         <property name="iconSize">
-          <size>
-           <width>16</width>
-           <height>16</height>
-          </size>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </widget>
     </widget>
    </item>
   </layout>
@@ -242,11 +127,6 @@
    <extends>QListView</extends>
    <header>fileview/fileviewlist.h</header>
   </customwidget>
-  <customwidget>
-   <class>FileViewTree</class>
-   <extends>QTreeView</extends>
-   <header>fileview/fileviewtree.h</header>
-  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>

src/fileview/fileviewlist.cpp

@@ -99,7 +99,7 @@ MimeData *FileViewList::MimeDataFromSelection() const {
 
   const QStringList filenames = FilenamesFromSelection();
 
-  // If just one folder selected - use its path as the new playlist's name
+  // if just one folder selected - use its path as the new playlist's name
   if (filenames.size() == 1 && QFileInfo(filenames.first()).isDir()) {
     if (filenames.first().length() > 20) {
       mimedata->name_for_new_playlist_ = QDir(filenames.first()).dirName();
@@ -108,7 +108,7 @@ MimeData *FileViewList::MimeDataFromSelection() const {
       mimedata->name_for_new_playlist_ = filenames.first();
     }
   }
-  // Otherwise, use the current root path
+  // otherwise, use the current root path
   else {
     QString path = qobject_cast<QFileSystemModel*>(model())->rootPath();
     if (path.length() > 20) {
@@ -196,11 +196,11 @@ void FileViewList::mousePressEvent(QMouseEvent *e) {
     case Qt::XButton2:
       Q_EMIT Forward();
       break;
-    // Enqueue to playlist with middleClick
+    // enqueue to playlist with middleClick
     case Qt::MiddleButton:{
       QListView::mousePressEvent(e);
 
-      // We need to update the menu selection
+      // we need to update the menu selection
       menu_selection_ = selectionModel()->selection();
 
       MimeData *mimedata = new MimeData;

src/fileview/fileviewtree.cpp

@@ -1,205 +0,0 @@
-/*
- * Strawberry Music Player
- * Copyright 2025, Jonas Kvinge <jonas@jkvinge.net>
- *
- * Strawberry is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Strawberry is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include <algorithm>
-#include <utility>
-
-#include <QWidget>
-#include <QAbstractItemModel>
-#include <QFileInfo>
-#include <QDir>
-#include <QMenu>
-#include <QUrl>
-#include <QCollator>
-#include <QtEvents>
-
-#include "core/iconloader.h"
-#include "core/mimedata.h"
-#include "utilities/filemanagerutils.h"
-#include "fileviewtree.h"
-#include "fileviewtreemodel.h"
-
-using namespace Qt::Literals::StringLiterals;
-
-FileViewTree::FileViewTree(QWidget *parent)
-    : QTreeView(parent),
-      menu_(new QMenu(this)) {
-
-  menu_->addAction(IconLoader::Load(u"media-playback-start"_s), tr("Append to current playlist"), this, &FileViewTree::AddToPlaylistSlot);
-  menu_->addAction(IconLoader::Load(u"media-playback-start"_s), tr("Replace current playlist"), this, &FileViewTree::LoadSlot);
-  menu_->addAction(IconLoader::Load(u"document-new"_s), tr("Open in new playlist"), this, &FileViewTree::OpenInNewPlaylistSlot);
-  menu_->addSeparator();
-  menu_->addAction(IconLoader::Load(u"edit-copy"_s), tr("Copy to collection..."), this, &FileViewTree::CopyToCollectionSlot);
-  menu_->addAction(IconLoader::Load(u"go-jump"_s), tr("Move to collection..."), this, &FileViewTree::MoveToCollectionSlot);
-  menu_->addAction(IconLoader::Load(u"device"_s), tr("Copy to device..."), this, &FileViewTree::CopyToDeviceSlot);
-  menu_->addAction(IconLoader::Load(u"edit-delete"_s), tr("Delete from disk..."), this, &FileViewTree::DeleteSlot);
-
-  menu_->addSeparator();
-  menu_->addAction(IconLoader::Load(u"edit-rename"_s), tr("Edit track information..."), this, &FileViewTree::EditTagsSlot);
-  menu_->addAction(IconLoader::Load(u"document-open-folder"_s), tr("Show in file browser..."), this, &FileViewTree::ShowInBrowser);
-
-  setAttribute(Qt::WA_MacShowFocusRect, false);
-  setHeaderHidden(true);
-  setUniformRowHeights(true);
-
-}
-
-void FileViewTree::contextMenuEvent(QContextMenuEvent *e) {
-
-  menu_selection_ = selectionModel()->selection();
-
-  menu_->popup(e->globalPos());
-  e->accept();
-
-}
-
-QStringList FileViewTree::FilenamesFromSelection() const {
-
-  QStringList filenames;
-  const QModelIndexList indexes = menu_selection_.indexes();
-
-  FileViewTreeModel *tree_model = qobject_cast<FileViewTreeModel*>(model());
-  if (tree_model) {
-    for (const QModelIndex &index : indexes) {
-      if (index.column() == 0) {
-        QString path = tree_model->data(index, FileViewTreeModel::Role_FilePath).toString();
-        if (!path.isEmpty()) {
-          filenames << path;
-        }
-      }
-    }
-  }
-
-  QCollator collator;
-  collator.setNumericMode(true);
-  std::sort(filenames.begin(), filenames.end(), collator);
-
-  return filenames;
-
-}
-
-QList<QUrl> FileViewTree::UrlListFromSelection() const {
-
-  QList<QUrl> urls;
-  const QStringList filenames = FilenamesFromSelection();
-  urls.reserve(filenames.count());
-  for (const QString &filename : std::as_const(filenames)) {
-    urls << QUrl::fromLocalFile(filename);
-  }
-
-  return urls;
-
-}
-
-MimeData *FileViewTree::MimeDataFromSelection() const {
-
-  MimeData *mimedata = new MimeData;
-  mimedata->setUrls(UrlListFromSelection());
-
-  const QStringList filenames = FilenamesFromSelection();
-
-  // if just one folder selected - use its path as the new playlist's name
-  if (filenames.size() == 1 && QFileInfo(filenames.first()).isDir()) {
-    if (filenames.first().length() > 20) {
-      mimedata->name_for_new_playlist_ = QDir(filenames.first()).dirName();
-    }
-    else {
-      mimedata->name_for_new_playlist_ = filenames.first();
-    }
-  }
-  // otherwise, use "Files" as default
-  else {
-    mimedata->name_for_new_playlist_ = tr("Files");
-  }
-
-  return mimedata;
-
-}
-
-void FileViewTree::LoadSlot() {
-
-  MimeData *mimedata = MimeDataFromSelection();
-  mimedata->clear_first_ = true;
-  Q_EMIT AddToPlaylist(mimedata);
-
-}
-
-void FileViewTree::AddToPlaylistSlot() {
-  Q_EMIT AddToPlaylist(MimeDataFromSelection());
-}
-
-void FileViewTree::OpenInNewPlaylistSlot() {
-
-  MimeData *mimedata = MimeDataFromSelection();
-  mimedata->open_in_new_playlist_ = true;
-  Q_EMIT AddToPlaylist(mimedata);
-
-}
-
-void FileViewTree::CopyToCollectionSlot() {
-  Q_EMIT CopyToCollection(UrlListFromSelection());
-}
-
-void FileViewTree::MoveToCollectionSlot() {
-  Q_EMIT MoveToCollection(UrlListFromSelection());
-}
-
-void FileViewTree::CopyToDeviceSlot() {
-  Q_EMIT CopyToDevice(UrlListFromSelection());
-}
-
-void FileViewTree::DeleteSlot() {
-  Q_EMIT Delete(FilenamesFromSelection());
-}
-
-void FileViewTree::EditTagsSlot() {
-  Q_EMIT EditTags(UrlListFromSelection());
-}
-
-void FileViewTree::mousePressEvent(QMouseEvent *e) {
-
-  switch (e->button()) {
-    // Enqueue to playlist with middleClick
-    case Qt::MiddleButton:{
-      QTreeView::mousePressEvent(e);
-
-      // We need to update the menu selection
-      QItemSelectionModel *selection_model = selectionModel();
-      if (!selection_model) {
-        e->ignore();
-        return;
-      }
-      menu_selection_ = selection_model->selection();
-
-      MimeData *mimedata = new MimeData;
-      mimedata->setUrls(UrlListFromSelection());
-      mimedata->enqueue_now_ = true;
-      Q_EMIT AddToPlaylist(mimedata);
-      break;
-    }
-    default:
-      QTreeView::mousePressEvent(e);
-      break;
-  }
-
-}
-
-void FileViewTree::ShowInBrowser() {
-  Utilities::OpenInFileBrowser(UrlListFromSelection());
-}

src/fileview/fileviewtree.h

@@ -1,78 +0,0 @@
-/*
- * Strawberry Music Player
- * Copyright 2025, Jonas Kvinge <jonas@jkvinge.net>
- *
- * Strawberry is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Strawberry is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef FILEVIEWTREE_H
-#define FILEVIEWTREE_H
-
-#include <QObject>
-#include <QTreeView>
-#include <QList>
-#include <QUrl>
-#include <QString>
-#include <QStringList>
-
-class QWidget;
-class QMimeData;
-class QMenu;
-class QMouseEvent;
-class QContextMenuEvent;
-
-class MimeData;
-
-class FileViewTree : public QTreeView {
-  Q_OBJECT
-
- public:
-  explicit FileViewTree(QWidget *parent = nullptr);
-
-  void mousePressEvent(QMouseEvent *e) override;
-
- Q_SIGNALS:
-  void AddToPlaylist(QMimeData *data);
-  void CopyToCollection(const QList<QUrl> &urls);
-  void MoveToCollection(const QList<QUrl> &urls);
-  void CopyToDevice(const QList<QUrl> &urls);
-  void Delete(const QStringList &filenames);
-  void EditTags(const QList<QUrl> &urls);
-
- protected:
-  void contextMenuEvent(QContextMenuEvent *e) override;
-
- private:
-  QStringList FilenamesFromSelection() const;
-  QList<QUrl> UrlListFromSelection() const;
-  MimeData *MimeDataFromSelection() const;
-
- private Q_SLOTS:
-  void LoadSlot();
-  void AddToPlaylistSlot();
-  void OpenInNewPlaylistSlot();
-  void CopyToCollectionSlot();
-  void MoveToCollectionSlot();
-  void CopyToDeviceSlot();
-  void DeleteSlot();
-  void EditTagsSlot();
-  void ShowInBrowser();
-
- private:
-  QMenu *menu_;
-  QItemSelection menu_selection_;
-};
-
-#endif  // FILEVIEWTREE_H

src/fileview/fileviewtreeitem.h

@@ -1,52 +0,0 @@
-/*
- * Strawberry Music Player
- * Copyright 2025, Jonas Kvinge <jonas@jkvinge.net>
- *
- * Strawberry is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Strawberry is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef FILEVIEWTREEITEM_H
-#define FILEVIEWTREEITEM_H
-
-#include "config.h"
-
-#include <QFileInfo>
-
-#include "core/simpletreeitem.h"
-
-class FileViewTreeItem : public SimpleTreeItem<FileViewTreeItem> {
- public:
-  enum class Type {
-    Root,          // Hidden root
-    VirtualRoot,   // User-configured root paths
-    Directory,     // File system directory
-    File           // File system file
-  };
-
-  explicit FileViewTreeItem(SimpleTreeModel<FileViewTreeItem> *_model) : SimpleTreeItem<FileViewTreeItem>(_model), type(Type::Root), lazy_loaded(false) {}
-  explicit FileViewTreeItem(const Type _type, FileViewTreeItem *_parent = nullptr) : SimpleTreeItem<FileViewTreeItem>(_parent), type(_type), lazy_loaded(false) {}
-
-  Type type;
-  QString file_path;        // Absolute file system path
-  QFileInfo file_info;      // Cached file info
-  bool lazy_loaded;         // Whether children have been loaded
-
- private:
-  Q_DISABLE_COPY(FileViewTreeItem)
-};
-
-Q_DECLARE_METATYPE(FileViewTreeItem::Type)
-
-#endif  // FILEVIEWTREEITEM_H

src/fileview/fileviewtreemodel.cpp

@@ -1,246 +0,0 @@
-/*
- * Strawberry Music Player
- * Copyright 2025, Jonas Kvinge <jonas@jkvinge.net>
- *
- * Strawberry is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Strawberry is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include <QObject>
-#include <QVariant>
-#include <QString>
-#include <QStringList>
-#include <QList>
-#include <QMap>
-#include <QDir>
-#include <QFileInfo>
-#include <QFileIconProvider>
-#include <QMimeData>
-#include <QUrl>
-#include <QIcon>
-
-#include "core/simpletreemodel.h"
-#include "core/logging.h"
-#include "fileviewtreemodel.h"
-#include "fileviewtreeitem.h"
-
-using namespace Qt::Literals::StringLiterals;
-
-FileViewTreeModel::FileViewTreeModel(QObject *parent)
-    : SimpleTreeModel<FileViewTreeItem>(new FileViewTreeItem(this), parent),
-      icon_provider_(new QFileIconProvider()) {
-}
-
-FileViewTreeModel::~FileViewTreeModel() {
-  delete root_;
-  delete icon_provider_;
-}
-
-Qt::ItemFlags FileViewTreeModel::flags(const QModelIndex &idx) const {
-
-  const FileViewTreeItem *item = IndexToItem(idx);
-  if (!item) return Qt::NoItemFlags;
-
-  switch (item->type) {
-    case FileViewTreeItem::Type::VirtualRoot:
-    case FileViewTreeItem::Type::Directory:
-    case FileViewTreeItem::Type::File:
-      return Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsDragEnabled;
-    case FileViewTreeItem::Type::Root:
-    default:
-      return Qt::ItemIsEnabled;
-  }
-
-}
-
-QVariant FileViewTreeModel::data(const QModelIndex &idx, const int role) const {
-
-  if (!idx.isValid()) return QVariant();
-
-  const FileViewTreeItem *item = IndexToItem(idx);
-  if (!item) return QVariant();
-
-  switch (role) {
-    case Qt::DisplayRole:
-      if (item->type == FileViewTreeItem::Type::VirtualRoot) {
-        return item->display_text.isEmpty() ? item->file_path : item->display_text;
-      }
-      return item->file_info.fileName();
-
-    case Qt::DecorationRole:
-      return GetIcon(item);
-
-    case Role_Type:
-      return QVariant::fromValue(item->type);
-
-    case Role_FilePath:
-      return item->file_path;
-
-    case Role_FileName:
-      return item->file_info.fileName();
-
-    default:
-      return QVariant();
-  }
-
-}
-
-bool FileViewTreeModel::hasChildren(const QModelIndex &parent) const {
-
-  const FileViewTreeItem *item = IndexToItem(parent);
-  if (!item) return false;
-
-  // Root and VirtualRoot always have children (or can have them)
-  if (item->type == FileViewTreeItem::Type::Root) return true;
-  if (item->type == FileViewTreeItem::Type::VirtualRoot) return true;
-
-  // Directories can have children
-  if (item->type == FileViewTreeItem::Type::Directory) {
-    return true;
-  }
-
-  // Files don't have children
-  return false;
-
-}
-
-bool FileViewTreeModel::canFetchMore(const QModelIndex &parent) const {
-
-  const FileViewTreeItem *item = IndexToItem(parent);
-  if (!item) return false;
-
-  // Can fetch more if not yet lazy loaded
-  return !item->lazy_loaded && (item->type == FileViewTreeItem::Type::VirtualRoot || item->type == FileViewTreeItem::Type::Directory);
-
-}
-
-void FileViewTreeModel::fetchMore(const QModelIndex &parent) {
-
-  FileViewTreeItem *item = IndexToItem(parent);
-  if (!item || item->lazy_loaded) return;
-
-  LazyLoad(item);
-
-}
-
-void FileViewTreeModel::LazyLoad(FileViewTreeItem *item) {
-
-  if (item->lazy_loaded) return;
-
-  QDir dir(item->file_path);
-  if (!dir.exists()) {
-    item->lazy_loaded = true;
-    return;
-  }
-
-  // Apply name filters
-  const QDir::Filters filters = QDir::AllDirs | QDir::Files | QDir::NoDotAndDotDot;
-  if (!name_filters_.isEmpty()) {
-    dir.setNameFilters(name_filters_);
-  }
-
-  const QFileInfoList entries = dir.entryInfoList(filters, QDir::Name | QDir::DirsFirst);
-  if (!entries.isEmpty()) {
-    BeginInsert(item, 0, static_cast<int>(entries.count()) - 1);
-
-    for (const QFileInfo &entry : entries) {
-      FileViewTreeItem *child = new FileViewTreeItem(
-        entry.isDir() ? FileViewTreeItem::Type::Directory : FileViewTreeItem::Type::File,
-        item
-      );
-      child->file_path = entry.absoluteFilePath();
-      child->file_info = entry;
-      child->lazy_loaded = false;
-      child->display_text = entry.fileName();
-    }
-
-    EndInsert();
-  }
-
-  item->lazy_loaded = true;
-
-}
-
-QIcon FileViewTreeModel::GetIcon(const FileViewTreeItem *item) const {
-
-  if (!item) return QIcon();
-
-  switch (item->type) {
-    case FileViewTreeItem::Type::VirtualRoot:
-    case FileViewTreeItem::Type::Directory:
-      return icon_provider_->icon(QFileIconProvider::Folder);
-    case FileViewTreeItem::Type::File:
-      return icon_provider_->icon(item->file_info);
-    default:
-      return QIcon();
-  }
-
-}
-
-QStringList FileViewTreeModel::mimeTypes() const {
-  return QStringList() << u"text/uri-list"_s;
-}
-
-QMimeData *FileViewTreeModel::mimeData(const QModelIndexList &indexes) const {
-
-  if (indexes.isEmpty()) return nullptr;
-
-  QList<QUrl> urls;
-  for (const QModelIndex &idx : indexes) {
-    const FileViewTreeItem *item = IndexToItem(idx);
-    if (item && (item->type == FileViewTreeItem::Type::File || item->type == FileViewTreeItem::Type::Directory || item->type == FileViewTreeItem::Type::VirtualRoot)) {
-      urls << QUrl::fromLocalFile(item->file_path);
-    }
-  }
-
-  if (urls.isEmpty()) return nullptr;
-
-  QMimeData *data = new QMimeData();
-  data->setUrls(urls);
-  return data;
-
-}
-
-void FileViewTreeModel::SetRootPaths(const QStringList &paths) {
-
-  Reset();
-
-  for (const QString &path : paths) {
-    QFileInfo info(path);
-    if (!info.exists() || !info.isDir()) continue;
-
-    FileViewTreeItem *virtual_root = new FileViewTreeItem(FileViewTreeItem::Type::VirtualRoot, root_);
-    virtual_root->file_path = info.absoluteFilePath();
-    virtual_root->file_info = info;
-    virtual_root->display_text = info.absoluteFilePath();
-    virtual_root->lazy_loaded = false;
-  }
-
-}
-
-void FileViewTreeModel::SetNameFilters(const QStringList &filters) {
-  name_filters_ = filters;
-}
-
-void FileViewTreeModel::Reset() {
-
-  beginResetModel();
-
-  // Clear children without notifications since we're in a reset
-  qDeleteAll(root_->children);
-  root_->children.clear();
-
-  endResetModel();
-
-}

src/fileview/fileviewtreemodel.h

@@ -1,72 +0,0 @@
-/*
- * Strawberry Music Player
- * Copyright 2025, Jonas Kvinge <jonas@jkvinge.net>
- *
- * Strawberry is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Strawberry is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef FILEVIEWTREEMODEL_H
-#define FILEVIEWTREEMODEL_H
-
-#include "config.h"
-
-#include <QObject>
-#include <QVariant>
-#include <QStringList>
-#include <QIcon>
-
-#include "core/simpletreemodel.h"
-#include "fileviewtreeitem.h"
-
-class QFileIconProvider;
-class QMimeData;
-
-class FileViewTreeModel : public SimpleTreeModel<FileViewTreeItem> {
-  Q_OBJECT
-
- public:
-  explicit FileViewTreeModel(QObject *parent = nullptr);
-  ~FileViewTreeModel() override;
-
-  enum Role {
-    Role_Type = Qt::UserRole + 1,
-    Role_FilePath,
-    Role_FileName,
-    RoleCount
-  };
-
-  // QAbstractItemModel
-  Qt::ItemFlags flags(const QModelIndex &idx) const override;
-  QVariant data(const QModelIndex &idx, const int role) const override;
-  bool hasChildren(const QModelIndex &parent) const override;
-  bool canFetchMore(const QModelIndex &parent) const override;
-  void fetchMore(const QModelIndex &parent) override;
-  QStringList mimeTypes() const override;
-  QMimeData *mimeData(const QModelIndexList &indexes) const override;
-
-  void SetRootPaths(const QStringList &paths);
-  void SetNameFilters(const QStringList &filters);
-
- private:
-  void Reset();
-  void LazyLoad(FileViewTreeItem *item);
-  QIcon GetIcon(const FileViewTreeItem *item) const;
-
- private:
-  QFileIconProvider *icon_provider_;
-  QStringList name_filters_;
-};
-
-#endif  // FILEVIEWTREEMODEL_H

src/main.cpp

@@ -93,6 +93,10 @@
 #  include "discord/richpresence.h"
 #endif
 
+#ifdef HAVE_WINDOWS_MEDIA_CONTROLS
+#  include "core/windowsmediacontroller.h"
+#endif
+
 #include "core/iconloader.h"
 #include "core/commandlineoptions.h"
 #include "core/networkproxyfactory.h"
@@ -365,6 +369,11 @@ int main(int argc, char *argv[]) {
 #endif
                options);
 
+#ifdef HAVE_WINDOWS_MEDIA_CONTROLS
+  // Initialize Windows Media Transport Controls
+  WindowsMediaController windows_media_controller(reinterpret_cast<HWND>(w.winId()), app.player(), app.playlist_manager(), app.current_albumcover_loader());
+#endif
+
 #ifdef Q_OS_MACOS
   mac::EnableFullScreen(w);
 #endif  // Q_OS_MACOS

src/playlist/songloaderinserter.cpp

@@ -80,13 +80,12 @@ void SongLoaderInserter::Load(Playlist *destination, const int row, const bool p
       songs_ << loader->songs();
       playlist_name_ = loader->playlist_name();
     }
-    
-    // Always check for errors, even on success (e.g., playlist parsed but some songs failed to load)
-    const QStringList errors = loader->errors();
-    for (const QString &error : errors) {
-      Q_EMIT Error(error);
+    else {
+      const QStringList errors = loader->errors();
+      for (const QString &error : errors) {
+        Q_EMIT Error(error);
+      }
     }
-    
     delete loader;
   }
 
@@ -193,13 +192,11 @@ void SongLoaderInserter::AsyncLoad() {
     const SongLoader::Result result = loader->LoadFilenamesBlocking();
     task_manager_->SetTaskProgress(async_load_id, static_cast<quint64>(++async_progress));
 
-    // Always check for errors, even on success (e.g., playlist parsed but some songs failed to load)
-    const QStringList errors = loader->errors();
-    for (const QString &error : errors) {
-      Q_EMIT Error(error);
-    }
-
     if (result == SongLoader::Result::Error) {
+      const QStringList errors = loader->errors();
+      for (const QString &error : errors) {
+        Q_EMIT Error(error);
+      }
       continue;
     }
 

src/playlistparsers/parserbase.cpp

@@ -112,18 +112,10 @@ void ParserBase::LoadSong(const QString &filename_or_url, const qint64 beginning
     }
   }
 
-  // Check if the file exists before trying to read it
-  if (!QFile::exists(filename)) {
-    qLog(Error) << "File does not exist:" << filename;
-    Q_EMIT Error(tr("File %1 does not exist").arg(filename));
-    return;
-  }
-
   if (tagreader_client_) {
     const TagReaderResult result = tagreader_client_->ReadFileBlocking(filename, song);
     if (!result.success()) {
       qLog(Error) << "Could not read file" << filename << result.error_string();
-      Q_EMIT Error(tr("Could not read file %1: %2").arg(filename, result.error_string()));
     }
   }
 

src/translations/strawberry_ru_RU.ts

@@ -5526,7 +5526,7 @@ Are you sure you want to continue?</source>
     <name>RadioParadiseService</name>
     <message>
       <source>Getting %1 channels</source>
-      <translation>Получение каналов %1</translation>
+      <translation>Получение %1 каналов</translation>
     </message>
   </context>
   <context>
@@ -6191,7 +6191,7 @@ Are you sure you want to continue?</source>
     <name>SomaFMService</name>
     <message>
       <source>Getting %1 channels</source>
-      <translation>Получение каналов %1</translation>
+      <translation>Получение %1 каналов</translation>
     </message>
   </context>
   <context>

src/translations/strawberry_tr_TR.ts

@@ -1187,7 +1187,7 @@ If there are no matches then it will use the largest image in the directory.</tr
     </message>
     <message>
       <source>Queue to play next</source>
-      <translation>Sıradaki yap</translation>
+      <translation>Sıradaki Yap</translation>
     </message>
     <message>
       <source>Search for this</source>
@@ -3496,7 +3496,7 @@ If there are no matches then it will use the largest image in the directory.</tr
     </message>
     <message>
       <source>Queue to play next</source>
-      <translation>Sıradaki yap</translation>
+      <translation>Sıradaki Yap</translation>
     </message>
     <message>
       <source>Unskip track</source>
@@ -4431,7 +4431,7 @@ If there are no matches then it will use the largest image in the directory.</tr
     </message>
     <message>
       <source>&amp;Hide %1</source>
-      <translation>&amp;%1 ögesini sakla</translation>
+      <translation>&amp;%1&apos;i sakla</translation>
     </message>
   </context>
   <context>
@@ -6407,7 +6407,7 @@ Devam etmek istediğinizden emin misiniz?</translation>
     </message>
     <message>
       <source>Queue to play next</source>
-      <translation>Sıradaki yap</translation>
+      <translation>Sıradaki Yap</translation>
     </message>
     <message>
       <source>Remove from favorites</source>