typedefs.h: Move some typedefs to a separate file

The relationship between sinks, sources, cards, profiles, and ports
is becoming ever more intertwined, to the point that if you try to
include one file from the other, you're likely to end up with some
weird error somewhere else.

Work around this by creating a new typedefs.h, which does not depend
on anything else, and just creates a few typedefs.

(Can be expanded with more typedefs in the future if the need arises.)

Signed-off-by: David Henningsson <david.henningsson@canonical.com>
This commit is contained in:
David Henningsson 2015-11-26 18:29:58 +01:00 committed by Tanu Kaskinen
parent f61a16b8b1
commit d97460045c
9 changed files with 47 additions and 19 deletions

View file

@ -20,8 +20,7 @@
along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
***/
typedef struct pa_card pa_card;
#include <pulsecore/typedefs.h>
#include <pulse/proplist.h>
#include <pulsecore/core.h>
#include <pulsecore/module.h>
@ -35,7 +34,7 @@ typedef enum pa_available {
PA_AVAILABLE_YES = 2,
} pa_available_t;
typedef struct pa_card_profile {
struct pa_card_profile {
pa_card *card;
char *name;
char *description;
@ -59,7 +58,7 @@ typedef struct pa_card_profile {
unsigned max_source_channels;
/* .. followed by some implementation specific data */
} pa_card_profile;
};
#define PA_CARD_PROFILE_DATA(d) ((void*) ((uint8_t*) d + PA_ALIGN(sizeof(pa_card_profile))))

View file

@ -22,8 +22,7 @@
#include <inttypes.h>
typedef struct pa_client pa_client;
#include <pulsecore/typedefs.h>
#include <pulse/proplist.h>
#include <pulsecore/core.h>
#include <pulsecore/module.h>

View file

@ -20,12 +20,11 @@
along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
***/
#include <pulsecore/typedefs.h>
#include <pulse/mainloop-api.h>
#include <pulse/sample.h>
#include <pulsecore/cpu.h>
typedef struct pa_core pa_core;
/* This is a bitmask that encodes the cause why a sink/source is
* suspended. */
typedef enum pa_suspend_cause {

View file

@ -22,14 +22,13 @@
along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
***/
typedef struct pa_device_port pa_device_port;
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <inttypes.h>
#include <pulsecore/typedefs.h>
#include <pulse/def.h>
#include <pulsecore/object.h>
#include <pulsecore/hashmap.h>

View file

@ -23,8 +23,7 @@
#include <inttypes.h>
typedef struct pa_sink_input pa_sink_input;
#include <pulsecore/typedefs.h>
#include <pulse/sample.h>
#include <pulse/format.h>
#include <pulsecore/memblockq.h>

View file

@ -21,11 +21,9 @@
along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
***/
typedef struct pa_sink pa_sink;
typedef struct pa_sink_volume_change pa_sink_volume_change;
#include <inttypes.h>
#include <pulsecore/typedefs.h>
#include <pulse/def.h>
#include <pulse/format.h>
#include <pulse/sample.h>

View file

@ -22,8 +22,7 @@
#include <inttypes.h>
typedef struct pa_source_output pa_source_output;
#include <pulsecore/typedefs.h>
#include <pulse/sample.h>
#include <pulse/format.h>
#include <pulsecore/memblockq.h>

View file

@ -21,11 +21,10 @@
along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
***/
typedef struct pa_source pa_source;
typedef struct pa_source_volume_change pa_source_volume_change;
#include <inttypes.h>
#include <pulsecore/typedefs.h>
#include <pulse/def.h>
#include <pulse/format.h>
#include <pulse/sample.h>

37
src/pulsecore/typedefs.h Normal file
View file

@ -0,0 +1,37 @@
#ifndef footypedefshfoo
#define footypedefshfoo
/***
This file is part of PulseAudio.
Copyright 2015 Canonical Ltd.
Written by David Henningsson <david.henningsson@canonical.com>
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2.1 of the License,
or (at your option) any later version.
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
***/
typedef struct pa_card pa_card;
typedef struct pa_card_profile pa_card_profile;
typedef struct pa_client pa_client;
typedef struct pa_core pa_core;
typedef struct pa_device_port pa_device_port;
typedef struct pa_sink pa_sink;
typedef struct pa_sink_volume_change pa_sink_volume_change;
typedef struct pa_sink_input pa_sink_input;
typedef struct pa_source pa_source;
typedef struct pa_source_volume_change pa_source_volume_change;
typedef struct pa_source_output pa_source_output;
#endif