--- a/qtmobility/src/multimedia/qmediaencodersettings.h Fri Jun 11 14:26:25 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaencodersettings.h Wed Jun 23 19:08:38 2010 +0300
@@ -52,7 +52,7 @@
class QAudioEncoderSettingsPrivate;
-class Q_MEDIA_EXPORT QAudioEncoderSettings
+class Q_MULTIMEDIA_EXPORT QAudioEncoderSettings
{
public:
QAudioEncoderSettings();
@@ -66,8 +66,8 @@
bool isNull() const;
- QtMediaServices::EncodingMode encodingMode() const;
- void setEncodingMode(QtMediaServices::EncodingMode);
+ QtMultimedia::EncodingMode encodingMode() const;
+ void setEncodingMode(QtMultimedia::EncodingMode);
QString codec() const;
void setCodec(const QString& codec);
@@ -81,15 +81,15 @@
int sampleRate() const;
void setSampleRate(int rate);
- QtMediaServices::EncodingQuality quality() const;
- void setQuality(QtMediaServices::EncodingQuality quality);
+ QtMultimedia::EncodingQuality quality() const;
+ void setQuality(QtMultimedia::EncodingQuality quality);
private:
QSharedDataPointer<QAudioEncoderSettingsPrivate> d;
};
class QVideoEncoderSettingsPrivate;
-class Q_MEDIA_EXPORT QVideoEncoderSettings
+class Q_MULTIMEDIA_EXPORT QVideoEncoderSettings
{
public:
QVideoEncoderSettings();
@@ -103,8 +103,8 @@
bool isNull() const;
- QtMediaServices::EncodingMode encodingMode() const;
- void setEncodingMode(QtMediaServices::EncodingMode);
+ QtMultimedia::EncodingMode encodingMode() const;
+ void setEncodingMode(QtMultimedia::EncodingMode);
QString codec() const;
void setCodec(const QString &);
@@ -119,15 +119,15 @@
int bitRate() const;
void setBitRate(int bitrate);
- QtMediaServices::EncodingQuality quality() const;
- void setQuality(QtMediaServices::EncodingQuality quality);
+ QtMultimedia::EncodingQuality quality() const;
+ void setQuality(QtMultimedia::EncodingQuality quality);
private:
QSharedDataPointer<QVideoEncoderSettingsPrivate> d;
};
class QImageEncoderSettingsPrivate;
-class Q_MEDIA_EXPORT QImageEncoderSettings
+class Q_MULTIMEDIA_EXPORT QImageEncoderSettings
{
public:
QImageEncoderSettings();
@@ -148,8 +148,8 @@
void setResolution(const QSize &);
void setResolution(int width, int height);
- QtMediaServices::EncodingQuality quality() const;
- void setQuality(QtMediaServices::EncodingQuality quality);
+ QtMultimedia::EncodingQuality quality() const;
+ void setQuality(QtMultimedia::EncodingQuality quality);
private:
QSharedDataPointer<QImageEncoderSettingsPrivate> d;