camerabin: Move debug category declaration to a separate file

Having GST_DEBUG_CATEGORY and GST_DEBUG_CATEGORY_EXTERN together
might lead to 'undefined symbol' problems. This commit moves
the _EXTERN to a separate new file.

7 files changed, 35 insertions, 4 deletions

diff --git a/gst/camerabin/Makefile.am b/gst/camerabin/Makefile.am
index fb21a6712..e4563f520 100644
--- a/gst/camerabin/Makefile.am
+++ b/gst/camerabin/Makefile.am
@@ -40,6 +40,7 @@ noinst_HEADERS = gstcamerabin.h             \
 		 gstcamerabincolorbalance.h \
 		 camerabinimage.h           \
 		 camerabinvideo.h           \
+		 camerabindebug.h           \
 		 camerabingeneral.h         \
 		 camerabinpreview.h         \
 		 gstcamerabinphotography.h  \
diff --git a/gst/camerabin/camerabindebug.h b/gst/camerabin/camerabindebug.h
new file mode 100644
index 000000000..9b16ac5f0
--- /dev/null
+++ b/gst/camerabin/camerabindebug.h
@@ -0,0 +1,30 @@
+/*
+ * GStreamer
+ * Copyright (C) 2010 Nokia Corporation <multimedia@maemo.org>
+ *
+ * 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., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __CAMERABIN_DEBUG_H_
+#define __CAMERABIN_DEBUG_H_
+
+#include <gst/gst.h>
+
+/* debug logging category */
+GST_DEBUG_CATEGORY_EXTERN (gst_camerabin_debug);
+#define GST_CAT_DEFAULT gst_camerabin_debug
+
+#endif /* #ifndef __CAMERABIN_DEBUG_H_ */
diff --git a/gst/camerabin/camerabingeneral.h b/gst/camerabin/camerabingeneral.h
index 1270aed81..0e84e4ad2 100644
--- a/gst/camerabin/camerabingeneral.h
+++ b/gst/camerabin/camerabingeneral.h
@@ -33,8 +33,4 @@ void gst_camerabin_remove_elements_from_bin (GstBin * bin);
 
 gboolean gst_camerabin_drop_eos_probe (GstPad * pad, GstEvent * event, gpointer u_data);
 
-/* debug logging category */
-GST_DEBUG_CATEGORY_EXTERN (gst_camerabin_debug);
-#define GST_CAT_DEFAULT gst_camerabin_debug
-
 #endif /* #ifndef __CAMERABIN_GENERAL_H_ */
diff --git a/gst/camerabin/camerabinimage.c b/gst/camerabin/camerabinimage.c
index 56453c670..25ca8f863 100644
--- a/gst/camerabin/camerabinimage.c
+++ b/gst/camerabin/camerabinimage.c
@@ -51,6 +51,7 @@
 #include <gst/gst.h>
 
 #include "camerabinimage.h"
+#include "camerabindebug.h"
 #include "camerabingeneral.h"
 #include "gstcamerabin-enum.h"
 
diff --git a/gst/camerabin/camerabinpreview.c b/gst/camerabin/camerabinpreview.c
index 255e1c3b4..b7776b9b4 100644
--- a/gst/camerabin/camerabinpreview.c
+++ b/gst/camerabin/camerabinpreview.c
@@ -25,6 +25,7 @@
 #include <gst/gst.h>
 #include <string.h>
 
+#include "camerabindebug.h"
 #include "camerabingeneral.h"
 #include "camerabinpreview.h"
 
diff --git a/gst/camerabin/camerabinvideo.c b/gst/camerabin/camerabinvideo.c
index 4ec5cfa38..b2715e7b6 100644
--- a/gst/camerabin/camerabinvideo.c
+++ b/gst/camerabin/camerabinvideo.c
@@ -56,6 +56,7 @@
 #endif
 
 #include <gst/gst.h>
+#include "camerabindebug.h"
 #include "camerabingeneral.h"
 
 #include "camerabinvideo.h"
diff --git a/gst/camerabin/gstcamerabin.c b/gst/camerabin/gstcamerabin.c
index f68253e4e..13812a277 100644
--- a/gst/camerabin/gstcamerabin.c
+++ b/gst/camerabin/gstcamerabin.c
@@ -163,6 +163,7 @@
 #include "gstcamerabincolorbalance.h"
 #include "gstcamerabinphotography.h"
 
+#include "camerabindebug.h"
 #include "camerabingeneral.h"
 #include "camerabinpreview.h"