Skip to content

Fix default configuration path and mesh size fallback on Linux #140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
discordianfish-bot wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −4
Open

Fix default configuration path and mesh size fallback on Linux #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT ENABLE_FLAT_PACKAGE)
set(PROJECTMSDL_DESKTOP_DIR "${CMAKE_INSTALL_DATAROOTDIR}/applications" CACHE STRING "Directory to install the .desktop file in, relative to the install prefix.")
set(PROJECTMSDL_ICONS_DIR "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor" CACHE STRING "Directory to install the icons in, relative to the install prefix.")

GNUInstallDirs_get_absolute_install_dir(_config_dir_abs_init PROJECTMSDL_CONFIG_DIR DATAROOTDIR)
GNUInstallDirs_get_absolute_install_dir(_config_dir_abs_init PROJECTMSDL_DATA_DIR DATAROOTDIR)
set(DEFAULT_CONFIG_PATH "${_config_dir_abs_init}" CACHE STRING "Optional path to look for the configuration file in addition to PROJECTMSDL_BIN_DIR. May include POCO variables like \${application.dir}.")
set(DEFAULT_PRESETS_PATH "${_config_dir_abs_init}/presets" CACHE STRING "Default presets path in the configuration file. May include POCO variables like \${application.dir}.")
set(DEFAULT_TEXTURES_PATH "${_config_dir_abs_init}/textures" CACHE STRING "Default textures path in the configuration file. May include POCO variables like \${application.dir}.")
Expand Down
4 changes: 4 additions & 0 deletions src/ProjectMSDLApplication.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,10 @@ void ProjectMSDLApplication::initialize(Poco::Util::Application& self)
{
loadConfiguration(configFilePath.toString(), PRIO_DEFAULT);
}
else
{
poco_warning_f1(logger(), "Default configuration file %s not found, using built-in defaults.", configFilePath.toString());
}
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/ProjectMWrapper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,10 +163,10 @@ void ProjectMWrapper::RenderFrame()
size_t currentMeshX{0};
size_t currentMeshY{0};
projectm_get_mesh_size(_projectM, &currentMeshX, &currentMeshY);
if (currentMeshX != _projectMConfigView->getInt("meshX", 220) ||
currentMeshY != _projectMConfigView->getInt("meshY", 125))
if (currentMeshX != _projectMConfigView->getInt("meshX", 48) ||
currentMeshY != _projectMConfigView->getInt("meshY", 32))
{
projectm_set_mesh_size(_projectM, _projectMConfigView->getInt("meshX", 220), _projectMConfigView->getInt("meshY", 125));
projectm_set_mesh_size(_projectM, _projectMConfigView->getInt("meshX", 48), _projectMConfigView->getInt("meshY", 32));
}

// Add new audio data to the instance from the staging buffer
Expand Down