diff --git a/.gitignore b/.gitignore index b0247cb..8232fdf 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,5 @@ build* lib install .vscode +out +.vs \ No newline at end of file diff --git a/Externals/CMakeLists.txt b/Externals/CMakeLists.txt index 3542789..c82fc6e 100644 --- a/Externals/CMakeLists.txt +++ b/Externals/CMakeLists.txt @@ -5,8 +5,17 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows") find_package(GLEW REQUIRED) set(GLEW_LIB ${GLEW_STATIC_LIBRARY_RELEASE} opengl32.lib PARENT_SCOPE) - set(PORTAUDIO_INCLUDE_DIR "../../ModulesWindowsLibraries/portaudio/include" PARENT_SCOPE) - set(PORTAUDIO_LIB "../../ModulesWindowsLibraries/portaudio_build/Debug/portaudio" PARENT_SCOPE) + # Your relative paths + set(RELATIVE_INCLUDE_DIR "../../ModulesWindowsLibraries/portaudio/include") + set(RELATIVE_LIB "../../ModulesWindowsLibraries/portaudio_build/Debug/portaudio.lib") + + # Convert to absolute paths + get_filename_component(ABSOLUTE_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/${RELATIVE_INCLUDE_DIR}" ABSOLUTE) + get_filename_component(ABSOLUTE_LIB "${CMAKE_CURRENT_SOURCE_DIR}/${RELATIVE_LIB}" ABSOLUTE) + + # Set absolute paths with respect to the parent scope + set(PORTAUDIO_INCLUDE_DIR "${ABSOLUTE_INCLUDE_DIR}" PARENT_SCOPE) + set(PORTAUDIO_LIB "${ABSOLUTE_LIB}" PARENT_SCOPE) else() find_package(GLEW REQUIRED) set(GLEW_LIB ${GLEW_LIBRARIES} GL PARENT_SCOPE) diff --git a/LibraryViewer/applications/Entry.cpp b/LibraryViewer/applications/Entry.cpp index f769322..029d55e 100644 --- a/LibraryViewer/applications/Entry.cpp +++ b/LibraryViewer/applications/Entry.cpp @@ -1,12 +1,12 @@ -#include "Player.hpp" #include "GUI.hpp" +#include "Player.hpp" // 1) artworks // 2) how to easy add more songs? // 3) GUi : -// - seeker -// - song idx +// - seeker +// - song idx // - non existing highlight // - prev next // - remove debug gui @@ -14,19 +14,20 @@ // 5) new database with history void runApp() { - Player player; - Library library; library.loadJson(getHome() + "Library.json"); library.checkExisting(); + Library library; + library.loadJson(getHome() + "Library.json"); + library.checkExisting(); LibraryWidget gui(&library, &player); - auto window = tp::Window::createWindow(800, 600, "Window 1"); + auto window = tp::Window::createWindow(800, 600, "Window 1"); if (window) { while (!window->shouldClose()) { window->processEvents(); - + auto area = window->getCanvas().getAvaliableArea(); - + gui.proc(window->getEvents(), {}, { area.x, area.y, area.z, area.w }); gui.draw(window->getCanvas(), {}, { area.x, area.y, area.z, area.w }); @@ -48,7 +49,7 @@ int main() { return 1; } - runApp(); - + runApp(); + binModule.deinitialize(); } diff --git a/LibraryViewer/library/traks/2437.wav b/LibraryViewer/library/tracks/2437.flac similarity index 62% rename from LibraryViewer/library/traks/2437.wav rename to LibraryViewer/library/tracks/2437.flac index 8cbc3f1..560ceba 100644 Binary files a/LibraryViewer/library/traks/2437.wav and b/LibraryViewer/library/tracks/2437.flac differ