109 HBufC* buf = NULL; |
109 HBufC* buf = NULL; |
110 HBufC8* buf8 = NULL; |
110 HBufC8* buf8 = NULL; |
111 |
111 |
112 if ( aWantedFields.Count() == 0 ) |
112 if ( aWantedFields.Count() == 0 ) |
113 { |
113 { |
114 TRAP(err, i3GPExtParser->GetilstBoxesL(EMetaDataSongTitle, &buf8)); |
114 TRAP(err, i3GPExtParser->GetilstBoxesL(K3GPExtMetaTitleFormat, EMetaDataSongTitle, &buf8)); |
115 if (KErrNone == err) |
115 if (KErrNone == err) |
116 { |
116 { |
117 ConvertAndAppendL(&buf8, EMetaDataSongTitle); |
117 ConvertAndAppendL(&buf8, EMetaDataSongTitle); |
118 } |
118 } |
119 |
119 |
120 TRAP(err, i3GPExtParser->GetilstBoxesL(EMetaDataArtist, &buf8)); |
120 TRAP(err, i3GPExtParser->GetilstBoxesL(K3GPExtMetaArtistFormat, EMetaDataArtist, &buf8)); |
121 if (KErrNone == err) |
121 if (KErrNone == err) |
122 { |
122 { |
123 ConvertAndAppendL(&buf8, EMetaDataArtist); |
123 ConvertAndAppendL(&buf8, EMetaDataArtist); |
124 } |
124 } |
125 |
125 |
126 TRAP(err, i3GPExtParser->GetilstBoxesL(EMetaDataComposer, &buf8)); |
126 TRAP(err, i3GPExtParser->GetilstBoxesL(K3GPExtMetaComposerFormat, EMetaDataComposer, &buf8)); |
127 if (KErrNone == err) |
127 if (KErrNone == err) |
128 { |
128 { |
129 ConvertAndAppendL(&buf8, EMetaDataComposer); |
129 ConvertAndAppendL(&buf8, EMetaDataComposer); |
130 } |
130 } |
131 |
131 |
132 TRAP(err, i3GPExtParser->GetilstBoxesL(EMetaDataAlbum, &buf8)); |
132 TRAP(err, i3GPExtParser->GetilstBoxesL(K3GPExtMetaAlbumFormat, EMetaDataAlbum, &buf8)); |
133 if (KErrNone == err) |
133 if (KErrNone == err) |
134 { |
134 { |
135 ConvertAndAppendL(&buf8, EMetaDataAlbum); |
135 ConvertAndAppendL(&buf8, EMetaDataAlbum); |
136 } |
136 } |
137 |
137 |
138 TRAP(err, i3GPExtParser->GetilstBoxesL(EMetaDataComment, &buf8)); |
138 TRAP(err, i3GPExtParser->GetilstBoxesL(K3GPExtMetaCommentFormat, EMetaDataComment, &buf8)); |
139 if (KErrNone == err) |
139 if (KErrNone == err) |
140 { |
140 { |
141 ConvertAndAppendL(&buf8, EMetaDataComment); |
141 ConvertAndAppendL(&buf8, EMetaDataComment); |
142 } |
142 } |
143 |
143 |
144 TRAP(err, i3GPExtParser->GetilstBoxesL(EMetaDataGenre, &buf)); |
144 TRAP(err, i3GPExtParser->GetilstBoxesL(K3GPExtMetaGenre, EMetaDataGenre, &buf)); |
145 if (KErrNone == err) |
145 if (KErrNone == err) |
146 { |
146 { |
147 AppendL(&buf, EMetaDataGenre); |
147 AppendL(&buf, EMetaDataGenre); |
148 } |
148 } |
149 |
149 |
150 TRAP(err, i3GPExtParser->GetilstBoxesL(EMetaDataYear, &buf)); |
150 TRAP(err, i3GPExtParser->GetilstBoxesL(K3GPExtMetaYearFormat, EMetaDataYear, &buf)); |
151 if (KErrNone == err) |
151 if (KErrNone == err) |
152 { |
152 { |
153 AppendL(&buf, EMetaDataYear); |
153 AppendL(&buf, EMetaDataYear); |
154 } |
154 } |
155 |
155 |
156 TRAP(err, i3GPExtParser->GetilstBoxesL(EMetaDataRating, &buf8)); |
156 TRAP(err, i3GPExtParser->GetilstBoxesL(K3GPExtMetaCustomGenreFormat, EMetaDataRating, &buf8)); |
157 if (KErrNone == err) |
157 if (KErrNone == err) |
158 { |
158 { |
159 ConvertAndAppendL(&buf8, EMetaDataGenre); |
159 ConvertAndAppendL(&buf8, EMetaDataGenre); |
160 } |
160 } |
161 |
161 |
162 TRAP(err, i3GPExtParser->GetilstBoxesL(EMetaDataAlbumTrack, &buf)); |
162 TRAP(err, i3GPExtParser->GetilstBoxesL(K3GPExtMetaTrack, EMetaDataAlbumTrack, &buf)); |
163 if (KErrNone == err) |
163 if (KErrNone == err) |
164 { |
164 { |
165 AppendL(&buf, EMetaDataAlbumTrack); |
165 AppendL(&buf, EMetaDataAlbumTrack); |
166 } |
166 } |
167 |
167 |
168 TRAP(err, GetDurationL(EMetaDataDuration)); |
168 TRAP(err, GetDurationL(EMetaDataDuration)); |
169 |
169 |
170 TRAP(err, i3GPExtParser->GetilstBoxesL(EMetaDataJpeg, &buf8)); |
170 TRAP(err, i3GPExtParser->GetilstBoxesL(K3GPExtMetaArtistFormat, EMetaDataAlbumArtist, &buf8)); |
|
171 if (KErrNone == err) |
|
172 { |
|
173 ConvertAndAppendL(&buf8, EMetaDataAlbumArtist); |
|
174 } |
|
175 |
|
176 TRAP(err, i3GPExtParser->GetilstBoxesL(K3GPExtMetaJpeg, EMetaDataJpeg, &buf8)); |
171 if (KErrNone == err) |
177 if (KErrNone == err) |
172 { |
178 { |
173 AppendL(&buf8, EMetaDataJpeg); |
179 AppendL(&buf8, EMetaDataJpeg); |
174 } |
180 } |
175 } |
181 } |
181 for ( TInt i = 0; i < count; i++ ) |
187 for ( TInt i = 0; i < count; i++ ) |
182 { |
188 { |
183 switch ( aWantedFields[ i ] ) |
189 switch ( aWantedFields[ i ] ) |
184 { |
190 { |
185 case EMetaDataSongTitle: |
191 case EMetaDataSongTitle: |
186 TRAP(err, i3GPExtParser->GetilstBoxesL(EMetaDataSongTitle, &buf8)); |
192 TRAP(err, i3GPExtParser->GetilstBoxesL(K3GPExtMetaTitleFormat, EMetaDataSongTitle, &buf8)); |
187 if (KErrNone == err) |
193 if (KErrNone == err) |
188 { |
194 { |
189 ConvertAndAppendL(&buf8, EMetaDataSongTitle); |
195 ConvertAndAppendL(&buf8, EMetaDataSongTitle); |
190 } |
196 } |
191 break; |
197 break; |
192 |
198 |
193 case EMetaDataComment: |
199 case EMetaDataComment: |
194 TRAP(err, i3GPExtParser->GetilstBoxesL(EMetaDataComment, &buf8)); |
200 TRAP(err, i3GPExtParser->GetilstBoxesL(K3GPExtMetaCommentFormat, EMetaDataComment, &buf8)); |
195 if (KErrNone == err) |
201 if (KErrNone == err) |
196 { |
202 { |
197 ConvertAndAppendL(&buf8, EMetaDataComment); |
203 ConvertAndAppendL(&buf8, EMetaDataComment); |
198 } |
204 } |
199 break; |
205 break; |
200 |
206 |
201 case EMetaDataAlbumTrack: |
207 case EMetaDataAlbumTrack: |
202 TRAP(err, i3GPExtParser->GetilstBoxesL(EMetaDataAlbumTrack, &buf)); |
208 TRAP(err, i3GPExtParser->GetilstBoxesL(K3GPExtMetaTrack, EMetaDataAlbumTrack, &buf)); |
203 if (KErrNone == err) |
209 if (KErrNone == err) |
204 { |
210 { |
205 AppendL(&buf, EMetaDataAlbumTrack); |
211 AppendL(&buf, EMetaDataAlbumTrack); |
206 } |
212 } |
207 break; |
213 break; |
208 |
214 |
209 case EMetaDataArtist: |
215 case EMetaDataArtist: |
210 TRAP(err, i3GPExtParser->GetilstBoxesL(EMetaDataArtist, &buf8)); |
216 TRAP(err, i3GPExtParser->GetilstBoxesL(K3GPExtMetaArtistFormat, EMetaDataArtist, &buf8)); |
211 if (KErrNone == err) |
217 if (KErrNone == err) |
212 { |
218 { |
213 ConvertAndAppendL(&buf8, EMetaDataArtist); |
219 ConvertAndAppendL(&buf8, EMetaDataArtist); |
214 } |
220 } |
215 break; |
221 break; |
216 |
222 |
217 case EMetaDataComposer: |
223 case EMetaDataComposer: |
218 TRAP(err, i3GPExtParser->GetilstBoxesL(EMetaDataComposer, &buf8)); |
224 TRAP(err, i3GPExtParser->GetilstBoxesL(K3GPExtMetaComposerFormat, EMetaDataComposer, &buf8)); |
219 if (KErrNone == err) |
225 if (KErrNone == err) |
220 { |
226 { |
221 ConvertAndAppendL(&buf8, EMetaDataComposer); |
227 ConvertAndAppendL(&buf8, EMetaDataComposer); |
222 } |
228 } |
223 break; |
229 break; |
224 |
230 |
225 case EMetaDataAlbum: |
231 case EMetaDataAlbum: |
226 TRAP(err, i3GPExtParser->GetilstBoxesL(EMetaDataAlbum, &buf8)); |
232 TRAP(err, i3GPExtParser->GetilstBoxesL(K3GPExtMetaAlbumFormat, EMetaDataAlbum, &buf8)); |
227 if (KErrNone == err) |
233 if (KErrNone == err) |
228 { |
234 { |
229 ConvertAndAppendL(&buf8, EMetaDataAlbum); |
235 ConvertAndAppendL(&buf8, EMetaDataAlbum); |
230 } |
236 } |
231 break; |
237 break; |
232 |
238 |
233 case EMetaDataGenre: |
239 case EMetaDataGenre: |
234 TRAP(err, i3GPExtParser->GetilstBoxesL(EMetaDataGenre, &buf)); |
240 TRAP(err, i3GPExtParser->GetilstBoxesL(K3GPExtMetaGenre, EMetaDataGenre, &buf)); |
235 if (KErrNone == err) |
241 if (KErrNone == err) |
236 { |
242 { |
237 AppendL(&buf, EMetaDataGenre); |
243 AppendL(&buf, EMetaDataGenre); |
238 } |
244 } |
239 break; |
245 break; |
241 case EMetaDataDuration: |
247 case EMetaDataDuration: |
242 TRAP(err, GetDurationL(EMetaDataDuration)); |
248 TRAP(err, GetDurationL(EMetaDataDuration)); |
243 break; |
249 break; |
244 |
250 |
245 case EMetaDataYear: |
251 case EMetaDataYear: |
246 TRAP(err, i3GPExtParser->GetilstBoxesL(EMetaDataYear, &buf)); |
252 TRAP(err, i3GPExtParser->GetilstBoxesL(K3GPExtMetaYearFormat, EMetaDataYear, &buf)); |
247 if (KErrNone == err) |
253 if (KErrNone == err) |
248 { |
254 { |
249 AppendL(&buf, EMetaDataYear); |
255 AppendL(&buf, EMetaDataYear); |
250 } |
256 } |
251 break; |
257 break; |
252 |
258 |
253 case EMetaDataRating: |
259 case EMetaDataRating: |
254 TRAP(err, i3GPExtParser->GetilstBoxesL(EMetaDataRating, &buf8)); |
260 TRAP(err, i3GPExtParser->GetilstBoxesL(K3GPExtMetaCustomGenreFormat, EMetaDataRating, &buf8)); |
255 if (KErrNone == err) |
261 if (KErrNone == err) |
256 { |
262 { |
257 ConvertAndAppendL(&buf8, EMetaDataGenre); |
263 ConvertAndAppendL(&buf8, EMetaDataGenre); |
258 } |
264 } |
259 break; |
265 break; |
260 |
266 |
|
267 case EMetaDataAlbumArtist: |
|
268 TRAP(err, i3GPExtParser->GetilstBoxesL(K3GPExtMetaArtistFormat, EMetaDataAlbumArtist, &buf8)); |
|
269 if (KErrNone == err) |
|
270 { |
|
271 ConvertAndAppendL(&buf8, EMetaDataAlbumArtist); |
|
272 } |
|
273 break; |
|
274 |
261 case EMetaDataJpeg: |
275 case EMetaDataJpeg: |
262 TRAP(err, i3GPExtParser->GetilstBoxesL(EMetaDataJpeg, &buf8)); |
276 TRAP(err, i3GPExtParser->GetilstBoxesL(K3GPExtMetaJpeg, EMetaDataJpeg, &buf8)); |
263 if (KErrNone == err) |
277 if (KErrNone == err) |
264 { |
278 { |
265 AppendL(&buf8, EMetaDataJpeg); |
279 AppendL(&buf8, EMetaDataJpeg); |
266 } |
280 } |
267 break; |
281 break; |