diff -r ecf06a08d4d9 -r 2c5162224003 mpserviceplugins/m3uplaylistplugin/inc/mpxm3uplaylistimporter.h --- a/mpserviceplugins/m3uplaylistplugin/inc/mpxm3uplaylistimporter.h Mon May 03 12:29:20 2010 +0300 +++ b/mpserviceplugins/m3uplaylistplugin/inc/mpxm3uplaylistimporter.h Fri Apr 30 19:33:32 2010 -0500 @@ -39,7 +39,7 @@ class CMPXM3uPlaylistImporter : public CActive { public: // Constructors and destructor - + /** * Two-phased constructor * @@ -63,7 +63,7 @@ * Destructor */ IMPORT_C virtual ~CMPXM3uPlaylistImporter(); - + protected: /** @@ -81,14 +81,14 @@ const CArrayFix& aTopCharacterSet, const CArrayFix& aAvailableCharacterSet, TRequestStatus& aStatus ); - + /** * 2nd phase constructor * * @param aPlaylistUri URI of the playlist file to be internalized */ IMPORT_C virtual void ConstructL( const TDesC& aPlaylistUri ); - + /** * From CActive * Handles an active object's request completion event @@ -105,7 +105,7 @@ * Does a step of the task */ IMPORT_C virtual void DoTaskStep(); - + /** * Does a step of the task, leave if there is an error */ @@ -117,7 +117,7 @@ * Reads data from playlist file to the buffer */ void ReadPlaylistFileToBufferL(); - + /** * Auto detects the character encoding from the supplied character * set @@ -132,7 +132,7 @@ const TDesC8& aSample, const CArrayFix& aCharacterSet, TUint& aCharSetId); - + /** * Parses the buffer where playlist file was read to. */ @@ -175,12 +175,12 @@ * compose CMPXMedia to be sent back to the client */ void ComposePlaylistL(); - + /** * Reset data members for after completing the current request */ void Cleanup(); - + /** * Notify client of the specified error through MMPXPlaylistPluginObserver * interface @@ -195,7 +195,7 @@ EMPXM3UParseWithAutoDetectEncoding, EMPXM3UComposePlaylistMedia }; - + protected: // Data HBufC* iBuffer; @@ -207,12 +207,12 @@ RFs* iFs; // not owned MMPXPlaylistPluginObserver* iObserver;// not owned - + TBool iExtendedFormat; - + TRequestStatus* iCallerStatus; - TInt iEndLineNumber; + TInt iEndLineNumber; TInt iCurrentLineNumber; TBool iMoreToDo; TBool iEndOfFile; @@ -220,15 +220,15 @@ CMPXMediaArray* iAutoEncodingPlaylistArray; TInt iAutoEncodingInvalidItems; - + CMPXMedia* iPlaylist; - + TMPXM3UImporterState iState; - + const CArrayFix& iTopCharacterSet; const CArrayFix& iAvailableCharacterSet; }; #endif // MPXM3UPLAYLISTIMPORTER_H + -