v4l2object: Orphan buffer pool on object_stop if supported

[platform/upstream/gst-plugins-good.git] / ext / libcaca / gstcacasink.h

diff --git a/ext/libcaca/gstcacasink.h b/ext/libcaca/gstcacasink.h
index 571e209..327a6a8 100644 (file)
--- a/ext/libcaca/gstcacasink.h
+++ b/ext/libcaca/gstcacasink.h
@@ -13,8 +13,8 @@
  *
  * 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.
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 
@@ -26,54 +26,34 @@
 #include <gst/video/video.h>
 
 #include <caca.h>
+#ifdef CACA_API_VERSION_1
+#   include <caca0.h>
+#endif
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define GST_CACA_DEFAULT_SCREEN_WIDTH 80
-#define GST_CACA_DEFAULT_SCREEN_HEIGHT 25
-#define GST_CACA_DEFAULT_BPP 24
-#define GST_CACA_DEFAULT_RED_MASK GST_VIDEO_BYTE1_MASK_32_INT
-#define GST_CACA_DEFAULT_GREEN_MASK GST_VIDEO_BYTE2_MASK_32_INT
-#define GST_CACA_DEFAULT_BLUE_MASK GST_VIDEO_BYTE3_MASK_32_INT
-
-//#define GST_CACA_DEFAULT_RED_MASK R_MASK_32_REVERSE_INT
-//#define GST_CACA_DEFAULT_GREEN_MASK G_MASK_32_REVERSE_INT
-//#define GST_CACA_DEFAULT_BLUE_MASK B_MASK_32_REVERSE_INT
+G_BEGIN_DECLS
 
 #define GST_TYPE_CACASINK \
   (gst_cacasink_get_type())
 #define GST_CACASINK(obj) \
   (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_CACASINK,GstCACASink))
 #define GST_CACASINK_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_CACASINK,GstCACASink))
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_CACASINK,GstCACASinkClass))
 #define GST_IS_CACASINK(obj) \
   (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_CACASINK))
-#define GST_IS_CACASINK_CLASS(obj) \
+#define GST_IS_CACASINK_CLASS(klass) \
   (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_CACASINK))
 
-typedef enum {
-  GST_CACASINK_OPEN              = GST_ELEMENT_FLAG_LAST,
-
-  GST_CACASINK_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 2,
-} GstCACASinkFlags;
-
 typedef struct _GstCACASink GstCACASink;
 typedef struct _GstCACASinkClass GstCACASinkClass;
 
 struct _GstCACASink {
   GstBaseSink parent;
 
-  GstPad *sinkpad;
-
-  gulong format;
-  gint width, height;
+  GstVideoInfo info;
   gint screen_width, screen_height;
-  guint bpp;
+
   guint dither;
   gboolean antialiasing;
-  guint red_mask, green_mask, blue_mask;
 
   struct caca_bitmap *bitmap;
 };
@@ -86,9 +66,6 @@ struct _GstCACASinkClass {
 
 GType gst_cacasink_get_type(void);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
-#endif /* __GST_CACASINKE_H__ */
+#endif /* __GST_CACASINK_H__ */