From 1fe4050c0a299016b82bfdb70dd46d414a53a082 Mon Sep 17 00:00:00 2001 From: Jan Schmidt Date: Mon, 8 Oct 2007 17:46:45 +0000 Subject: gst/: Fix compiler warnings shown by Forte. Original commit message from CVS: * gst/librfb/rfbbuffer.c: (rfb_buffer_new_and_alloc): * gst/librfb/rfbbuffer.h: * gst/librfb/rfbdecoder.c: (rfb_socket_get_buffer): * gst/mpegvideoparse/mpegvideoparse.c: (gst_mpegvideoparse_chain): * gst/nsf/nes6502.c: (nes6502_execute): * gst/real/gstrealaudiodec.c: (gst_real_audio_dec_setcaps): * gst/real/gstrealvideodec.c: (open_library): * gst/real/gstrealvideodec.h: * gst/rtpmanager/gstrtpsession.c: (create_recv_rtp_sink), (create_recv_rtcp_sink), (create_send_rtp_sink): Fix compiler warnings shown by Forte. --- ChangeLog | 14 ++++++++++++++ gst/librfb/rfbbuffer.c | 2 +- gst/librfb/rfbbuffer.h | 3 ++- gst/librfb/rfbdecoder.c | 2 +- gst/mpegvideoparse/mpegvideoparse.c | 2 +- gst/nsf/nes6502.c | 19 ++++++++++++++++--- gst/real/gstrealaudiodec.c | 18 ++++++++++-------- gst/real/gstrealvideodec.c | 8 ++++---- gst/real/gstrealvideodec.h | 13 +++++++++---- gst/rtpmanager/gstrtpsession.c | 6 +++--- 10 files changed, 61 insertions(+), 26 deletions(-) diff --git a/ChangeLog b/ChangeLog index 817fd2f6..8d22a77b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2007-10-08 Jan Schmidt + + * gst/librfb/rfbbuffer.c: (rfb_buffer_new_and_alloc): + * gst/librfb/rfbbuffer.h: + * gst/librfb/rfbdecoder.c: (rfb_socket_get_buffer): + * gst/mpegvideoparse/mpegvideoparse.c: (gst_mpegvideoparse_chain): + * gst/nsf/nes6502.c: (nes6502_execute): + * gst/real/gstrealaudiodec.c: (gst_real_audio_dec_setcaps): + * gst/real/gstrealvideodec.c: (open_library): + * gst/real/gstrealvideodec.h: + * gst/rtpmanager/gstrtpsession.c: (create_recv_rtp_sink), + (create_recv_rtcp_sink), (create_send_rtp_sink): + Fix compiler warnings shown by Forte. + 2007-10-08 Wim Taymans * gst/rtpmanager/gstrtpbin.c: (get_pt_map), diff --git a/gst/librfb/rfbbuffer.c b/gst/librfb/rfbbuffer.c index 4ab4eb0e..d8ca081d 100644 --- a/gst/librfb/rfbbuffer.c +++ b/gst/librfb/rfbbuffer.c @@ -16,7 +16,7 @@ rfb_buffer_new_and_alloc (int len) RfbBuffer *buffer = g_new0 (RfbBuffer, 1); buffer->data = g_malloc (len); - buffer->free_data = (void *) g_free; + buffer->free_data = (RfbBufferFreeFunc) g_free; return buffer; } diff --git a/gst/librfb/rfbbuffer.h b/gst/librfb/rfbbuffer.h index f220c0e7..5c09c77c 100644 --- a/gst/librfb/rfbbuffer.h +++ b/gst/librfb/rfbbuffer.h @@ -6,10 +6,11 @@ G_BEGIN_DECLS typedef struct _RfbBuffer RfbBuffer; +typedef void(*RfbBufferFreeFunc)(guint8 *data, gpointer priv); struct _RfbBuffer { - void (*free_data) (guint8 *data, gpointer priv); + RfbBufferFreeFunc free_data; gpointer buffer_private; guint8 *data; diff --git a/gst/librfb/rfbdecoder.c b/gst/librfb/rfbdecoder.c index 4ea3910b..8b9254a1 100644 --- a/gst/librfb/rfbdecoder.c +++ b/gst/librfb/rfbdecoder.c @@ -642,7 +642,7 @@ rfb_socket_get_buffer (gint length, gpointer user_data) buffer = rfb_buffer_new (); buffer->data = g_malloc (length); - buffer->free_data = (void *) g_free; + buffer->free_data = (RfbBufferFreeFunc) g_free; // g_print ("calling read(%d, %p, %d)\n", fd, buffer->data, length); ret = read (fd, buffer->data, length); diff --git a/gst/mpegvideoparse/mpegvideoparse.c b/gst/mpegvideoparse/mpegvideoparse.c index ffce53ba..0d700afd 100644 --- a/gst/mpegvideoparse/mpegvideoparse.c +++ b/gst/mpegvideoparse/mpegvideoparse.c @@ -380,7 +380,7 @@ gst_mpegvideoparse_chain (GstPad * pad, GstBuffer * buf) MpegVideoParse *mpegvideoparse; GstFlowReturn res; gboolean have_discont; - gint64 next_offset = GST_BUFFER_OFFSET_NONE; + guint64 next_offset = GST_BUFFER_OFFSET_NONE; g_return_val_if_fail (pad != NULL, GST_FLOW_ERROR); g_return_val_if_fail (buf != NULL, GST_FLOW_ERROR); diff --git a/gst/nsf/nes6502.c b/gst/nsf/nes6502.c index c677a5ae..28bdc432 100644 --- a/gst/nsf/nes6502.c +++ b/gst/nsf/nes6502.c @@ -944,7 +944,7 @@ ADD_CYCLES(cycles); \ } -#define SEC() \ +#define NSF_SEC() \ { \ SET_FLAG(C_FLAG); \ ADD_CYCLES(2); \ @@ -1641,7 +1641,7 @@ nes6502_execute (int remaining_cycles) break; case 0x38: /* SEC */ - SEC (); + NSF_SEC (); break; case 0x39: /* AND $nnnn,Y */ @@ -2394,7 +2394,20 @@ nes6502_setdma (int cycles) /* ** $Log$ -** Revision 1.1 2006/07/13 15:07:28 wtay +** Revision 1.2 2007/10/08 17:46:44 thaytan +** * gst/librfb/rfbbuffer.c: (rfb_buffer_new_and_alloc): +** * gst/librfb/rfbbuffer.h: +** * gst/librfb/rfbdecoder.c: (rfb_socket_get_buffer): +** * gst/mpegvideoparse/mpegvideoparse.c: (gst_mpegvideoparse_chain): +** * gst/nsf/nes6502.c: (nes6502_execute): +** * gst/real/gstrealaudiodec.c: (gst_real_audio_dec_setcaps): +** * gst/real/gstrealvideodec.c: (open_library): +** * gst/real/gstrealvideodec.h: +** * gst/rtpmanager/gstrtpsession.c: (create_recv_rtp_sink), +** (create_recv_rtcp_sink), (create_send_rtp_sink): +** Fix compiler warnings shown by Forte. +** +** Revision 1.1 2006-07-13 15:07:28 wtay ** Based on patches by: Johan Dahlin ** Ronald Bultje ** * configure.ac: diff --git a/gst/real/gstrealaudiodec.c b/gst/real/gstrealaudiodec.c index 1045e11f..9cb1f5df 100644 --- a/gst/real/gstrealaudiodec.c +++ b/gst/real/gstrealaudiodec.c @@ -282,14 +282,16 @@ codec_search_done: g_module_symbol (module, "RASetPwd", &ra_set_pwd); g_module_symbol (module, "SetDLLAccessPath", &set_dll_access_path); - funcs.RACloseCodec = ra_close_codec; - funcs.RADecode = ra_decode; - funcs.RAFreeDecoder = ra_free_decoder; - funcs.RAOpenCodec2 = ra_open_codec2; - funcs.RAInitDecoder = ra_init_decoder; - funcs.RASetFlavor = ra_set_flavor; - funcs.RASetPwd = ra_set_pwd; - funcs.SetDLLAccessPath = set_dll_access_path; + funcs.RACloseCodec = (guint16 (*)(gpointer)) ra_close_codec; + funcs.RADecode = + (guint16 (*)(gpointer, guint8 *, guint32, guint8 *, guint32 *, guint32)) + ra_decode; + funcs.RAFreeDecoder = (guint16 (*)(gpointer)) ra_free_decoder; + funcs.RAOpenCodec2 = (guint16 (*)(gpointer, const gchar *)) ra_open_codec2; + funcs.RAInitDecoder = (guint16 (*)(gpointer, gpointer)) ra_init_decoder; + funcs.RASetFlavor = (guint16 (*)(gpointer, guint16)) ra_set_flavor; + funcs.RASetPwd = (void (*)(gpointer, gchar *)) ra_set_pwd; + funcs.SetDLLAccessPath = (void (*)(gchar *)) set_dll_access_path; if (funcs.SetDLLAccessPath) funcs.SetDLLAccessPath (split_path[i]); diff --git a/gst/real/gstrealvideodec.c b/gst/real/gstrealvideodec.c index 75bc6bc1..be6292f1 100644 --- a/gst/real/gstrealvideodec.c +++ b/gst/real/gstrealvideodec.c @@ -461,10 +461,10 @@ codec_search_done: goto could_not_load; } - hooks->init = rv_init; - hooks->free = rv_free; - hooks->transform = rv_transform; - hooks->custom_message = rv_custom_msg; + hooks->init = (GstRealVideoDecInitFunc) rv_init; + hooks->free = (GstRealVideoDecFreeFunc) rv_free; + hooks->transform = (GstRealVideoDecTransformFunc) rv_transform; + hooks->custom_message = (GstRealVideoDecMessageFunc) rv_custom_msg; hooks->module = module; dec->error_count = 0; diff --git a/gst/real/gstrealvideodec.h b/gst/real/gstrealvideodec.h index 148bd8ae..d3ac5391 100644 --- a/gst/real/gstrealvideodec.h +++ b/gst/real/gstrealvideodec.h @@ -35,6 +35,11 @@ typedef struct _GstRealVideoDec GstRealVideoDec; typedef struct _GstRealVideoDecClass GstRealVideoDecClass; typedef enum _GstRealVideoDecVersion GstRealVideoDecVersion; +typedef guint32 (*GstRealVideoDecMessageFunc) (gpointer, gpointer); +typedef guint32 (*GstRealVideoDecFreeFunc) (gpointer); +typedef guint32 (*GstRealVideoDecInitFunc) (gpointer, gpointer); +typedef guint32 (*GstRealVideoDecTransformFunc) (gchar *, gchar *, gpointer, gpointer, gpointer); + enum _GstRealVideoDecVersion { GST_REAL_VIDEO_DEC_VERSION_2 = 2, @@ -45,10 +50,10 @@ enum _GstRealVideoDecVersion typedef struct { GModule *module; - guint32 (*custom_message) (gpointer, gpointer); - guint32 (*free) (gpointer); - guint32 (*init) (gpointer, gpointer); - guint32 (*transform) (gchar *, gchar *, gpointer, gpointer, gpointer); + GstRealVideoDecMessageFunc custom_message; + GstRealVideoDecFreeFunc free; + GstRealVideoDecInitFunc init; + GstRealVideoDecTransformFunc transform; gpointer context; } GstRealVideoDecHooks; diff --git a/gst/rtpmanager/gstrtpsession.c b/gst/rtpmanager/gstrtpsession.c index 85b8a55a..d18ad8c5 100644 --- a/gst/rtpmanager/gstrtpsession.c +++ b/gst/rtpmanager/gstrtpsession.c @@ -1356,7 +1356,7 @@ create_recv_rtp_sink (GstRtpSession * rtpsession) gst_pad_set_chain_function (rtpsession->recv_rtp_sink, gst_rtp_session_chain_recv_rtp); gst_pad_set_event_function (rtpsession->recv_rtp_sink, - gst_rtp_session_event_recv_rtp_sink); + (GstPadEventFunction) gst_rtp_session_event_recv_rtp_sink); gst_pad_set_setcaps_function (rtpsession->recv_rtp_sink, gst_rtp_session_sink_setcaps); gst_pad_set_internal_link_function (rtpsession->recv_rtp_sink, @@ -1392,7 +1392,7 @@ create_recv_rtcp_sink (GstRtpSession * rtpsession) gst_pad_set_chain_function (rtpsession->recv_rtcp_sink, gst_rtp_session_chain_recv_rtcp); gst_pad_set_event_function (rtpsession->recv_rtcp_sink, - gst_rtp_session_event_recv_rtcp_sink); + (GstPadEventFunction) gst_rtp_session_event_recv_rtcp_sink); gst_pad_set_active (rtpsession->recv_rtcp_sink, TRUE); gst_element_add_pad (GST_ELEMENT_CAST (rtpsession), rtpsession->recv_rtcp_sink); @@ -1424,7 +1424,7 @@ create_send_rtp_sink (GstRtpSession * rtpsession) gst_pad_set_getcaps_function (rtpsession->send_rtp_sink, gst_rtp_session_getcaps_send_rtp); gst_pad_set_event_function (rtpsession->send_rtp_sink, - gst_rtp_session_event_send_rtp_sink); + (GstPadEventFunction) gst_rtp_session_event_send_rtp_sink); gst_pad_set_internal_link_function (rtpsession->send_rtp_sink, gst_rtp_session_internal_links); gst_pad_set_active (rtpsession->send_rtp_sink, TRUE); -- cgit v1.2.1