mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-07 13:30:09 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't use __ in defines or declarations, it's reserved

Browse source 
SPA_TYPE -> SPA_TYPE_INFO for type info strings
improve includes

Fixes #115
This commit is contained in:
Wim Taymans 2019-01-14 12:58:23 +01:00
parent 6856f02cab
commit 3dc6820e9e
146 changed files with 890 additions and 951 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/modules/module-access.c
View file

@ -32,13 +32,7 @@
#include "config.h"
#include "pipewire/core.h"
#include "pipewire/interfaces.h"
#include "pipewire/link.h"
#include "pipewire/log.h"
#include "pipewire/module.h"
#include "pipewire/properties.h"
#include "pipewire/utils.h"
#include <pipewire/pipewire.h>
static const struct spa_dict_item module_props[] = {
{ PW_MODULE_PROP_AUTHOR, "Wim Taymans <wim.taymans@gmail.com>" },

5
src/modules/module-audio-dsp.c
View file

@ -34,10 +34,7 @@
#include <spa/param/audio/format-utils.h>
#include <spa/pod/filter.h>
#include "pipewire/core.h"
#include "pipewire/interfaces.h"
#include "pipewire/log.h"
#include "pipewire/module.h"
#include <pipewire/pipewire.h>
#include "pipewire/private.h"
#include "module-audio-dsp/audio-dsp.h"

6
src/modules/module-audio-dsp/audio-dsp.c
View file

@ -36,11 +36,7 @@
#include <spa/utils/type-info.h>
#include <spa/param/audio/type-info.h>
#include "pipewire/core.h"
#include "pipewire/link.h"
#include "pipewire/log.h"
#include "pipewire/module.h"
#include "pipewire/type.h"
#include "pipewire/pipewire.h"
#include "pipewire/private.h"
#include "modules/spa/spa-node.h"

6
src/modules/module-audio-dsp/audio-dsp.h
View file

@ -22,8 +22,8 @@
* DEALINGS IN THE SOFTWARE.
*/
#ifndef __PIPEWIRE_AUDIO_DSP_H__
#define __PIPEWIRE_AUDIO_DSP_H__
#ifndef PIPEWIRE_AUDIO_DSP_H
#define PIPEWIRE_AUDIO_DSP_H
#include <pipewire/core.h>
#include <pipewire/node.h>
@ -45,4 +45,4 @@ void *pw_audio_dsp_get_user_data(struct pw_node *node);
}
#endif
#endif /* __PIPEWIRE_AUDIO_DSP_H__ */
#endif /* PIPEWIRE_AUDIO_DSP_H */

5
src/modules/module-client-node.c
View file

@ -29,10 +29,7 @@
#include "config.h"
#include "pipewire/core.h"
#include "pipewire/interfaces.h"
#include "pipewire/log.h"
#include "pipewire/module.h"
#include <pipewire/pipewire.h>
#include "module-client-node/client-node.h"
#include "module-client-node/client-stream.h"

4
src/modules/module-client-node/client-node.c
View file

@ -37,11 +37,9 @@
#include <spa/pod/filter.h>
#include <spa/debug/types.h>
#include "pipewire/pipewire.h"
#include "pipewire/interfaces.h"
#include <pipewire/pipewire.h>
#include "pipewire/private.h"
#include "pipewire/core.h"
#include "modules/spa/spa-node.h"
#include "client-node.h"

6
src/modules/module-client-node/client-node.h
View file

@ -22,8 +22,8 @@
* DEALINGS IN THE SOFTWARE.
*/
#ifndef __PIPEWIRE_CLIENT_NODE_H__
#define __PIPEWIRE_CLIENT_NODE_H__
#ifndef PIPEWIRE_CLIENT_NODE_H
#define PIPEWIRE_CLIENT_NODE_H
#include <pipewire/node.h>
#include <extensions/client-node.h>
@ -58,4 +58,4 @@ void pw_client_node_registered(struct pw_client_node *node, uint32_t node_id);
}
#endif
#endif /* __PIPEWIRE_CLIENT_NODE_H__ */
#endif /* PIPEWIRE_CLIENT_NODE_H */

6
src/modules/module-client-node/client-stream.h
View file

