equal
deleted
inserted
replaced
354 { |
354 { |
355 visual->SetExtBitmapFileL( extBitmap ); |
355 visual->SetExtBitmapFileL( extBitmap ); |
356 } |
356 } |
357 if (aLayer && aLayer->Type() == ELayerTypeGroup) |
357 if (aLayer && aLayer->Type() == ELayerTypeGroup) |
358 { |
358 { |
359 CHuiFxGroupLayer* group = reinterpret_cast<CHuiFxGroupLayer*>(aLayer); |
359 CHuiFxGroupLayer* group = static_cast<CHuiFxGroupLayer*>(aLayer); |
360 group->AddLayerL( visual ); // ownership transferred |
360 group->AddLayerL( visual ); // ownership transferred |
361 } |
361 } |
362 else |
362 else |
363 { |
363 { |
364 iEffect->AddLayerL( visual ); // ownership transferred |
364 iEffect->AddLayerL( visual ); // ownership transferred |
1194 THuiFxVisualSrcType CHuiFxEffectParser::GetSrcTypeL( CMDXMLNode* aNode, TPtrC16& aBitmap ) |
1194 THuiFxVisualSrcType CHuiFxEffectParser::GetSrcTypeL( CMDXMLNode* aNode, TPtrC16& aBitmap ) |
1195 { |
1195 { |
1196 #ifdef _HUI_FX_PARSER_LOGGING |
1196 #ifdef _HUI_FX_PARSER_LOGGING |
1197 __ALFFXLOGSTRING1("CHuiFxEffectParser::GetSrcTypeL - 0x%x ",this); |
1197 __ALFFXLOGSTRING1("CHuiFxEffectParser::GetSrcTypeL - 0x%x ",this); |
1198 #endif |
1198 #endif |
|
1199 |
|
1200 |
1199 if (aNode->NodeType() != CMDXMLNode::EElementNode) |
1201 if (aNode->NodeType() != CMDXMLNode::EElementNode) |
1200 { |
1202 { |
1201 FAIL(KErrGeneral, _L("Text node expected while reading visual source type")); |
1203 FAIL(KErrGeneral, _L("Text node expected while reading visual source type")); |
1202 } |
1204 } |
1203 TInt attributeIndex = ((CMDXMLElement*)aNode)->FindIndex( KLitSrc ); |
1205 TInt attributeIndex = ((CMDXMLElement*)aNode)->FindIndex( KLitSrc ); |
1209 } |
1211 } |
1210 |
1212 |
1211 TPtrC attributeValue; |
1213 TPtrC attributeValue; |
1212 TPtrC attributeName; |
1214 TPtrC attributeName; |
1213 User::LeaveIfError(((CMDXMLElement*)aNode)->AttributeDetails( attributeIndex, attributeName, attributeValue )); |
1215 User::LeaveIfError(((CMDXMLElement*)aNode)->AttributeDetails( attributeIndex, attributeName, attributeValue )); |
1214 |
1216 |
1215 if( attributeValue.Compare( KLitItem ) == 0 ) |
1217 |
|
1218 if( attributeValue.CompareF( KLitItem ) == 0 ) |
1216 { |
1219 { |
1217 return EVisualSrcVisual; |
1220 return EVisualSrcVisual; |
1218 } |
1221 } |
1219 else if ( attributeValue.Compare( KLitInput1 ) == 0 ) |
1222 else if ( attributeValue.CompareF( KLitInput1 ) == 0 ) |
1220 { |
1223 { |
1221 // This means that the source is given as a parameter to the effect |
1224 // This means that the source is given as a parameter to the effect |
1222 return EVisualSrcInput1; |
1225 return EVisualSrcInput1; |
1223 } |
1226 } |
1224 else if ( attributeValue.Compare( KLitInput2 ) == 0 ) |
1227 else if ( attributeValue.CompareF( KLitInput2 ) == 0 ) |
1225 { |
1228 { |
1226 // This means that the source is given as a parameter to the effect |
1229 // This means that the source is given as a parameter to the effect |
1227 return EVisualSrcInput2; |
1230 return EVisualSrcInput2; |
1228 } |
1231 } |
1229 else |
1232 else |