From: Benjamin Otte Date: Sun, 21 Mar 2010 20:39:18 +0000 (+0100) Subject: Add -Wmissing-declarations -Wmissing-prototypes to configure flags X-Git-Tag: 1.19.3~507^2~17301 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f96e4f15817974e8d3675bfe3980cdf02815bd74;p=platform%2Fupstream%2Fgstreamer.git Add -Wmissing-declarations -Wmissing-prototypes to configure flags And fix all warnings --- diff --git a/configure.ac b/configure.ac index 1675369..606f740 100644 --- a/configure.ac +++ b/configure.ac @@ -239,10 +239,12 @@ dnl set location of plugin directory AG_GST_SET_PLUGINDIR dnl define an ERROR_CFLAGS Makefile variable -AG_GST_SET_ERROR_CFLAGS($GST_GIT) +AG_GST_SET_ERROR_CFLAGS($GST_GIT, [ + -Wmissing-declarations -Wmissing-prototypes ]) dnl define an ERROR_CXXFLAGS Makefile variable -AG_GST_SET_ERROR_CXXFLAGS($GST_GIT) +AG_GST_SET_ERROR_CXXFLAGS($GST_GIT, [ + -Wmissing-declarations ]) dnl define correct level for debugging messages AG_GST_SET_LEVEL_DEFAULT($GST_GIT) diff --git a/ext/cdaudio/gstcdaudio.c b/ext/cdaudio/gstcdaudio.c index 8d1a153..4dd4619 100644 --- a/ext/cdaudio/gstcdaudio.c +++ b/ext/cdaudio/gstcdaudio.c @@ -128,6 +128,7 @@ _do_init (GType cdaudio_type) &urihandler_info); } +GType gst_cdaudio_get_type (void); GST_BOILERPLATE_FULL (GstCDAudio, gst_cdaudio, GstElement, GST_TYPE_ELEMENT, _do_init); diff --git a/ext/dc1394/gstdc1394.c b/ext/dc1394/gstdc1394.c index 4848b65..5835707 100644 --- a/ext/dc1394/gstdc1394.c +++ b/ext/dc1394/gstdc1394.c @@ -92,7 +92,7 @@ static gint gst_dc1394_caps_set_framerate_list (GstStructure * gs, static void gst_dc1394_framerate_const_to_frac (int framerateconst, GValue * framefrac); -static GstCaps *gst_dc1394_get_all_dc1394_caps (); +static GstCaps *gst_dc1394_get_all_dc1394_caps (void); static GstCaps *gst_dc1394_get_cam_caps (GstDc1394 * src); static gboolean gst_dc1394_open_cam_with_best_caps (GstDc1394 * src); static gint gst_dc1394_framerate_frac_to_const (gint num, gint denom); @@ -811,10 +811,8 @@ gst_dc1394_framerate_const_to_frac (gint framerateconst, GValue * framefrac) } } - - -GstCaps * -gst_dc1394_get_all_dc1394_caps () +static GstCaps * +gst_dc1394_get_all_dc1394_caps (void) { /* generate all possible caps diff --git a/ext/dirac/gstdiracenc.cc b/ext/dirac/gstdiracenc.cc index c54e7ec..b94bb9d 100644 --- a/ext/dirac/gstdiracenc.cc +++ b/ext/dirac/gstdiracenc.cc @@ -108,6 +108,7 @@ struct _GstDiracEncClass GstBaseVideoEncoderClass parent_class; }; +GType gst_dirac_enc_get_type (void); enum { diff --git a/ext/flite/gstflitetestsrc.c b/ext/flite/gstflitetestsrc.c index c8c4a1f..ea7da1d 100644 --- a/ext/flite/gstflitetestsrc.c +++ b/ext/flite/gstflitetestsrc.c @@ -325,7 +325,7 @@ gst_flite_test_src_stop (GstBaseSrc * basesrc) return TRUE; } -char * +static char * get_channel_name (GstFliteTestSrc * src, int channel) { const char *numbers[10] = { diff --git a/ext/jack/gstjack.h b/ext/jack/gstjack.h index fc26b71..4565e06 100644 --- a/ext/jack/gstjack.h +++ b/ext/jack/gstjack.h @@ -47,6 +47,6 @@ typedef enum { typedef jack_default_audio_sample_t sample_t; #define GST_TYPE_JACK_CONNECT (gst_jack_connect_get_type()) -GType gst_jack_connect_get_type(); +GType gst_jack_connect_get_type(void); #endif // _GST_JACK_H_ diff --git a/ext/metadata/gstmetadata.c b/ext/metadata/gstmetadata.c index 2e72925..7ab2bbf 100644 --- a/ext/metadata/gstmetadata.c +++ b/ext/metadata/gstmetadata.c @@ -47,11 +47,10 @@ #include +#include "gstmetadatademux.h" +#include "gstmetadatamux.h" #include "metadatatags.h" -extern gboolean gst_metadata_demux_plugin_init (GstPlugin * plugin); -extern gboolean gst_metadata_mux_plugin_init (GstPlugin * plugin); - GST_DEBUG_CATEGORY_EXTERN (gst_metadata_exif_debug); GST_DEBUG_CATEGORY_EXTERN (gst_metadata_iptc_debug); GST_DEBUG_CATEGORY_EXTERN (gst_metadata_xmp_debug); diff --git a/ext/metadata/gstmetadatademux.h b/ext/metadata/gstmetadatademux.h index de47f25..eef59b8 100644 --- a/ext/metadata/gstmetadatademux.h +++ b/ext/metadata/gstmetadatademux.h @@ -84,7 +84,9 @@ struct _GstMetadataDemuxClass GstBaseMetadataClass parent_class; }; -extern GType gst_metadata_demux_get_type (void); +GType gst_metadata_demux_get_type (void); + +gboolean gst_metadata_demux_plugin_init (GstPlugin * plugin); G_END_DECLS #endif /* __GST_METADATA_DEMUX_H__ */ diff --git a/ext/metadata/gstmetadatamux.h b/ext/metadata/gstmetadatamux.h index a24b3ff..0e81163 100644 --- a/ext/metadata/gstmetadatamux.h +++ b/ext/metadata/gstmetadatamux.h @@ -85,7 +85,9 @@ struct _GstMetadataMuxClass GstBaseMetadataClass parent_class; }; -extern GType gst_metadata_mux_get_type (void); +GType gst_metadata_mux_get_type (void); + +gboolean gst_metadata_mux_plugin_init (GstPlugin * plugin); G_END_DECLS #endif /* __GST_METADATA_MUX_H__ */ diff --git a/ext/mythtv/gstmythtvsrc.c b/ext/mythtv/gstmythtvsrc.c index 5ec8397..c80bae8 100644 --- a/ext/mythtv/gstmythtvsrc.c +++ b/ext/mythtv/gstmythtvsrc.c @@ -433,32 +433,6 @@ read_error: return GST_FLOW_ERROR; } -gint64 -gst_mythtv_src_get_position (GstMythtvSrc * src) -{ - gint64 size_tmp = 0; - guint max_tries = 2; - - if (src->live_tv == TRUE && - (abs (src->content_size - src->bytes_read) < - GMYTHTV_TRANSFER_MAX_BUFFER)) { - - get_file_pos: - g_usleep (10); - size_tmp = gmyth_recorder_get_file_position (src->spawn_livetv->recorder); - if (size_tmp > (src->content_size + GMYTHTV_TRANSFER_MAX_BUFFER)) - src->content_size = size_tmp; - else if (size_tmp > 0 && --max_tries > 0) - goto get_file_pos; - GST_LOG_OBJECT (src, "file_position = %" G_GINT64_FORMAT, size_tmp); - /* - * sets the last content size amount before it can be updated - */ - src->prev_content_size = src->content_size; - } - return src->content_size; -} - static gboolean gst_mythtv_src_do_seek (GstBaseSrc * base, GstSegment * segment) { @@ -729,6 +703,32 @@ gst_mythtv_src_stop (GstBaseSrc * bsrc) } #if 0 +static gint64 +gst_mythtv_src_get_position (GstMythtvSrc * src) +{ + gint64 size_tmp = 0; + guint max_tries = 2; + + if (src->live_tv == TRUE && + (abs (src->content_size - src->bytes_read) < + GMYTHTV_TRANSFER_MAX_BUFFER)) { + + get_file_pos: + g_usleep (10); + size_tmp = gmyth_recorder_get_file_position (src->spawn_livetv->recorder); + if (size_tmp > (src->content_size + GMYTHTV_TRANSFER_MAX_BUFFER)) + src->content_size = size_tmp; + else if (size_tmp > 0 && --max_tries > 0) + goto get_file_pos; + GST_LOG_OBJECT (src, "file_position = %" G_GINT64_FORMAT, size_tmp); + /* + * sets the last content size amount before it can be updated + */ + src->prev_content_size = src->content_size; + } + return src->content_size; +} + static gboolean gst_mythtv_src_handle_event (GstPad * pad, GstEvent * event) { @@ -1011,10 +1011,3 @@ gst_mythtv_src_uri_handler_init (gpointer g_iface, gpointer iface_data) iface->get_uri = gst_mythtv_src_uri_get_uri; iface->set_uri = gst_mythtv_src_uri_set_uri; } - -void -size_header_handler (void *src, const char *value) -{ - GST_DEBUG_OBJECT (src, "content size = %" G_GUINT64_FORMAT " bytes", - GST_MYTHTV_SRC (src)->content_size); -} diff --git a/ext/resindvd/resindvdsrc.c b/ext/resindvd/resindvdsrc.c index ec8f92b..95ab374 100644 --- a/ext/resindvd/resindvdsrc.c +++ b/ext/resindvd/resindvdsrc.c @@ -2780,14 +2780,3 @@ fail: GST_DEBUG_OBJECT (src, "Seek in format %d failed", segment->format); return FALSE; } - -gboolean -rsndvdsrc_init (GstPlugin * plugin) -{ - gboolean res; - - res = gst_element_register (plugin, "rsndvdsrc", - GST_RANK_NONE, RESIN_TYPE_DVDSRC); - - return res; -} diff --git a/ext/schroedinger/gstschrodec.c b/ext/schroedinger/gstschrodec.c index 6d6faa5..29ca5d7 100644 --- a/ext/schroedinger/gstschrodec.c +++ b/ext/schroedinger/gstschrodec.c @@ -63,6 +63,8 @@ struct _GstSchroDecClass GstBaseVideoDecoder base_video_decoder_class; }; +GType gst_schro_dec_get_type (void); + /* GstSchroDec signals and args */ enum diff --git a/ext/schroedinger/gstschroenc.c b/ext/schroedinger/gstschroenc.c index 6cc1a0d..c87375b 100644 --- a/ext/schroedinger/gstschroenc.c +++ b/ext/schroedinger/gstschroenc.c @@ -83,6 +83,8 @@ struct _GstSchroEncClass GstBaseVideoEncoderClass parent_class; }; +GType gst_schro_enc_get_type (void); + enum diff --git a/ext/schroedinger/gstschroparse.c b/ext/schroedinger/gstschroparse.c index adff59c..717bb0d 100644 --- a/ext/schroedinger/gstschroparse.c +++ b/ext/schroedinger/gstschroparse.c @@ -86,6 +86,9 @@ struct _GstSchroParseClass GstBaseVideoParseClass base_video_parse_class; }; +GType gst_schro_parse_get_type (void); + + /* GstSchroParse signals and args */ enum { diff --git a/ext/schroedinger/gstschroutils.c b/ext/schroedinger/gstschroutils.c index 9f6a579..bb1f1bc 100644 --- a/ext/schroedinger/gstschroutils.c +++ b/ext/schroedinger/gstschroutils.c @@ -21,6 +21,8 @@ #include "config.h" #endif +#include "gstschroutils.h" + //#define SCHRO_ENABLE_UNSTABLE_API #include diff --git a/ext/sdl/sdlaudiosink.c b/ext/sdl/sdlaudiosink.c index 2106864..f2c5eff 100644 --- a/ext/sdl/sdlaudiosink.c +++ b/ext/sdl/sdlaudiosink.c @@ -300,7 +300,7 @@ gst_sdlaudio_sink_write (GstAudioSink * asink, gpointer data, guint length) } -void +static void mixaudio (void *unused, Uint8 * stream, int len) { GstSDLAudioSink *sdlaudio; diff --git a/gst-libs/gst/video/gstbasevideoutils.c b/gst-libs/gst/video/gstbasevideoutils.c index 0faed8a..83d72c9 100644 --- a/gst-libs/gst/video/gstbasevideoutils.c +++ b/gst-libs/gst/video/gstbasevideoutils.c @@ -29,19 +29,6 @@ GST_DEBUG_CATEGORY_EXTERN (basevideo_debug); #define GST_CAT_DEFAULT basevideo_debug -guint64 -gst_base_video_convert_bytes_to_frames (GstVideoState * state, guint64 bytes) -{ - return gst_util_uint64_scale_int (bytes, 1, state->bytes_per_picture); -} - -guint64 -gst_base_video_convert_frames_to_bytes (GstVideoState * state, guint64 frames) -{ - return frames * state->bytes_per_picture; -} - - gboolean gst_base_video_rawvideo_convert (GstVideoState * state, GstFormat src_format, gint64 src_value, diff --git a/gst/adpcmdec/adpcmdec.c b/gst/adpcmdec/adpcmdec.c index 34e4f3a..d8a8dec 100644 --- a/gst/adpcmdec/adpcmdec.c +++ b/gst/adpcmdec/adpcmdec.c @@ -97,6 +97,7 @@ typedef struct _ADPCMDec } ADPCMDec; +GType adpcmdec_get_type (void); GST_BOILERPLATE (ADPCMDec, adpcmdec, GstElement, GST_TYPE_ELEMENT); static gboolean adpcmdec_setup (ADPCMDec * dec) diff --git a/gst/adpcmenc/adpcmenc.c b/gst/adpcmenc/adpcmenc.c index 89b8334..0a9d0e9 100644 --- a/gst/adpcmenc/adpcmenc.c +++ b/gst/adpcmenc/adpcmenc.c @@ -144,6 +144,7 @@ typedef struct _ADPCMEnc } ADPCMEnc; +GType adpcmenc_get_type (void); GST_BOILERPLATE (ADPCMEnc, adpcmenc, GstElement, GST_TYPE_ELEMENT); static gboolean adpcmenc_setup (ADPCMEnc * enc) diff --git a/gst/aiff/aiffmux.c b/gst/aiff/aiffmux.c index d3477a8..2bfbbc8 100644 --- a/gst/aiff/aiffmux.c +++ b/gst/aiff/aiffmux.c @@ -183,7 +183,7 @@ typedef struct AVExtFloat guint8 mantissa[8]; } AVExtFloat; -AVExtFloat +static AVExtFloat av_dbl2ext (double d) { struct AVExtFloat ext = { {0} }; diff --git a/gst/asfmux/gstasfmux.c b/gst/asfmux/gstasfmux.c index 0a6ad57..a73d4e7 100644 --- a/gst/asfmux/gstasfmux.c +++ b/gst/asfmux/gstasfmux.c @@ -1220,7 +1220,7 @@ gst_asf_mux_write_data_object (GstAsfMux * asfmux, guint8 ** buf) *buf += ASF_DATA_OBJECT_SIZE; } -guint +static guint gst_asf_mux_find_payload_parsing_info_size (GstAsfMux * asfmux) { /* Minimum payload parsing information size is 8 bytes */ diff --git a/gst/autoconvert/gstautoconvert.c b/gst/autoconvert/gstautoconvert.c index 4fb0a41..9583779 100644 --- a/gst/autoconvert/gstautoconvert.c +++ b/gst/autoconvert/gstautoconvert.c @@ -1551,7 +1551,7 @@ gst_auto_convert_internal_src_query_type (GstPad * pad) return ret; } -gboolean +static gboolean gst_auto_convert_plugin_init (GstPlugin * plugin) { return gst_element_register (plugin, "autoconvert", diff --git a/gst/autoconvert/gstautoconvert.h b/gst/autoconvert/gstautoconvert.h index 4375255..612bcb1 100644 --- a/gst/autoconvert/gstautoconvert.h +++ b/gst/autoconvert/gstautoconvert.h @@ -65,5 +65,7 @@ struct _GstAutoConvertClass GstBinClass parent_class; }; +GType gst_auto_convert_get_type (void); + G_END_DECLS #endif /* __GST_AUTO_CONVERT_H__ */ diff --git a/gst/bayer/gstbayer2rgb.c b/gst/bayer/gstbayer2rgb.c index 1538465..ac88202 100644 --- a/gst/bayer/gstbayer2rgb.c +++ b/gst/bayer/gstbayer2rgb.c @@ -138,6 +138,7 @@ enum #define DEBUG_INIT(bla) \ GST_DEBUG_CATEGORY_INIT (gst_bayer2rgb_debug, "bayer2rgb", 0, "bayer2rgb element"); +GType gst_bayer2rgb_get_type (void); GST_BOILERPLATE_FULL (GstBayer2RGB, gst_bayer2rgb, GstBaseTransform, GST_TYPE_BASE_TRANSFORM, DEBUG_INIT); diff --git a/gst/dccp/gstdccp.c b/gst/dccp/gstdccp.c index 148aa4a..3d44731 100644 --- a/gst/dccp/gstdccp.c +++ b/gst/dccp/gstdccp.c @@ -516,12 +516,13 @@ gst_dccp_set_ccid (GstElement * element, int sock_fd, uint8_t ccid) return TRUE; } +#if 0 /* * Get the current ccid of TX or RX half-connection. tx_or_rx parameter must be * DCCP_SOCKOPT_TX_CCID or DCCP_SOCKOPT_RX_CCID. * @return ccid or -1 on error or tx_or_rx not the correct option */ -uint8_t +static uint8_t gst_dccp_get_ccid (GstElement * element, int sock_fd, int tx_or_rx) { uint8_t ccid; @@ -548,6 +549,7 @@ gst_dccp_get_ccid (GstElement * element, int sock_fd, int tx_or_rx) } return ccid; } +#endif /* * Get the socket MTU. diff --git a/gst/dtmf/gstrtpdtmfdepay.h b/gst/dtmf/gstrtpdtmfdepay.h index dfbcc4a..172cb84 100644 --- a/gst/dtmf/gstrtpdtmfdepay.h +++ b/gst/dtmf/gstrtpdtmfdepay.h @@ -60,6 +60,8 @@ struct _GstRtpDTMFDepayClass GstBaseRTPDepayloadClass parent_class; }; +GType gst_rtp_dtmf_depay_get_type (void); + gboolean gst_rtp_dtmf_depay_plugin_init (GstPlugin * plugin); G_END_DECLS diff --git a/gst/dvdspu/gstdvdspu.c b/gst/dvdspu/gstdvdspu.c index e4ded05..6ef0328 100644 --- a/gst/dvdspu/gstdvdspu.c +++ b/gst/dvdspu/gstdvdspu.c @@ -1169,7 +1169,7 @@ gst_dvd_spu_change_state (GstElement * element, GstStateChange transition) return ret; } -gboolean +static gboolean gst_dvd_spu_plugin_init (GstPlugin * plugin) { GST_DEBUG_CATEGORY_INIT (dvdspu_debug, "gstspu", diff --git a/gst/invtelecine/gstinvtelecine.c b/gst/invtelecine/gstinvtelecine.c index 753957f..98b59aa 100644 --- a/gst/invtelecine/gstinvtelecine.c +++ b/gst/invtelecine/gstinvtelecine.c @@ -116,7 +116,7 @@ static GstFlowReturn gst_invtelecine_output_fields (GstInvtelecine * invtelecine, int num_fields); -GType +static GType gst_invtelecine_get_type (void) { static GType invtelecine_type = 0; diff --git a/gst/legacyresample/resample.c b/gst/legacyresample/resample.c index c464adf..f8f229f 100644 --- a/gst/legacyresample/resample.c +++ b/gst/legacyresample/resample.c @@ -33,9 +33,6 @@ #include "buffer.h" #include "debug.h" -void resample_scale_ref (ResampleState * r); -void resample_scale_functable (ResampleState * r); - GST_DEBUG_CATEGORY (libaudioresample_debug); void diff --git a/gst/legacyresample/resample.h b/gst/legacyresample/resample.h index 84bf8f0..ba14983 100644 --- a/gst/legacyresample/resample.h +++ b/gst/legacyresample/resample.h @@ -124,5 +124,8 @@ void resample_set_format (ResampleState *r, ResampleFormat format); void resample_set_method (ResampleState *r, int method); int resample_format_size (ResampleFormat format); +void resample_scale_ref (ResampleState * r); +void resample_scale_functable (ResampleState * r); + #endif /* __RESAMPLE_H__ */ diff --git a/gst/librfb/rfbdecoder.c b/gst/librfb/rfbdecoder.c index 28ca5c9..36e47aa 100644 --- a/gst/librfb/rfbdecoder.c +++ b/gst/librfb/rfbdecoder.c @@ -155,7 +155,7 @@ rfb_decoder_iterate (RfbDecoder * decoder) return decoder->state (decoder); } -guint8 * +static guint8 * rfb_decoder_read (RfbDecoder * decoder, guint32 len) { guint32 total = 0; diff --git a/gst/mpegdemux/gstmpegdemux.c b/gst/mpegdemux/gstmpegdemux.c index 0b4f242..d62fbd0 100644 --- a/gst/mpegdemux/gstmpegdemux.c +++ b/gst/mpegdemux/gstmpegdemux.c @@ -77,25 +77,6 @@ typedef enum GST_DEBUG_CATEGORY_STATIC (gstflupsdemux_debug); #define GST_CAT_DEFAULT (gstflupsdemux_debug) -#define GST_TYPE_FLUPS_DEMUX_SYNC (gst_flups_demux_sync_get_type ()) -GType -gst_flups_demux_sync_get_type (void) -{ - static GType sync_type = 0; - static GEnumValue sync_types[] = { - {GST_FLUPS_DEMUX_SYNC_AUTO, "Auto-select method to synchronize streams", - "auto"}, - {GST_FLUPS_DEMUX_SYNC_SCR, "Use SCR to synchronize streams", "scr"}, - {GST_FLUPS_DEMUX_SYNC_DTS, "Use DTS to synchronize streams", "dts"}, - {0, NULL, NULL} - }; - - if (sync_type == 0) - sync_type = g_enum_register_static ("GstPSDemuxSync", sync_types); - - return sync_type; -} - /* MPEG2Demux signals and args */ enum { diff --git a/gst/mpegdemux/gstmpegdesc.h b/gst/mpegdemux/gstmpegdesc.h index 09a9a7c..9e1ae75 100644 --- a/gst/mpegdemux/gstmpegdesc.h +++ b/gst/mpegdemux/gstmpegdesc.h @@ -329,7 +329,7 @@ typedef struct { guint8 *data; } GstMPEGDescriptor; -void gst_mpegtsdesc_init_debug (); +void gst_mpegtsdesc_init_debug (void); GstMPEGDescriptor* gst_mpeg_descriptor_parse (guint8 *data, guint size); void gst_mpeg_descriptor_free (GstMPEGDescriptor *desc); diff --git a/gst/mpegdemux/mpegtspacketizer.c b/gst/mpegdemux/mpegtspacketizer.c index 3576090..642e130 100644 --- a/gst/mpegdemux/mpegtspacketizer.c +++ b/gst/mpegdemux/mpegtspacketizer.c @@ -1967,7 +1967,7 @@ mpegts_packetizer_remove_stream (MpegTSPacketizer * packetizer, gint16 pid) } MpegTSPacketizer * -mpegts_packetizer_new () +mpegts_packetizer_new (void) { MpegTSPacketizer *packetizer; @@ -1983,7 +1983,7 @@ mpegts_packetizer_push (MpegTSPacketizer * packetizer, GstBuffer * buffer) gst_adapter_push (packetizer->adapter, buffer); } -void +static void mpegts_try_discover_packet_size (MpegTSPacketizer * packetizer) { guint8 *dest; diff --git a/gst/mpegdemux/mpegtspacketizer.h b/gst/mpegdemux/mpegtspacketizer.h index 1f82848..6a06906 100644 --- a/gst/mpegdemux/mpegtspacketizer.h +++ b/gst/mpegdemux/mpegtspacketizer.h @@ -121,9 +121,9 @@ typedef enum { PACKET_NEED_MORE } MpegTSPacketizerPacketReturn; -GType gst_mpegts_packetizer_get_type(void); +GType mpegts_packetizer_get_type(void); -MpegTSPacketizer *mpegts_packetizer_new (); +MpegTSPacketizer *mpegts_packetizer_new (void); void mpegts_packetizer_clear (MpegTSPacketizer *packetizer); void mpegts_packetizer_push (MpegTSPacketizer *packetizer, GstBuffer *buffer); gboolean mpegts_packetizer_has_packets (MpegTSPacketizer *packetizer); diff --git a/gst/mpegdemux/mpegtsparse.h b/gst/mpegdemux/mpegtsparse.h index 36466b8..149a917 100644 --- a/gst/mpegdemux/mpegtsparse.h +++ b/gst/mpegdemux/mpegtsparse.h @@ -76,7 +76,7 @@ struct _MpegTSParseClass { void (*eit_info) (GstStructure *eit); }; -GType gst_mpegts_parse_get_type(void); +GType mpegts_parse_get_type(void); gboolean gst_mpegtsparse_plugin_init (GstPlugin * plugin); diff --git a/gst/mpegvideoparse/mpegpacketiser.c b/gst/mpegvideoparse/mpegpacketiser.c index 90c13c6..b22b51f 100644 --- a/gst/mpegvideoparse/mpegpacketiser.c +++ b/gst/mpegvideoparse/mpegpacketiser.c @@ -118,7 +118,7 @@ mpeg_util_find_start_code (guint32 * sync_word, guint8 * cur, guint8 * end) /* Get the index of the next unfilled block in the buffer. May need to grow * the array first */ -gint +static gint get_next_free_block (MPEGPacketiser * p) { gint next; diff --git a/gst/mpegvideoparse/mpegvideoparse.h b/gst/mpegvideoparse/mpegvideoparse.h index 8c3854b..b514863 100644 --- a/gst/mpegvideoparse/mpegvideoparse.h +++ b/gst/mpegvideoparse/mpegvideoparse.h @@ -65,7 +65,7 @@ struct _MpegVideoParseClass { GstElementClass parent_class; }; -GType gst_mpegvideoparse_get_type(void); +GType mpegvideoparse_get_type(void); G_END_DECLS diff --git a/gst/mve/gstmvedemux.c b/gst/mve/gstmvedemux.c index 816dc54..90f18fd 100644 --- a/gst/mve/gstmvedemux.c +++ b/gst/mve/gstmvedemux.c @@ -32,14 +32,6 @@ GST_DEBUG_CATEGORY_STATIC (mvedemux_debug); #define GST_CAT_DEFAULT mvedemux_debug -extern int ipvideo_decode_frame8 (const GstMveDemuxStream * s, - const unsigned char *data, unsigned short len); -extern int ipvideo_decode_frame16 (const GstMveDemuxStream * s, - const unsigned char *data, unsigned short len); - -extern void ipaudio_uncompress (short *buffer, - unsigned short buf_len, const unsigned char *data, unsigned char channels); - enum MveDemuxState { MVEDEMUX_STATE_INITIAL, /* initial state, header not read */ diff --git a/gst/mve/gstmvedemux.h b/gst/mve/gstmvedemux.h index 533d023..502a50f 100644 --- a/gst/mve/gstmvedemux.h +++ b/gst/mve/gstmvedemux.h @@ -99,6 +99,14 @@ struct _GstMveDemuxStream { GType gst_mve_demux_get_type (void); +int ipvideo_decode_frame8 (const GstMveDemuxStream * s, + const unsigned char *data, unsigned short len); +int ipvideo_decode_frame16 (const GstMveDemuxStream * s, + const unsigned char *data, unsigned short len); + +void ipaudio_uncompress (short *buffer, + unsigned short buf_len, const unsigned char *data, unsigned char channels); + G_END_DECLS #endif /* __GST_MVE_DEMUX_H__ */ diff --git a/gst/mve/gstmvemux.c b/gst/mve/gstmvemux.c index e54c4a1..822a23f 100644 --- a/gst/mve/gstmvemux.c +++ b/gst/mve/gstmvemux.c @@ -37,13 +37,6 @@ gst-launch-0.10 filesrc location=movie.mve ! mvedemux name=d ! GST_DEBUG_CATEGORY_STATIC (mvemux_debug); #define GST_CAT_DEFAULT mvemux_debug -extern GstFlowReturn mve_encode_frame8 (GstMveMux * mve, - GstBuffer * frame, const guint32 * palette, guint16 max_data); -extern GstFlowReturn mve_encode_frame16 (GstMveMux * mve, - GstBuffer * frame, guint16 max_data); -extern gint mve_compress_audio (guint8 * dest, - const guint8 * src, guint16 len, guint8 channels); - static const char mve_preamble[] = MVE_PREAMBLE; enum diff --git a/gst/mve/gstmvemux.h b/gst/mve/gstmvemux.h index 319b2ae..4873758 100644 --- a/gst/mve/gstmvemux.h +++ b/gst/mve/gstmvemux.h @@ -115,6 +115,13 @@ struct _GstMveMuxClass { GType gst_mve_mux_get_type (void); +GstFlowReturn mve_encode_frame8 (GstMveMux * mve, + GstBuffer * frame, const guint32 * palette, guint16 max_data); +GstFlowReturn mve_encode_frame16 (GstMveMux * mve, + GstBuffer * frame, guint16 max_data); +gint mve_compress_audio (guint8 * dest, + const guint8 * src, guint16 len, guint8 channels); + G_END_DECLS #endif /* __GST_MVE_MUX_H__ */ diff --git a/gst/mve/mveaudiodec.c b/gst/mve/mveaudiodec.c index 0e9ee4e..51d47b1 100644 --- a/gst/mve/mveaudiodec.c +++ b/gst/mve/mveaudiodec.c @@ -18,7 +18,7 @@ * Interplay compressed audio codec by Mike Melanson (melanson@pcisys.net) */ -#include +#include "gstmvedemux.h" static const short delta_table[256] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, diff --git a/gst/mve/mveaudioenc.c b/gst/mve/mveaudioenc.c index e3cf937..a0e1ef6 100644 --- a/gst/mve/mveaudioenc.c +++ b/gst/mve/mveaudioenc.c @@ -21,7 +21,8 @@ #include #include -#include + +#include "gstmvemux.h" static const gint32 dec_table[256] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, diff --git a/gst/mxf/mxfdemux.c b/gst/mxf/mxfdemux.c index ce1a1d3..6881a6e 100644 --- a/gst/mxf/mxfdemux.c +++ b/gst/mxf/mxfdemux.c @@ -74,6 +74,7 @@ GST_STATIC_PAD_TEMPLATE ("track_%u", GST_DEBUG_CATEGORY_STATIC (mxfdemux_debug); #define GST_CAT_DEFAULT mxfdemux_debug +GType gst_mxf_demux_pad_get_type (void); G_DEFINE_TYPE (GstMXFDemuxPad, gst_mxf_demux_pad, GST_TYPE_PAD); static void @@ -2007,7 +2008,7 @@ beach: return ret; } -void +static void gst_mxf_demux_pull_random_index_pack (GstMXFDemux * demux) { GstBuffer *buffer; diff --git a/gst/mxf/mxfmpeg.c b/gst/mxf/mxfmpeg.c index 949ba80..08b1a27 100644 --- a/gst/mxf/mxfmpeg.c +++ b/gst/mxf/mxfmpeg.c @@ -1013,7 +1013,7 @@ static MXFEssenceElementWriter mxf_mpeg_audio_essence_element_writer = { "channels = (int) [ 1, 8 ]" /* See ISO/IEC 13818-2 for MPEG ES format */ -gboolean +static gboolean mxf_mpeg_is_mpeg2_frame (GstBuffer * buffer) { GstByteReader reader = GST_BYTE_READER_INIT_FROM_BUFFER (buffer); diff --git a/gst/nsf/nes_apu.c b/gst/nsf/nes_apu.c index 6ba5026..b3a9b42 100644 --- a/gst/nsf/nes_apu.c +++ b/gst/nsf/nes_apu.c @@ -1091,7 +1091,7 @@ apu_reset (void) apu->ext->reset (); } -void +static void apu_build_luts (int num_samples) { int i; diff --git a/gst/nsf/nsf.c b/gst/nsf/nsf.c index 5844b11..8f1e618 100644 --- a/gst/nsf/nsf.c +++ b/gst/nsf/nsf.c @@ -344,7 +344,7 @@ nsf_frame (nsf_t * nsf) } /* Deallocate memory */ -void +static void nes_shutdown (nsf_t * nsf) { int i; diff --git a/gst/qtmux/atoms.c b/gst/qtmux/atoms.c index 99b02ef..841900d 100644 --- a/gst/qtmux/atoms.c +++ b/gst/qtmux/atoms.c @@ -341,15 +341,15 @@ atom_edts_clear (AtomEDTS * edts) atom_elst_clear (&edts->elst); } -AtomEDTS * -atom_edts_new () +static AtomEDTS * +atom_edts_new (void) { AtomEDTS *edts = g_new0 (AtomEDTS, 1); atom_edts_init (edts); return edts; } -void +static void atom_edts_free (AtomEDTS * edts) { atom_edts_clear (edts); @@ -3014,7 +3014,7 @@ atom_trak_set_audio_type (AtomTRAK * trak, AtomsContext * context, atom_trak_set_constant_size_samples (trak, sample_size); } -AtomInfo * +static AtomInfo * build_pasp_extension (AtomTRAK * trak, gint par_width, gint par_height) { AtomData *atom_data; @@ -3378,7 +3378,7 @@ build_codec_data_extension (guint32 fourcc, const GstBuffer * codec_data) } AtomInfo * -build_amr_extension () +build_amr_extension (void) { guint8 ext[9]; GstBuffer *buf; @@ -3405,7 +3405,7 @@ build_amr_extension () } AtomInfo * -build_h263_extension () +build_h263_extension (void) { guint8 ext[7]; GstBuffer *buf; diff --git a/gst/qtmux/atoms.h b/gst/qtmux/atoms.h index ae167ba..85a41d3 100644 --- a/gst/qtmux/atoms.h +++ b/gst/qtmux/atoms.h @@ -731,8 +731,8 @@ AtomInfo * build_jp2h_extension (AtomTRAK * trak, gint width, gint heig AtomInfo * build_jp2x_extension (const GstBuffer * prefix); AtomInfo * build_fiel_extension (gint fields); -AtomInfo * build_amr_extension (); -AtomInfo * build_h263_extension (); +AtomInfo * build_amr_extension (void); +AtomInfo * build_h263_extension (void); AtomInfo * build_gama_atom (gdouble gamma); AtomInfo * build_SMI_atom (const GstBuffer *seqh); AtomInfo * build_ima_adpcm_extension (gint channels, gint rate, diff --git a/gst/qtmux/atomsrecovery.c b/gst/qtmux/atomsrecovery.c index 907683e..c9684b1 100644 --- a/gst/qtmux/atomsrecovery.c +++ b/gst/qtmux/atomsrecovery.c @@ -794,7 +794,7 @@ moov_recov_parse_buffers (MoovRecovFile * moovrf, MdatRecovFile * mdatrf, return TRUE; } -guint32 +static guint32 trak_recov_data_get_trak_atom_size (TrakRecovData * trak) { AtomSTBL *stbl = &trak->stbl; @@ -832,7 +832,7 @@ fail: return 0; } -guint8 * +static guint8 * moov_recov_get_stbl_children_data (MoovRecovFile * moovrf, TrakRecovData * trak, guint64 * p_size) { diff --git a/gst/qtmux/descriptors.c b/gst/qtmux/descriptors.c index f450fce..d1e99c2 100644 --- a/gst/qtmux/descriptors.c +++ b/gst/qtmux/descriptors.c @@ -206,13 +206,6 @@ desc_es_descriptor_clear (ESDescriptor * es) desc_sl_config_descriptor_clear (&es->sl_conf_desc); } -void -desc_es_descriptor_free (ESDescriptor * es) -{ - desc_es_descriptor_clear (es); - g_free (es); -} - /* * Size handling functions below */ diff --git a/gst/sdp/gstsdpdemux.c b/gst/sdp/gstsdpdemux.c index b9fc106..f7b4858 100644 --- a/gst/sdp/gstsdpdemux.c +++ b/gst/sdp/gstsdpdemux.c @@ -315,7 +315,7 @@ find_stream_by_udpsrc (GstSDPStream * stream, gconstpointer a) return -1; } -GstSDPStream * +static GstSDPStream * find_stream (GstSDPDemux * demux, gconstpointer data, gconstpointer func) { GList *lstream; diff --git a/gst/siren/common.c b/gst/siren/common.c index b968c5b..3146597 100644 --- a/gst/siren/common.c +++ b/gst/siren/common.c @@ -65,7 +65,7 @@ static int siren_initialized = 0; #define STEPSIZE 0.3010299957 void -siren_init () +siren_init (void) { int i; float region_power; diff --git a/gst/siren/common.h b/gst/siren/common.h index 3641654..a231de8 100644 --- a/gst/siren/common.h +++ b/gst/siren/common.h @@ -100,7 +100,7 @@ extern float step_size_inverse[8]; -extern void siren_init(); +extern void siren_init(void); extern int categorize_regions(int number_of_regions, int number_of_available_bits, int *absolute_region_power_index, int *power_categories, int *category_balance); extern int GetSirenCodecInfo(int flag, int sample_rate, int *number_of_coefs, int *sample_rate_bits, int *rate_control_bits, int *rate_control_possibilities, int *checksum_bits, int *esf_adjustment, int *scale_factor, int *number_of_regions, int *sample_rate_code, int *bits_per_frame ); diff --git a/gst/siren/dct4.c b/gst/siren/dct4.c index 89a5d8a..db2dfba 100644 --- a/gst/siren/dct4.c +++ b/gst/siren/dct4.c @@ -54,7 +54,7 @@ static dct_table_type *dct_tables[8] = { dct_table_5, static int dct4_initialized = 0; void -siren_dct4_init () +siren_dct4_init (void) { int i, j = 0; double scale_320 = (float) sqrt (2.0 / 320); diff --git a/gst/siren/dct4.h b/gst/siren/dct4.h index 6394b13..5bdd0e0 100644 --- a/gst/siren/dct4.h +++ b/gst/siren/dct4.h @@ -23,7 +23,7 @@ #ifndef _SIREN7_DCT4_H_ #define _SIREN7_DCT4_H_ -extern void siren_dct4_init(); +extern void siren_dct4_init(void); extern void siren_dct4(float *Source, float *Destination, int dct_length); diff --git a/gst/siren/huffman.c b/gst/siren/huffman.c index b563b43..e97da4a 100644 --- a/gst/siren/huffman.c +++ b/gst/siren/huffman.c @@ -29,7 +29,7 @@ static int bit_idx = 0; static int *bitstream_ptr = NULL; int -next_bit () +next_bit (void) { if (bitstream_ptr == NULL) return -1; diff --git a/gst/siren/huffman.h b/gst/siren/huffman.h index 196932d..ea4fab0 100644 --- a/gst/siren/huffman.h +++ b/gst/siren/huffman.h @@ -30,6 +30,6 @@ extern int decode_envelope(int number_of_regions, float *decoder_standard_deviat extern int decode_vector(SirenDecoder decoder, int number_of_regions, int number_of_available_bits, float *decoder_standard_deviation, int *power_categories, float *coefs, int scale_factor); extern void set_bitstream(int *stream); -extern int next_bit(); +extern int next_bit(void); #endif /* _SIREN7_HUFFMAN_H_ */ diff --git a/gst/siren/rmlt.c b/gst/siren/rmlt.c index acba9b7..df3088c 100644 --- a/gst/siren/rmlt.c +++ b/gst/siren/rmlt.c @@ -30,7 +30,7 @@ static float rmlt_window_320[320]; #define PI_2 1.57079632679489661923 void -siren_rmlt_init () +siren_rmlt_init (void) { int i = 0; float angle; diff --git a/gst/siren/rmlt.h b/gst/siren/rmlt.h index a855dd0..27257cf 100644 --- a/gst/siren/rmlt.h +++ b/gst/siren/rmlt.h @@ -23,7 +23,7 @@ #ifndef _SIREN7_RMLT_H_ #define _SIREN7_RMLT_H_ -extern void siren_rmlt_init(); +extern void siren_rmlt_init(void); extern int siren_rmlt_encode_samples(float *samples, float *old_samples, int dct_length, float *rmlt_coefs); extern int siren_rmlt_decode_samples(float *coefs, float *old_coefs, int dct_length, float *samples); diff --git a/gst/tta/gstttadec.c b/gst/tta/gstttadec.c index 7fdea3c..31c05e9 100644 --- a/gst/tta/gstttadec.c +++ b/gst/tta/gstttadec.c @@ -231,7 +231,7 @@ gst_tta_dec_init (GstTtaDec * ttadec) ttadec->tta_buf.buffer_end = ttadec->tta_buf.buffer + TTA_BUFFER_SIZE; } -void +static void rice_init (adapt * rice, unsigned long k0, unsigned long k1) { rice->k0 = k0; @@ -240,7 +240,7 @@ rice_init (adapt * rice, unsigned long k0, unsigned long k1) rice->sum1 = shift_16[k1]; } -void +static void decoder_init (decoder * tta, long nch, long byte_size) { long shift = flt_set[byte_size - 1]; @@ -253,7 +253,7 @@ decoder_init (decoder * tta, long nch, long byte_size) } } -void +static void get_binary (tta_buffer * tta_buf, guchar * buffer, unsigned long buffersize, unsigned long *value, unsigned long bits) { @@ -279,7 +279,7 @@ get_binary (tta_buffer * tta_buf, guchar * buffer, unsigned long buffersize, tta_buf->bit_cache &= bit_mask[tta_buf->bit_count]; } -void +static void get_unary (tta_buffer * tta_buf, guchar * buffer, unsigned long buffersize, unsigned long *value) { diff --git a/gst/videomeasure/gstvideomeasure_ssim.c b/gst/videomeasure/gstvideomeasure_ssim.c index d377b9b..515c261 100644 --- a/gst/videomeasure/gstvideomeasure_ssim.c +++ b/gst/videomeasure/gstvideomeasure_ssim.c @@ -1304,13 +1304,13 @@ gst_ssim_finalize (GObject * object) typedef gfloat (*GstSSimWeightFunc) (GstSSim * ssim, gint y, gint x); -gfloat +static gfloat gst_ssim_weight_func_none (GstSSim * ssim, gint y, gint x) { return 1; } -gfloat +static gfloat gst_ssim_weight_func_gauss (GstSSim * ssim, gint y, gint x) { gfloat coord = sqrt (x * x + y * y); @@ -1318,7 +1318,7 @@ gst_ssim_weight_func_gauss (GstSSim * ssim, gint y, gint x) (ssim->sigma * sqrt (2 * G_PI)); } -gboolean +static gboolean gst_ssim_regenerate_windows (GstSSim * ssim) { gint windowiseven; @@ -1339,16 +1339,16 @@ gst_ssim_regenerate_windows (GstSSim * ssim) switch (ssim->windowtype) { case 0: - func = (GstSSimWeightFunc) gst_ssim_weight_func_none; + func = gst_ssim_weight_func_none; break; case 1: - func = (GstSSimWeightFunc) gst_ssim_weight_func_gauss; + func = gst_ssim_weight_func_gauss; break; default: GST_WARNING_OBJECT (ssim, "unknown window type - %d. Defaulting to %d", ssim->windowtype, 1); ssim->windowtype = 1; - func = (GstSSimWeightFunc) gst_ssim_weight_func_gauss; + func = gst_ssim_weight_func_gauss; } for (y = 0; y < ssim->windowsize; y++) { diff --git a/gst/vmnc/vmncdec.c b/gst/vmnc/vmncdec.c index f2332c7..3db3511 100644 --- a/gst/vmnc/vmncdec.c +++ b/gst/vmnc/vmncdec.c @@ -149,6 +149,7 @@ GST_STATIC_PAD_TEMPLATE ("sink", "width=(int)[0, max], " "height=(int)[0, max]") ); +GType gst_vmnc_dec_get_type (void); GST_BOILERPLATE (GstVMncDec, gst_vmnc_dec, GstElement, GST_TYPE_ELEMENT); static void vmnc_dec_get_property (GObject * object, guint prop_id, diff --git a/sys/dvb/cam.c b/sys/dvb/cam.c index ec67888..cd3ff66 100644 --- a/sys/dvb/cam.c +++ b/sys/dvb/cam.c @@ -27,7 +27,7 @@ GST_DEBUG_CATEGORY (cam_debug_cat); void -cam_init () +cam_init (void) { GST_DEBUG_CATEGORY_INIT (cam_debug_cat, "dvbcam", 0, "DVB CAM support"); } diff --git a/sys/dvb/cam.h b/sys/dvb/cam.h index 3211a2d..927fff7 100644 --- a/sys/dvb/cam.h +++ b/sys/dvb/cam.h @@ -28,6 +28,6 @@ GST_DEBUG_CATEGORY_EXTERN (cam_debug_cat); -void cam_init (); +void cam_init (void); #endif /* CAM_H */ diff --git a/sys/dvb/camapplicationinfo.c b/sys/dvb/camapplicationinfo.c index 63a885a..c05e827 100644 --- a/sys/dvb/camapplicationinfo.c +++ b/sys/dvb/camapplicationinfo.c @@ -40,7 +40,7 @@ static CamReturn data_impl (CamALApplication * application, CamSLSession * session, guint tag, guint8 * buffer, guint length); CamApplicationInfo * -cam_application_info_new () +cam_application_info_new (void) { CamApplicationInfo *info; CamALApplication *application; diff --git a/sys/dvb/camapplicationinfo.h b/sys/dvb/camapplicationinfo.h index c8aa8fa..df3a946 100644 --- a/sys/dvb/camapplicationinfo.h +++ b/sys/dvb/camapplicationinfo.h @@ -35,7 +35,7 @@ struct _CamApplicationInfo CamALApplication application; }; -CamApplicationInfo *cam_application_info_new (); +CamApplicationInfo *cam_application_info_new (void); void cam_application_info_destroy (CamApplicationInfo *info); #endif /* CAM_APPLICATION_INFO_H */ diff --git a/sys/dvb/camconditionalaccess.c b/sys/dvb/camconditionalaccess.c index c667b97..a0c680a 100644 --- a/sys/dvb/camconditionalaccess.c +++ b/sys/dvb/camconditionalaccess.c @@ -41,7 +41,7 @@ static CamReturn data_impl (CamALApplication * application, CamSLSession * session, guint tag, guint8 * buffer, guint length); CamConditionalAccess * -cam_conditional_access_new () +cam_conditional_access_new (void) { CamConditionalAccess *cas; CamALApplication *application; diff --git a/sys/dvb/camconditionalaccess.h b/sys/dvb/camconditionalaccess.h index 43334c5..b01701f 100644 --- a/sys/dvb/camconditionalaccess.h +++ b/sys/dvb/camconditionalaccess.h @@ -46,7 +46,7 @@ struct _CamConditionalAccess gboolean ready; }; -CamConditionalAccess *cam_conditional_access_new (); +CamConditionalAccess *cam_conditional_access_new (void); void cam_conditional_access_destroy (CamConditionalAccess *cas); CamReturn cam_conditional_access_set_pmt (CamConditionalAccess *cas, diff --git a/sys/dvb/camdevice.c b/sys/dvb/camdevice.c index f72f47c..d38d625 100644 --- a/sys/dvb/camdevice.c +++ b/sys/dvb/camdevice.c @@ -33,7 +33,7 @@ #define GST_CAT_DEFAULT cam_debug_cat CamDevice * -cam_device_new () +cam_device_new (void) { CamDevice *device = g_new0 (CamDevice, 1); diff --git a/sys/dvb/camdevice.h b/sys/dvb/camdevice.h index b1fe118..8138440 100644 --- a/sys/dvb/camdevice.h +++ b/sys/dvb/camdevice.h @@ -55,7 +55,7 @@ typedef struct CamConditionalAccess *cas; } CamDevice; -CamDevice *cam_device_new (); +CamDevice *cam_device_new (void); void cam_device_free (CamDevice *device); gboolean cam_device_open (CamDevice *device, const char *filename); diff --git a/sys/dvb/camresourcemanager.c b/sys/dvb/camresourcemanager.c index 5b8c6c1..2b6169f 100644 --- a/sys/dvb/camresourcemanager.c +++ b/sys/dvb/camresourcemanager.c @@ -38,7 +38,7 @@ static CamReturn data_impl (CamALApplication * application, CamSLSession * session, guint tag, guint8 * buffer, guint length); CamResourceManager * -cam_resource_manager_new () +cam_resource_manager_new (void) { CamALApplication *application; CamResourceManager *mgr; diff --git a/sys/dvb/camresourcemanager.h b/sys/dvb/camresourcemanager.h index b6fd0a4..96792fc 100644 --- a/sys/dvb/camresourcemanager.h +++ b/sys/dvb/camresourcemanager.h @@ -35,7 +35,7 @@ struct _CamResourceManager CamALApplication application; }; -CamResourceManager *cam_resource_manager_new (); +CamResourceManager *cam_resource_manager_new (void); void cam_resource_manager_destroy (CamResourceManager *manager); #endif /* CAM_RESOURCE_MANAGER_H */ diff --git a/sys/dvb/camsession.c b/sys/dvb/camsession.c index 6a2deb9..4fe728e 100644 --- a/sys/dvb/camsession.c +++ b/sys/dvb/camsession.c @@ -38,7 +38,7 @@ static CamReturn connection_data_cb (CamTL * tl, CamTLConnection * connection, guint8 * spdu, guint spdu_length); -CamSLSession * +static CamSLSession * cam_sl_session_new (CamSL * sl, CamTLConnection * connection, guint16 session_nb, guint resource_id) { @@ -53,7 +53,7 @@ cam_sl_session_new (CamSL * sl, CamTLConnection * connection, return session; } -void +static void cam_sl_session_destroy (CamSLSession * session) { g_free (session); diff --git a/sys/dvb/camswclient.c b/sys/dvb/camswclient.c index d9d0af2..b68b0a7 100644 --- a/sys/dvb/camswclient.c +++ b/sys/dvb/camswclient.c @@ -36,7 +36,7 @@ #define UNIX_PATH_MAX 108 CamSwClient * -cam_sw_client_new () +cam_sw_client_new (void) { CamSwClient *client = g_new0 (CamSwClient, 1); diff --git a/sys/dvb/camswclient.h b/sys/dvb/camswclient.h index 5b1a4a2..57c4708 100644 --- a/sys/dvb/camswclient.h +++ b/sys/dvb/camswclient.h @@ -41,7 +41,7 @@ typedef struct } CamSwClient; -CamSwClient *cam_sw_client_new (); +CamSwClient *cam_sw_client_new (void); void cam_sw_client_free (CamSwClient *sw_client); gboolean cam_sw_client_open (CamSwClient *sw_client, const char *sock_path); diff --git a/sys/dvb/camtransport.c b/sys/dvb/camtransport.c index 288b2e4..98467f0 100644 --- a/sys/dvb/camtransport.c +++ b/sys/dvb/camtransport.c @@ -56,7 +56,7 @@ typedef struct void cam_gst_util_dump_mem (const guchar * mem, guint size); -CamTLConnection * +static CamTLConnection * cam_tl_connection_new (CamTL * tl, guint8 id) { CamTLConnection *connection; @@ -335,7 +335,7 @@ cam_tl_connection_delete (CamTLConnection * connection) return CAM_RETURN_OK; } -CamReturn +static CamReturn handle_control_tpdu (CamTL * tl, CamTLConnection * connection) { if (tl->body_length != 0) { @@ -371,7 +371,7 @@ handle_control_tpdu (CamTL * tl, CamTLConnection * connection) return CAM_RETURN_OK; } -CamReturn +static CamReturn handle_data_tpdu (CamTL * tl, CamTLConnection * connection) { if (tl->body_length == 0) { diff --git a/sys/dvb/dvbbasebin.h b/sys/dvb/dvbbasebin.h index fbf0b18..3389283 100644 --- a/sys/dvb/dvbbasebin.h +++ b/sys/dvb/dvbbasebin.h @@ -67,7 +67,7 @@ struct _DvbBaseBinClass { /* signals */ }; -GType gst_dvb_base_bin_get_type(void); +GType dvb_base_bin_get_type(void); gboolean gst_dvb_base_bin_plugin_init (GstPlugin *plugin); G_END_DECLS diff --git a/sys/dvb/parsechannels.c b/sys/dvb/parsechannels.c index ed07e53..3df3a6d 100644 --- a/sys/dvb/parsechannels.c +++ b/sys/dvb/parsechannels.c @@ -27,6 +27,8 @@ #include #include +#include "parsechannels.h" + /* this will do zap style channels.conf only for the moment*/ GHashTable * parse_channels_conf_from_file (const gchar * filename) diff --git a/sys/oss4/oss4-mixer.c b/sys/oss4/oss4-mixer.c index 11227c7..db7f0d2 100644 --- a/sys/oss4/oss4-mixer.c +++ b/sys/oss4/oss4-mixer.c @@ -850,7 +850,7 @@ static struct /* Decent i18n is pretty much impossible with OSS's way of providing us with * mixer labels (and the fact that they are pretty much random), but that * doesn't mean we shouldn't at least try. */ -const gchar * +static const gchar * gst_oss4_mixer_control_get_translated_name (GstOss4MixerControl * mc) { gchar name[128] = { 0, }; diff --git a/sys/vcd/vcdsrc.h b/sys/vcd/vcdsrc.h index 6dd5d91..9a61a4c 100644 --- a/sys/vcd/vcdsrc.h +++ b/sys/vcd/vcdsrc.h @@ -69,6 +69,8 @@ struct _GstVCDSrcClass { GstPushSrcClass parent_class; }; +GType gst_vcdsrc_get_type (void); + G_END_DECLS #endif /* __VCDSRC_H__ */ diff --git a/tests/check/elements/aacparse.c b/tests/check/elements/aacparse.c index f14ce9d..78662a2 100644 --- a/tests/check/elements/aacparse.c +++ b/tests/check/elements/aacparse.c @@ -67,7 +67,7 @@ typedef struct } buffer_verify_data_s; /* takes a copy of the passed buffer data */ -GstBuffer * +static GstBuffer * buffer_new (const unsigned char *buffer_data, guint size) { GstBuffer *buffer; @@ -143,7 +143,7 @@ buffer_verify_adts (void *buffer, void *user_data) buffer_counter++; } -GstElement * +static GstElement * setup_aacparse (const gchar * src_caps_str) { GstElement *aacparse; @@ -487,7 +487,7 @@ GST_END_TEST; static Suite * -aacparse_suite () +aacparse_suite (void) { Suite *s = suite_create ("aacparse"); TCase *tc_chain = tcase_create ("general"); diff --git a/tests/check/elements/amrparse.c b/tests/check/elements/amrparse.c index 484fc4d..be97444 100644 --- a/tests/check/elements/amrparse.c +++ b/tests/check/elements/amrparse.c @@ -90,7 +90,7 @@ typedef struct /* * Create a GstBuffer of the given data and set the caps, if not NULL. */ -GstBuffer * +static GstBuffer * buffer_new (const unsigned char *buffer_data, guint size, const gchar * caps_str) { @@ -174,7 +174,7 @@ buffer_verify_wb (void *buffer, void *user_data) /* * Create a parser and pads according to given templates. */ -GstElement * +static GstElement * setup_amrparse (GstStaticPadTemplate * srctemplate, GstStaticPadTemplate * sinktemplate) { diff --git a/tests/check/elements/asfmux.c b/tests/check/elements/asfmux.c index 4d3c707..40834e9 100644 --- a/tests/check/elements/asfmux.c +++ b/tests/check/elements/asfmux.c @@ -55,7 +55,7 @@ static GstStaticPadTemplate srcaudiotemplate = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_ALWAYS, GST_STATIC_CAPS (AUDIO_CAPS_STRING)); -GstPad * +static GstPad * setup_src_pad (GstElement * element, GstStaticPadTemplate * template, GstCaps * caps, gchar * sinkname) { @@ -85,7 +85,7 @@ setup_src_pad (GstElement * element, return srcpad; } -void +static void teardown_src_pad (GstElement * element, gchar * sinkname) { GstPad *srcpad, *sinkpad; @@ -121,7 +121,7 @@ teardown_src_pad (GstElement * element, gchar * sinkname) gst_object_unref (srcpad); } -GstElement * +static GstElement * setup_asfmux (GstStaticPadTemplate * srctemplate, gchar * sinkname) { GstElement *asfmux; @@ -136,7 +136,7 @@ setup_asfmux (GstStaticPadTemplate * srctemplate, gchar * sinkname) return asfmux; } -void +static void cleanup_asfmux (GstElement * asfmux, gchar * sinkname) { GST_DEBUG ("cleanup_asfmux"); @@ -148,7 +148,7 @@ cleanup_asfmux (GstElement * asfmux, gchar * sinkname) gst_check_teardown_element (asfmux); } -void +static void check_asfmux_pad (GstStaticPadTemplate * srctemplate, gchar * src_caps_string, gchar * sinkname) { @@ -190,7 +190,7 @@ GST_START_TEST (test_audio_pad) GST_END_TEST; -Suite * +static Suite * asfmux_suite (void) { Suite *s = suite_create ("asfmux"); diff --git a/tests/check/elements/assrender.c b/tests/check/elements/assrender.c index 28308e1..39e0a73 100644 --- a/tests/check/elements/assrender.c +++ b/tests/check/elements/assrender.c @@ -273,7 +273,7 @@ GST_END_TEST; CREATE_BASIC_TEST (xRGB); CREATE_BASIC_TEST (I420); -Suite * +static Suite * assrender_suite (void) { Suite *s = suite_create ("assrender"); diff --git a/tests/check/elements/autoconvert.c b/tests/check/elements/autoconvert.c index d79334c..83813bd 100644 --- a/tests/check/elements/autoconvert.c +++ b/tests/check/elements/autoconvert.c @@ -32,7 +32,9 @@ typedef GstBinClass TestElement1Class; typedef GstBin TestElement2; typedef GstBinClass TestElement2Class; +GType test_element1_get_type (void); G_DEFINE_TYPE (TestElement1, test_element1, GST_TYPE_BIN); +GType test_element2_get_type (void); G_DEFINE_TYPE (TestElement2, test_element2, GST_TYPE_BIN); static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src", @@ -149,7 +151,7 @@ GST_START_TEST (test_autoconvert_simple) GST_END_TEST; -Suite * +static Suite * autoconvert_suite (void) { Suite *s = suite_create ("autoconvert"); diff --git a/tests/check/elements/camerabin.c b/tests/check/elements/camerabin.c index c3c6e83..624dda4 100644 --- a/tests/check/elements/camerabin.c +++ b/tests/check/elements/camerabin.c @@ -507,7 +507,7 @@ GST_START_TEST (validate_captured_video_files) GST_END_TEST; -Suite * +static Suite * camerabin_suite (void) { Suite *s = suite_create ("camerabin"); diff --git a/tests/check/elements/faad.c b/tests/check/elements/faad.c index a91b0ef..c911048 100644 --- a/tests/check/elements/faad.c +++ b/tests/check/elements/faad.c @@ -54,8 +54,8 @@ static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src", GST_STATIC_CAPS (AAC_CAPS_STRING)); -GstElement * -setup_faad () +static GstElement * +setup_faad (void) { GstElement *faad; @@ -69,7 +69,7 @@ setup_faad () return faad; } -void +static void cleanup_faad (GstElement * faad) { GST_DEBUG ("cleanup_faad"); @@ -82,7 +82,7 @@ cleanup_faad (GstElement * faad) gst_check_teardown_element (faad); } -void +static void do_test (GstBuffer * inbuffer) { GstElement *faad; @@ -194,7 +194,7 @@ GST_START_TEST (test_raw) GST_END_TEST; -Suite * +static Suite * faad_suite (void) { Suite *s = suite_create ("faad"); diff --git a/tests/check/elements/imagefreeze.c b/tests/check/elements/imagefreeze.c index e7d9467..eb2243d 100644 --- a/tests/check/elements/imagefreeze.c +++ b/tests/check/elements/imagefreeze.c @@ -424,7 +424,7 @@ GST_START_TEST (test_imagefreeze_25_1_220ms_380ms) GST_END_TEST; -Suite * +static Suite * imagefreeze_suite (void) { Suite *s = suite_create ("imagefreeze"); diff --git a/tests/check/elements/jpegparse.c b/tests/check/elements/jpegparse.c index 228394c..abeebce 100644 --- a/tests/check/elements/jpegparse.c +++ b/tests/check/elements/jpegparse.c @@ -164,7 +164,7 @@ GST_START_TEST (test_parse_all_in_one_buf) GST_END_TEST; -Suite * +static Suite * jpegparse_suite (void) { Suite *s = suite_create ("jpegparse"); diff --git a/tests/check/elements/mpeg2enc.c b/tests/check/elements/mpeg2enc.c index 221d732..2c9be2f 100644 --- a/tests/check/elements/mpeg2enc.c +++ b/tests/check/elements/mpeg2enc.c @@ -56,7 +56,7 @@ static GMutex *mpeg2enc_mutex; static GCond *mpeg2enc_cond; static gboolean arrived_eos; -gboolean +static gboolean test_sink_event (GstPad * pad, GstEvent * event) { @@ -74,8 +74,8 @@ test_sink_event (GstPad * pad, GstEvent * event) return gst_pad_event_default (pad, event); } -GstElement * -setup_mpeg2enc () +static GstElement * +setup_mpeg2enc (void) { GstElement *mpeg2enc; @@ -96,7 +96,7 @@ setup_mpeg2enc () return mpeg2enc; } -void +static void cleanup_mpeg2enc (GstElement * mpeg2enc) { GST_DEBUG ("cleanup_mpeg2enc"); @@ -177,7 +177,7 @@ GST_START_TEST (test_video_pad) GST_END_TEST; -Suite * +static Suite * mpeg2enc_suite (void) { Suite *s = suite_create ("mpeg2enc"); diff --git a/tests/check/elements/mplex.c b/tests/check/elements/mplex.c index 306c987..0b62e24 100644 --- a/tests/check/elements/mplex.c +++ b/tests/check/elements/mplex.c @@ -97,7 +97,7 @@ guint8 mp2_data[] = /* 384 */ /* end binary data. size = 384 bytes */ -gboolean +static gboolean test_sink_event (GstPad * pad, GstEvent * event) { @@ -116,7 +116,7 @@ test_sink_event (GstPad * pad, GstEvent * event) } /* setup and teardown needs some special handling for muxer */ -GstPad * +static GstPad * setup_src_pad (GstElement * element, GstStaticPadTemplate * template, GstCaps * caps, gchar * sinkname) { @@ -145,7 +145,7 @@ setup_src_pad (GstElement * element, return srcpad; } -void +static void teardown_src_pad (GstElement * element, gchar * sinkname) { GstPad *srcpad, *sinkpad; @@ -175,8 +175,8 @@ teardown_src_pad (GstElement * element, gchar * sinkname) } -GstElement * -setup_mplex () +static GstElement * +setup_mplex (void) { GstElement *mplex; @@ -197,7 +197,7 @@ setup_mplex () return mplex; } -void +static void cleanup_mplex (GstElement * mplex) { GST_DEBUG ("cleanup_mplex"); @@ -285,7 +285,7 @@ GST_START_TEST (test_audio_pad) GST_END_TEST; -Suite * +static Suite * mplex_suite (void) { Suite *s = suite_create ("mplex"); diff --git a/tests/check/elements/ofa.c b/tests/check/elements/ofa.c index 37b9d8e..4ccc1ac 100644 --- a/tests/check/elements/ofa.c +++ b/tests/check/elements/ofa.c @@ -363,7 +363,7 @@ GST_START_TEST (test_ofa_be_2ch) GST_END_TEST; -Suite * +static Suite * ofa_suite (void) { Suite *s = suite_create ("OFA"); diff --git a/tests/check/elements/qtmux.c b/tests/check/elements/qtmux.c index bd88b19..0c05818 100644 --- a/tests/check/elements/qtmux.c +++ b/tests/check/elements/qtmux.c @@ -56,7 +56,7 @@ static GstStaticPadTemplate srcaudiotemplate = GST_STATIC_PAD_TEMPLATE ("src", /* setup and teardown needs some special handling for muxer */ -GstPad * +static GstPad * setup_src_pad (GstElement * element, GstStaticPadTemplate * template, GstCaps * caps, gchar * sinkname) { @@ -86,7 +86,7 @@ setup_src_pad (GstElement * element, return srcpad; } -void +static void teardown_src_pad (GstPad * srcpad) { GstPad *sinkpad; @@ -110,7 +110,7 @@ teardown_src_pad (GstPad * srcpad) gst_object_unref (srcpad); } -GstElement * +static GstElement * setup_qtmux (GstStaticPadTemplate * srctemplate, gchar * sinkname) { GstElement *qtmux; @@ -125,7 +125,7 @@ setup_qtmux (GstStaticPadTemplate * srctemplate, gchar * sinkname) return qtmux; } -void +static void cleanup_qtmux (GstElement * qtmux, gchar * sinkname) { GST_DEBUG ("cleanup_qtmux"); @@ -138,7 +138,7 @@ cleanup_qtmux (GstElement * qtmux, gchar * sinkname) gst_check_teardown_element (qtmux); } -void +static void check_qtmux_pad (GstStaticPadTemplate * srctemplate, gchar * sinkname) { GstElement *qtmux; @@ -232,7 +232,7 @@ GST_START_TEST (test_audio_pad) GST_END_TEST; -Suite * +static Suite * qtmux_suite (void) { Suite *s = suite_create ("qtmux"); diff --git a/tests/check/elements/rtpmux.c b/tests/check/elements/rtpmux.c index e2f1dc2..b37522c 100644 --- a/tests/check/elements/rtpmux.c +++ b/tests/check/elements/rtpmux.c @@ -169,7 +169,7 @@ test_basic (const gchar * elem_name, int count, check_cb cb) gst_check_teardown_element (rtpmux); } -void +static void basic_check_cb (GstPad * pad, int i) { fail_unless (buffers && g_list_length (buffers) == 1); @@ -194,7 +194,7 @@ GST_START_TEST (test_rtpdtmfmux_basic) GST_END_TEST; -void +static void lock_check_cb (GstPad * pad, int i) { GstStructure *s; diff --git a/tests/check/elements/selector.c b/tests/check/elements/selector.c index e308ac4..e9449c0 100644 --- a/tests/check/elements/selector.c +++ b/tests/check/elements/selector.c @@ -34,7 +34,7 @@ static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src", GST_STATIC_CAPS_ANY); /* Data probe cb to drop everything but count buffers and events */ -gboolean +static gboolean probe_cb (GstPad * pad, GstMiniObject * obj, gpointer user_data) { gint count = 0; @@ -60,7 +60,7 @@ probe_cb (GstPad * pad, GstMiniObject * obj, gpointer user_data) } /* Create and link output pad: selector:src%d ! output_pad */ -GstPad * +static GstPad * setup_output_pad (GstElement * element) { GstPad *srcpad = NULL, *output_pad = NULL; @@ -96,7 +96,7 @@ setup_output_pad (GstElement * element) } /* Clean up output/input pad and respective selector request pad */ -void +static void cleanup_pad (GstPad * pad, GstElement * element) { GstPad *selpad = NULL; @@ -134,7 +134,7 @@ cleanup_pad (GstPad * pad, GstElement * element) } /* Duplicate and push given buffer many times to all input_pads */ -void +static void push_input_buffers (GList * input_pads, GstBuffer * buf, gint num_buffers) { GstBuffer *buf_in = NULL; @@ -156,7 +156,7 @@ push_input_buffers (GList * input_pads, GstBuffer * buf, gint num_buffers) } /* Check that received buffers count match to expected buffers */ -void +static void count_output_buffers (GList * output_pads, gint expected_buffers) { gint count = 0; @@ -181,7 +181,7 @@ count_output_buffers (GList * output_pads, gint expected_buffers) } /* Set selector active pad */ -void +static void selector_set_active_pad (GstElement * elem, GstPad * selpad) { gchar *padname = ""; @@ -198,7 +198,7 @@ selector_set_active_pad (GstElement * elem, GstPad * selpad) } /* Push buffers and switch for each selector pad */ -void +static void push_switched_buffers (GList * input_pads, GstElement * elem, GList * peer_pads, gint num_buffers) { @@ -233,7 +233,7 @@ push_switched_buffers (GList * input_pads, /* Create output-selector with given number of src pads and switch given number of input buffers to each src pad. */ -void +static void run_output_selector_buffer_count (gint num_output_pads, gint num_buffers_per_output) { @@ -268,7 +268,7 @@ run_output_selector_buffer_count (gint num_output_pads, } /* Create and link input pad: input_pad ! selector:sink%d */ -GstPad * +static GstPad * setup_input_pad (GstElement * element) { GstPad *sinkpad = NULL, *input_pad = NULL; @@ -300,7 +300,7 @@ setup_input_pad (GstElement * element) /* Create input-selector with given number of sink pads and switch given number of input buffers to each sink pad. */ -void +static void run_input_selector_buffer_count (gint num_input_pads, gint num_buffers_per_input) { @@ -371,7 +371,7 @@ GST_START_TEST (test_input_selector_buffer_count); GST_END_TEST; -Suite * +static Suite * selector_suite (void) { Suite *s = suite_create ("selector"); diff --git a/tests/check/elements/timidity.c b/tests/check/elements/timidity.c index 4470eae..b30de31 100644 --- a/tests/check/elements/timidity.c +++ b/tests/check/elements/timidity.c @@ -59,7 +59,7 @@ GST_START_TEST (test_midi_typefind) GST_END_TEST; -Suite * +static Suite * timidity_suite (void) { Suite *s = suite_create ("timidity"); diff --git a/tests/check/generic/states.c b/tests/check/generic/states.c index 3c9062a..feaf0f0 100644 --- a/tests/check/generic/states.c +++ b/tests/check/generic/states.c @@ -213,7 +213,7 @@ GST_START_TEST (test_state_changes_down_seq) GST_END_TEST; -Suite * +static Suite * states_suite (void) { Suite *s = suite_create ("states"); diff --git a/tests/check/pipelines/metadata.c b/tests/check/pipelines/metadata.c index 1a16a4a..d8117d0 100644 --- a/tests/check/pipelines/metadata.c +++ b/tests/check/pipelines/metadata.c @@ -224,7 +224,7 @@ GST_START_TEST (test_gps_tags) GST_END_TEST; -Suite * +static Suite * metadata_suite (void) { Suite *s = suite_create ("MetaData"); diff --git a/tests/check/pipelines/tagschecking.c b/tests/check/pipelines/tagschecking.c index 20bdcc8..9aa7ffa 100644 --- a/tests/check/pipelines/tagschecking.c +++ b/tests/check/pipelines/tagschecking.c @@ -275,7 +275,7 @@ GST_START_TEST (test_geo_location_tags) GST_END_TEST; -Suite * +static Suite * metadata_suite (void) { Suite *s = suite_create ("tagschecking"); diff --git a/tests/icles/metadata_editor.c b/tests/icles/metadata_editor.c index 613946c..e8b93ff 100644 --- a/tests/icles/metadata_editor.c +++ b/tests/icles/metadata_editor.c @@ -41,13 +41,18 @@ * Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +#include +#endif + +#include "metadata_editor.h" + #include #include #include #include #include -#include /* * Global constants @@ -93,8 +98,8 @@ me_gst_setup_encode_pipeline (const gchar * src_file, const gchar * dest_file, /* ui related functions */ -static void ui_refresh (); -static void process_file(); +static void ui_refresh (void); +static void process_file(void); /* * Global Vars