Commit 3f82e919 authored by Sebastian Dröge's avatar Sebastian Dröge

libs: Use foo/foo.h as single-include header consistently everywhere

https://bugzilla.gnome.org/show_bug.cgi?id=688785
parent 4c58077f
......@@ -23,7 +23,7 @@ libgstapp_@GST_API_VERSION@_la_LIBTOOLFLAGS = --tag=disable-static
libgstapp_@GST_API_VERSION@includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/app
libgstapp_@GST_API_VERSION@include_HEADERS = \
gstapp.h \
app.h \
gstappsrc.h \
gstappsink.h
......@@ -45,7 +45,7 @@ GstApp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstapp-@GST_API_VERSIO
--nsversion=@GST_API_VERSION@ \
--strip-prefix=Gst \
--warn-all \
--c-include "gst/app/gstapp.h" \
--c-include "gst/app/app.h" \
-I$(top_srcdir)/gst-libs \
-I$(top_builddir)/gst-libs \
--add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
......
......@@ -49,7 +49,6 @@ libgstaudio_@GST_API_VERSION@include_HEADERS = \
audio-format.h \
audio-channels.h \
audio-info.h \
gstaudio.h \
gstaudioringbuffer.h \
gstaudioclock.h \
gstaudiofilter.h \
......@@ -93,7 +92,7 @@ GstAudio-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstaudio-@GST_API_VE
--strip-prefix=Gst \
-I$(top_srcdir)/gst-libs \
-I$(top_builddir)/gst-libs \
--c-include "gst/audio/gstaudio.h" \
--c-include "gst/audio/audio.h" \
--add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
--add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
--add-include-path="$(top_builddir)/gst-libs/gst/tag/" \
......
......@@ -62,4 +62,18 @@ GstBuffer * gst_audio_buffer_clip (GstBuffer *buffer, GstSegment *segment
G_END_DECLS
#include <gst/audio/gstaudioringbuffer.h>
#include <gst/audio/gstaudioclock.h>
#include <gst/audio/gstaudiofilter.h>
#include <gst/audio/gstaudiocdsrc.h>
#include <gst/audio/gstaudiodecoder.h>
#include <gst/audio/gstaudioencoder.h>
#include <gst/audio/gstaudiobasesink.h>
#include <gst/audio/gstaudiobasesrc.h>
#include <gst/audio/gstaudiometa.h>
#include <gst/audio/gstaudiosink.h>
#include <gst/audio/gstaudiosrc.h>
#include <gst/audio/streamvolume.h>
#include <gst/audio/gstaudioiec61937.h>
#endif /* __GST_AUDIO_AUDIO_H__ */
/* GStreamer
* Copyright (C) 2012 GStreamer developers
*
* gstaudio.h: single include header for gst-audio library
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library 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
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
#ifndef __GST_AUDIO_GST_AUDIO_H__
#define __GST_AUDIO_GST_AUDIO_H__
#include <gst/audio/audio.h>
#include <gst/audio/audio-format.h>
#include <gst/audio/audio-channels.h>
#include <gst/audio/audio-enumtypes.h>
#include <gst/audio/audio-info.h>
#include <gst/audio/gstaudioringbuffer.h>
#include <gst/audio/gstaudioclock.h>
#include <gst/audio/gstaudiofilter.h>
#include <gst/audio/gstaudiocdsrc.h>
#include <gst/audio/gstaudiodecoder.h>
#include <gst/audio/gstaudioencoder.h>
#include <gst/audio/gstaudiobasesink.h>
#include <gst/audio/gstaudiobasesrc.h>
#include <gst/audio/gstaudiometa.h>
#include <gst/audio/gstaudiosink.h>
#include <gst/audio/gstaudiosrc.h>
#include <gst/audio/streamvolume.h>
#include <gst/audio/gstaudioiec61937.h>
#endif /* __GST_AUDIO_GST_AUDIO_H__ */
......@@ -34,6 +34,7 @@
#include <string.h>
#include <gst/audio/audio.h>
#include "gstaudiobasesink.h"
GST_DEBUG_CATEGORY_STATIC (gst_audio_base_sink_debug);
......
......@@ -38,6 +38,7 @@
#include <string.h>
#include <gst/audio/audio.h>
#include "gstaudiobasesrc.h"
#include "gst/gst-i18n-plugin.h"
......
......@@ -33,6 +33,8 @@
#endif
#include <string.h>
#include <gst/audio/audio.h>
#include "gstaudioiec61937.h"
#define IEC61937_HEADER_SIZE 8
......
......@@ -41,6 +41,7 @@
#include <string.h>
#include <gst/audio/audio.h>
#include "gstaudioringbuffer.h"
GST_DEBUG_CATEGORY_STATIC (gst_audio_ring_buffer_debug);
......
......@@ -69,6 +69,7 @@
#include <string.h>
#include <gst/audio/audio.h>
#include "gstaudiosink.h"
GST_DEBUG_CATEGORY_STATIC (gst_audio_sink_debug);
......
......@@ -69,6 +69,7 @@
#include <string.h>
#include <gst/audio/audio.h>
#include "gstaudiosrc.h"
GST_DEBUG_CATEGORY_STATIC (gst_audio_src_debug);
......
......@@ -3,6 +3,7 @@ lib_LTLIBRARIES = libgstfft-@GST_API_VERSION@.la
libgstfft_@GST_API_VERSION@_includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/fft
libgstfft_@GST_API_VERSION@_include_HEADERS = \
fft.h \
gstfft.h \
gstffts16.h \
gstffts32.h \
......@@ -57,7 +58,7 @@ GstFft-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstfft-@GST_API_VERSIO
--nsversion=@GST_API_VERSION@ \
--strip-prefix=Gst \
--warn-all \
--c-include "gst/fft/gstfft.h" \
--c-include "gst/fft/fft.h" \
-I$(top_srcdir)/gst-libs \
-I$(top_builddir)/gst-libs \
--add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
......
/* GStreamer
* Copyright (C) 2012 GStreamer developers
*
* gstfft.h: single include header for gst-fft library
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library 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
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
#ifndef __GST_FFT__H__
#define __GST_FFT__H__
#include <gst/fft/gstfft.h>
#include <gst/fft/gstffts16.h>
#include <gst/fft/gstffts32.h>
#include <gst/fft/gstfftf32.h>
#include <gst/fft/gstfftf64.h>
#endif /* __GST_FFT__H__ */
......@@ -50,9 +50,4 @@ gint gst_fft_next_fast_length (gint n) G_GNUC_CONST;
G_END_DECLS
#include <gst/fft/gstffts16.h>
#include <gst/fft/gstffts32.h>
#include <gst/fft/gstfftf32.h>
#include <gst/fft/gstfftf64.h>
#endif /* __GST_FFT_H__ */
......@@ -8,8 +8,7 @@ headers_pbutils = \
encoding-target.h \
install-plugins.h \
missing-plugins.h \
gstdiscoverer.h \
gstpbutils.h
gstdiscoverer.h
# variables used for enum/marshal generation
glib_enum_headers = $(headers_pbutils)
......@@ -77,7 +76,7 @@ GstPbutils-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstpbutils-@GST_AP
--nsversion=@GST_API_VERSION@ \
--strip-prefix=Gst \
--warn-all \
--c-include "gst/pbutils/gstpbutils.h" \
--c-include "gst/pbutils/pbutils.h" \
-I$(top_srcdir)/gst-libs \
-I$(top_builddir)/gst-libs \
--add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
......
/* GStreamer
* Copyright (C) 2012 GStreamer developers
*
* gstpbutils.h: single include header for gst-pbutils library
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library 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
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
#ifndef __GST_PB_UTILS_GST_PB_UTILS_H__
#define __GST_PB_UTILS_GST_PB_UTILS_H__
#include <gst/pbutils/codec-utils.h>
#include <gst/pbutils/descriptions.h>
#include <gst/pbutils/encoding-profile.h>
#include <gst/pbutils/encoding-target.h>
#include <gst/pbutils/gstdiscoverer.h>
#include <gst/pbutils/gstpluginsbaseversion.h>
#include <gst/pbutils/install-plugins.h>
#include <gst/pbutils/missing-plugins.h>
#include <gst/pbutils/pbutils-enumtypes.h>
#include <gst/pbutils/pbutils.h>
#endif /* __GST_PB_UTILS_GST_PB_UTILS_H__ */
......@@ -7,7 +7,7 @@ libgstriff_@GST_API_VERSION@_la_SOURCES = \
libgstriff_@GST_API_VERSION@includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/riff
libgstriff_@GST_API_VERSION@include_HEADERS = \
gstriff.h \
riff.h \
riff-ids.h \
riff-media.h \
riff-read.h
......@@ -33,7 +33,7 @@ GstRiff-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstriff-@GST_API_VERS
--nsversion=@GST_API_VERSION@ \
--strip-prefix=Gst \
--warn-all \
--c-include "gst/riff/gstriff.h" \
--c-include "gst/riff/riff.h" \
--add-include-path=$(builddir)/../tag \
--add-include-path=$(builddir)/../audio \
--add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
......
libgstrtpincludedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/rtp
libgstrtpinclude_HEADERS = \
gstrtp.h \
rtp.h \
gstrtpbuffer.h \
gstrtcpbuffer.h \
gstrtppayloads.h \
......@@ -37,7 +37,7 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtp-@GST_API_VERSIO
--nsversion=@GST_API_VERSION@ \
--strip-prefix=Gst \
--warn-all \
--c-include "gst/rtp/gstrtp.h" \
--c-include "gst/rtp/rtp.h" \
-I$(top_srcdir)/gst-libs \
--add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
--add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
......
libgstrtspincludedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/rtsp
libgstrtspinclude_HEADERS = \
rtsp.h \
gstrtsp.h \
gstrtsptransport.h \
gstrtspurl.h \
......@@ -62,7 +63,7 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS
--nsversion=@GST_API_VERSION@ \
--strip-prefix=Gst \
--warn-all \
--c-include "gst/rtsp/gstrtsp.h" \
--c-include "gst/rtsp/rtsp.h" \
-I$(top_builddir)/gst-libs \
-I$(top_srcdir)/gst-libs \
--add-include-path=$(builddir)/../sdp \
......
/* GStreamer
* Copyright (C) 2012 GStreamer developers
*
* gstrtsp.h: single include header for gst-rtsp library
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library 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
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
#ifndef __GST_RTSP__H__
#define __GST_RTSP__H__
#include <gst/rtsp/gstrtsp.h>
#include <gst/rtsp/gstrtspconnection.h>
#include <gst/rtsp/gstrtspdefs.h>
#include <gst/rtsp/gstrtsp-enumtypes.h>
#include <gst/rtsp/gstrtspextension.h>
#include <gst/rtsp/gstrtspmessage.h>
#include <gst/rtsp/gstrtsprange.h>
#include <gst/rtsp/gstrtsptransport.h>
#include <gst/rtsp/gstrtspurl.h>
#endif /* __GST_RTSP__H__ */
libgstsdpincludedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/sdp
libgstsdpinclude_HEADERS = gstsdp.h \
libgstsdpinclude_HEADERS = sdp.h \
gstsdp.h \
gstsdpmessage.h
lib_LTLIBRARIES = libgstsdp-@GST_API_VERSION@.la
......@@ -24,7 +25,7 @@ GstSdp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstsdp-@GST_API_VERSIO
--nsversion=@GST_API_VERSION@ \
--strip-prefix=Gst \
--warn-all \
--c-include "gst/sdp/gstsdp.h" \
--c-include "gst/sdp/sdp.h" \
-I$(top_srcdir)/gst-libs \
--add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
--library=libgstsdp-@GST_API_VERSION@.la \
......
......@@ -55,6 +55,4 @@ typedef enum {
GST_SDP_EINVAL = -1
} GstSDPResult;
#include <gst/sdp/gstsdpmessage.h>
#endif /* __GST_SDP_H__ */
/* GStreamer
* Copyright (C) 2012 GStreamer developers
*
* gsttag.h: single include header for gst-tag library
* gstsdp.h: single include header for gst-sdp library
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
......@@ -19,12 +19,10 @@
* Boston, MA 02110-1301, USA.
*/
#ifndef __GST_TAG_GST_TAG_H__
#define __GST_TAG_GST_TAG_H__
#ifndef __GST_SDP__H__
#define __GST_SDP__H__
#include <gst/tag/tag.h>
#include <gst/tag/gsttagdemux.h>
#include <gst/tag/gsttagmux.h>
#include <gst/tag/xmpwriter.h>
#include <gst/sdp/gstsdp.h>
#include <gst/sdp/gstsdpmessage.h>
#endif /* __GST_TAG_GST_TAG_H__ */
#endif /* __GST_SDP__H__ */
......@@ -2,7 +2,7 @@ libgsttagincludedir = \
$(includedir)/gstreamer-@GST_API_VERSION@/gst/tag
libgsttaginclude_HEADERS = \
tag.h gsttag.h gsttagdemux.h gsttagmux.h xmpwriter.h
tag.h gsttagdemux.h gsttagmux.h xmpwriter.h
lib_LTLIBRARIES = libgsttag-@GST_API_VERSION@.la
......@@ -36,7 +36,7 @@ GstTag-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgsttag-@GST_API_VERSIO
--nsversion=@GST_API_VERSION@ \
--strip-prefix=Gst \
--warn-all \
--c-include "gst/tag/gsttag.h" \
--c-include "gst/tag/tag.h" \
-I$(top_srcdir)/gst-libs \
-I$(top_builddir)/gst-libs \
--add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
......
......@@ -23,6 +23,9 @@
#define __GST_TAG_TAG_H__
#include <gst/gst.h>
#include <gst/tag/gsttagdemux.h>
#include <gst/tag/gsttagmux.h>
#include <gst/tag/xmpwriter.h>
G_BEGIN_DECLS
......
......@@ -52,7 +52,6 @@ libgstvideo_@GST_API_VERSION@include_HEADERS = \
video-color.h \
video-info.h \
video-frame.h \
gstvideo.h \
gstvideosink.h \
gstvideofilter.h \
gstvideometa.h \
......@@ -89,7 +88,7 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VE
--nsversion=@GST_API_VERSION@ \
--strip-prefix=Gst \
--warn-all \
--c-include "gst/video/gstvideo.h" \
--c-include "gst/video/video.h" \
-I$(top_srcdir)/gst-libs \
-I$(top_builddir)/gst-libs \
--add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
......
/* GStreamer
* Copyright (C) 2012 GStreamer developers
*
* gstvideo.h: single include header for gst-video library
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library 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
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
#ifndef __GST_VIDEO_GST_VIDEO_H__
#define __GST_VIDEO_GST_VIDEO_H__
#include <gst/video/colorbalancechannel.h>
#include <gst/video/colorbalance.h>
#include <gst/video/gstvideodecoder.h>
#include <gst/video/gstvideoencoder.h>
#include <gst/video/gstvideofilter.h>
#include <gst/video/gstvideometa.h>
#include <gst/video/gstvideopool.h>
#include <gst/video/gstvideosink.h>
#include <gst/video/gstvideoutils.h>
#include <gst/video/navigation.h>
#include <gst/video/video-blend.h>
#include <gst/video/video-color.h>
#include <gst/video/video-enumtypes.h>
#include <gst/video/video-event.h>
#include <gst/video/video-format.h>
#include <gst/video/video-frame.h>
#include <gst/video/video.h>
#include <gst/video/video-info.h>
#include <gst/video/videoorientation.h>
#include <gst/video/video-overlay-composition.h>
#include <gst/video/videooverlay.h>
#endif /* __GST_VIDEO_GST_VIDEO_H__ */
......@@ -296,6 +296,7 @@
#include "gstvideodecoder.h"
#include "gstvideoutils.h"
#include <gst/video/video.h>
#include <gst/video/video-event.h>
#include <gst/video/gstvideopool.h>
#include <gst/video/gstvideometa.h>
......
......@@ -115,6 +115,7 @@
* and if it exceeds the recorded one, save it and emit a GST_MESSAGE_LATENCY
*/
#include <gst/video/video.h>
#include "gstvideoencoder.h"
#include "gstvideoutils.h"
......
......@@ -23,6 +23,7 @@
#include "config.h"
#endif
#include <gst/video/video.h>
#include "gstvideoutils.h"
#include <string.h>
......
......@@ -26,6 +26,7 @@
#include <string.h>
#include <stdio.h>
#include <gst/video/video.h>
#include "video-frame.h"
#include "gstvideometa.h"
......
......@@ -24,7 +24,6 @@
typedef struct _GstVideoAlignment GstVideoAlignment;
#include <gst/video/video-event.h>
#include <gst/video/video-format.h>
#include <gst/video/video-color.h>
#include <gst/video/video-info.h>
......@@ -82,6 +81,23 @@ GstSample * gst_video_convert_sample (GstSample * sample,
const GstCaps * to_caps,
GstClockTime timeout,
GError ** error);
G_END_DECLS
#include <gst/video/colorbalancechannel.h>
#include <gst/video/colorbalance.h>
#include <gst/video/gstvideodecoder.h>
#include <gst/video/gstvideoencoder.h>
#include <gst/video/gstvideofilter.h>
#include <gst/video/gstvideometa.h>
#include <gst/video/gstvideopool.h>
#include <gst/video/gstvideosink.h>
#include <gst/video/gstvideoutils.h>
#include <gst/video/navigation.h>
#include <gst/video/video-blend.h>
#include <gst/video/video-event.h>
#include <gst/video/videoorientation.h>
#include <gst/video/video-overlay-composition.h>
#include <gst/video/videooverlay.h>
#endif /* __GST_VIDEO_H__ */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment