1.1 --- a/epoc32/include/mmf/server/mmfdatapathproxy.h	Wed Mar 31 12:27:01 2010 +0100
     1.2 +++ b/epoc32/include/mmf/server/mmfdatapathproxy.h	Wed Mar 31 12:33:34 2010 +0100
     1.3 @@ -1,9 +1,9 @@
     1.4  // Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
     1.5  // All rights reserved.
     1.6  // This component and the accompanying materials are made available
     1.7 -// 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
     1.8 +// under the terms of "Eclipse Public License v1.0"
     1.9  // which accompanies this distribution, and is available
    1.10 -// at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
    1.11 +// at the URL "http://www.eclipse.org/legal/epl-v10.html".
    1.12  //
    1.13  // Initial Contributors:
    1.14  // Nokia Corporation - initial contribution.
    1.15 @@ -154,62 +154,9 @@
    1.16  	IMPORT_C void Close();
    1.17  	};
    1.18  
    1.19 -/**
    1.20 -@internalComponent
    1.21 - 
    1.22 -The server running in the datapath subthread.
    1.23 -The subthread is owned by the main thread and shares the same heap.
    1.24 -*/
    1.25 -class CMMFDataPathProxyServer : public CMMFSubThreadServer
    1.26 -	{
    1.27 -public:
    1.28 -	static CMMFDataPathProxyServer* NewL();
    1.29 -	~CMMFDataPathProxyServer();
    1.30 -	static TInt StartThread(TAny* aAny);
    1.31 -	static void DoStartThreadL();
    1.32 -private:
    1.33 -	CMmfIpcSession* NewSessionL(const TVersion& aVersion) const;
    1.34 -	CMMFDataPathProxyServer();
    1.35 -	void ConstructL();
    1.36 -	};
    1.37 -
    1.38 -
    1.39 -/**
    1.40 -@internalComponent
    1.41 -
    1.42 -The session used to transmit messages between the main thread and the subthread.
    1.43 -Only one session can be created with a datapath subthread.
    1.44 -Once this session is closed, the subthread will be killed.
    1.45 -*/
    1.46 -class CMMFDataPathProxySession : public CMMFSubThreadSession
    1.47 -	{
    1.48 -public:
    1.49 -	static CMMFDataPathProxySession* NewL();
    1.50 -	~CMMFDataPathProxySession();
    1.51 -	void ServiceL(const RMmfIpcMessage& aMessage);
    1.52 -private:
    1.53 -	CMMFDataPathProxySession();
    1.54 -	TBool LoadDataPathByL(const RMmfIpcMessage& aMessage);
    1.55 -	TBool LoadDataPathByMediaIdL(const RMmfIpcMessage& aMessage);
    1.56 -	TBool LoadDataPathByCodecUidL(const RMmfIpcMessage& aMessage);
    1.57 -	TBool LoadDataPathByMediaIdCodecUidL(const RMmfIpcMessage& aMessage);
    1.58 -	TBool AddDataSourceL(const RMmfIpcMessage& aMessage);
    1.59 -	TBool AddDataSinkL(const RMmfIpcMessage& aMessage);
    1.60 -	TBool PrimeL(const RMmfIpcMessage& aMessage);
    1.61 -	TBool PlayL(const RMmfIpcMessage& aMessage);
    1.62 -	TBool PauseL(const RMmfIpcMessage& aMessage);
    1.63 -	TBool StopL(const RMmfIpcMessage& aMessage);
    1.64 -	TBool GetPositionL(const RMmfIpcMessage& aMessage) const;
    1.65 -	TBool SetPositionL(const RMmfIpcMessage& aMessage);
    1.66 -	TBool SetPlayWindowL(const RMmfIpcMessage& aMessage) ;
    1.67 -	TBool ClearPlayWindowL(const RMmfIpcMessage& aMessage) ;
    1.68 -	TBool StateL(const RMmfIpcMessage& aMessage) ;
    1.69 -
    1.70 -	void CheckDataPathExistsL() const {if (!iDataPath) User::Leave(KErrNotReady);};
    1.71 -private:
    1.72 -	CMMFDataPath* iDataPath;
    1.73 -	};
    1.74 -
    1.75 -
    1.76 +#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
    1.77 +#include <mmf/server/mmfdatapathproxyserver.h>
    1.78 +#endif
    1.79  
    1.80  #endif
    1.81 +