Исправил пару ошибок

CMakeLists.txt

@@ -26,8 +26,13 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 find_package(Python3 COMPONENTS Development REQUIRED)
 
-find_package(QT NAMES Qt6 Qt5 COMPONENTS Core Quick LinguistTools Multimedia DBus REQUIRED)
-find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Quick LinguistTools Multimedia DBus REQUIRED)
+set(qt_winextras )
+if(WIN32)
+  set(qt_winextras WinExtras)
+endif()
+
+find_package(QT NAMES Qt6 Qt5 COMPONENTS Core Quick LinguistTools Multimedia DBus ${qt_winextras} REQUIRED)
+find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Quick LinguistTools Multimedia DBus ${qt_winextras} REQUIRED)
 
 set(TS_FILES ${PROJECT_NAME}_ru_RU.ts)
 
@@ -61,5 +66,8 @@ target_link_libraries(${PROJECT_NAME} PRIVATE
   Qt${QT_VERSION_MAJOR}::Multimedia
   Qt${QT_VERSION_MAJOR}::DBus
 )
+if(WIN32)
+  target_link_libraries(${PROJECT_NAME} PRIVATE Qt${QT_VERSION_MAJOR}::WinExtras)
+endif()
 
 target_include_directories(${PROJECT_NAME} PRIVATE ${Python3_INCLUDE_DIRS})

Log.hpp

@@ -1,5 +1,6 @@
 #pragma once
 #include <QString>
+#undef log
 
 struct Log
 {
@@ -9,4 +10,4 @@ struct Log
   Log& error(QString s);
 };
 
-inline static Log log;
+inline static Log logging;

api.cpp

@@ -146,7 +146,7 @@ Playlist::Generator DPlaylist::sequenceGenerator(int index)
 
 Playlist::Generator DPlaylist::shuffleGenerator(int index)
 {
-  if (index < 0 || index > size()) return shuffleGenerator(QRandomGenerator::global()->bounded(_tracks.length() - 1));
+  if (index < 0 || index > size()) return shuffleGenerator(QRandomGenerator::global()->bounded(_tracks.length()));
 
   _history = _tracks;
   std::shuffle(_history.begin(), _history.end(), rnd);

main.cpp

@@ -6,6 +6,7 @@
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 #include <QIcon>
+#include <QtWinExtras>
 
 int main(int argc, char *argv[])
 {
@@ -21,8 +22,7 @@ int main(int argc, char *argv[])
   qmlRegisterType<Settings>("DMusic", 1, 0, "Settings");
   qmlRegisterType<RemoteMediaController>("DMusic", 1, 0, "RemoteMediaController");
 
-  if (QFileInfo::exists("application.svg"))
-    QGuiApplication::setWindowIcon(QIcon("application.svg"));
+  QGuiApplication::setWindowIcon(QIcon(":resources/application.svg"));
   app.setApplicationName("DMusic");
 
   QQmlApplicationEngine engine;

mediaplayer.cpp

@@ -163,7 +163,7 @@ void MediaPlayer::setMedia(QMediaContent media)
 
 void MediaPlayer::onMediaAborted()
 {
-  log.error("media aborted");
+  logging.error("media aborted");
   next();
 }
 

yapi.cpp

@@ -2,6 +2,7 @@
 #include "file.hpp"
 #include "settings.hpp"
 #include "utils.hpp"
+#include "Log.hpp"
 #include <thread>
 #include <functional>
 #include <QDebug>
@@ -309,7 +310,10 @@ QMediaContent YTrack::media()
 {
   if (_media.isEmpty()) {
     if (!_noMedia) _downloadMedia(); // async
-    else emit mediaAborted();
+    else {
+      logging.warning("yandex/" + QString::number(id()) + ": no media");
+      emit mediaAborted();
+    }
     return {};
   }
   return QMediaContent("file:" + QDir::cleanPath(Settings::ym_savePath() + QDir::separator() + _media));