# HG changeset patch # User hgs # Date 1272433944 -10800 # Node ID 6c10323ce807e67d28c9c2d679422f2a0f216787 # Parent b78e66e882383380f13a49e6f82f740ccec14cf5 201016 diff -r b78e66e88238 -r 6c10323ce807 bluetoothappprofiles/avrcp/avc/avcframe.h --- a/bluetoothappprofiles/avrcp/avc/avcframe.h Sat Apr 24 00:30:17 2010 +0300 +++ b/bluetoothappprofiles/avrcp/avc/avcframe.h Wed Apr 28 08:52:24 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2004-2010 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" @@ -512,26 +512,26 @@ // Factory pattern stuff - these are useful to do donkey work, // but have existing clients treat them as the base class -class CAVCVendorDependentResponse +class CAVCVendorDependentResponse // codescanner::missingcclass { public: IMPORT_C static CAVCFrame* NewL(TUint aVendorId); }; -class CAVCPassthroughCommand +class CAVCPassthroughCommand // codescanner::missingcclass { public: }; // likely not have newl because dont allocate on parse pattern -class CAVCVendorDependentCommand +class CAVCVendorDependentCommand // codescanner::missingcclass { public: IMPORT_C static TPtrC8 GetPayloadAndVID(const CAVCFrame& aFrame, TUint& aVID); }; // likely not have newl because dont allocate on parse pattern -class CAVCVendorUniquePassthroughCommand +class CAVCVendorUniquePassthroughCommand // codescanner::missingcclass { public: IMPORT_C static TPtrC8 GetPayloadAndVID(const CAVCFrame& aFrame, TUint& aVID); diff -r b78e66e88238 -r 6c10323ce807 bluetoothappprofiles/avrcp/mediabrowseapi/public/remconmediabrowsepanic.h --- a/bluetoothappprofiles/avrcp/mediabrowseapi/public/remconmediabrowsepanic.h Sat Apr 24 00:30:17 2010 +0300 +++ b/bluetoothappprofiles/avrcp/mediabrowseapi/public/remconmediabrowsepanic.h Wed Apr 28 08:52:24 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2008-2010 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" @@ -39,6 +39,7 @@ ESearchResultWithoutRequest = 6, /** The value of the media library state cookie must not be zero. */ EZeroMediaLibraryStateCookie = 7, + EUnexpectedNullMemberField = 8, }; class MediaBrowsePanic diff -r b78e66e88238 -r 6c10323ce807 bluetoothappprofiles/avrcp/mediabrowseapi/src/remconmediabrowsetargetbase.cpp --- a/bluetoothappprofiles/avrcp/mediabrowseapi/src/remconmediabrowsetargetbase.cpp Sat Apr 24 00:30:17 2010 +0300 +++ b/bluetoothappprofiles/avrcp/mediabrowseapi/src/remconmediabrowsetargetbase.cpp Wed Apr 28 08:52:24 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2008-2010 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" @@ -73,12 +73,16 @@ { } -CRemConMediaBrowseTargetBase::~CRemConMediaBrowseTargetBase() +CRemConMediaBrowseTargetBase::~CRemConMediaBrowseTargetBase() // codescanner::destructor { iMediaAttributeIds.Close(); iNullArray.Close(); iOutBuf.Close(); iSearchString.Close(); + + // iGetPathResponse, iGiaResponse and iGflResponse are instantiated in CRemConMediaBrowseTargetBase::BaseConstructL() and + // so should have the same lifetime as this CRemConMediaBrowseTargetBase instance + __ASSERT_DEBUG(iGetPathResponse && iGiaResponse && iGflResponse, MediaBrowsePanic::Panic(EUnexpectedNullMemberField)); iGetPathResponse->Close(); iGiaResponse->Close(); iGflResponse->Close(); diff -r b78e66e88238 -r 6c10323ce807 bluetoothappprofiles/avrcp/playerinformation/src/playerapplicationsetting.cpp --- a/bluetoothappprofiles/avrcp/playerinformation/src/playerapplicationsetting.cpp Sat Apr 24 00:30:17 2010 +0300 +++ b/bluetoothappprofiles/avrcp/playerinformation/src/playerapplicationsetting.cpp Wed Apr 28 08:52:24 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2008-2010 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" @@ -30,7 +30,7 @@ CPlayerApplicationSettings* CPlayerApplicationSettings::NewL( TUint aAttributeID, TDesC8& aAttributeText, - RArray aValues, + const RArray& aValues, RArray& aValueTexts, TUint aInitialValue ) { @@ -55,7 +55,7 @@ void CPlayerApplicationSettings::ConstructL(TUint aAttributeID, TDesC8& aAttributeText, - RArray aValues, + const RArray& aValues, RArray& aValueText, TUint aInitialValue ) { diff -r b78e66e88238 -r 6c10323ce807 bluetoothappprofiles/avrcp/playerinformation/src/playerapplicationsetting.h --- a/bluetoothappprofiles/avrcp/playerinformation/src/playerapplicationsetting.h Sat Apr 24 00:30:17 2010 +0300 +++ b/bluetoothappprofiles/avrcp/playerinformation/src/playerapplicationsetting.h Wed Apr 28 08:52:24 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2007-2010 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" @@ -42,7 +42,7 @@ */ static CPlayerApplicationSettings* NewL( TUint aAttributeID, TDesC8& aAttributeText, - RArray aValues, + const RArray& aValues, RArray& aValueTexts, TUint aInitialValue ); @@ -65,7 +65,7 @@ void ConstructL(TUint aAttributeID, TDesC8& aAttributeText, - RArray aValues, + const RArray& aValues, RArray& aValueText, TUint aInitialValue ); diff -r b78e66e88238 -r 6c10323ce807 bluetoothappprofiles/avrcp/remconbeareravrcp/inc/playerbitmasks.h --- a/bluetoothappprofiles/avrcp/remconbeareravrcp/inc/playerbitmasks.h Sat Apr 24 00:30:17 2010 +0300 +++ b/bluetoothappprofiles/avrcp/remconbeareravrcp/inc/playerbitmasks.h Wed Apr 28 08:52:24 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2008-2010 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" @@ -176,11 +176,11 @@ inline const TDesC8& FeatureBitmask() const; - void SetCoreApiFeatures(RArray aOperation); - void SetAbsoluteVolumeApiFeatures(RArray aOperation); - void SetGroupNavigationApiFeatures(RArray aOperation); - void SetNowPlayingApiFeatures(RArray aOperation); - void SetMediaBrowseApiFeatures(RArray aOperation); + void SetCoreApiFeatures(const RArray& aOperation); + void SetAbsoluteVolumeApiFeatures(const RArray& aOperation); + void SetGroupNavigationApiFeatures(const RArray& aOperation); + void SetNowPlayingApiFeatures(const RArray& aOperation); + void SetMediaBrowseApiFeatures(const RArray& aOperation); private: void SetCoreApiFeatures(); diff -r b78e66e88238 -r 6c10323ce807 bluetoothappprofiles/avrcp/remconbeareravrcp/src/playerbitmasks.cpp --- a/bluetoothappprofiles/avrcp/remconbeareravrcp/src/playerbitmasks.cpp Sat Apr 24 00:30:17 2010 +0300 +++ b/bluetoothappprofiles/avrcp/remconbeareravrcp/src/playerbitmasks.cpp Wed Apr 28 08:52:24 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2008-2010 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" @@ -33,7 +33,7 @@ iFeatureBitmask.Copy(aFeatureBitmask.FeatureBitmask()); } -void TPlayerFeatureBitmask::SetCoreApiFeatures(RArray aOperation) +void TPlayerFeatureBitmask::SetCoreApiFeatures(const RArray& aOperation) { if(aOperation.Count() > 0) { @@ -282,7 +282,7 @@ iFeatureBitmask[EF5ByteOffset]|= (1< aOperation) +void TPlayerFeatureBitmask::SetAbsoluteVolumeApiFeatures(const RArray& aOperation) { if(aOperation.Count()) { @@ -290,7 +290,7 @@ } } -void TPlayerFeatureBitmask::SetGroupNavigationApiFeatures(RArray aOperation) +void TPlayerFeatureBitmask::SetGroupNavigationApiFeatures(const RArray& aOperation) { if(aOperation.Count()) { @@ -299,7 +299,7 @@ } } -void TPlayerFeatureBitmask::SetNowPlayingApiFeatures(RArray aOperation) +void TPlayerFeatureBitmask::SetNowPlayingApiFeatures(const RArray& aOperation) { if(aOperation.Count()) { @@ -313,7 +313,7 @@ } } -void TPlayerFeatureBitmask::SetMediaBrowseApiFeatures(RArray aOperation) +void TPlayerFeatureBitmask::SetMediaBrowseApiFeatures(const RArray& aOperation) { if(aOperation.Count()) {