diff -r e1b950c65cb4 -r 837f303aceeb epoc32/include/mmf/common/mmfvideo.h --- a/epoc32/include/mmf/common/mmfvideo.h Wed Mar 31 12:27:01 2010 +0100 +++ b/epoc32/include/mmf/common/mmfvideo.h Wed Mar 31 12:33:34 2010 +0100 @@ -1,9 +1,9 @@ // Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Symbian Foundation License v1.0" to Symbian Foundation members and "Symbian Foundation End User License Agreement v1.0" to non-members +// under the terms of "Eclipse Public License v1.0" // which accompanies this distribution, and is available -// at the URL "http://www.symbianfoundation.org/legal/licencesv10.html". +// at the URL "http://www.eclipse.org/legal/epl-v10.html". // // Initial Contributors: // Nokia Corporation - initial contribution. @@ -20,6 +20,10 @@ #include +#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS +#include +#endif + class CFbsBitmap; /** @@ -309,7 +313,7 @@ /** @publishedAll -@prototype +@released Represents the video aspect ratio as a fraction: iNumerator/iDenominator. */ @@ -380,44 +384,10 @@ } /** -Video playback rate capabilities. This structure defines playback rate -capabilities for the current controller and video clip, and can be used -to determine if fast forward, rewind, step forward, or step backward -is possible. - -@publishedPartner -@prototype - -@see CVideoPlayerUtility::GetPlayRateCapabilitiesL, CVideoPlayerUtility::SetPlayVelocityL -*/ -class TVideoPlayRateCapabilities - { -public: - /** - ETrue if fast or slow play forward is possible (i.e. playback - velocity 1-99 or 101-). Normal play forward (velocity 100) is - supported by default. - */ - TBool iPlayForward; - - /** - ETrue if play backward is possible (i.e. playback velocity below0). - This includes normal speed, slow, and fast reverse playback. - */ - TBool iPlayBackward; - - /** ETrue if step forward is possible */ - TBool iStepForward; - - /** Etrue if step backward is possible */ - TBool iStepBackward; - }; - -/** Automatic scaling type. -@publishedPartner -@prototype +@publishedAll +@released @see CVideoPlayerUtility::SetAutoScaleL */ @@ -453,8 +423,8 @@ /** Horizontal alignment for automatic scaling. -@publishedPartner -@prototype +@publishedAll +@released @see SetAutoScaleL */ @@ -471,8 +441,8 @@ /** Vertical alignment for automatic scaling. -@publishedPartner -@prototype +@publishedAll +@released @see SetAutoScaleL */ @@ -485,21 +455,5 @@ /** The picture is bottom-aligned */ EVerticalAlignBottom }; - -/** -Video quality. - -@publishedPartner -@prototype - -@see CVideoPlayerUtility::SetVideoQualityL -*/ -enum TVideoQuality - { - EVideoQualityLow = 25, - EVideoQualityNormal = 50, - EVideoQualityHigh = 75, - EVideoQualityLossless = 100 - }; #endif