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

@@ -43,7 +43,7 @@
#include "mfaudioendpointcontrol.h"
MFAudioEndpointControl::MFAudioEndpointControl(QObject *parent)
: QAudioEndpointSelector(parent)
: QAudioEndpointSelectorControl(parent)
, m_currentActivate(0)
{
updateEndpoints();

View File

@@ -46,13 +46,13 @@
#include <mfidl.h>
#include <mmdeviceapi.h>
#include "qaudioendpointselector.h"
#include "qaudioendpointselectorcontrol.h"
class MFPlayerService;
QT_USE_NAMESPACE
class MFAudioEndpointControl : public QAudioEndpointSelector
class MFAudioEndpointControl : public QAudioEndpointSelectorControl
{
Q_OBJECT
public:

View File

@@ -97,7 +97,7 @@ QMediaControl* MFPlayerService::requestControl(const char *name)
{
if (qstrcmp(name, QMediaPlayerControl_iid) == 0) {
return m_player;
} else if (qstrcmp(name, QAudioEndpointSelector_iid) == 0) {
} else if (qstrcmp(name, QAudioEndpointSelectorControl_iid) == 0) {
return m_audioEndpointControl;
} else if (qstrcmp(name, QMetaDataReaderControl_iid) == 0) {
return m_metaDataControl;