Martchus
/
dbus-soundrecorder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Adapt to c++utilities v5

This commit is contained in:
Martchus 2019-03-14 17:53:37 +01:00
parent 7065b62aee
commit 7f104eb525
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -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

6
ffmpeglauncher.cpp
View File

@ -2,7 +2,6 @@
#include "playerwatcher.h"
#include <c++utilities/conversion/stringconversion.h>
#include <c++utilities/io/catchiofailure.h>
#include <c++utilities/io/inifile.h>
#include <QStringBuilder>
@ -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