--- a/qtmobility/plugins/multimedia/symbian/mmf/audiosource/s60audioencodercontrol.h	Fri Jun 11 14:26:25 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/audiosource/s60audioencodercontrol.h	Wed Jun 23 19:08:38 2010 +0300
@@ -69,24 +69,14 @@
     QVariant encodingOption(const QString &codec, const QString &name) const;
     void setEncodingOption(const QString &codec, const QString &name, const QVariant &value);    
     
-private:    
-    QString audioCodec() const;
-    bool setAudioCodec(const QString &codecName);
-    int bitRate() const;
-    void setBitRate(int);
+private:
+    QtMultimedia::EncodingQuality quality() const;
+    void setQuality(QtMultimedia::EncodingQuality, QAudioFormat &format);
 
-    QtMediaServices::EncodingQuality quality() const;
-    void setQuality(QtMediaServices::EncodingQuality);
-
-    int sampleRate() const;
-    void setSampleRate(int sampleRate);
-    int channelCount() const;
-    void setChannelCount(int channels);    
-    int sampleSize() const;
-    void setSampleSize(int sampleSize);    
 private:
     S60AudioCaptureSession* m_session;
-    QtMediaServices::EncodingQuality m_quality;
+    QAudioEncoderSettings m_settings;
+    QtMultimedia::EncodingQuality m_quality;
 };
 
 #endif