Rename a few controls.

The encoder controls could be confused with actual encoding, so make
clear they are just settings.  Also, the end point selector controls
were not named very well.

Change-Id: I27f8bf9c865c5f295abad97c01ef98752af42613
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Ling Hu <ling.hu@nokia.com>
This commit is contained in:
Michael Goddard
2012-06-20 16:04:57 +10:00
committed by Qt by Nokia
parent b834fe032f
commit bba28afe55
60 changed files with 247 additions and 247 deletions

View File

@@ -40,7 +40,7 @@
****************************************************************************/
#include "qaudiorecorder.h"
#include "qaudioendpointselector.h"
#include "qaudioendpointselectorcontrol.h"
#include "qmediaobject_p.h"
#include "qmediarecorder_p.h"
#include <qmediaservice.h>
@@ -76,7 +76,7 @@ QT_BEGIN_NAMESPACE
The \l {audiorecorder}{Audio Recorder} example shows how to use this class
in more detail.
\sa QMediaRecorder, QAudioEndpointSelector
\sa QMediaRecorder, QAudioEndpointSelectorControl
*/
class QAudioRecorderObject : public QMediaObject
@@ -105,7 +105,7 @@ public:
QMediaService *service = mediaObject ? mediaObject->service() : 0;
if (service != 0)
audioEndpointSelector = qobject_cast<QAudioEndpointSelector*>(service->requestControl(QAudioEndpointSelector_iid));
audioEndpointSelector = qobject_cast<QAudioEndpointSelectorControl*>(service->requestControl(QAudioEndpointSelectorControl_iid));
if (audioEndpointSelector) {
q->connect(audioEndpointSelector, SIGNAL(activeEndpointChanged(QString)),
@@ -121,7 +121,7 @@ public:
audioEndpointSelector(0) {}
QMediaServiceProvider *provider;
QAudioEndpointSelector *audioEndpointSelector;
QAudioEndpointSelectorControl *audioEndpointSelector;
};