system/pipewire
system/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire synced 2024-07-21 18:26:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

rename signal -> sig

Browse source 
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:
Wim Taymans 2016-11-28 16:24:10 +01:00
parent 497febf2f1
commit 3dada4731c
10 changed files with 13 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
meson.build
View file

@ -116,7 +116,6 @@ configure_file(input : 'config.h.meson',
configuration : cdata)
configinc = include_directories('.')
pinosinc = include_directories('pinos')
# Find dependencies
glib_dep = dependency('glib-2.0', version : '>=2.32.0')

4
pinos/client/loop.c
View file

@ -513,21 +513,17 @@ loop_add_signal (SpaLoopUtils *utils,
{
PinosLoopImpl *impl = SPA_CONTAINER_OF (utils, PinosLoopImpl, utils);
SpaSourceImpl *source;
#if 0
sigset_t mask;
#endif
source = calloc (1, sizeof (SpaSourceImpl));
source->source.loop = &impl->loop;
source->source.func = source_signal_func;
source->source.data = data;
#if 0
sigemptyset (&mask);
sigaddset (&mask, signal_number);
source->source.fd = signalfd (-1, &mask, SFD_CLOEXEC | SFD_NONBLOCK);
sigprocmask (SIG_BLOCK, &mask, NULL);
#endif
source->source.mask = SPA_IO_IN;
source->close = true;
source->func.signal = func;

2
pinos/client/loop.h
View file

@ -26,7 +26,7 @@ extern "C" {
#include <spa/include/spa/list.h>
#include <spa/include/spa/loop.h>
#include <pinos/client/signal.h>
#include <pinos/client/sig.h>
typedef struct _PinosLoop PinosLoop;

0
pinos/client/signal.h → pinos/client/sig.h
View file

2
pinos/client/transport.h
View file

@ -34,7 +34,7 @@ typedef struct _PinosTransportArea PinosTransportArea;
#include <spa/node.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_NEED_DATA (1<<0)

8
pinos/modules/meson.build
View file

@ -8,7 +8,7 @@ pinos_module_c_args = [
pinos_module_autolink = shared_library('pinos-module-autolink', [ 'module-autolink.c' ],
c_args : pinos_module_c_args,
include_directories : [configinc, pinosinc, spa_inc],
include_directories : [configinc, spa_inc],
link_with : spalib,
install : true,
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 ],
c_args : pinos_module_c_args,
include_directories : [configinc, pinosinc, spa_inc],
include_directories : [configinc, spa_inc],
link_with : spalib,
install : true,
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' ],
c_args : pinos_module_c_args,
include_directories : [configinc, pinosinc, spa_inc],
include_directories : [configinc, spa_inc],
link_with : spalib,
install : true,
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' ],
c_args : pinos_module_c_args,
include_directories : [configinc, pinosinc, spa_inc],
include_directories : [configinc, spa_inc],
link_with : spalib,
install : true,
install_dir : '@0@/pinos-0.1'.format(get_option('libdir')),

2
pinos/modules/spa/meson.build
View file

@ -16,7 +16,7 @@ pinos_module_spa_c_args = [
pinos_module_spa = shared_library('pinos-module-spa', pinos_module_spa_sources,
c_args : pinos_module_spa_c_args,
include_directories : [configinc, pinosinc, spa_inc],
include_directories : [configinc, spa_inc],
link_with : spalib,
install : true,
install_dir : '@0@/pinos-0.1'.format(get_option('libdir')),

6
pinos/modules/spa/module.c
View file

@ -21,9 +21,9 @@
#include <getopt.h>
#include <limits.h>
#include <client/utils.h>
#include <server/core.h>
#include <server/module.h>
#include <pinos/client/utils.h>
#include <pinos/server/core.h>
#include <pinos/server/module.h>
#include "spa-monitor.h"
#include "spa-node.h"

4
pinos/modules/spa/spa-node.h
View file

@ -20,8 +20,8 @@
#ifndef __PINOS_SPA_NODE_H__
#define __PINOS_SPA_NODE_H__
#include <server/core.h>
#include <server/node.h>
#include <pinos/server/core.h>
#include <pinos/server/node.h>
#ifdef __cplusplus
extern "C" {

2
pinos/tools/pinos-monitor.c
View file

@ -20,7 +20,7 @@
#include <stdio.h>
#include <pinos/client/pinos.h>
#include <pinos/client/signal.h>
#include <pinos/client/sig.h>
typedef struct {
bool running;