ilusha/Modules
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Small fixes from windows

Browse source
This commit is contained in:
Ilusha 2024-01-17 16:14:47 -08:00 • committed by Ilya Shurupov
parent 420bb37039
commit b26310439d
4 changed files with 24 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -5,3 +5,5 @@ build*
lib lib
install install
.vscode .vscode
out
.vs

13
Externals/CMakeLists.txt vendored
View file

@ -5,8 +5,17 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
find_package(GLEW REQUIRED) find_package(GLEW REQUIRED)
set(GLEW_LIB ${GLEW_STATIC_LIBRARY_RELEASE} opengl32.lib PARENT_SCOPE) set(GLEW_LIB ${GLEW_STATIC_LIBRARY_RELEASE} opengl32.lib PARENT_SCOPE)
set(PORTAUDIO_INCLUDE_DIR "../../ModulesWindowsLibraries/portaudio/include" PARENT_SCOPE) # Your relative paths
set(PORTAUDIO_LIB "../../ModulesWindowsLibraries/portaudio_build/Debug/portaudio" PARENT_SCOPE) 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() else()
find_package(GLEW REQUIRED) find_package(GLEW REQUIRED)
set(GLEW_LIB ${GLEW_LIBRARIES} GL PARENT_SCOPE) set(GLEW_LIB ${GLEW_LIBRARIES} GL PARENT_SCOPE)

21
LibraryViewer/applications/Entry.cpp
View file

@ -1,12 +1,12 @@
#include "Player.hpp"
#include "GUI.hpp" #include "GUI.hpp"
#include "Player.hpp"
// 1) artworks // 1) artworks
// 2) how to easy add more songs? // 2) how to easy add more songs?
// 3) GUi : // 3) GUi :
// - seeker // - seeker
// - song idx // - song idx
// - non existing highlight // - non existing highlight
// - prev next // - prev next
// - remove debug gui // - remove debug gui
@ -14,19 +14,20 @@
// 5) new database with history // 5) new database with history
void runApp() { void runApp() {
Player player; Player player;
Library library; library.loadJson(getHome() + "Library.json"); library.checkExisting(); Library library;
library.loadJson(getHome() + "Library.json");
library.checkExisting();
LibraryWidget<tp::Window::Events, tp::Graphics::Canvas> gui(&library, &player); LibraryWidget<tp::Window::Events, tp::Graphics::Canvas> gui(&library, &player);
auto window = tp::Window::createWindow(800, 600, "Window 1"); auto window = tp::Window::createWindow(800, 600, "Window 1");
if (window) { if (window) {
while (!window->shouldClose()) { while (!window->shouldClose()) {
window->processEvents(); window->processEvents();
auto area = window->getCanvas().getAvaliableArea(); auto area = window->getCanvas().getAvaliableArea();
gui.proc(window->getEvents(), {}, { area.x, area.y, area.z, area.w }); gui.proc(window->getEvents(), {}, { area.x, area.y, area.z, area.w });
gui.draw(window->getCanvas(), {}, { 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; return 1;
} }
runApp(); runApp();
binModule.deinitialize(); binModule.deinitialize();
} }

BIN
LibraryViewer/library/traks/2437.wav → LibraryViewer/library/tracks/2437.flac
View file

Binary file not shown.