equal
deleted
inserted
replaced
396 |
396 |
397 searchMedia->SetTObjectValueL( KMPXMediaGeneralType, EMPXItem ); |
397 searchMedia->SetTObjectValueL( KMPXMediaGeneralType, EMPXItem ); |
398 searchMedia->SetTObjectValueL( KMPXMediaGeneralCategory, EMPXSong ); |
398 searchMedia->SetTObjectValueL( KMPXMediaGeneralCategory, EMPXSong ); |
399 searchMedia->SetTObjectValueL<TMPXItemId>( KMPXMediaGeneralId, |
399 searchMedia->SetTObjectValueL<TMPXItemId>( KMPXMediaGeneralId, |
400 KMtpInvalidSongID ); |
400 KMtpInvalidSongID ); |
401 searchMedia->SetTextValueL( KMPXMediaGeneralDrive, iStoreRoot ); |
401 if ( iStoreRoot.Length() > 0 ) |
|
402 { |
|
403 searchMedia->SetTextValueL( KMPXMediaGeneralDrive, iStoreRoot ); |
|
404 } |
402 |
405 |
403 RArray<TMPXAttribute> songAttributes; |
406 RArray<TMPXAttribute> songAttributes; |
404 CleanupClosePushL( songAttributes ); // + songAttributes |
407 CleanupClosePushL( songAttributes ); // + songAttributes |
405 songAttributes.AppendL( KMPXMediaGeneralId ); |
408 songAttributes.AppendL( KMPXMediaGeneralId ); |
406 |
409 |
939 CleanupStack::PushL( searchMedia ); // + searchMedia |
942 CleanupStack::PushL( searchMedia ); // + searchMedia |
940 |
943 |
941 searchMedia->SetTObjectValueL( KMPXMediaGeneralType, EMPXItem ); |
944 searchMedia->SetTObjectValueL( KMPXMediaGeneralType, EMPXItem ); |
942 searchMedia->SetTObjectValueL( KMPXMediaGeneralCategory, EMPXSong ); |
945 searchMedia->SetTObjectValueL( KMPXMediaGeneralCategory, EMPXSong ); |
943 searchMedia->SetTextValueL( KMPXMediaGeneralUri, aFullFileName ); |
946 searchMedia->SetTextValueL( KMPXMediaGeneralUri, aFullFileName ); |
944 searchMedia->SetTextValueL( KMPXMediaGeneralDrive, iStoreRoot ); |
947 |
|
948 TParsePtrC parse( aFullFileName ); |
|
949 searchMedia->SetTextValueL( KMPXMediaGeneralDrive, parse.Drive() ); |
945 |
950 |
946 RArray<TMPXAttribute> songAttributes; |
951 RArray<TMPXAttribute> songAttributes; |
947 CleanupClosePushL( songAttributes ); // + songAttributes |
952 CleanupClosePushL( songAttributes ); // + songAttributes |
948 songAttributes.AppendL( KMPXMediaGeneralUri ); |
953 songAttributes.AppendL( KMPXMediaGeneralUri ); |
949 |
954 |
1171 media->SetTextValueL( KMPXMediaGeneralUri, aRefFileArray[j] ); |
1176 media->SetTextValueL( KMPXMediaGeneralUri, aRefFileArray[j] ); |
1172 // TODO: need to confirm that should set drive letter or storage root path. |
1177 // TODO: need to confirm that should set drive letter or storage root path. |
1173 TParsePtrC parse( aRefFileArray[j] ); |
1178 TParsePtrC parse( aRefFileArray[j] ); |
1174 media->SetTextValueL( KMPXMediaGeneralDrive, parse.Drive() ); |
1179 media->SetTextValueL( KMPXMediaGeneralDrive, parse.Drive() ); |
1175 media->SetTObjectValueL( KMPXMediaGeneralModified, EFalse ); |
1180 media->SetTObjectValueL( KMPXMediaGeneralModified, EFalse ); |
1176 |
1181 |
1177 // Add media into array contents |
1182 // Add media into array contents |
1178 abstractMediaArray->AppendL( media ); |
1183 abstractMediaArray->AppendL( media ); |
1179 |
1184 |
1180 CleanupStack::Pop( media ); // - media |
1185 CleanupStack::Pop( media ); // - media |
1181 } |
1186 } |
1581 CleanupStack::PushL( searchMedia ); // + searchMedia |
1586 CleanupStack::PushL( searchMedia ); // + searchMedia |
1582 |
1587 |
1583 searchMedia->SetTObjectValueL( KMPXMediaGeneralType, EMPXItem ); |
1588 searchMedia->SetTObjectValueL( KMPXMediaGeneralType, EMPXItem ); |
1584 searchMedia->SetTObjectValueL( KMPXMediaGeneralCategory, EMPXPlaylist ); |
1589 searchMedia->SetTObjectValueL( KMPXMediaGeneralCategory, EMPXPlaylist ); |
1585 searchMedia->SetTextValueL( KMPXMediaGeneralUri, aSuid ); |
1590 searchMedia->SetTextValueL( KMPXMediaGeneralUri, aSuid ); |
1586 searchMedia->SetTextValueL( KMPXMediaGeneralDrive, iStoreRoot ); |
1591 |
|
1592 TParsePtrC parse( aSuid ); |
|
1593 searchMedia->SetTextValueL( KMPXMediaGeneralDrive, parse.Drive() ); |
1587 |
1594 |
1588 RArray<TMPXAttribute> playlistAttributes; |
1595 RArray<TMPXAttribute> playlistAttributes; |
1589 CleanupClosePushL( playlistAttributes ); // + playlistAttributes |
1596 CleanupClosePushL( playlistAttributes ); // + playlistAttributes |
1590 playlistAttributes.AppendL( KMPXMediaGeneralId ); |
1597 playlistAttributes.AppendL( KMPXMediaGeneralId ); |
1591 playlistAttributes.AppendL( KMPXMediaGeneralTitle ); |
1598 playlistAttributes.AppendL( KMPXMediaGeneralTitle ); |