Mercurial Mercurial > oss > FCL > sf > incubator > stemkit / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Create stem_cone.dll, breaking dependency on mediaclientaudio.dll and mediaclient.dll
authorWilliam Roberts <williamr@symbian.org>
Fri, 15 Oct 2010 14:49:09 +0100
changeset 55 f1c1302a0b48
parent 54 dcd1a22c2899
child 56 865fbeda552a
Create stem_cone.dll, breaking dependency on mediaclientaudio.dll and mediaclient.dll
breakdeps/CONE.MMP file | annotate | diff | comparison | revisions
breakdeps/coesndpy.cpp file | annotate | diff | comparison | revisions
eabi/stem_coneu.DEF file | annotate | diff | comparison | revisions 
--- a/breakdeps/CONE.MMP	Fri Oct 15 14:46:27 2010 +0100
+++ b/breakdeps/CONE.MMP	Fri Oct 15 14:49:09 2010 +0100
@@ -13,28 +13,30 @@
 // Description:
 // cone.dll Control environment
 // 
-//
+// Modified to build stem_cone.dll to break dependency on mediaclientaudio.dll
+// Assumes that the sf/mw/classicui package is accessible and adjusts the paths
+// to refer back to /sf/mw/classicui/lafagnosticuifoundation/cone where needed
 
 /**
  @file
 */
 
-target			cone.dll
+target			stem_cone.dll
 CAPABILITY All -Tcb
 
 targettype		DLL
 UID			0x1000008D 0x10003A41
 VENDORID 	0x70000001
 
-userinclude		../inc
-USERINCLUDE ../src
-userinclude		../../../../../mw/classicui/lafagnosticuifoundation/cone/inc
+userinclude		/sf/mw/classicui/lafagnosticuifoundation/cone/inc
+USERINCLUDE     /sf/mw/classicui/lafagnosticuifoundation/cone/src
+// userinclude		../../../../../mw/classicui/lafagnosticuifoundation/cone/inc
 MW_LAYER_SYSTEMINCLUDE_SYMBIAN
 
-SOURCEPATH	../src
+SOURCEPATH	/sf/mw/classicui/lafagnosticuifoundation/cone/src
 
 source  COEAUI.CPP    COECCNTX.CPP COECNTRL.CPP
-source  COEFEP.CPP    COEHELP.CPP  COEMAIN.CPP   coesndpy.cpp
+source  COEFEP.CPP    COEHELP.CPP  COEMAIN.CPP
 source  COEUTILS.CPP  Coemop.cpp   COEMAINSECUREFEP.CPP
 source  COEFONT.cpp	COEFONTPROVIDER.cpp	coetextdrawer.cpp
 source  coecontrolarray.cpp CoeDataStorage.cpp
@@ -46,9 +48,12 @@
 source  COEINPUT.CPP
 source  CoeEnvExtra.cpp
 
+SOURCEPATH .
+
+source  coesndpy.cpp
+
 library			euser.lib  efsrv.lib  bafl.lib
 library			gdi.lib    ws32.lib   egul.lib   viewcli.lib
-library			mediaclientaudio.lib  mediaclient.lib
 library			ecom.lib  centralrepository.lib  estor.lib
 library			hal.lib
 
@@ -56,7 +61,7 @@
 library         instrumentationhandler.lib
 #endif
 
-deffile			CONE.DEF
+deffile stem_cone.def
 
 START WINS
 	baseaddress		0x40600000
--- a/breakdeps/coesndpy.cpp	Fri Oct 15 14:46:27 2010 +0100
+++ b/breakdeps/coesndpy.cpp	Fri Oct 15 14:49:09 2010 +0100
@@ -13,15 +13,16 @@
 // Description:
 //
 
-#include <mda/client/utility.h>
-#include <mdaaudiosampleplayer.h>
-#include <mdaaudiotoneplayer.h>
+//#include <mda/client/utility.h>
+//#include <mdaaudiosampleplayer.h>
+//#include <mdaaudiotoneplayer.h>
 #include <bassnd.h>
 #include <coesndpy.h>
 #include <coemain.h>
 #include "coepanic.h"
 #include <coeutils.h>
 
+#if 0
 const TUid KLafSoundPlayerUid={0x10005F1A};
 
 class CCoeSoundPlayer;
@@ -424,7 +425,7 @@
 	{
 	iMdaServer=CMdaServer::NewL();
 	}
-
+#endif
 //
 // class CoeSoundPlayer
 //
