Add G_BEGIN_DECLS and G_END_DECLS around headers where missing, so that they work...

Original commit message from CVS:
Add G_BEGIN_DECLS and G_END_DECLS around headers where missing, so that they work when included from C++ code

diff --git a/ChangeLog b/ChangeLog
index 8c73f7a..14ca0d4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2005-02-09  Tim-Philipp Müller  <tim at centricular dot net>
+
+       * gst-libs/gst/audio/multichannel.h:
+       * gst-libs/gst/gconf/gconf.h:
+       * gst-libs/gst/idct/idct.h:
+       * gst-libs/gst/media-info/media-info-priv.h:
+       * gst-libs/gst/play/play.h:
+       * gst-libs/gst/resample/private.h:
+       * gst-libs/gst/resample/resample.h:
+       * gst-libs/gst/riff/riff-ids.h:
+       * gst-libs/gst/video/video.h:
+       * gst-libs/gst/video/videosink.h:
+         Add G_BEGIN_DECLS and G_END_DECLS around headers where
+         missing, so that they work when included from C++ code.
+
 2005-02-09  David Schleef  <ds@schleef.org>
 
        * testsuite/gst-lint: Check for non-statically scoped

diff --git a/gst-libs/gst/audio/multichannel.h b/gst-libs/gst/audio/multichannel.h
index 5194fff..3b32222 100644 (file)
--- a/gst-libs/gst/audio/multichannel.h
+++ b/gst-libs/gst/audio/multichannel.h
@@ -23,6 +23,8 @@
 #include <gst/audio/audio.h>
 #include <gst/audio/multichannel-enumtypes.h>
 
