diff --git a/doc/pipewire-modules.dox b/doc/pipewire-modules.dox index 4e53aec8d..ed547ea3b 100644 --- a/doc/pipewire-modules.dox +++ b/doc/pipewire-modules.dox @@ -73,7 +73,7 @@ List of known modules: - \subpage page_module_raop_discover - \subpage page_module_roc_sink - \subpage page_module_roc_source -- \subpage page_module_rtkit +- \subpage page_module_rt - \subpage page_module_session_manager - \subpage page_module_zeroconf_discover diff --git a/meson.build b/meson.build index 7221cb776..5df1c6656 100644 --- a/meson.build +++ b/meson.build @@ -323,7 +323,7 @@ rt_lib = cc.find_library('rt', required : false) # clock_gettime dl_lib = cc.find_library('dl', required : false) pthread_lib = dependency('threads') dbus_dep = dependency('dbus-1', required : get_option('dbus')) -summary({'dbus (Bluetooth, rtkit, portal, pw-reserve)': dbus_dep.found()}, bool_yn: true, section: 'Misc dependencies') +summary({'dbus (Bluetooth, rt, portal, pw-reserve)': dbus_dep.found()}, bool_yn: true, section: 'Misc dependencies') if dbus_dep.found() cdata.set('HAVE_DBUS', 1) endif diff --git a/src/daemon/client-rt.conf.in b/src/daemon/client-rt.conf.in index fd85a9bce..ff28a3fec 100644 --- a/src/daemon/client-rt.conf.in +++ b/src/daemon/client-rt.conf.in @@ -34,8 +34,8 @@ context.modules = [ # If ifexists is given, the module is ignored when it is not found. # If nofail is given, module initialization failures are ignored. # - # Uses RTKit to boost the data thread priority. - { name = libpipewire-module-rtkit + # Uses realtime scheduling to boost the audio thread priorities + { name = libpipewire-module-rt args = { #nice.level = -11 #rt.prio = 88 diff --git a/src/daemon/filter-chain/demonic.conf b/src/daemon/filter-chain/demonic.conf index c90d73c73..562ff4868 100644 --- a/src/daemon/filter-chain/demonic.conf +++ b/src/daemon/filter-chain/demonic.conf @@ -19,8 +19,8 @@ context.spa-libs = { } context.modules = [ - # Uses RTKit to boost the data thread priority. - { name = libpipewire-module-rtkit + # Uses realtime scheduling to boost the audio thread priorities + { name = libpipewire-module-rt args = { #nice.level = -11 #rt.prio = 88 diff --git a/src/daemon/filter-chain/sink-dolby-surround.conf b/src/daemon/filter-chain/sink-dolby-surround.conf index d4d101c09..86a2b86fb 100644 --- a/src/daemon/filter-chain/sink-dolby-surround.conf +++ b/src/daemon/filter-chain/sink-dolby-surround.conf @@ -12,7 +12,7 @@ context.spa-libs = { } context.modules = [ - { name = libpipewire-module-rtkit + { name = libpipewire-module-rt args = { #nice.level = -11 #rt.prio = 88 diff --git a/src/daemon/filter-chain/sink-eq6.conf b/src/daemon/filter-chain/sink-eq6.conf index 609332e85..ad4f3b32d 100644 --- a/src/daemon/filter-chain/sink-eq6.conf +++ b/src/daemon/filter-chain/sink-eq6.conf @@ -12,7 +12,7 @@ context.spa-libs = { } context.modules = [ - { name = libpipewire-module-rtkit + { name = libpipewire-module-rt args = { #nice.level = -11 #rt.prio = 88 diff --git a/src/daemon/filter-chain/sink-matrix-spatialiser.conf b/src/daemon/filter-chain/sink-matrix-spatialiser.conf index 243c928a9..41a81c5bc 100644 --- a/src/daemon/filter-chain/sink-matrix-spatialiser.conf +++ b/src/daemon/filter-chain/sink-matrix-spatialiser.conf @@ -13,7 +13,7 @@ context.spa-libs = { } context.modules = [ - { name = libpipewire-module-rtkit + { name = libpipewire-module-rt args = { #nice.level = -11 #rt.prio = 88 diff --git a/src/daemon/filter-chain/sink-virtual-surround-5.1-kemar.conf b/src/daemon/filter-chain/sink-virtual-surround-5.1-kemar.conf index b53d27979..1bc77a83b 100644 --- a/src/daemon/filter-chain/sink-virtual-surround-5.1-kemar.conf +++ b/src/daemon/filter-chain/sink-virtual-surround-5.1-kemar.conf @@ -12,7 +12,7 @@ context.spa-libs = { } context.modules = [ - { name = libpipewire-module-rtkit + { name = libpipewire-module-rt args = { #nice.level = -11 #rt.prio = 88 diff --git a/src/daemon/filter-chain/sink-virtual-surround-7.1-hesuvi.conf b/src/daemon/filter-chain/sink-virtual-surround-7.1-hesuvi.conf index b13a2f325..7c8bcd911 100644 --- a/src/daemon/filter-chain/sink-virtual-surround-7.1-hesuvi.conf +++ b/src/daemon/filter-chain/sink-virtual-surround-7.1-hesuvi.conf @@ -12,7 +12,7 @@ context.spa-libs = { } context.modules = [ - { name = libpipewire-module-rtkit + { name = libpipewire-module-rt args = { #nice.level = -11 #rt.prio = 88 diff --git a/src/daemon/filter-chain/source-rnnoise.conf b/src/daemon/filter-chain/source-rnnoise.conf index c5531d619..bf453046c 100644 --- a/src/daemon/filter-chain/source-rnnoise.conf +++ b/src/daemon/filter-chain/source-rnnoise.conf @@ -12,7 +12,7 @@ context.spa-libs = { } context.modules = [ - { name = libpipewire-module-rtkit + { name = libpipewire-module-rt args = { #nice.level = -11 #rt.prio = 88 diff --git a/src/daemon/jack.conf.in b/src/daemon/jack.conf.in index ba1dc22a2..8e648bd37 100644 --- a/src/daemon/jack.conf.in +++ b/src/daemon/jack.conf.in @@ -35,7 +35,7 @@ context.modules = [ # # # Boost the data thread priority. - { name = libpipewire-module-rtkit + { name = libpipewire-module-rt args = { #nice.level = -11 #rt.prio = 88 diff --git a/src/daemon/pipewire-pulse.conf.in b/src/daemon/pipewire-pulse.conf.in index ccf195713..72ac9e6d0 100644 --- a/src/daemon/pipewire-pulse.conf.in +++ b/src/daemon/pipewire-pulse.conf.in @@ -19,7 +19,7 @@ context.spa-libs = { } context.modules = [ - { name = libpipewire-module-rtkit + { name = libpipewire-module-rt args = { #nice.level = -11 #rt.prio = 88 diff --git a/src/daemon/pipewire.conf.in b/src/daemon/pipewire.conf.in index 79ae0fca1..23edfd7e4 100644 --- a/src/daemon/pipewire.conf.in +++ b/src/daemon/pipewire.conf.in @@ -68,10 +68,10 @@ context.modules = [ # If nofail is given, module initialization failures are ignored. # - # Use realtime scheduling to boost the audio thread priorities. This uses + # Uses realtime scheduling to boost the audio thread priorities. This uses # RTKit if the user doesn't have permission to use regular realtime # scheduling. - { name = libpipewire-module-rtkit + { name = libpipewire-module-rt args = { #nice.level = -11 #rt.prio = 88 diff --git a/src/modules/meson.build b/src/modules/meson.build index d9150668a..df6588484 100644 --- a/src/modules/meson.build +++ b/src/modules/meson.build @@ -20,7 +20,7 @@ module_sources = [ 'module-protocol-pulse.c', 'module-protocol-simple.c', 'module-pulse-tunnel.c', - 'module-rtkit.c', + 'module-rt.c', 'module-raop-discover.c', 'module-session-manager.c', 'module-zeroconf-discover.c', @@ -136,9 +136,9 @@ pipewire_module_profiler = shared_library('pipewire-module-profiler', dependencies : [spa_dep, mathlib, dl_lib, pipewire_dep], ) -build_module_rtkit = dbus_dep.found() -if build_module_rtkit -pipewire_module_rtkit = shared_library('pipewire-module-rtkit', [ 'module-rtkit.c' ], +build_module_rt = dbus_dep.found() +if build_module_rt +pipewire_module_rt = shared_library('pipewire-module-rt', [ 'module-rt.c' ], include_directories : [configinc], install : true, install_dir : modules_install_dir, @@ -146,7 +146,7 @@ pipewire_module_rtkit = shared_library('pipewire-module-rtkit', [ 'module-rtkit. dependencies : [dbus_dep, mathlib, dl_lib, pipewire_dep], ) endif -summary({'rtkit': build_module_rtkit}, bool_yn: true, section: 'Optional Modules') +summary({'rt': build_module_rt}, bool_yn: true, section: 'Optional Modules') build_module_portal = dbus_dep.found() if build_module_portal diff --git a/src/modules/module-rtkit.c b/src/modules/module-rt.c similarity index 99% rename from src/modules/module-rtkit.c rename to src/modules/module-rt.c index 7d3a00d20..a06e1aadf 100644 --- a/src/modules/module-rtkit.c +++ b/src/modules/module-rt.c @@ -45,9 +45,9 @@ #include #include -/** \page page_module_rtkit PipeWire Module: RTKit +/** \page page_module_rt PipeWire Module: RT * - * The `rtkit` module uses the operating system's scheduler to enable realtime + * The `rt` module uses the operating system's scheduler to enable realtime * scheduling for certain threads to assist with low latency audio processing. * This requires `RLIMIT_RTPRIO` to be set to a value that's equal to this * module's `rt.prio` parameter or higher. Most distros will come with some @@ -55,8 +55,7 @@ * up and DBus is available, then this module will fall back to using RTKit. */ -// TODO: Rename from rtkit/RTKit to rt/RT -#define NAME "rtkit" +#define NAME "rt" PW_LOG_TOPIC_STATIC(mod_topic, "mod." NAME); #define PW_LOG_TOPIC_DEFAULT mod_topic