--- a/qtmobility/plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_31.cpp Fri Jun 11 14:26:25 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_31.cpp Wed Jun 23 19:08:38 2010 +0300
@@ -63,7 +63,7 @@
, m_currentBand(QRadioTuner::FM)
, m_currentFreq(87500000)
, m_scanning(false)
- , m_vol(100)
+ , m_vol(50)
{
initRadio();
}
@@ -109,7 +109,6 @@
m_tunerUtility->NotifyChange(*this);
m_tunerUtility->NotifyStereoChange(*this);
m_tunerUtility->NotifySignalStrength(*this);
- setVolume(m_audioPlayerUtility->MaxVolume()/2);
TFrequency freq(m_currentFreq);
m_tunerUtility->Tune(freq);
@@ -280,7 +279,7 @@
{
if (m_audioPlayerUtility) {
m_vol = volume;
- TInt error = m_audioPlayerUtility->SetVolume(m_vol);
+ TInt error = m_audioPlayerUtility->SetVolume(volume/10);
emit volumeChanged(m_vol);
}
}
@@ -345,12 +344,12 @@
return m_available;
}
-QtMediaServices::AvailabilityError S60RadioTunerControl::availabilityError() const
+QtMultimedia::AvailabilityError S60RadioTunerControl::availabilityError() const
{
if (m_available)
- return QtMediaServices::NoError;
+ return QtMultimedia::NoError;
else
- return QtMediaServices::ResourceError;
+ return QtMultimedia::ResourceError;
}
QRadioTuner::Error S60RadioTunerControl::error() const