module-rt: small fixes

Signed-off-by: Théo Lebrun <theo.lebrun@bootlin.com>
This commit is contained in:
Théo Lebrun 2022-03-11 10:33:09 +01:00 committed by Wim Taymans
parent 6798b9a933
commit 344cacd24a
2 changed files with 2 additions and 6 deletions

View file

@ -131,8 +131,6 @@ pipewire_module_profiler = shared_library('pipewire-module-profiler',
dependencies : [spa_dep, mathlib, dl_lib, pipewire_dep], dependencies : [spa_dep, mathlib, dl_lib, pipewire_dep],
) )
pipewire_module_rt = shared_library('pipewire-module-rt', [ 'module-rt.c' ], pipewire_module_rt = shared_library('pipewire-module-rt', [ 'module-rt.c' ],
include_directories : [configinc], include_directories : [configinc],
install : true, install : true,
@ -153,7 +151,7 @@ pipewire_module_rtkit = shared_library('pipewire-module-rtkit', [ 'module-rt.c'
dependencies : [dbus_dep, mathlib, dl_lib, pipewire_dep], dependencies : [dbus_dep, mathlib, dl_lib, pipewire_dep],
) )
endif endif
summary({'rtkit': build_module_rtkit}, bool_yn: true, section: 'Optional Modules') summary({'rt': '@0@ RTKit'.format(build_module_rtkit ? 'with' : 'without')}, section: 'Optional Modules')
build_module_portal = dbus_dep.found() build_module_portal = dbus_dep.found()
if build_module_portal if build_module_portal

View file

@ -557,9 +557,6 @@ static int set_rlimit(struct impl *impl)
{ {
struct rlimit rl; struct rlimit rl;
int res = 0; int res = 0;
#ifdef HAVE_DBUS
long long rttime;
#endif
spa_zero(rl); spa_zero(rl);
rl.rlim_cur = impl->rt_time_soft; rl.rlim_cur = impl->rt_time_soft;
@ -567,6 +564,7 @@ static int set_rlimit(struct impl *impl)
#ifdef HAVE_DBUS #ifdef HAVE_DBUS
if (impl->use_rtkit) { if (impl->use_rtkit) {
long long rttime;
rttime = pw_rtkit_get_rttime_usec_max(impl->system_bus); rttime = pw_rtkit_get_rttime_usec_max(impl->system_bus);
if (rttime >= 0) { if (rttime >= 0) {
if ((rlim_t)rttime < rl.rlim_cur) { if ((rlim_t)rttime < rl.rlim_cur) {