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

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

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"

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 */

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 */

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;