FCL/sf/mw/dlnasrv: comparison upnpavcontroller/upnpavcontrollerserver/src/upnpavdeviceextended.cpp

equal deleted inserted replaced

-:3785f754ee62
+:5360b7ddc251
 // INCLUDES
-// upnp stack api
+#include <in_sock.h>
+// dlnasrv / mediaserver api
 #include <upnpdlnaprotocolinfo.h>
 #include <upnpitem.h>
-// upnpframework / avcontroller helper api
+// dlnasrv / avcontroller helper api
 #include "upnpitemutility.h"
 #include "upnpconstantdefs.h" // for upnp-specific stuff
-// upnpframework / internal api's
+// dlnasrv / internal api's
 #include "upnpcommonutils.h"
-// avcontroller internal
+// dlnasrv / avcontroller internal
 #include "upnpavdeviceextended.h"
 _LIT8( KAudioSupport,        "audio/" );
 _LIT8( KImageSupport,        "image/" );
 const TInt KUnicodeC1RangeEnd = 159;// the end character of C1 range
 const TInt KSlash = 92;
 _LIT8( KProtocolInfo,       "protocolInfo" );
 _LIT8( KAsterisk,           "*" );
+const TInt KUrlIpBufLen = 16; // For IP address e.g. xxx.xxx.xxx.xxx
+const TInt KUrlPortLen = 11; // For HTTP port e.g. yyyyy
+_LIT8( KUrlColon, ":" );
+_LIT8( KUrlSlash, "/" );
+_LIT8( KUrlHttp, "http://" );
 _LIT( KComponentLogfile, "upnpavcontrollerserver.txt");
 #include "upnplog.h"
+// --------------------------------------------------------------------------
+// EnsureFinalSlash
+// --------------------------------------------------------------------------
+static void EnsureFinalSlash( TDes8& aUrl )
+{
+TInt len( aUrl.Length() );
+if ( len > 0 && aUrl[ len - 1 ] != KUrlSlash()[ 0 ] )
+{
+aUrl.Append( KUrlSlash );
+}
+}
+// --------------------------------------------------------------------------
+// RemoveInitial
+// --------------------------------------------------------------------------
+static TPtrC8 RemoveInitial( const TDesC8& aUrl, const TDesC8& aInitial )
+{
+return aUrl.Find( aInitial ) == 0 ? aUrl.Mid( aInitial.Length() ) : aUrl;
+}
 // ============================ MEMBER FUNCTIONS ============================
 // --------------------------------------------------------------------------
 // CUpnpAVDeviceExtended::NewL
 dev->iImageMediaCapability = aDevice.ImageCapability();
 dev->iVideoMediaCapability = aDevice.VideoCapability();
 dev->iNextAVTransportUri = aDevice.NextAVTransportUri();
 dev->iMaxVolume = aDevice.MaxVolume();
 dev->iDlnaCompatible = aDevice.DlnaCompatible();
+dev->iSeekCapability = aDevice.SeekCapability();
 dev->ConstructL();
 CleanupStack::Pop();
 return dev;
 }
 dev->iImageMediaCapability = aDevice.ImageCapability();
 dev->iVideoMediaCapability = aDevice.VideoCapability();
 dev->iNextAVTransportUri = aDevice.NextAVTransportUri();
 dev->iMaxVolume = aDevice.MaxVolume();
 dev->iDlnaCompatible = aDevice.DlnaCompatible();
+dev->iSeekCapability = aDevice.SeekCapability();
 dev->SetSinkProtocolInfoL( aDevice.SinkProtocolInfo() );
 dev->SetSourceProtocolInfoL( aDevice.SourceProtocolInfo() );
 dev->iSubscriptionCount = aDevice.SubscriptionCount();
 dev->iLocal = aDevice.Local();
 dev->iVideoUpload = aDevice.VideoUpload();
 dev->iCreateChildContainer = aDevice.CreateChildContainer();
 dev->iDestroyObject = aDevice.DestroyObject();
 dev->iPInfoReceived = aDevice.PInfoReceived();
 dev->iDLNADeviceType = aDevice.DLNADeviceType();
