Merge branch 'master' into qstring-refactor

Signed-off-by: Integral <[email protected]>
kraxarn · Dec 7, 2024 · c9b9f68 · c9b9f68
2 parents 5b6b978 + 0045d7e
commit c9b9f68
Show file tree

Hide file tree

Showing 36 changed files with 129 additions and 1,172 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.9)
+cmake_minimum_required(VERSION 3.10)
 
 project(spotify-qt LANGUAGES CXX VERSION 3.11)
 

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.10)
 project(spotify-qt-lib LANGUAGES CXX VERSION 0.9)
 
 set(CMAKE_CXX_STANDARD 11)
@@ -28,7 +28,6 @@ target_include_directories(spotify-qt-lib PUBLIC
 
 # Third-party libraries
 add_subdirectory(thirdparty)
-target_link_libraries(spotify-qt-lib PUBLIC spotify-qt-lib-third-party)
 
 # Version macros
 target_compile_definitions(spotify-qt-lib PUBLIC LIB_VERSION="v${PROJECT_VERSION}")

diff --git a/lib/include/lib/enum/audiofeature.hpp b/lib/include/lib/enum/audiofeature.hpp
diff --git a/lib/include/lib/enum/audiokey.hpp b/lib/include/lib/enum/audiokey.hpp
diff --git a/lib/include/lib/enum/audiomode.hpp b/lib/include/lib/enum/audiomode.hpp
diff --git a/lib/include/lib/spotify/api.hpp b/lib/include/lib/spotify/api.hpp
@@ -7,7 +7,6 @@
 #include "lib/enum/repeatstate.hpp"
 #include "lib/spotify/album.hpp"
 #include "lib/spotify/artist.hpp"
-#include "lib/spotify/audiofeatures.hpp"
 #include "lib/spotify/callback.hpp"
 #include "lib/spotify/episode.hpp"
 #include "lib/spotify/page.hpp"
@@ -315,12 +314,6 @@ namespace lib
 			void track(const std::string &track_id,
 				lib::callback<lib::spt::track> &callback);
 
-			void track_audio_features(const std::string &track_id,
-				lib::callback<lib::spt::audio_features> &callback);
-
-			void track_audio_features(const std::vector<std::string> &track_ids,
-				lib::callback<std::vector<lib::spt::audio_features>> &callback);
-
 			//endregion
 
 			//region User Profile

diff --git a/lib/include/lib/spotify/audiofeature.hpp b/lib/include/lib/spotify/audiofeature.hpp
diff --git a/lib/include/lib/spotify/audiofeatures.hpp b/lib/include/lib/spotify/audiofeatures.hpp
diff --git a/lib/include/lib/spotify/show.hpp b/lib/include/lib/spotify/show.hpp
@@ -16,11 +16,6 @@ namespace lib
 		class show: public entity
 		{
 		public:
-			/**
-			 * Countries, in ISO 3166, which show can be played in
-			 */
-			std::vector<std::string> available_markets;
-
 			/**
 			 * Description in plain text
 			 */