summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog51
-rw-r--r--examples/seeking/cdplayer.c4
-rw-r--r--examples/seeking/playbin.c4
-rw-r--r--examples/seeking/seek.c4
-rw-r--r--examples/seeking/spider_seek.c4
-rw-r--r--ext/audiofile/gstafsink.c5
-rw-r--r--ext/musicbrainz/gsttrm.c22
-rw-r--r--ext/smoothwave/gstsmoothwave.c2
-rw-r--r--gst/smoothwave/gstsmoothwave.c2
9 files changed, 76 insertions, 22 deletions
diff --git a/ChangeLog b/ChangeLog
index b50e6ae4..9c83e23e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,56 @@
2005-05-05 Tim-Philipp Müller <tim at centricular dot net>
+ * examples/seeking/cdplayer.c: (update_scale):
+ * examples/seeking/playbin.c: (update_scale):
+ * examples/seeking/seek.c: (update_scale):
+ * examples/seeking/spider_seek.c: (update_scale):
+ * ext/aalib/gstaasink.c: (gst_aasink_scale), (gst_aasink_chain):
+ * ext/alsa/gstalsa.c: (gst_alsa_get_format), (gst_alsa_get_caps):
+ * ext/alsa/gstalsamixer.c: (gst_alsa_mixer_get_option):
+ * ext/alsa/gstalsasink.c: (gst_alsa_sink_check_event),
+ (gst_alsa_sink_mmap):
+ * ext/alsa/gstalsasrc.c: (gst_alsa_src_mmap):
+ * ext/audiofile/gstafsink.c: (gst_afsink_open_file):
+ * ext/cairo/gsttextoverlay.c: (gst_textoverlay_render_text),
+ (gst_textoverlay_loop):
+ * ext/cairo/gsttimeoverlay.c: (gst_timeoverlay_planar411):
+ * ext/cdparanoia/gstcdparanoia.c: (get_musicbrainz_discid):
+ * ext/dv/gstdvdec.c: (gst_dvdec_handle_sink_event):
+ * ext/dvdread/dvdreadsrc.c: (dvdnavsrc_make_clut_change_event):
+ * ext/flac/gstflacdec.c: (gst_flacdec_update_metadata):
+ * ext/flac/gstflactag.c: (gst_flac_tag_chain):
+ * ext/gnomevfs/gstgnomevfssrc.c:
+ (gst_gnomevfssrc_get_icy_metadata):
+ * ext/jpeg/gstsmokedec.c: (gst_smokedec_chain):
+ * ext/jpeg/gstsmokeenc.c: (gst_smokeenc_chain):
+ * ext/jpeg/smokecodec.c: (find_best_size):
+ * ext/lame/gstlame.c: (add_one_tag), (gst_lame_chain):
+ * ext/mad/gstid3tag.c: (mad_id3_parse_latin1_string),
+ (mad_id3_parse_comment_frame), (gst_mad_id3_to_tag_list),
+ (gst_id3_tag_handle_event):
+ * ext/mad/gstmad.c: (gst_mad_handle_event), (gst_mad_chain):
+ * ext/mpeg2dec/gstmpeg2dec.c:
+ * ext/musicbrainz/gsttrm.c: (gst_musicbrainz_sinkconnect),
+ (gst_musicbrainz_chain):
+ * ext/ogg/gstoggmux.c: (gst_ogg_mux_next_buffer):
+ * ext/pango/gsttextoverlay.c: (gst_textoverlay_loop):
+ * ext/smoothwave/gstsmoothwave.c: (gst_smoothwave_chain):
+ * ext/spc/gstspc.c: (spc_setup):
+ * ext/speex/gstspeexdec.c: (speex_dec_src_event),
+ (speex_dec_event), (speex_dec_chain):
+ * ext/speex/gstspeexenc.c: (gst_speexenc_chain):
+ * ext/theora/theoradec.c: (theora_dec_src_query),
+ (theora_dec_src_event), (theora_dec_event), (theora_dec_chain):
+ * ext/theora/theoraenc.c: (theora_enc_chain):
+ * ext/vorbis/vorbisdec.c: (vorbis_dec_src_event),
+ (vorbis_dec_event), (vorbis_dec_chain):
+ * ext/vorbis/vorbisenc.c: (gst_vorbisenc_chain):
+ * ext/wavpack/unpack.c: (init_wv_bitstream), (init_wvc_bitstream),
+ (init_wvx_bitstream):
+ Even more gcc-4.0 fixes.
+
+2005-05-05 Tim-Philipp Müller <tim at centricular dot net>
+
* ext/nas/nassink.c: (gst_nassink_init), (gst_nassink_sync_parms),
(gst_nassink_sinkconnect), (gst_nassink_chain_handle_event),
(gst_nassink_chain):
diff --git a/examples/seeking/cdplayer.c b/examples/seeking/cdplayer.c
index 5532e68c..dfbf1143 100644
--- a/examples/seeking/cdplayer.c
+++ b/examples/seeking/cdplayer.c
@@ -9,7 +9,7 @@ static GList *seekable_elements = NULL;
static GstElement *pipeline;
static GtkAdjustment *adjustment;
static gboolean stats = FALSE;
-static guint64 duration;
+static gint64 duration;
static guint update_id;
@@ -121,7 +121,7 @@ static gboolean
update_scale (gpointer data)
{
GstClock *clock;
- guint64 position = 0;
+ gint64 position = 0;
GstFormat format = GST_FORMAT_TIME;
duration = 0;
diff --git a/examples/seeking/playbin.c b/examples/seeking/playbin.c
index b213c5fc..da02a508 100644
--- a/examples/seeking/playbin.c
+++ b/examples/seeking/playbin.c
@@ -6,7 +6,7 @@
static GstElement *playbin = NULL;
static GstElement *pipeline;
-static guint64 duration;
+static gint64 duration;
static GtkAdjustment *adjustment;
static GtkWidget *hscale;
static gboolean verbose = FALSE;
@@ -45,7 +45,7 @@ static gboolean
update_scale (gpointer data)
{
GstClock *clock;
- guint64 position;
+ gint64 position;
GstFormat format = GST_FORMAT_TIME;
gboolean res;
diff --git a/examples/seeking/seek.c b/examples/seeking/seek.c
index d4a269fb..7a1ce9b4 100644
--- a/examples/seeking/seek.c
+++ b/examples/seeking/seek.c
@@ -12,7 +12,7 @@ static GList *rate_pads = NULL;
static GList *seekable_elements = NULL;
static GstElement *pipeline;
-static guint64 duration;
+static gint64 duration;
static GtkAdjustment *adjustment;
static GtkWidget *hscale;
static gboolean stats = FALSE;
@@ -786,7 +786,7 @@ static gboolean
update_scale (gpointer data)
{
GstClock *clock;
- guint64 position;
+ gint64 position;
GstFormat format = GST_FORMAT_TIME;
gboolean res;
diff --git a/examples/seeking/spider_seek.c b/examples/seeking/spider_seek.c
index c19b5de6..edd78f97 100644
--- a/examples/seeking/spider_seek.c
+++ b/examples/seeking/spider_seek.c
@@ -13,7 +13,7 @@ static GList *seekable_elements = NULL;
static GstElement *pipeline;
static GtkAdjustment *adjustment;
static gboolean stats = FALSE;
-static guint64 duration;
+static gint64 duration;
static guint update_id;
@@ -197,7 +197,7 @@ static gboolean
update_scale (gpointer data)
{
GstClock *clock;
- guint64 position;
+ gint64 position;
GstFormat format = GST_FORMAT_TIME;
duration = 0;
diff --git a/ext/audiofile/gstafsink.c b/ext/audiofile/gstafsink.c
index 872864b2..6d004ccb 100644
--- a/ext/audiofile/gstafsink.c
+++ b/ext/audiofile/gstafsink.c
@@ -302,12 +302,15 @@ gst_afsink_open_file (GstAFSink * sink)
if (caps == NULL) {
g_critical ("gstafsink chain : Could not get caps of pad !\n");
} else {
+ gint rate = 0;
+
structure = gst_caps_get_structure (caps, 0);
gst_structure_get_int (structure, "channels", &sink->channels);
gst_structure_get_int (structure, "width", &sink->width);
- gst_structure_get_int (structure, "rate", &sink->rate);
+ gst_structure_get_int (structure, "rate", &rate);
gst_structure_get_boolean (structure, "signed", &sink->is_signed);
gst_structure_get_int (structure, "endianness", &sink->endianness_data);
+ sink->rate = rate;
}
GST_DEBUG ("channels %d, width %d, rate %d, signed %s",
sink->channels, sink->width, sink->rate, sink->is_signed ? "yes" : "no");
diff --git a/ext/musicbrainz/gsttrm.c b/ext/musicbrainz/gsttrm.c
index 85939f9f..fb310326 100644
--- a/ext/musicbrainz/gsttrm.c
+++ b/ext/musicbrainz/gsttrm.c
@@ -176,7 +176,7 @@ gst_musicbrainz_sinkconnect (GstPad * pad, const GstCaps * caps)
GstMusicBrainz *musicbrainz;
GstStructure *structure;
const gchar *mimetype;
- gint width;
+ gint width, depth, chans, rate;
musicbrainz = GST_MUSICBRAINZ (gst_pad_get_parent (pad));
@@ -185,18 +185,18 @@ gst_musicbrainz_sinkconnect (GstPad * pad, const GstCaps * caps)
structure = gst_caps_get_structure (caps, 0);
mimetype = gst_structure_get_name (structure);
- if (!gst_structure_get_int (structure, "depth", &musicbrainz->depth) ||
- !gst_structure_get_int (structure, "width", &width))
+ if (!gst_structure_get_int (structure, "depth", &depth) ||
+ !gst_structure_get_int (structure, "width", &width) ||
+ !gst_structure_get_int (structure, "channels", &chans) ||
+ !gst_structure_get_int (structure, "rate", &rate))
return GST_PAD_LINK_REFUSED;
- if (musicbrainz->depth != width)
+ if (depth != width)
return GST_PAD_LINK_REFUSED;
- if (!gst_structure_get_int (structure, "channels", &musicbrainz->channels))
- return GST_PAD_LINK_REFUSED;
-
- if (!gst_structure_get_int (structure, "rate", &musicbrainz->rate))
- return GST_PAD_LINK_REFUSED;
+ musicbrainz->rate = rate;
+ musicbrainz->depth = depth;
+ musicbrainz->channels = chans;
trm_SetPCMDataInfo (musicbrainz->trm, musicbrainz->rate,
musicbrainz->channels, musicbrainz->depth);
@@ -272,8 +272,8 @@ gst_musicbrainz_chain (GstPad * pad, GstData * data)
}
if (!musicbrainz->signature_available
- && trm_GenerateSignature (musicbrainz->trm, GST_BUFFER_DATA (buf),
- GST_BUFFER_SIZE (buf))) {
+ && trm_GenerateSignature (musicbrainz->trm,
+ (gchar *) GST_BUFFER_DATA (buf), GST_BUFFER_SIZE (buf))) {
GST_DEBUG ("Signature");
if (musicbrainz->proxy_address != NULL) {
diff --git a/ext/smoothwave/gstsmoothwave.c b/ext/smoothwave/gstsmoothwave.c
index 2583a4db..de440f59 100644
--- a/ext/smoothwave/gstsmoothwave.c
+++ b/ext/smoothwave/gstsmoothwave.c
@@ -314,7 +314,7 @@ gst_smoothwave_chain (GstPad * pad, GstData * _data)
gint i;
gint qheight;
const gint16 *samples =
- (const guint16 *) gst_adapter_peek (smoothwave->adapter, bytesperread);
+ (const gint16 *) gst_adapter_peek (smoothwave->adapter, bytesperread);
gint stride = smoothwave->width;
/* First draw the new waveform */
diff --git a/gst/smoothwave/gstsmoothwave.c b/gst/smoothwave/gstsmoothwave.c
index 2583a4db..de440f59 100644
--- a/gst/smoothwave/gstsmoothwave.c
+++ b/gst/smoothwave/gstsmoothwave.c
@@ -314,7 +314,7 @@ gst_smoothwave_chain (GstPad * pad, GstData * _data)
gint i;
gint qheight;
const gint16 *samples =
- (const guint16 *) gst_adapter_peek (smoothwave->adapter, bytesperread);
+ (const gint16 *) gst_adapter_peek (smoothwave->adapter, bytesperread);
gint stride = smoothwave->width;
/* First draw the new waveform */
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-19 09:24:37 +0000