diff --git a/ChangeLog b/ChangeLog index d6739203a4..140f7ae131 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +2007-09-17 Jan Schmidt + + * ext/pango/gsttextoverlay.c: (gst_text_overlay_init), + (gst_text_overlay_set_property): + * ext/vorbis/vorbisdec.c: (vorbis_handle_data_packet): + * gst-libs/gst/audio/gstbaseaudiosink.c: + (gst_base_audio_sink_render): + * gst-libs/gst/rtp/gstrtcpbuffer.c: (gst_rtcp_ntp_to_unix), + (gst_rtcp_unix_to_ntp): + * gst-libs/gst/rtsp/gstrtspmessage.c: (gst_rtsp_message_get_type): + * gst/playback/gstqueue2.c: + * tests/examples/seek/seek.c: (set_scale): + Fix a bunch of compile warnings shown with Forte. + + * gst/audiorate/gstaudiorate.c: + Always pull in config.h before including any system headers. + 2007-09-17 Wim Taymans * gst/playback/gstqueue2.c: (update_buffering), diff --git a/ext/pango/gsttextoverlay.c b/ext/pango/gsttextoverlay.c index 98687e6b71..804eeae8ec 100644 --- a/ext/pango/gsttextoverlay.c +++ b/ext/pango/gsttextoverlay.c @@ -487,7 +487,8 @@ gst_text_overlay_init (GstTextOverlay * overlay, GstTextOverlayClass * klass) overlay->line_align = DEFAULT_PROP_LINE_ALIGNMENT; overlay->layout = pango_layout_new (GST_TEXT_OVERLAY_GET_CLASS (overlay)->pango_context); - pango_layout_set_alignment (overlay->layout, overlay->line_align); + pango_layout_set_alignment (overlay->layout, + (PangoAlignment) overlay->line_align); memset (&overlay->bitmap, 0, sizeof (overlay->bitmap)); overlay->halign = DEFAULT_PROP_HALIGNMENT; @@ -685,7 +686,8 @@ gst_text_overlay_set_property (GObject * object, guint prop_id, break; case PROP_LINE_ALIGNMENT: overlay->line_align = g_value_get_enum (value); - pango_layout_set_alignment (overlay->layout, overlay->line_align); + pango_layout_set_alignment (overlay->layout, + (PangoAlignment) overlay->line_align); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); diff --git a/ext/vorbis/vorbisdec.c b/ext/vorbis/vorbisdec.c index bdde28418e..fc8b9d7005 100644 --- a/ext/vorbis/vorbisdec.c +++ b/ext/vorbis/vorbisdec.c @@ -913,7 +913,7 @@ vorbis_handle_data_packet (GstVorbisDec * vd, ogg_packet * packet) guint sample_count; GstBuffer *out; GstFlowReturn result; - GstClockTime timestamp = -1, nextts; + GstClockTime timestamp = GST_CLOCK_TIME_NONE, nextts; gint size; if (!vd->initialized) diff --git a/gst-libs/gst/audio/gstbaseaudiosink.c b/gst-libs/gst/audio/gstbaseaudiosink.c index 51a0bba61c..d3dcfa0141 100644 --- a/gst-libs/gst/audio/gstbaseaudiosink.c +++ b/gst-libs/gst/audio/gstbaseaudiosink.c @@ -884,7 +884,7 @@ gst_base_audio_sink_render (GstBaseSink * bsink, GstBuffer * buf) gint bps; gint accum; gint out_samples; - GstClockTime base_time = -1, latency; + GstClockTime base_time = GST_CLOCK_TIME_NONE, latency; GstClock *clock; gboolean sync, slaved, align_next; diff --git a/gst-libs/gst/rtp/gstrtcpbuffer.c b/gst-libs/gst/rtp/gstrtcpbuffer.c index 422cf574e5..e2847c90e0 100644 --- a/gst-libs/gst/rtp/gstrtcpbuffer.c +++ b/gst-libs/gst/rtp/gstrtcpbuffer.c @@ -1637,7 +1637,7 @@ gst_rtcp_ntp_to_unix (guint64 ntptime) /* conversion from NTP timestamp (seconds since 1900) to seconds since * 1970. */ - unixtime = ntptime - (2208988800LL << 32); + unixtime = ntptime - (2208988800ULL << 32); /* conversion to nanoseconds */ unixtime = gst_util_uint64_scale (unixtime, GST_SECOND, (1LL << 32)); @@ -1666,7 +1666,7 @@ gst_rtcp_unix_to_ntp (guint64 unixtime) ntptime = gst_util_uint64_scale (unixtime, (1LL << 32), GST_SECOND); /* conversion from UNIX timestamp (seconds since 1970) to NTP (seconds * since 1900). */ - ntptime += (2208988800LL << 32); + ntptime += (2208988800ULL << 32); return ntptime; } diff --git a/gst-libs/gst/rtsp/gstrtspmessage.c b/gst-libs/gst/rtsp/gstrtspmessage.c index 10f1ff2e34..297cdc3d90 100644 --- a/gst-libs/gst/rtsp/gstrtspmessage.c +++ b/gst-libs/gst/rtsp/gstrtspmessage.c @@ -132,7 +132,7 @@ gst_rtsp_message_init (GstRTSPMessage * msg) GstRTSPMsgType gst_rtsp_message_get_type (GstRTSPMessage * msg) { - g_return_val_if_fail (msg != NULL, GST_RTSP_EINVAL); + g_return_val_if_fail (msg != NULL, GST_RTSP_MESSAGE_INVALID); return msg->type; } diff --git a/gst/audiorate/gstaudiorate.c b/gst/audiorate/gstaudiorate.c index c1bd2857bc..88ad972c50 100644 --- a/gst/audiorate/gstaudiorate.c +++ b/gst/audiorate/gstaudiorate.c @@ -17,12 +17,12 @@ * Boston, MA 02111-1307, USA. */ -#include - #ifdef HAVE_CONFIG_H #include "config.h" #endif + #include +#include #include #include diff --git a/gst/playback/gstqueue2.c b/gst/playback/gstqueue2.c index d478cda914..437f44d0bc 100644 --- a/gst/playback/gstqueue2.c +++ b/gst/playback/gstqueue2.c @@ -320,7 +320,7 @@ static GstFlowReturn gst_queue_chain (GstPad * pad, GstBuffer * buffer); static GstFlowReturn gst_queue_bufferalloc (GstPad * pad, guint64 offset, guint size, GstCaps * caps, GstBuffer ** buf); static gboolean gst_queue_acceptcaps (GstPad * pad, GstCaps * caps); -static gboolean gst_queue_push_one (GstQueue * queue); +static GstFlowReturn gst_queue_push_one (GstQueue * queue); static void gst_queue_loop (GstPad * pad); static gboolean gst_queue_handle_sink_event (GstPad * pad, GstEvent * event); diff --git a/tests/examples/seek/seek.c b/tests/examples/seek/seek.c index 1a30e873c5..3cff77f0e8 100644 --- a/tests/examples/seek/seek.c +++ b/tests/examples/seek/seek.c @@ -1032,11 +1032,15 @@ static gboolean stop_seek (GtkWidget * widget, GdkEventButton * event, static void set_scale (gdouble value) { - g_signal_handlers_block_by_func (hscale, start_seek, pipeline); - g_signal_handlers_block_by_func (hscale, stop_seek, pipeline); + g_signal_handlers_block_by_func (hscale, (void *) start_seek, + (void *) pipeline); + g_signal_handlers_block_by_func (hscale, (void *) stop_seek, + (void *) pipeline); gtk_adjustment_set_value (adjustment, value); - g_signal_handlers_unblock_by_func (hscale, start_seek, pipeline); - g_signal_handlers_unblock_by_func (hscale, stop_seek, pipeline); + g_signal_handlers_unblock_by_func (hscale, (void *) start_seek, + (void *) pipeline); + g_signal_handlers_unblock_by_func (hscale, (void *) stop_seek, + (void *) pipeline); gtk_widget_queue_draw (hscale); }