diff --git a/CMakeLists.txt b/CMakeLists.txt index 3cab55b..f7f84b5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,14 +31,15 @@ set(META_APP_URL "https://github.com/${META_APP_AUTHOR}/${META_PROJECT_NAME}") set(META_APP_DESCRIPTION "Records sound from Pulse Audio with ffmpeg while watching D-Bus to determine tracks and meta information") set(META_VERSION_MAJOR 1) set(META_VERSION_MINOR 2) -set(META_VERSION_PATCH 2) +set(META_VERSION_PATCH 3) # find c++utilities -find_package(c++utilities 4.10.0 REQUIRED) +set(CONFIGURATION_PACKAGE_SUFFIX "" CACHE STRING "sets the suffix for find_package() calls to packages configured via c++utilities") +find_package(c++utilities${CONFIGURATION_PACKAGE_SUFFIX} 5.0.0 REQUIRED) use_cpp_utilities() # find qtutilities -find_package(qtutilities 5.0.0 REQUIRED) +find_package(qtutilities${CONFIGURATION_PACKAGE_SUFFIX} 6.0.0 REQUIRED) list(APPEND CMAKE_MODULE_PATH ${QT_UTILITIES_MODULE_DIRS}) # include modules to apply configuration diff --git a/ffmpeglauncher.cpp b/ffmpeglauncher.cpp index acef709..866bf74 100644 --- a/ffmpeglauncher.cpp +++ b/ffmpeglauncher.cpp @@ -2,7 +2,6 @@ #include "playerwatcher.h" #include -#include #include #include @@ -149,9 +148,8 @@ void FfmpegLauncher::nextSong() cerr << "Warning: Ignoring unknown section [" << scope.first << "] in info.ini." << endl; } } - } catch (...) { - ::IoUtilities::catchIoFailure(); - cerr << "Warning: Can't parse info.ini because an IO error occured." << endl; + } catch (const std::ios_base::failure &failure) { + cerr << "Warning: Can't parse info.ini because an IO error occured: " << failure.what() << endl; } } // determine target name/path