From: Wim Taymans <wim.taymans@collabora.co.uk>
Date: Thu, 24 May 2012 11:28:33 +0000 (+0200)
Subject: cdparanoia: always set the read_speed
X-Git-Tag: 1.19.3~511^2~6447
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=897a1e93b7e224e0adea18d97d116cfc9fe360f8;p=platform%2Fupstream%2Fgstreamer.git

cdparanoia: always set the read_speed

Always set the read speed to the configured value. Clarify that 0 or -1
speed means full speed.

Fixes https://bugzilla.gnome.org/show_bug.cgi?id=676361
---

diff --git a/ext/cdparanoia/gstcdparanoiasrc.c b/ext/cdparanoia/gstcdparanoiasrc.c
index fe6a098..66a75b2 100644
--- a/ext/cdparanoia/gstcdparanoiasrc.c
+++ b/ext/cdparanoia/gstcdparanoiasrc.c
@@ -143,8 +143,9 @@ gst_cd_paranoia_src_class_init (GstCdParanoiaSrcClass * klass)
           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
   g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_READ_SPEED,
       g_param_spec_int ("read-speed", "Read speed",
-          "Read from device at specified speed", -1, G_MAXINT,
-          DEFAULT_READ_SPEED, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+          "Read from device at specified speed (-1 and 0 = full speed)",
+          -1, G_MAXINT, DEFAULT_READ_SPEED,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
   g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_PARANOIA_MODE,
       g_param_spec_flags ("paranoia-mode", "Paranoia mode",
           "Type of checking to perform", GST_TYPE_CD_PARANOIA_MODE,
@@ -228,9 +229,8 @@ gst_cd_paranoia_src_open (GstAudioCdSrc * audiocdsrc, const gchar * device)
   if (cdda_open (src->d))
     goto open_failed;
 
-  if (src->read_speed != -1) {
-    cdda_speed_set (src->d, src->read_speed);
-  }
+  GST_INFO_OBJECT (src, "set read speed to %d", src->read_speed);
+  cdda_speed_set (src->d, src->read_speed);
 
   for (i = 1; i < src->d->tracks + 1; i++) {
     GstAudioCdSrcTrack track = { 0, };