From 3f82e919ddbe9dfeae5249059b4649bb5f5073b1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sebastian=20Dr=C3=B6ge?= Date: Wed, 12 Dec 2012 17:13:10 +0000 Subject: [PATCH] libs: Use foo/foo.h as single-include header consistently everywhere https://bugzilla.gnome.org/show_bug.cgi?id=688785 --- gst-libs/gst/app/Makefile.am | 4 +-- gst-libs/gst/app/{gstapp.h => app.h} | 0 gst-libs/gst/audio/Makefile.am | 3 +- gst-libs/gst/audio/audio.h | 14 ++++++++++ gst-libs/gst/audio/gstaudio.h | 44 ------------------------------ gst-libs/gst/audio/gstaudiobasesink.c | 1 + gst-libs/gst/audio/gstaudiobasesrc.c | 1 + gst-libs/gst/audio/gstaudioiec61937.c | 2 ++ gst-libs/gst/audio/gstaudioringbuffer.c | 1 + gst-libs/gst/audio/gstaudiosink.c | 1 + gst-libs/gst/audio/gstaudiosrc.c | 1 + gst-libs/gst/fft/Makefile.am | 3 +- gst-libs/gst/fft/fft.h | 31 +++++++++++++++++++++ gst-libs/gst/fft/gstfft.h | 5 ---- gst-libs/gst/pbutils/Makefile.am | 5 ++-- gst-libs/gst/pbutils/gstpbutils.h | 36 ------------------------ gst-libs/gst/riff/Makefile.am | 4 +-- gst-libs/gst/riff/{gstriff.h => riff.h} | 0 gst-libs/gst/rtp/Makefile.am | 4 +-- gst-libs/gst/rtp/{gstrtp.h => rtp.h} | 0 gst-libs/gst/rtsp/Makefile.am | 3 +- gst-libs/gst/rtsp/rtsp.h | 35 ++++++++++++++++++++++++ gst-libs/gst/sdp/Makefile.am | 5 ++-- gst-libs/gst/sdp/gstsdp.h | 2 -- gst-libs/gst/{tag/gsttag.h => sdp/sdp.h} | 14 ++++------ gst-libs/gst/tag/Makefile.am | 4 +-- gst-libs/gst/tag/tag.h | 3 ++ gst-libs/gst/video/Makefile.am | 3 +- gst-libs/gst/video/gstvideo.h | 47 -------------------------------- gst-libs/gst/video/gstvideodecoder.c | 1 + gst-libs/gst/video/gstvideoencoder.c | 1 + gst-libs/gst/video/gstvideoutils.c | 1 + gst-libs/gst/video/video-frame.c | 1 + gst-libs/gst/video/video.h | 18 +++++++++++- 34 files changed, 136 insertions(+), 162 deletions(-) rename gst-libs/gst/app/{gstapp.h => app.h} (100%) delete mode 100644 gst-libs/gst/audio/gstaudio.h create mode 100644 gst-libs/gst/fft/fft.h delete mode 100644 gst-libs/gst/pbutils/gstpbutils.h rename gst-libs/gst/riff/{gstriff.h => riff.h} (100%) rename gst-libs/gst/rtp/{gstrtp.h => rtp.h} (100%) create mode 100644 gst-libs/gst/rtsp/rtsp.h rename gst-libs/gst/{tag/gsttag.h => sdp/sdp.h} (75%) delete mode 100644 gst-libs/gst/video/gstvideo.h diff --git a/gst-libs/gst/app/Makefile.am b/gst-libs/gst/app/Makefile.am index d4c371b..6166053 100644 --- a/gst-libs/gst/app/Makefile.am +++ b/gst-libs/gst/app/Makefile.am @@ -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@` \ diff --git a/gst-libs/gst/app/gstapp.h b/gst-libs/gst/app/app.h similarity index 100% rename from gst-libs/gst/app/gstapp.h rename to gst-libs/gst/app/app.h diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am index 62f3862..0f9f748 100644 --- a/gst-libs/gst/audio/Makefile.am +++ b/gst-libs/gst/audio/Makefile.am @@ -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/" \ diff --git a/gst-libs/gst/audio/audio.h b/gst-libs/gst/audio/audio.h index 5922bc2..d7a63c7 100644 --- a/gst-libs/gst/audio/audio.h +++ b/gst-libs/gst/audio/audio.h @@ -62,4 +62,18 @@ GstBuffer * gst_audio_buffer_clip (GstBuffer *buffer, GstSegment *segment G_END_DECLS +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #endif /* __GST_AUDIO_AUDIO_H__ */ diff --git a/gst-libs/gst/audio/gstaudio.h b/gst-libs/gst/audio/gstaudio.h deleted file mode 100644 index aad5986..0000000 --- a/gst-libs/gst/audio/gstaudio.h +++ /dev/null @@ -1,44 +0,0 @@ -/* 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 -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#endif /* __GST_AUDIO_GST_AUDIO_H__ */ diff --git a/gst-libs/gst/audio/gstaudiobasesink.c b/gst-libs/gst/audio/gstaudiobasesink.c index 21daa8e..4062fd5 100644 --- a/gst-libs/gst/audio/gstaudiobasesink.c +++ b/gst-libs/gst/audio/gstaudiobasesink.c @@ -34,6 +34,7 @@ #include +#include #include "gstaudiobasesink.h" GST_DEBUG_CATEGORY_STATIC (gst_audio_base_sink_debug); diff --git a/gst-libs/gst/audio/gstaudiobasesrc.c b/gst-libs/gst/audio/gstaudiobasesrc.c index 003603d..f594f51 100644 --- a/gst-libs/gst/audio/gstaudiobasesrc.c +++ b/gst-libs/gst/audio/gstaudiobasesrc.c @@ -38,6 +38,7 @@ #include +#include #include "gstaudiobasesrc.h" #include "gst/gst-i18n-plugin.h" diff --git a/gst-libs/gst/audio/gstaudioiec61937.c b/gst-libs/gst/audio/gstaudioiec61937.c index eecc9c3..ebd0d33 100644 --- a/gst-libs/gst/audio/gstaudioiec61937.c +++ b/gst-libs/gst/audio/gstaudioiec61937.c @@ -33,6 +33,8 @@ #endif #include + +#include #include "gstaudioiec61937.h" #define IEC61937_HEADER_SIZE 8 diff --git a/gst-libs/gst/audio/gstaudioringbuffer.c b/gst-libs/gst/audio/gstaudioringbuffer.c index 55366f3..c19a110 100644 --- a/gst-libs/gst/audio/gstaudioringbuffer.c +++ b/gst-libs/gst/audio/gstaudioringbuffer.c @@ -41,6 +41,7 @@ #include +#include #include "gstaudioringbuffer.h" GST_DEBUG_CATEGORY_STATIC (gst_audio_ring_buffer_debug); diff --git a/gst-libs/gst/audio/gstaudiosink.c b/gst-libs/gst/audio/gstaudiosink.c index 81b3786..1c318e6 100644 --- a/gst-libs/gst/audio/gstaudiosink.c +++ b/gst-libs/gst/audio/gstaudiosink.c @@ -69,6 +69,7 @@ #include +#include #include "gstaudiosink.h" GST_DEBUG_CATEGORY_STATIC (gst_audio_sink_debug); diff --git a/gst-libs/gst/audio/gstaudiosrc.c b/gst-libs/gst/audio/gstaudiosrc.c index b9e709a..fac7c9c 100644 --- a/gst-libs/gst/audio/gstaudiosrc.c +++ b/gst-libs/gst/audio/gstaudiosrc.c @@ -69,6 +69,7 @@ #include +#include #include "gstaudiosrc.h" GST_DEBUG_CATEGORY_STATIC (gst_audio_src_debug); diff --git a/gst-libs/gst/fft/Makefile.am b/gst-libs/gst/fft/Makefile.am index f65f5b3..95711a5 100644 --- a/gst-libs/gst/fft/Makefile.am +++ b/gst-libs/gst/fft/Makefile.am @@ -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@` \ diff --git a/gst-libs/gst/fft/fft.h b/gst-libs/gst/fft/fft.h new file mode 100644 index 0000000..fc78a42 --- /dev/null +++ b/gst-libs/gst/fft/fft.h @@ -0,0 +1,31 @@ +/* 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 +#include +#include +#include +#include + +#endif /* __GST_FFT__H__ */ diff --git a/gst-libs/gst/fft/gstfft.h b/gst-libs/gst/fft/gstfft.h index d42464b..5f99de7 100644 --- a/gst-libs/gst/fft/gstfft.h +++ b/gst-libs/gst/fft/gstfft.h @@ -50,9 +50,4 @@ gint gst_fft_next_fast_length (gint n) G_GNUC_CONST; G_END_DECLS -#include -#include -#include -#include - #endif /* __GST_FFT_H__ */ diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/Makefile.am index 999d03a..2a08f53 100644 --- a/gst-libs/gst/pbutils/Makefile.am +++ b/gst-libs/gst/pbutils/Makefile.am @@ -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@` \ diff --git a/gst-libs/gst/pbutils/gstpbutils.h b/gst-libs/gst/pbutils/gstpbutils.h deleted file mode 100644 index 27fe956..0000000 --- a/gst-libs/gst/pbutils/gstpbutils.h +++ /dev/null @@ -1,36 +0,0 @@ -/* 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 -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#endif /* __GST_PB_UTILS_GST_PB_UTILS_H__ */ diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am index 6038c53..3dbd735 100644 --- a/gst-libs/gst/riff/Makefile.am +++ b/gst-libs/gst/riff/Makefile.am @@ -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@` \ diff --git a/gst-libs/gst/riff/gstriff.h b/gst-libs/gst/riff/riff.h similarity index 100% rename from gst-libs/gst/riff/gstriff.h rename to gst-libs/gst/riff/riff.h diff --git a/gst-libs/gst/rtp/Makefile.am b/gst-libs/gst/rtp/Makefile.am index bee682a..8107a42 100644 --- a/gst-libs/gst/rtp/Makefile.am +++ b/gst-libs/gst/rtp/Makefile.am @@ -1,7 +1,7 @@ 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@` \ diff --git a/gst-libs/gst/rtp/gstrtp.h b/gst-libs/gst/rtp/rtp.h similarity index 100% rename from gst-libs/gst/rtp/gstrtp.h rename to gst-libs/gst/rtp/rtp.h diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am index 54d9167..4489f6f 100644 --- a/gst-libs/gst/rtsp/Makefile.am +++ b/gst-libs/gst/rtsp/Makefile.am @@ -1,6 +1,7 @@ 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 \ diff --git a/gst-libs/gst/rtsp/rtsp.h b/gst-libs/gst/rtsp/rtsp.h new file mode 100644 index 0000000..3044b1f --- /dev/null +++ b/gst-libs/gst/rtsp/rtsp.h @@ -0,0 +1,35 @@ +/* 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 +#include +#include +#include +#include +#include +#include +#include +#include + +#endif /* __GST_RTSP__H__ */ diff --git a/gst-libs/gst/sdp/Makefile.am b/gst-libs/gst/sdp/Makefile.am index ebf0130..21fa402 100644 --- a/gst-libs/gst/sdp/Makefile.am +++ b/gst-libs/gst/sdp/Makefile.am @@ -1,6 +1,7 @@ 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 \ diff --git a/gst-libs/gst/sdp/gstsdp.h b/gst-libs/gst/sdp/gstsdp.h index 32f7c55..1eb5483 100644 --- a/gst-libs/gst/sdp/gstsdp.h +++ b/gst-libs/gst/sdp/gstsdp.h @@ -55,6 +55,4 @@ typedef enum { GST_SDP_EINVAL = -1 } GstSDPResult; -#include - #endif /* __GST_SDP_H__ */ diff --git a/gst-libs/gst/tag/gsttag.h b/gst-libs/gst/sdp/sdp.h similarity index 75% rename from gst-libs/gst/tag/gsttag.h rename to gst-libs/gst/sdp/sdp.h index cb0a06f..0647bf6 100644 --- a/gst-libs/gst/tag/gsttag.h +++ b/gst-libs/gst/sdp/sdp.h @@ -1,7 +1,7 @@ /* 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 -#include -#include -#include +#include +#include -#endif /* __GST_TAG_GST_TAG_H__ */ +#endif /* __GST_SDP__H__ */ diff --git a/gst-libs/gst/tag/Makefile.am b/gst-libs/gst/tag/Makefile.am index 8e20649..505917b 100644 --- a/gst-libs/gst/tag/Makefile.am +++ b/gst-libs/gst/tag/Makefile.am @@ -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@` \ diff --git a/gst-libs/gst/tag/tag.h b/gst-libs/gst/tag/tag.h index 60b7b4f..0e968a7 100644 --- a/gst-libs/gst/tag/tag.h +++ b/gst-libs/gst/tag/tag.h @@ -23,6 +23,9 @@ #define __GST_TAG_TAG_H__ #include +#include +#include +#include G_BEGIN_DECLS diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am index 7469a80..759c958 100644 --- a/gst-libs/gst/video/Makefile.am +++ b/gst-libs/gst/video/Makefile.am @@ -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@` \ diff --git a/gst-libs/gst/video/gstvideo.h b/gst-libs/gst/video/gstvideo.h deleted file mode 100644 index 32b08bf..0000000 --- a/gst-libs/gst/video/gstvideo.h +++ /dev/null @@ -1,47 +0,0 @@ -/* 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 -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#endif /* __GST_VIDEO_GST_VIDEO_H__ */ diff --git a/gst-libs/gst/video/gstvideodecoder.c b/gst-libs/gst/video/gstvideodecoder.c index 27f2e2b..e128b7b 100644 --- a/gst-libs/gst/video/gstvideodecoder.c +++ b/gst-libs/gst/video/gstvideodecoder.c @@ -296,6 +296,7 @@ #include "gstvideodecoder.h" #include "gstvideoutils.h" +#include #include #include #include diff --git a/gst-libs/gst/video/gstvideoencoder.c b/gst-libs/gst/video/gstvideoencoder.c index 62f797f..025484c 100644 --- a/gst-libs/gst/video/gstvideoencoder.c +++ b/gst-libs/gst/video/gstvideoencoder.c @@ -115,6 +115,7 @@ * and if it exceeds the recorded one, save it and emit a GST_MESSAGE_LATENCY */ +#include #include "gstvideoencoder.h" #include "gstvideoutils.h" diff --git a/gst-libs/gst/video/gstvideoutils.c b/gst-libs/gst/video/gstvideoutils.c index 3e2bd00..b4bf009 100644 --- a/gst-libs/gst/video/gstvideoutils.c +++ b/gst-libs/gst/video/gstvideoutils.c @@ -23,6 +23,7 @@ #include "config.h" #endif +#include #include "gstvideoutils.h" #include diff --git a/gst-libs/gst/video/video-frame.c b/gst-libs/gst/video/video-frame.c index 77affb9..5ae3095 100644 --- a/gst-libs/gst/video/video-frame.c +++ b/gst-libs/gst/video/video-frame.c @@ -26,6 +26,7 @@ #include #include +#include #include "video-frame.h" #include "gstvideometa.h" diff --git a/gst-libs/gst/video/video.h b/gst-libs/gst/video/video.h index 1330db8..bd01ac5 100644 --- a/gst-libs/gst/video/video.h +++ b/gst-libs/gst/video/video.h @@ -24,7 +24,6 @@ typedef struct _GstVideoAlignment GstVideoAlignment; -#include #include #include #include @@ -82,6 +81,23 @@ GstSample * gst_video_convert_sample (GstSample * sample, const GstCaps * to_caps, GstClockTime timeout, GError ** error); + G_END_DECLS +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #endif /* __GST_VIDEO_H__ */ -- 2.7.4