+dev->iPrepareForConnection = aDevice.PrepareForConnection();
 dev->ConstructL();
 CleanupStack::Pop();
 return dev;
 }
 // --------------------------------------------------------------------------
 // CUpnpAVDeviceExtended::~CUpnpAVDeviceExtended
 // See upnpavdeviceextended.h
 // --------------------------------------------------------------------------
 CUpnpAVDeviceExtended::~CUpnpAVDeviceExtended()
 {
+delete iIconUrl;
 iSinkProtocolInfo.ResetAndDestroy();
 iSourceProtocolInfo.ResetAndDestroy();
 }
 input.MarkedToken() ) );
 if( err == KErrNone && tmpInfo )
 {
 // Transfer ownership of tmpInfo
-iSinkProtocolInfo.AppendL( tmpInfo );
+iSinkProtocolInfo.Append( tmpInfo );
 }
 else
 {
 __LOG1( "CUpnpDlnaProtocolInfo::NewL failed: %d", err );
 }
 input.MarkedToken() ) );
 if( err == KErrNone && tmpInfo )
 {
 // Transfer ownership of tmpInfo
-iSourceProtocolInfo.AppendL( tmpInfo );
+iSourceProtocolInfo.Append( tmpInfo );
 }
 else
 {
 __LOG1( "CUpnpDlnaProtocolInfo::NewL failed: %d", err );
 }
 {
 __LOG( "CUpnpAVDeviceExtended::MatchSinkProtocolInfo" );
 TBool match = EFalse;
-if( DlnaCompatible() )
+if( DlnaCompatible() && DLNADeviceType() == CUpnpAVDeviceExtended::EDMR )
 {
 // The device is DLNA compatible
 // Try try find PN parameter to determine if it's dlna content
 if( aInfo.Find( KDlnaPn ) != KErrNotFound )
 {
 __LOG( "MatchSinkProtocolInfo - DLNA content and the renderer \
 is DLNA compatible, start matching..." );
 match = MatchSinkProfileId( aInfo );
+if( !match )
+{
+// if profile id was not found try matching mime
+match = MatchSinkMime( aInfo );
+}
 }
 else
 {
 __LOG( "MatchSinkProtocolInfo - Non DLNA content and the \
 renderer is DLNA compatible, start matching..." );
 // Match the first parameter and PN parameter
 TInt count = iSinkProtocolInfo.Count();
 for( TInt i = 0; i < count; i++ )
 {
 if( iSinkProtocolInfo[ i ]->PnParameter() ==
-tmpInfo->PnParameter() ||
+tmpInfo->PnParameter() )
-iSinkProtocolInfo[ i ]->FourthField() == KAsterisk )
 {
 // PN parameter matches, try matching the first
 // parameter
 if( iSinkProtocolInfo[ i ]->FirstField() ==
 tmpInfo->FirstField() ||
 {
 __LOG( "CUpnpAVDeviceExtended::SetCapabilitiesBySupportedMimeTypesL" );
 if( aListOfMimeTypes != KNullDesC8 )
 {
-	    // Update the audio media capability
+// Update the audio media capability
 if( UPnPCommonUtils::IsAudioSupported( aListOfMimeTypes ) )
 {
 iAudioMediaCapability = ETrue;
 }
 else
 {
 iAudioMediaCapability = EFalse;
 }
-	    // Update the audio media capability
+// Update the audio media capability
 if( UPnPCommonUtils::IsImageSupported( aListOfMimeTypes ) )
 {
 iImageMediaCapability = ETrue;
 }
 else
 {
 iImageMediaCapability = EFalse;
 }
 // Update the video media capability
 if( UPnPCommonUtils::IsVideoSupported( aListOfMimeTypes ) )
 {
 iVideoMediaCapability = ETrue;
 }
 else
 {
 iVideoMediaCapability = EFalse;
 }
 }
 }
 for( TInt i = 0; i < aProtocolInfo.Count(); i++ )
 {
 CUpnpDlnaProtocolInfo* tmpInfo = CUpnpDlnaProtocolInfo::NewL(
 aProtocolInfo[ i ]->ProtocolInfoL() );
-iSourceProtocolInfo.AppendL( tmpInfo ); // Ownership is transferred
+iSourceProtocolInfo.Append( tmpInfo ); // Ownership is transferred
 }
 }
 // --------------------------------------------------------------------------
 // CUpnpAVDeviceExtended::SetSinkProtocolInfoL
 for( TInt i = 0; i < aProtocolInfo.Count(); i++ )
 {
 CUpnpDlnaProtocolInfo* tmpInfo = CUpnpDlnaProtocolInfo::NewL(
 aProtocolInfo[ i ]->ProtocolInfoL() );
-iSinkProtocolInfo.AppendL( tmpInfo ); // Ownership is transferred
+iSinkProtocolInfo.Append( tmpInfo ); // Ownership is transferred
 }
 }
 // --------------------------------------------------------------------------
 // CUpnpAVDeviceExtended::ParseToDelimeter
 // See upnpavdeviceextended.h
 // --------------------------------------------------------------------------
 void CUpnpAVDeviceExtended::ParseToDelimeter( TLex8& aLex, TChar aDelimeter )
 {
 aLex.Mark();
 TChar chr = 0;
-	TChar edchr = 0;
+TChar edchr = 0;
-	while( !aLex.Eos() )
+while( !aLex.Eos() )
-		{
+{
-		edchr = chr;
+edchr = chr;
+chr = aLex.Peek();
-		chr = aLex.Peek();
+if( chr == aDelimeter && edchr != TChar( KSlash ) )
-		if( chr == aDelimeter && edchr != TChar( KSlash ) )
+{
-			{
+break;
-			break;
+}
-			}
+aLex.Inc();
+}
-		aLex.Inc();
+}
-		}
-}
 // --------------------------------------------------------------------------
 // CUpnpAVDeviceExtended::RemoveIllegalCharactersL
 // See upnpavdeviceextended.h
 // --------------------------------------------------------------------------
 HBufC8* CUpnpAVDeviceExtended::RemoveIllegalCharactersL(
 const TDesC8& aPtr ) const
 {
 HBufC8* ptrResult = NULL;
 TInt i = KErrNotFound;
 TBool CUpnpAVDeviceExtended::PInfoReceived() const
 {
 return iPInfoReceived;
 }
+// --------------------------------------------------------------------------
+// CUpnpAVDeviceExtended::PrepareForConnection
+// See upnpavdeviceextended.h
+// --------------------------------------------------------------------------
+TBool CUpnpAVDeviceExtended::PrepareForConnection() const
+{
+return iPrepareForConnection;
+}
+// --------------------------------------------------------------------------
+// CUpnpAVDeviceExtended::SetPrepareForConnection
+// See upnpavdeviceextended.h
+// --------------------------------------------------------------------------
+void CUpnpAVDeviceExtended::SetPrepareForConnection(
+TBool aPrepareForConnection )
+{
+iPrepareForConnection = aPrepareForConnection;
+}
+// --------------------------------------------------------------------------
+// CUpnpAVDeviceExtended::SetDLNADeviceType
+// See upnpavdeviceextended.h
+// --------------------------------------------------------------------------
 void CUpnpAVDeviceExtended::SetDLNADeviceType( TDLNADeviceType aDeviceType )
 {
 iDLNADeviceType = aDeviceType;
 }
+// --------------------------------------------------------------------------
+// CUpnpAVDeviceExtended::DLNADeviceType
+// See upnpavdeviceextended.h
+// --------------------------------------------------------------------------
 CUpnpAVDeviceExtended::TDLNADeviceType
 CUpnpAVDeviceExtended::DLNADeviceType() const
 {
 return iDLNADeviceType;
 }
+// --------------------------------------------------------------------------
+// CUpnpAVDeviceExtended::SetIconUrlL
+// See upnpavdeviceextended.h
+// --------------------------------------------------------------------------
+void CUpnpAVDeviceExtended::SetIconUrlL( const TInetAddr& aAddress,
+const TDesC8& aUrlBase, const TDesC8& aIconUrl )
+{
+__LOG8_1( "CUpnpAVDeviceExtended::SetIconUrlL - Base: %S", &aUrlBase );
+__LOG8_1( "CUpnpAVDeviceExtended::SetIconUrlL - Icon: %S", &aIconUrl );
+TBuf< KUrlIpBufLen > ip;
+aAddress.Output( ip );
+HBufC8* iconUrl = HBufC8::NewL( KUrlHttp().Length() + ip.Length() + 1 + // 1 for colon
+KUrlPortLen + 1 + // 1 for slash
+aUrlBase.Length() + 1 + // 1 for slash
+aIconUrl.Length() );
+TPtr8 ptr( iconUrl->Des() );
+if ( aUrlBase.Find( KUrlHttp ) == KErrNotFound )
+{
+ptr.Copy( KUrlHttp );
+ptr.Append( ip );
+ptr.Append( KUrlColon );
+ptr.AppendNumUC( aAddress.Port() );
+}
+EnsureFinalSlash( ptr );
+TPtrC8 urlBase( RemoveInitial( aUrlBase, KUrlSlash ) ); // Url base without initial slash
+ptr.Append( urlBase );
+EnsureFinalSlash( ptr );
+TPtrC8 icon( RemoveInitial( aIconUrl, KUrlSlash ) ); // Icon url without initial slash
+ptr.Append( RemoveInitial( icon, urlBase ) ); // Remove base from icon url if it already contains base
+delete iIconUrl;
+iIconUrl = iconUrl;
+__LOG8_1( "CUpnpAVDeviceExtended::SetIconUrlL - Device: %S", &( FriendlyName() ) );
+__LOG8_1( "CUpnpAVDeviceExtended::SetIconUrlL - Url: %S", iIconUrl );
+}
+// --------------------------------------------------------------------------
+// CUpnpAVDeviceExtended::IconUrl
+// See upnpavdeviceextended.h
+// --------------------------------------------------------------------------
+TPtrC8 CUpnpAVDeviceExtended::IconUrl() const
+{
+return ( iIconUrl ? *iIconUrl : KNullDesC8() );
+}
 // end of file

branch	new development branch with rendering state machine and other goodies
changeset 38	5360b7ddc251
parent 32	3785f754ee62