@@ -432,7 +433,7 @@
 EXPORT_C void CoeSoundPlayer::PlaySound(const TBaSystemSoundType& aType,TInt aPlayCount,
 											TTimeIntervalMicroSeconds32 aGap,TBool aInterrupt)
 	{ // static
-	TRAP_IGNORE(ManagerL()->PlaySoundL(aType,aPlayCount,aGap,aInterrupt));
+	//TRAP_IGNORE(ManagerL()->PlaySoundL(aType,aPlayCount,aGap,aInterrupt));
 	}
 
 EXPORT_C void CoeSoundPlayer::CancelSound(const TBaSystemSoundType& aType)
@@ -440,11 +441,12 @@
 
 @param aType The sound to stop playing. */
 	{ // static
-	TRAP_IGNORE(ManagerL()->CancelSound(aType));
+	//TRAP_IGNORE(ManagerL()->CancelSound(aType));
 	}
 
 CCoeSoundPlayerManager* CoeSoundPlayer::ManagerL()
 	{ // static
+#if 0	
 	CCoeEnv* env=CCoeEnv::Static();
 	__ASSERT_ALWAYS(env,Panic(ECoePanicNullEnvironment));
 	CCoeSoundPlayerManager* manager=
@@ -452,4 +454,6 @@
 	if (!manager)
 		manager=CCoeSoundPlayerManager::NewL();
 	return manager;
+#endif
+	return NULL;
 	}
--- a/eabi/stem_coneu.DEF	Fri Oct 15 14:46:27 2010 +0100
+++ b/eabi/stem_coneu.DEF	Fri Oct 15 14:49:09 2010 +0100
@@ -403,28 +403,28 @@
 	_ZTI12CCoeEnvExtra @ 402 NONAME ; #<TI>#
 	_ZTI12CCoeRedrawer @ 403 NONAME ; #<TI>#
 	_ZTI13CCoeFepLoader @ 404 NONAME ; #<TI>#
-	_ZTI14CCoeFilePlayer @ 405 NONAME ; #<TI>#
-	_ZTI14CCoeTonePlayer @ 406 NONAME ; #<TI>#
+	_ZTI14CCoeFilePlayer @ 405 NONAME ABSENT ; #<TI>#
+	_ZTI14CCoeTonePlayer @ 406 NONAME ABSENT ; #<TI>#
 	Absentee1 @ 407 NONAME ABSENT
-	_ZTI15CCoeSoundPlayer @ 408 NONAME ; #<TI>#
+	_ZTI15CCoeSoundPlayer @ 408 NONAME ABSENT ; #<TI>#
 	_ZTI15CCoeViewManager @ 409 NONAME ; #<TI>#
 	_ZTI16CCoeViewObserver @ 410 NONAME ; #<TI>#
 	Absentee1 @ 411 NONAME ABSENT
 	_ZTI22CCoeBrushAndPenContext @ 412 NONAME ; #<TI>#
-	_ZTI22CCoeSoundPlayerManager @ 413 NONAME ; #<TI>#
+	_ZTI22CCoeSoundPlayerManager @ 413 NONAME ABSENT ; #<TI>#
 	_ZTIN12CCoeEnvExtra19CHighPriorityActiveE @ 414 NONAME ; #<TI>#
 	_ZTV12CCoeEnvExtra @ 415 NONAME ; #<VT>#
 	_ZTV12CCoeRedrawer @ 416 NONAME ; #<VT>#
 	_ZTV13CCoeFepLoader @ 417 NONAME ; #<VT>#
-	_ZTV14CCoeFilePlayer @ 418 NONAME ; #<VT>#
-	_ZTV14CCoeTonePlayer @ 419 NONAME ; #<VT>#
+	_ZTV14CCoeFilePlayer @ 418 NONAME ABSENT ; #<VT>#
+	_ZTV14CCoeTonePlayer @ 419 NONAME ABSENT ; #<VT>#
 	Absentee2 @ 420 NONAME ABSENT
-	_ZTV15CCoeSoundPlayer @ 421 NONAME ; #<VT>#
+	_ZTV15CCoeSoundPlayer @ 421 NONAME ABSENT ; #<VT>#
 	_ZTV15CCoeViewManager @ 422 NONAME ; #<VT>#
 	_ZTV16CCoeViewObserver @ 423 NONAME ; #<VT>#
 	Absentee1 @ 424 NONAME ABSENT
 	_ZTV22CCoeBrushAndPenContext @ 425 NONAME ; #<VT>#
-	_ZTV22CCoeSoundPlayerManager @ 426 NONAME ; #<VT>#
+	_ZTV22CCoeSoundPlayerManager @ 426 NONAME ABSENT ; #<VT>#
 	_ZTVN12CCoeEnvExtra19CHighPriorityActiveE @ 427 NONAME ; #<VT>#
 	_ZN7CCoeEnv11InstallFepLE4TUid @ 428 NONAME
 	_ZN7CCoeEnv11InstallFepLE4TUidi @ 429 NONAME
FCL/sf/incubator/stemkit