mirror of
https://gitlab.freedesktop.org/pipewire/pipewire
synced 2024-10-15 04:12:29 +00:00
rename signal -> sig
Meson puts the directory of the source file in the include path and then it picks up our signal.h instead of the system one...
This commit is contained in:
parent
497febf2f1
commit
3dada4731c
|
@ -116,7 +116,6 @@ configure_file(input : 'config.h.meson',
|
||||||
configuration : cdata)
|
configuration : cdata)
|
||||||
|
|
||||||
configinc = include_directories('.')
|
configinc = include_directories('.')
|
||||||
pinosinc = include_directories('pinos')
|
|
||||||
|
|
||||||
# Find dependencies
|
# Find dependencies
|
||||||
glib_dep = dependency('glib-2.0', version : '>=2.32.0')
|
glib_dep = dependency('glib-2.0', version : '>=2.32.0')
|
||||||
|
|
|
@ -513,21 +513,17 @@ loop_add_signal (SpaLoopUtils *utils,
|
||||||
{
|
{
|
||||||
PinosLoopImpl *impl = SPA_CONTAINER_OF (utils, PinosLoopImpl, utils);
|
PinosLoopImpl *impl = SPA_CONTAINER_OF (utils, PinosLoopImpl, utils);
|
||||||
SpaSourceImpl *source;
|
SpaSourceImpl *source;
|
||||||
#if 0
|
|
||||||
sigset_t mask;
|
sigset_t mask;
|
||||||
#endif
|
|
||||||
|
|
||||||
source = calloc (1, sizeof (SpaSourceImpl));
|
source = calloc (1, sizeof (SpaSourceImpl));
|
||||||
|
|
||||||
source->source.loop = &impl->loop;
|
source->source.loop = &impl->loop;
|
||||||
source->source.func = source_signal_func;
|
source->source.func = source_signal_func;
|
||||||
source->source.data = data;
|
source->source.data = data;
|
||||||
#if 0
|
|
||||||
sigemptyset (&mask);
|
sigemptyset (&mask);
|
||||||
sigaddset (&mask, signal_number);
|
sigaddset (&mask, signal_number);
|
||||||
source->source.fd = signalfd (-1, &mask, SFD_CLOEXEC | SFD_NONBLOCK);
|
source->source.fd = signalfd (-1, &mask, SFD_CLOEXEC | SFD_NONBLOCK);
|
||||||
sigprocmask (SIG_BLOCK, &mask, NULL);
|
sigprocmask (SIG_BLOCK, &mask, NULL);
|
||||||
#endif
|
|
||||||
source->source.mask = SPA_IO_IN;
|
source->source.mask = SPA_IO_IN;
|
||||||
source->close = true;
|
source->close = true;
|
||||||
source->func.signal = func;
|
source->func.signal = func;
|
||||||
|
|
|
@ -26,7 +26,7 @@ extern "C" {
|
||||||
|
|
||||||
#include <spa/include/spa/list.h>
|
#include <spa/include/spa/list.h>
|
||||||
#include <spa/include/spa/loop.h>
|
#include <spa/include/spa/loop.h>
|
||||||
#include <pinos/client/signal.h>
|
#include <pinos/client/sig.h>
|
||||||
|
|
||||||
typedef struct _PinosLoop PinosLoop;
|
typedef struct _PinosLoop PinosLoop;
|
||||||
|
|
||||||
|
|
|
@ -34,7 +34,7 @@ typedef struct _PinosTransportArea PinosTransportArea;
|
||||||
#include <spa/node.h>
|
#include <spa/node.h>
|
||||||
|
|
||||||
#include <pinos/client/mem.h>
|
#include <pinos/client/mem.h>
|
||||||
#include <pinos/client/signal.h>
|
#include <pinos/client/sig.h>
|
||||||
|
|
||||||
#define PINOS_TRANSPORT_CMD_NONE 0
|
#define PINOS_TRANSPORT_CMD_NONE 0
|
||||||
#define PINOS_TRANSPORT_CMD_NEED_DATA (1<<0)
|
#define PINOS_TRANSPORT_CMD_NEED_DATA (1<<0)
|
||||||
|
|
|
@ -8,7 +8,7 @@ pinos_module_c_args = [
|
||||||
|
|
||||||
pinos_module_autolink = shared_library('pinos-module-autolink', [ 'module-autolink.c' ],
|
pinos_module_autolink = shared_library('pinos-module-autolink', [ 'module-autolink.c' ],
|
||||||
c_args : pinos_module_c_args,
|
c_args : pinos_module_c_args,
|
||||||
include_directories : [configinc, pinosinc, spa_inc],
|
include_directories : [configinc, spa_inc],
|
||||||
link_with : spalib,
|
link_with : spalib,
|
||||||
install : true,
|
install : true,
|
||||||
install_dir : '@0@/pinos-0.1'.format(get_option('libdir')),
|
install_dir : '@0@/pinos-0.1'.format(get_option('libdir')),
|
||||||
|
@ -17,7 +17,7 @@ pinos_module_autolink = shared_library('pinos-module-autolink', [ 'module-autoli
|
||||||
|
|
||||||
pinos_module_protocol_dbus = shared_library('pinos-module-protocol-dbus', [ 'module-protocol-dbus.c', gdbus_target ],
|
pinos_module_protocol_dbus = shared_library('pinos-module-protocol-dbus', [ 'module-protocol-dbus.c', gdbus_target ],
|
||||||
c_args : pinos_module_c_args,
|
c_args : pinos_module_c_args,
|
||||||
include_directories : [configinc, pinosinc, spa_inc],
|
include_directories : [configinc, spa_inc],
|
||||||
link_with : spalib,
|
link_with : spalib,
|
||||||
install : true,
|
install : true,
|
||||||
install_dir : '@0@/pinos-0.1'.format(get_option('libdir')),
|
install_dir : '@0@/pinos-0.1'.format(get_option('libdir')),
|
||||||
|
@ -26,7 +26,7 @@ pinos_module_protocol_dbus = shared_library('pinos-module-protocol-dbus', [ 'mod
|
||||||
|
|
||||||
pinos_module_protocol_native = shared_library('pinos-module-protocol-native', [ 'module-protocol-native.c' ],
|
pinos_module_protocol_native = shared_library('pinos-module-protocol-native', [ 'module-protocol-native.c' ],
|
||||||
c_args : pinos_module_c_args,
|
c_args : pinos_module_c_args,
|
||||||
include_directories : [configinc, pinosinc, spa_inc],
|
include_directories : [configinc, spa_inc],
|
||||||
link_with : spalib,
|
link_with : spalib,
|
||||||
install : true,
|
install : true,
|
||||||
install_dir : '@0@/pinos-0.1'.format(get_option('libdir')),
|
install_dir : '@0@/pinos-0.1'.format(get_option('libdir')),
|
||||||
|
@ -35,7 +35,7 @@ pinos_module_protocol_native = shared_library('pinos-module-protocol-native', [
|
||||||
|
|
||||||
pinos_module_suspend_on_idle = shared_library('pinos-module-suspend-on-idle', [ 'module-suspend-on-idle.c' ],
|
pinos_module_suspend_on_idle = shared_library('pinos-module-suspend-on-idle', [ 'module-suspend-on-idle.c' ],
|
||||||
c_args : pinos_module_c_args,
|
c_args : pinos_module_c_args,
|
||||||
include_directories : [configinc, pinosinc, spa_inc],
|
include_directories : [configinc, spa_inc],
|
||||||
link_with : spalib,
|
link_with : spalib,
|
||||||
install : true,
|
install : true,
|
||||||
install_dir : '@0@/pinos-0.1'.format(get_option('libdir')),
|
install_dir : '@0@/pinos-0.1'.format(get_option('libdir')),
|
||||||
|
|
|
@ -16,7 +16,7 @@ pinos_module_spa_c_args = [
|
||||||
|
|
||||||
pinos_module_spa = shared_library('pinos-module-spa', pinos_module_spa_sources,
|
pinos_module_spa = shared_library('pinos-module-spa', pinos_module_spa_sources,
|
||||||
c_args : pinos_module_spa_c_args,
|
c_args : pinos_module_spa_c_args,
|
||||||
include_directories : [configinc, pinosinc, spa_inc],
|
include_directories : [configinc, spa_inc],
|
||||||
link_with : spalib,
|
link_with : spalib,
|
||||||
install : true,
|
install : true,
|
||||||
install_dir : '@0@/pinos-0.1'.format(get_option('libdir')),
|
install_dir : '@0@/pinos-0.1'.format(get_option('libdir')),
|
||||||
|
|
|
@ -21,9 +21,9 @@
|
||||||
#include <getopt.h>
|
#include <getopt.h>
|
||||||
#include <limits.h>
|
#include <limits.h>
|
||||||
|
|
||||||
#include <client/utils.h>
|
#include <pinos/client/utils.h>
|
||||||
#include <server/core.h>
|
#include <pinos/server/core.h>
|
||||||
#include <server/module.h>
|
#include <pinos/server/module.h>
|
||||||
|
|
||||||
#include "spa-monitor.h"
|
#include "spa-monitor.h"
|
||||||
#include "spa-node.h"
|
#include "spa-node.h"
|
||||||
|
|
|
@ -20,8 +20,8 @@
|
||||||
#ifndef __PINOS_SPA_NODE_H__
|
#ifndef __PINOS_SPA_NODE_H__
|
||||||
#define __PINOS_SPA_NODE_H__
|
#define __PINOS_SPA_NODE_H__
|
||||||
|
|
||||||
#include <server/core.h>
|
#include <pinos/server/core.h>
|
||||||
#include <server/node.h>
|
#include <pinos/server/node.h>
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C" {
|
extern "C" {
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
||||||
#include <pinos/client/pinos.h>
|
#include <pinos/client/pinos.h>
|
||||||
#include <pinos/client/signal.h>
|
#include <pinos/client/sig.h>
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
bool running;
|
bool running;
|
||||||
|
|
Loading…
Reference in a new issue