From 2c6be94a6b4cf28e5618d317b2742e7edb8c5bf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Moczulski?= Date: Sun, 12 May 2024 23:07:47 +0200 Subject: [PATCH 01/15] There are cmake errors if libav is not found, so made it required. Also added intellij files to .gitignore. --- .gitignore | 4 +++- src/libs/av/CMakeLists.txt | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index b8617e347..d3419b0be 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,6 @@ CMakeCache.txt CMakeFiles/ build/ -.vscode/ \ No newline at end of file +.vscode/ +cmake-build-*/ +.idea/ \ No newline at end of file diff --git a/src/libs/av/CMakeLists.txt b/src/libs/av/CMakeLists.txt index be2bd834c..6e45f402f 100644 --- a/src/libs/av/CMakeLists.txt +++ b/src/libs/av/CMakeLists.txt @@ -1,4 +1,4 @@ -pkg_check_modules(LIBAV IMPORTED_TARGET libavcodec libavutil libavformat) +pkg_check_modules(LIBAV REQUIRED IMPORTED_TARGET libavcodec libavutil libavformat) add_library(lmsav SHARED impl/AudioFile.cpp From 675364810490b391d390c95e181676577266e4fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Moczulski?= Date: Tue, 14 May 2024 15:20:13 +0200 Subject: [PATCH 02/15] Basic multisearch interface. --- approot/main.xml | 2 + approot/multisearch.xml | 123 +++++++++++++++++++ src/lms/CMakeLists.txt | 4 +- src/lms/ui/LmsApplication.cpp | 6 +- src/lms/ui/explore/DatabaseCollectorBase.cpp | 6 +- src/lms/ui/explore/DatabaseCollectorBase.hpp | 17 ++- src/lms/ui/explore/Explore.cpp | 8 +- src/lms/ui/explore/Explore.hpp | 2 +- src/lms/ui/explore/MultisearchCollector.cpp | 60 +++++++++ src/lms/ui/explore/MultisearchCollector.hpp | 43 +++++++ src/lms/ui/explore/MultisearchView.cpp | 95 ++++++++++++++ src/lms/ui/explore/MultisearchView.hpp | 52 ++++++++ 12 files changed, 402 insertions(+), 16 deletions(-) create mode 100644 approot/multisearch.xml create mode 100644 src/lms/ui/explore/MultisearchCollector.cpp create mode 100644 src/lms/ui/explore/MultisearchCollector.hpp create mode 100644 src/lms/ui/explore/MultisearchView.cpp create mode 100644 src/lms/ui/explore/MultisearchView.hpp diff --git a/approot/main.xml b/approot/main.xml index 0dea95e88..25a769ed4 100644 --- a/approot/main.xml +++ b/approot/main.xml @@ -34,6 +34,8 @@ ${filters class="d-flex align-items-center me-auto mb-2 mb-md-0"}
+ ${multisearch class="form-control form-control-sm me-1" type="search"} + ${}