--- a/audiostubs/devsoundextensions_stubs/cistubplugin/data/cistubplugin.rss Wed Mar 31 21:06:16 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Stubplugin rss
-*
-*/
-
-
-
-#include <registryinfo.rh>
-#include <mmfplugininterfaceuids.hrh>
-#include "cistubplugin.hrh"
-
-
-RESOURCE REGISTRY_INFO theInfo
- {
- dll_uid = KUidCustomInterfacePluginDll;
- interfaces =
- {
- INTERFACE_INFO
- {
- interface_uid = KMmfUidS60CustomInterfaceStub;
- implementations =
- {
- IMPLEMENTATION_INFO
- {
- implementation_uid = KUidCustomInterfaceStubPlugin;
- version_no = 1;
- display_name = "Audio Play Routing Control Stub";
- default_data = "10207cab" ;
- opaque_data = "";
- }
- };
- }
- };
- }
-
--- a/audiostubs/devsoundextensions_stubs/cistubplugin/group/bld.inf Wed Mar 31 21:06:16 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-/*
-* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-PRJ_MMPFILES
-cistubplugin.mmp
--- a/audiostubs/devsoundextensions_stubs/cistubplugin/group/cistubplugin.mmp Wed Mar 31 21:06:16 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-/*
-* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: CI Stub plugin mmp
-*
-*/
-
-
-#include <platform_paths.hrh>
-
-TARGET cistubplugin.dll
-TARGETTYPE PLUGIN
-UID 0x10009D8D 0x10207C70
-CAPABILITY ALL -TCB
-VENDORID VID_DEFAULT
-
-
-USERINCLUDE ../inc
-USERINCLUDE ../../inc
-OS_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE /epoc32/include/ecom
-SYSTEMINCLUDE /epoc32/include/mmf/server
-SYSTEMINCLUDE /epoc32/include/mmf/common
-
-LIBRARY euser.lib
-LIBRARY ecom.lib
-LIBRARY efsrv.lib
-LIBRARY RestrictedAudioOutputCI.lib
-LIBRARY AudioOutputCI.lib
-LIBRARY AudioInputCI.lib
-
-SOURCEPATH ../src
-
-SOURCE cistubplugin.cpp
-SOURCE cistubpluginMain.cpp
-
-SOURCEPATH ../data
-START RESOURCE cistubplugin.rss
-TARGET cistubplugin.rsc
-END
-
--- a/audiostubs/devsoundextensions_stubs/cistubplugin/inc/cistubplugin.h Wed Mar 31 21:06:16 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-/*
-* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: CI stub plugin
-*
-*/
-
-
-
-// This file defines the API for AudiPlayRoutingControlCIStub.dll
-
-#ifndef CISTUBPLUGIN_H
-#define CISTUBPLUGIN_H
-
-#include <e32base.h> // CBase
-#include <e32std.h> // TBuf
-#include <e32debug.h>
-#include <ecom.h>
-#include "RestrictedAudioOutputCIStub.h"
-#include "AudioOutputCI.h"
-#include "AudioInputCI.h"
-#include "AudioOutputMessageTypes.h"
-#include "AudioInputMessageTypes.h"
-
-class MyMCustomInterface
- {
-public:
- virtual TAny* CustomInterface(TUid aCustomeInterface) = 0;
- virtual void Release() = 0;
- virtual void PassDestructionKey(TUid aUid) = 0;
- };
-
-class CCIStubPlugin : public CBase,public MyMCustomInterface
- {
-public:
-
- static MyMCustomInterface* NewL();
- static CCIStubPlugin* NewLC();
- ~CCIStubPlugin();
- TAny* CustomInterface(TUid aInterfaceId);
- void Release();
- void PassDestructionKey(TUid aUid);
-
-private:
- TUid iDtor_ID_Key;
- CCIStubPlugin();
- void ConstructL();
- };
-
-#endif // __AUDIPLAYROUTINGCONTROLHWDEVICE_H__
--- a/audiostubs/devsoundextensions_stubs/cistubplugin/inc/cistubplugin.hrh Wed Mar 31 21:06:16 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-/*
-* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: ci stub plugin uids
-*
-*/
-
-
-#ifndef CISTUBPLUGIN_HRH
-#define CISTUBPLUGIN_HRH
-
-
-#define KMmfUidS60CustomInterfaceStub 0x10207C49
-#define KUidCustomInterfacePluginDll 0x10207C70
-#define KUidCustomInterfaceStubPlugin 0x10207C71
-
-#endif
--- a/audiostubs/devsoundextensions_stubs/cistubplugin/src/cistubplugin.cpp Wed Mar 31 21:06:16 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,95 +0,0 @@
-/*
- * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- * This component and the accompanying materials are made available
- * under the terms of "Eclipse Public License v1.0"
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Nokia Corporation - initial contribution.
- *
- * Contributors:
- *
- * Description: Generic Stub plugin that load required CI stub in WINSCW
- *
- */
-
-
-
-#include "cistubplugin.h"
-
-#ifdef _DEBUG
-#define DEBPRN0 RDebug::Printf( "*CI STUB PLUGIN* %s", __PRETTY_FUNCTION__);
-#define DEBPRN1(str) RDebug::Printf( "%s %s", __PRETTY_FUNCTION__, str );
-#else
-#define DEBPRN0
-#define DEBPRN1(str)
-#endif
-
-#define KTenSeconds 3000000
-// Member Functions
-
-
-CCIStubPlugin* CCIStubPlugin::NewLC()
- {
- DEBPRN0;
- CCIStubPlugin* self = new (ELeave) CCIStubPlugin;
- CleanupStack::PushL(self);
- self->ConstructL();
- return self;
- }
-
-MyMCustomInterface* CCIStubPlugin::NewL()
- {
- DEBPRN0;
- CCIStubPlugin* self = CCIStubPlugin::NewLC();
- CleanupStack::Pop(self);
- return (MyMCustomInterface*) self;
- }
-
-CCIStubPlugin::CCIStubPlugin()
-// note, CBase initialises all member variables to zero
- {
- DEBPRN0;
- }
-
-void CCIStubPlugin::ConstructL()
- {
- DEBPRN0;
- }
-
-CCIStubPlugin::~CCIStubPlugin()
- {
- DEBPRN0;
- }
-
-TAny* CCIStubPlugin::CustomInterface(TUid aInterfaceId)
- {
- DEBPRN0;
- if (aInterfaceId == KUidRestrictedAudioOutput)
- {
- return (TAny*)CRestrictedAudioOutputCI::NewL();
- }
- if(aInterfaceId == KUidAudioOutput)
- {
- return (TAny*)CAudioOutputCI::NewL();
- }
- if(aInterfaceId == KUidAudioInput)
- {
- return (TAny*)CAudioInputCI::NewL();
- }
- return NULL;
- }
-
-void CCIStubPlugin::Release()
- {
- DEBPRN0;
- REComSession::DestroyedImplementation(iDtor_ID_Key);
- delete this;
- }
-void CCIStubPlugin::PassDestructionKey(TUid aUid)
- {
- DEBPRN0;
- iDtor_ID_Key = aUid;
- }
--- a/audiostubs/devsoundextensions_stubs/cistubplugin/src/cistubpluginMain.cpp Wed Mar 31 21:06:16 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Stub plugin main
-*
-*/
-
-
-
-#include <implementationproxy.h>
-#include <ecom.h>
-#include "cistubplugin.h"
-#include "cistubplugin.hrh"
-
-
-// ImplementationTable
-
-const TImplementationProxy
- ImplementationTable[] =
- {
- IMPLEMENTATION_PROXY_ENTRY(KUidCustomInterfaceStubPlugin, CCIStubPlugin::NewL),
- };
-
-
-// ImplementationGroupProxy
-
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy(TInt& aTableCount)
- {
- aTableCount = sizeof(ImplementationTable) / sizeof(TImplementationProxy);
- return ImplementationTable;
- }
-
--- a/audiostubs/devsoundextensions_stubs/group/bld.inf Wed Mar 31 21:06:16 2010 +0300
+++ b/audiostubs/devsoundextensions_stubs/group/bld.inf Tue Apr 27 16:18:44 2010 +0300
@@ -52,9 +52,6 @@
// Restricted Audio Output CI Stub
#include "../restrictedaudiooutputcistub/Group/bld.inf"
-//CI stub plugin
-#include "../cistubplugin/group/bld.inf"
-
PRJ_TESTMMPFILES
PRJ_TESTEXPORTS