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

device-port: Fix the circular dependency problem more cleanly.

Browse source 
Declaring structs before including anything ensures that the
structs are available for everybody in case of circular includes.
This commit is contained in:
Tanu Kaskinen 2011-11-27 17:16:53 +02:00
parent e199077eca
commit 46920bab16
1 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/pulsecore/device-port.h
View file

@ -24,6 +24,7 @@
USA. USA.
***/ ***/
typedef struct pa_device_port pa_device_port;
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
@ -34,16 +35,11 @@
#include <pulse/def.h> #include <pulse/def.h>
#include <pulsecore/object.h> #include <pulsecore/object.h>
#include <pulsecore/hashmap.h> #include <pulsecore/hashmap.h>
#include <pulsecore/core.h>
/* Note: Including core.h here leads to circular references
(device-port.h -> core.h -> sink.h -> device-port.h), hence the line below instead */
struct pa_core;
typedef struct pa_device_port pa_device_port;
struct pa_device_port { struct pa_device_port {
pa_object parent; /* Needed for reference counting */ pa_object parent; /* Needed for reference counting */
struct pa_core *core; pa_core *core;
char *name; char *name;
char *description; char *description;
@ -63,7 +59,7 @@ PA_DECLARE_PUBLIC_CLASS(pa_device_port);
#define PA_DEVICE_PORT_DATA(d) ((void*) ((uint8_t*) d + PA_ALIGN(sizeof(pa_device_port)))) #define PA_DEVICE_PORT_DATA(d) ((void*) ((uint8_t*) d + PA_ALIGN(sizeof(pa_device_port))))
pa_device_port *pa_device_port_new(struct pa_core *c, const char *name, const char *description, size_t extra); pa_device_port *pa_device_port_new(pa_core *c, const char *name, const char *description, size_t extra);
void pa_device_port_hashmap_free(pa_hashmap *h); void pa_device_port_hashmap_free(pa_hashmap *h);