--- a/qtmobility/src/multimedia/qaudiocapturesource.cpp	Fri Jun 11 14:26:25 2010 +0300
+++ b/qtmobility/src/multimedia/qaudiocapturesource.cpp	Wed Jun 23 19:08:38 2010 +0300
@@ -87,7 +87,7 @@
         Q_Q(QAudioCaptureSource);
 
         if (service != 0)
-            audioEndpointSelector = qobject_cast<QAudioEndpointSelector*>(service->control(QAudioEndpointSelector_iid));
+            audioEndpointSelector = qobject_cast<QAudioEndpointSelector*>(service->requestControl(QAudioEndpointSelector_iid));
 
         if (audioEndpointSelector) {
             q->connect(audioEndpointSelector, SIGNAL(activeEndpointChanged(const QString&)),
@@ -96,14 +96,14 @@
                        SIGNAL(availableAudioInputsChanged()));
             q->connect(audioEndpointSelector, SIGNAL(availableEndpointsChanged()),
                        SLOT(statusChanged()));
-            errorState = QtMediaServices::NoError;
+            errorState = QtMultimedia::NoError;
         }
     }
 
-    QAudioCaptureSourcePrivate():provider(0), audioEndpointSelector(0), errorState(QtMediaServices::ServiceMissingError) {}
+    QAudioCaptureSourcePrivate():provider(0), audioEndpointSelector(0), errorState(QtMultimedia::ServiceMissingError) {}
     QMediaServiceProvider *provider;
     QAudioEndpointSelector   *audioEndpointSelector;
-    QtMediaServices::AvailabilityError errorState;
+    QtMultimedia::AvailabilityError errorState;
 };
 
 /*!
@@ -120,19 +120,6 @@
 }
 
 /*!
-    Construct a QAudioCaptureSource using the QMediaObject \a mediaObject, with \a parent.
-*/
-
-QAudioCaptureSource::QAudioCaptureSource(QMediaObject *mediaObject, QObject *parent)
-    :QMediaObject(*new QAudioCaptureSourcePrivate, parent, mediaObject->service())
-{
-    Q_D(QAudioCaptureSource);
-
-    d->provider = 0;
-    d->initControls();
-}
-
-/*!
     Destroys the audiocapturesource object.
 */
 
@@ -140,6 +127,9 @@
 {
     Q_D(QAudioCaptureSource);
 
+    if (d->service && d->audioEndpointSelector)
+        d->service->releaseControl(d->audioEndpointSelector);
+
     if (d->provider)
         d->provider->releaseService(d->service);
 }
@@ -148,7 +138,7 @@
     Returns the error state of the audio capture service.
 */
 
-QtMediaServices::AvailabilityError QAudioCaptureSource::availabilityError() const
+QtMultimedia::AvailabilityError QAudioCaptureSource::availabilityError() const
 {
     Q_D(const QAudioCaptureSource);
 
@@ -260,14 +250,14 @@
 
     if (d->audioEndpointSelector) {
         if (d->audioEndpointSelector->availableEndpoints().size() > 0) {
-            d->errorState = QtMediaServices::NoError;
+            d->errorState = QtMultimedia::NoError;
             emit availabilityChanged(true);
         } else {
-            d->errorState = QtMediaServices::BusyError;
+            d->errorState = QtMultimedia::BusyError;
             emit availabilityChanged(false);
         }
     } else {
-        d->errorState = QtMediaServices::ServiceMissingError;
+        d->errorState = QtMultimedia::ServiceMissingError;
         emit availabilityChanged(false);
     }
 }