ext/alsa/: Re-commit ALSA switches.

Original commit message from CVS:
* ext/alsa/gstalsamixer.c: (gst_alsa_mixer_build_list):
* ext/alsa/gstalsamixertrack.c: (gst_alsa_mixer_track_new):
Re-commit ALSA switches.
* gst/adder/gstadder.c: (gst_adder_loop):
64-bit fix (#151416).
* gst/debug/progressreport.c: (gst_progressreport_report):
64-bit fix (#151419).
* gst/matroska/matroska-demux.c:
(gst_matroska_demux_parse_contents):
64-bit fix (#151420).
* gst/playback/test3.c: (update_scale):
64-bit fix (#151421).
This commit is contained in:
Ronald S. Bultje 2004-08-31 14:12:49 +00:00
parent 8947c41055
commit 436a489e65
3 changed files with 20 additions and 3 deletions

View file

@ -1,3 +1,18 @@
2004-08-31 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* ext/alsa/gstalsamixer.c: (gst_alsa_mixer_build_list):
* ext/alsa/gstalsamixertrack.c: (gst_alsa_mixer_track_new):
Re-commit ALSA switches.
* gst/adder/gstadder.c: (gst_adder_loop):
64-bit fix (#151416).
* gst/debug/progressreport.c: (gst_progressreport_report):
64-bit fix (#151419).
* gst/matroska/matroska-demux.c:
(gst_matroska_demux_parse_contents):
64-bit fix (#151420).
* gst/playback/test3.c: (update_scale):
64-bit fix (#151421).
2004-08-31 Thomas Vander Stichele <thomas at apestaart dot org>
* configure.ac:

View file

@ -200,12 +200,13 @@ gst_progressreport_report (GstProgressReport * progressreport,
}
if (got_total == TRUE) {
g_print ("%s (%2d:%2d:%2d): %lld / %lld %s (%3.2g %%)\n",
g_print ("%s (%2d:%2d:%2d): %" G_GINT64_FORMAT " / %" G_GINT64_FORMAT
" %s (%3.2g %%)\n",
gst_object_get_name (GST_OBJECT (progressreport)), hh, mm, ss,
cur_progress, total_progress, format_name,
((gdouble) (cur_progress)) / total_progress * 100);
} else {
g_print ("%s (%2d:%2d:%2d): %lld %s\n",
g_print ("%s (%2d:%2d:%2d): %" G_GINT64_FORMAT " %s\n",
gst_object_get_name (GST_OBJECT (progressreport)), hh, mm, ss,
cur_progress, format_name);
}

View file

@ -2176,7 +2176,8 @@ gst_matroska_demux_parse_contents (GstMatroskaDemux * demux)
break;
}
if (id != seek_id) {
g_warning ("We looked for ID=0x%x but got ID=0x%x (pos=%llu)",
g_warning ("We looked for ID=0x%x but got ID=0x%x (pos=%"
G_GUINT64_FORMAT ")",
seek_id, id, seek_pos + demux->segment_start);
goto finish;
}