diff options
author | David Schleef <ds@schleef.org> | 2005-05-16 15:35:52 +0000 |
---|---|---|
committer | David Schleef <ds@schleef.org> | 2005-05-16 15:35:52 +0000 |
commit | d90ee5bfa397e7f7969fffc5e43c3aa20001cbd2 (patch) | |
tree | 97f55a0e1868220f8fb77fd3b495966983e593b4 /sys/ximage/ximagesink.h | |
parent | 4c7a8ba0ec1dd80b35e82fe96d74d55416b51065 (diff) |
Port from GstData to GstMiniObject.
Original commit message from CVS:
Port from GstData to GstMiniObject.
* ext/ogg/gstoggdemux.c: (gst_ogg_pad_dispose):
* ext/ogg/gstoggmux.c: (gst_ogg_mux_buffer_from_page),
(gst_ogg_mux_queue_pads), (gst_ogg_mux_set_header_on_caps),
(gst_ogg_mux_collected):
* ext/ogg/gstogmparse.c: (gst_ogm_parse_chain):
* ext/theora/theoradec.c: (theora_handle_comment_packet),
(theora_handle_data_packet):
* ext/theora/theoraenc.c: (theora_buffer_from_packet),
(theora_set_header_on_caps), (theora_enc_chain):
* ext/vorbis/vorbisdec.c: (vorbis_dec_sink_event),
(vorbis_handle_comment_packet):
* ext/vorbis/vorbisenc.c: (gst_vorbisenc_set_header_on_caps):
* ext/vorbis/vorbisparse.c: (vorbis_parse_set_header_on_caps):
* gst-libs/gst/audio/gstaudiofilter.c: (gst_audiofilter_chain):
* gst-libs/gst/tag/gstvorbistag.c: (gst_vorbis_tag_chain):
* gst/audioconvert/gstaudioconvert.c:
(gst_audio_convert_get_buffer):
* gst/playback/gstdecodebin.c: (gst_decode_bin_class_init):
* gst/playback/gstplaybasebin.c: (check_queue), (probe_triggered),
(mute_stream), (silence_stream):
* gst/playback/gstplaybin.c: (gst_play_bin_class_init):
* gst/volume/gstvolume.c: (volume_transform):
* sys/ximage/ximagesink.c: (gst_ximage_buffer_finalize),
(gst_ximage_buffer_init), (gst_ximage_buffer_class_init),
(gst_ximage_buffer_get_type), (gst_ximagesink_check_xshm_calls),
(gst_ximagesink_ximage_new), (gst_ximagesink_ximage_destroy),
(gst_ximagesink_ximage_put), (gst_ximagesink_imagepool_clear),
(gst_ximagesink_show_frame), (gst_ximagesink_buffer_free),
(gst_ximagesink_buffer_alloc):
* sys/ximage/ximagesink.h:
Diffstat (limited to 'sys/ximage/ximagesink.h')
-rw-r--r-- | sys/ximage/ximagesink.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/sys/ximage/ximagesink.h b/sys/ximage/ximagesink.h index 0f994ba8e..4b2652f88 100644 --- a/sys/ximage/ximagesink.h +++ b/sys/ximage/ximagesink.h @@ -53,7 +53,9 @@ G_BEGIN_DECLS typedef struct _GstXContext GstXContext; typedef struct _GstXWindow GstXWindow; -typedef struct _GstXImage GstXImage; + +typedef struct _GstXImageBuffer GstXImageBuffer; +typedef struct _GstXImageBufferClass GstXImageBufferClass; typedef struct _GstXImageSink GstXImageSink; typedef struct _GstXImageSinkClass GstXImageSinkClass; @@ -93,7 +95,9 @@ struct _GstXWindow { }; /* XImage stuff */ -struct _GstXImage { +struct _GstXImageBuffer { + GstBuffer buffer; + /* Reference to the ximagesink we belong to */ GstXImageSink *ximagesink; @@ -114,8 +118,8 @@ struct _GstXImageSink { GstXContext *xcontext; GstXWindow *xwindow; - GstXImage *ximage; - GstXImage *cur_image; + GstXImageBuffer *ximage; + GstXImageBuffer *cur_image; gdouble framerate; GMutex *x_lock; |