diff --git a/CMakeLists.txt b/CMakeLists.txt index 3ee7050..e9b24bc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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}.") diff --git a/src/ProjectMSDLApplication.cpp b/src/ProjectMSDLApplication.cpp index 3d12e58..b71373a 100644 --- a/src/ProjectMSDLApplication.cpp +++ b/src/ProjectMSDLApplication.cpp @@ -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()); + } } } } diff --git a/src/ProjectMWrapper.cpp b/src/ProjectMWrapper.cpp index f176a34..abe8f85 100644 --- a/src/ProjectMWrapper.cpp +++ b/src/ProjectMWrapper.cpp @@ -163,10 +163,10 @@ void ProjectMWrapper::RenderFrame() size_t currentMeshX{0}; size_t currentMeshY{0}; projectm_get_mesh_size(_projectM, ¤tMeshX, ¤tMeshY); - 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