From: David S. <dsc...@us...> - 2003-05-28 06:25:54
|
CVS Root: /cvsroot/gstreamer Module: gst-plugins Changes by: dschleef Date: Tue May 27 2003 23:25:52 PDT Log message: GST_FORMAT_UNITS -> GST_FORMAT_DEFAULT conversion Modified files: ext/alsa : gstalsa.c Links: http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/alsa/gstalsa.c.diff?r1=1.59&r2=1.60 ====Begin Diffs==== Index: gstalsa.c =================================================================== RCS file: /cvsroot/gstreamer/gst-plugins/ext/alsa/gstalsa.c,v retrieving revision 1.59 retrieving revision 1.60 diff -u -d -r1.59 -r1.60 --- gstalsa.c 24 May 2003 10:32:16 -0000 1.59 +++ gstalsa.c 28 May 2003 06:25:39 -0000 1.60 @@ -1678,7 +1678,7 @@ { static const GstFormat formats[] = { GST_FORMAT_TIME, - GST_FORMAT_UNITS, + GST_FORMAT_DEFAULT, GST_FORMAT_BYTES, 0 }; @@ -1696,8 +1696,7 @@ { gboolean res = TRUE; - if (src_format == *dest_format || (src_format == GST_FORMAT_UNITS && *dest_format == GST_FORMAT_DEFAULT)) { - *dest_format = GST_FORMAT_UNITS; + if (src_format == *dest_format) { *dest_value = src_value; return TRUE; } @@ -1708,13 +1707,11 @@ case GST_FORMAT_BYTES: switch (*dest_format) { case GST_FORMAT_DEFAULT: - *dest_format = GST_FORMAT_UNITS; + *dest_value = gst_alsa_bytes_to_samples (this, (guint) src_value); + break; case GST_FORMAT_TIME: *dest_value = gst_alsa_bytes_to_timestamp (this, (guint) src_value); break; - case GST_FORMAT_UNITS: - *dest_value = gst_alsa_samples_to_timestamp (this, (guint) src_value); - break; default: res = FALSE; break; @@ -1723,8 +1720,6 @@ case GST_FORMAT_TIME: switch (*dest_format) { case GST_FORMAT_DEFAULT: - *dest_format = GST_FORMAT_UNITS; - case GST_FORMAT_UNITS: *dest_value = gst_alsa_timestamp_to_samples (this, (GstClockTime) src_value); break; case GST_FORMAT_BYTES: @@ -1735,7 +1730,7 @@ break; } break; - case GST_FORMAT_UNITS: + case GST_FORMAT_DEFAULT: switch (*dest_format) { case GST_FORMAT_TIME: *dest_value = gst_alsa_samples_to_timestamp (this, (guint) src_value); @@ -1777,11 +1772,11 @@ case GST_QUERY_LATENCY: { snd_pcm_sframes_t delay; ERROR_CHECK (snd_pcm_delay (this->handle, &delay), "Error getting delay: %s"); - res = gst_alsa_convert (this, GST_FORMAT_UNITS, (gint64) delay, format, value); + res = gst_alsa_convert (this, GST_FORMAT_DEFAULT, (gint64) delay, format, value); break; } case GST_QUERY_POSITION: - res = gst_alsa_convert (this, GST_FORMAT_UNITS, this->transmitted, format, value); + res = gst_alsa_convert (this, GST_FORMAT_DEFAULT, this->transmitted, format, value); break; default: break; |