--- a/qtmobility/src/multimedia/qtmedianamespace.qdoc Fri Jun 11 14:26:25 2010 +0300
+++ b/qtmobility/src/multimedia/qtmedianamespace.qdoc Wed Jun 23 19:08:38 2010 +0300
@@ -40,15 +40,15 @@
****************************************************************************/
/*!
- \namespace QtMediaServices
+ \namespace QtMultimedia
\ingroup multimedia
- \brief The QtMediaServices namespace contains miscellaneous identifiers used throughout the Qt Media
+ \brief The QtMultimedia namespace contains miscellaneous identifiers used throughout the Qt Media
services library.
*/
/*!
- \enum QtMediaServices::MetaData
+ \enum QtMultimedia::MetaData
This enum provides identifiers for meta-data attributes.
@@ -169,7 +169,7 @@
*/
/*!
- \enum QtMediaServices::SupportEstimate
+ \enum QtMultimedia::SupportEstimate
Enumerates the levels of support a media service provider may have for a feature.
@@ -180,7 +180,7 @@
*/
/*!
- \enum QtMediaServices::EncodingQuality
+ \enum QtMultimedia::EncodingQuality
Enumerates quality encoding levels.
@@ -192,7 +192,7 @@
*/
/*!
- \enum QtMediaServices::EncodingMode
+ \enum QtMultimedia::EncodingMode
Enumerates encoding modes.
@@ -203,12 +203,12 @@
*/
/*!
- \enum QtMediaServices::AvailabilityError
+ \enum QtMultimedia::AvailabilityError
Enumerates Service status errors.
- \value NoError
- \value ServiceMissingError
- \value ResourceError
- \value BusyError
+ \value NoError The service is operating correctly.
+ \value ServiceMissingError There is no service available to provide the requested functionality.
+ \value ResourceError The service could not allocate resources required to function correctly.
+ \value BusyError The service must wait for access to necessary resources.
*/