@ -22,8 +22,8 @@
* DEALINGS IN THE SOFTWARE.
*/
#ifndef __PIPEWIRE_CLIENT_STREAM_H__
#define __PIPEWIRE_CLIENT_STREAM_H__
#ifndef PIPEWIRE_CLIENT_STREAM_H
#define PIPEWIRE_CLIENT_STREAM_H
#include <pipewire/node.h>
@ -51,4 +51,4 @@ pw_client_stream_destroy(struct pw_client_stream *stream);
}
#endif
#endif /* __PIPEWIRE_CLIENT_STREAM_H__ */
#endif /* PIPEWIRE_CLIENT_STREAM_H */

11
src/modules/module-client-node/protocol-native.c
View file

@ -26,13 +26,10 @@
#include <spa/pod/parser.h>
#include "pipewire/pipewire.h"
#include "pipewire/interfaces.h"
#include "pipewire/protocol.h"
#include "pipewire/client.h"
#include <pipewire/pipewire.h>
#include "extensions/protocol-native.h"
#include "extensions/client-node.h"
#include <extensions/protocol-native.h>
#include <extensions/client-node.h>
static void
client_node_marshal_done(void *object, int seq, int res)
@ -928,7 +925,7 @@ struct pw_protocol *pw_protocol_native_ext_client_node_init(struct pw_core *core
{
struct pw_protocol *protocol;
protocol = pw_core_find_protocol(core, PW_TYPE_PROTOCOL__Native);
protocol = pw_core_find_protocol(core, PW_TYPE_INFO_PROTOCOL_Native);
if (protocol == NULL)
return NULL;

6
src/modules/module-link-factory.c
View file

@ -29,11 +29,7 @@
#include "config.h"
#include "pipewire/core.h"
#include "pipewire/interfaces.h"
#include "pipewire/log.h"
#include "pipewire/module.h"
#include "pipewire/link.h"
#include <pipewire/pipewire.h>
#include "pipewire/private.h"
static const struct spa_dict_item module_props[] = {

19
src/modules/module-protocol-native.c
View file

@ -42,21 +42,10 @@
#include <systemd/sd-daemon.h>
#endif
#include "pipewire/pipewire.h"
#include <pipewire/pipewire.h>
#include <extensions/protocol-native.h>
#include "pipewire/private.h"
#include "pipewire/log.h"
#include "pipewire/interfaces.h"
#include "pipewire/core.h"
#include "pipewire/node.h"
#include "pipewire/module.h"
#include "pipewire/client.h"
#include "pipewire/resource.h"
#include "pipewire/link.h"
#include "pipewire/factory.h"
#include "pipewire/data-loop.h"
#include "pipewire/main-loop.h"
#include "extensions/protocol-native.h"
#include "modules/module-protocol-native/connection.h"
#include "modules/module-protocol-native/defs.h"
@ -854,10 +843,10 @@ static int module_init(struct pw_module *module, struct pw_properties *propertie
const char *val;
struct protocol_data *d;
if (pw_core_find_protocol(core, PW_TYPE_PROTOCOL__Native) != NULL)
if (pw_core_find_protocol(core, PW_TYPE_INFO_PROTOCOL_Native) != NULL)
return 0;
this = pw_protocol_new(core, PW_TYPE_PROTOCOL__Native, sizeof(struct protocol_data));
this = pw_protocol_new(core, PW_TYPE_INFO_PROTOCOL_Native, sizeof(struct protocol_data));
if (this == NULL)
return -ENOMEM;

2
src/modules/module-protocol-native/connection.c
View file

@ -33,7 +33,7 @@
#include <spa/debug/pod.h>
#include <pipewire/pipewire.h>
#include <pipewire/private.h>
#include "pipewire/private.h"
#include "connection.h"

6
src/modules/module-protocol-native/connection.h
View file

@ -22,8 +22,8 @@
* DEALINGS IN THE SOFTWARE.
*/
#ifndef __PIPEWIRE_PROTOCOL_NATIVE_CONNECTION_H__
#define __PIPEWIRE_PROTOCOL_NATIVE_CONNECTION_H__
#ifndef PIPEWIRE_PROTOCOL_NATIVE_CONNECTION_H
#define PIPEWIRE_PROTOCOL_NATIVE_CONNECTION_H
#ifdef __cplusplus
extern "C" {
@ -104,4 +104,4 @@ pw_protocol_native_connection_clear(struct pw_protocol_native_connection *conn);
} /* extern "C" */
#endif
#endif /* __PIPEWIRE_PROTOCOL_NATIVE_CONNECTION_H__ */
#endif /* PIPEWIRE_PROTOCOL_NATIVE_CONNECTION_H */

1
src/modules/module-protocol-native/local-socket.c
View file

@ -35,7 +35,6 @@
#include <sys/file.h>
#include <pipewire/pipewire.h>
#include <pipewire/private.h>
static const char *
get_remote(const struct pw_properties *properties)

1
src/modules/module-protocol-native/portal-screencast.c
View file

@ -31,7 +31,6 @@
#include <sys/socket.h>
#include <pipewire/pipewire.h>
#include <pipewire/private.h>
int pw_protocol_native_connect_portal_screencast(struct pw_protocol_client *client,
void (*done_callback) (void *data, int res),

9
src/modules/module-protocol-native/protocol-native.c
View file

@ -25,13 +25,10 @@
#include <stdio.h>
#include <errno.h>
#include "spa/pod/parser.h"
#include <spa/pod/parser.h>
#include "pipewire/pipewire.h"
#include "pipewire/protocol.h"
#include "pipewire/interfaces.h"
#include "pipewire/resource.h"
#include "extensions/protocol-native.h"
#include <pipewire/pipewire.h>
#include <extensions/protocol-native.h>
#include "connection.h"

7
src/modules/module-rtkit.c
View file

@ -39,12 +39,7 @@
#include <spa/support/dbus.h>
#include "pipewire/core.h"
#include "pipewire/interfaces.h"
#include "pipewire/link.h"
#include "pipewire/log.h"
#include "pipewire/module.h"
#include "pipewire/utils.h"
#include <pipewire/pipewire.h>
static const struct spa_dict_item module_props[] = {
{ PW_MODULE_PROP_AUTHOR, "Wim Taymans <wim.taymans@gmail.com>" },

5
src/modules/spa/module-node-factory.c
View file

@ -29,10 +29,7 @@
#include "config.h"
#include "pipewire/interfaces.h"
#include "pipewire/core.h"
#include "pipewire/log.h"
#include "pipewire/module.h"
#include "pipewire/pipewire.h"
#include "spa-node.h"

1
src/modules/spa/spa-device.c
View file

@ -39,6 +39,7 @@
#include "pipewire/port.h"
#include "pipewire/log.h"
#include "pipewire/private.h"
#include "pipewire/pipewire.h"
struct impl {
struct pw_device *this;

6
src/modules/spa/spa-device.h
View file

@ -22,8 +22,8 @@
* DEALINGS IN THE SOFTWARE.
*/
#ifndef __PIPEWIRE_SPA_DEVICE_H__
#define __PIPEWIRE_SPA_DEVICE_H__
#ifndef PIPEWIRE_SPA_DEVICE_H
#define PIPEWIRE_SPA_DEVICE_H
#include <spa/monitor/device.h>
@ -67,4 +67,4 @@ void *pw_spa_device_get_user_data(struct pw_device *device);
}
#endif
#endif /* __PIPEWIRE_SPA_DEVICE_H__ */
#endif /* PIPEWIRE_SPA_DEVICE_H */

6
src/modules/spa/spa-monitor.h
View file

@ -22,8 +22,8 @@
* DEALINGS IN THE SOFTWARE.
*/
#ifndef __PIPEWIRE_SPA_MONITOR_H__
#define __PIPEWIRE_SPA_MONITOR_H__
#ifndef PIPEWIRE_SPA_MONITOR_H
#define PIPEWIRE_SPA_MONITOR_H
#include <spa/monitor/monitor.h>
@ -59,4 +59,4 @@ pw_spa_monitor_destroy(struct pw_spa_monitor *monitor);
}
#endif
#endif /* __PIPEWIRE_SPA_MONITOR_H__ */
#endif /* PIPEWIRE_SPA_MONITOR_H */

6
src/modules/spa/spa-node.h
View file

@ -22,8 +22,8 @@
* DEALINGS IN THE SOFTWARE.
*/
#ifndef __PIPEWIRE_SPA_NODE_H__
#define __PIPEWIRE_SPA_NODE_H__
#ifndef PIPEWIRE_SPA_NODE_H
#define PIPEWIRE_SPA_NODE_H
#include <spa/node/node.h>
@ -69,4 +69,4 @@ void *pw_spa_node_get_user_data(struct pw_node *node);
}
#endif
#endif /* __PIPEWIRE_SPA_NODE_H__ */
#endif /* PIPEWIRE_SPA_NODE_H */