+G_BEGIN_DECLS
+
 typedef enum {
   GST_AUDIO_CHANNEL_POSITION_INVALID = -1,
 
@@ -83,4 +85,6 @@ void  gst_audio_set_caps_channel_positions_list
 GstAudioChannelPosition *
        gst_audio_fixate_channel_positions (GstStructure *str);
 
+G_END_DECLS
+
 #endif /* __GST_AUDIO_MULTICHANNEL_H__ */

diff --git a/gst-libs/gst/gconf/gconf.h b/gst-libs/gst/gconf/gconf.h
index 70007f7..7dce40b 100644 (file)
--- a/gst-libs/gst/gconf/gconf.h
+++ b/gst-libs/gst/gconf/gconf.h
@@ -27,6 +27,8 @@
 #include <gst/gst.h>
 #include <gconf/gconf-client.h>
 
+G_BEGIN_DECLS
+
 gchar *                gst_gconf_get_string            (const gchar *key);
 void           gst_gconf_set_string            (const gchar *key, 
                                                  const gchar *value);
@@ -40,4 +42,6 @@ GstElement *  gst_gconf_get_default_video_src (void);
 GstElement *   gst_gconf_get_default_audio_src (void);
 GstElement *   gst_gconf_get_default_visualization_element (void);
 
+G_END_DECLS
+
 #endif /* GST_GCONF_H */

diff --git a/gst-libs/gst/idct/idct.h b/gst-libs/gst/idct/idct.h
index b137789..290ca9d 100644 (file)
--- a/gst-libs/gst/idct/idct.h
+++ b/gst-libs/gst/idct/idct.h
@@ -23,6 +23,8 @@
 
 #include <glib.h>
 
+G_BEGIN_DECLS
+
 typedef enum {
   GST_IDCT_DEFAULT,    
   GST_IDCT_INT,        
@@ -48,4 +50,6 @@ GstIDCT *gst_idct_new(GstIDCTMethod method);
 #define gst_idct_convert_sparse(idct, blocks) (idct)->convert_sparse((blocks))
 void gst_idct_destroy(GstIDCT *idct);
 
+G_END_DECLS
+
 #endif /* __GST_IDCT_H__ */

diff --git a/gst-libs/gst/media-info/media-info-priv.h b/gst-libs/gst/media-info/media-info-priv.h
index 3c98240..0c65da9 100644 (file)
--- a/gst-libs/gst/media-info/media-info-priv.h
+++ b/gst-libs/gst/media-info/media-info-priv.h
@@ -25,6 +25,8 @@
 #include <gst/gst.h>
 #include <glib/gprintf.h>
 
+G_BEGIN_DECLS
+
 /* debug */
 GST_DEBUG_CATEGORY_EXTERN (gst_media_info_debug);
 #define GST_CAT_DEFAULT gst_media_info_debug
@@ -152,4 +154,6 @@ gboolean    gmip_find_track_format_pre      (GstMediaInfoPriv *priv);
 gboolean       gmip_find_track_format_post     (GstMediaInfoPriv *priv);
 gboolean       gmip_find_track_format          (GstMediaInfoPriv *priv);
 
+G_END_DECLS
+
 #endif /* __GST_MEDIA_INFO_PRIV_H__ */

diff --git a/gst-libs/gst/play/play.h b/gst-libs/gst/play/play.h
index 4714698..a5ca414 100644 (file)
--- a/gst-libs/gst/play/play.h
+++ b/gst-libs/gst/play/play.h
@@ -24,6 +24,8 @@
 #include <gst/xoverlay/xoverlay.h>
 #include <gst/play/play-enumtypes.h>
 
+G_BEGIN_DECLS
+
 /* GError stuff */
 
 #define GST_PLAY_ERROR         gst_play_error_quark ()
@@ -97,4 +99,6 @@ GList *               gst_play_get_all_by_interface   (GstPlay *play,
 
 gdouble               gst_play_get_framerate         (GstPlay *play);
 
+G_END_DECLS
+
 #endif /* __GST_PLAY_H__ */

diff --git a/gst-libs/gst/resample/private.h b/gst-libs/gst/resample/private.h
index c2eb86a..20339c1 100644 (file)
--- a/gst-libs/gst/resample/private.h
+++ b/gst-libs/gst/resample/private.h
@@ -23,6 +23,8 @@
 
 #include "resample.h"
 
+G_BEGIN_DECLS
+
 void gst_resample_nearest_s16(gst_resample_t *r);
 void gst_resample_bilinear_s16(gst_resample_t *r);
 void gst_resample_sinc_s16(gst_resample_t *r);
@@ -111,4 +113,6 @@ void conv_float_double_ref(float *dest, double *src, int n);
 void conv_double_float_dstr(double *dest, float *src, int n, int dstr);
 void conv_float_double_sstr(float *dest, double *src, int n, int sstr);
 
+G_END_DECLS
+
 #endif /* __PRIVATE_H__ */

diff --git a/gst-libs/gst/resample/resample.h b/gst-libs/gst/resample/resample.h
index e887951..111c201 100644 (file)
--- a/gst-libs/gst/resample/resample.h
+++ b/gst-libs/gst/resample/resample.h
@@ -21,6 +21,10 @@
 #ifndef __GST_RESAMPLE_H__
 #define __GST_RESAMPLE_H__
 
+#include <glib.h>
+
+G_BEGIN_DECLS
+
 typedef enum {
        GST_RESAMPLE_NEAREST = 0,
        GST_RESAMPLE_BILINEAR,
@@ -102,4 +106,6 @@ void gst_resample_close (gst_resample_t * r);
 
 void gst_resample_scale(gst_resample_t *r, void *i_buf, unsigned int size);
 
+G_END_DECLS
+
 #endif /* __GST_RESAMPLE_H__ */

diff --git a/gst-libs/gst/riff/riff-ids.h b/gst-libs/gst/riff/riff-ids.h
index 453df2e..e311f9e 100644 (file)
--- a/gst-libs/gst/riff/riff-ids.h
+++ b/gst-libs/gst/riff/riff-ids.h
@@ -24,6 +24,8 @@
 
 #include <gst/gst.h>
 
+G_BEGIN_DECLS
+
 /* RIFF types */
 #define GST_RIFF_RIFF_WAVE GST_MAKE_FOURCC ('W','A','V','E')
 #define GST_RIFF_RIFF_AVI  GST_MAKE_FOURCC ('A','V','I',' ')
@@ -328,4 +330,6 @@ typedef struct _gst_riff_dmlh {
   guint32 totalframes;
 } gst_riff_dmlh;
 
+G_END_DECLS
+
 #endif /* __GST_RIFF_IDS_H__ */

diff --git a/gst-libs/gst/video/gstvideosink.h b/gst-libs/gst/video/gstvideosink.h
index d1e3aa9..bdf52e1 100644 (file)
--- a/gst-libs/gst/video/gstvideosink.h
+++ b/gst-libs/gst/video/gstvideosink.h
@@ -24,9 +24,7 @@
 
 #include <gst/gst.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
   
 #define GST_TYPE_VIDEOSINK (gst_videosink_get_type())
 #define GST_VIDEOSINK(obj) \
@@ -68,8 +66,6 @@ struct _GstVideoSinkClass {
 
 GType gst_videosink_get_type (void);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif  /* __GST_VIDEOSINK_H__ */

diff --git a/gst-libs/gst/video/video.h b/gst-libs/gst/video/video.h
index 6875f63..97a2aac 100644 (file)
--- a/gst-libs/gst/video/video.h
+++ b/gst-libs/gst/video/video.h
@@ -23,6 +23,8 @@
 
 #include <gst/gst.h>
 
+G_BEGIN_DECLS
+
 #define GST_VIDEO_BYTE1_MASK_32  "0xFF000000"
 #define GST_VIDEO_BYTE2_MASK_32  "0x00FF0000"
 #define GST_VIDEO_BYTE3_MASK_32  "0x0000FF00"
@@ -187,4 +189,6 @@ gboolean gst_video_get_size   (GstPad *pad,
                                gint   *width,
                                gint   *height);
 
+G_END_DECLS
+
 #endif /* __GST_VIDEO_H__ */

diff --git a/gst-libs/gst/video/videosink.h b/gst-libs/gst/video/videosink.h
index d1e3aa9..bdf52e1 100644 (file)
--- a/gst-libs/gst/video/videosink.h
+++ b/gst-libs/gst/video/videosink.h
@@ -24,9 +24,7 @@
 
 #include <gst/gst.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
   
 #define GST_TYPE_VIDEOSINK (gst_videosink_get_type())
 #define GST_VIDEOSINK(obj) \
@@ -68,8 +66,6 @@ struct _GstVideoSinkClass {
 
 GType gst_videosink_get_type (void);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif  /* __GST_VIDEOSINK_H__ */