equal
deleted
inserted
replaced
86 // --------------------------------------------------------------------------- |
86 // --------------------------------------------------------------------------- |
87 // CComposerImagePlugin |
87 // CComposerImagePlugin |
88 // --------------------------------------------------------------------------- |
88 // --------------------------------------------------------------------------- |
89 // |
89 // |
90 CImageComposerAO::CImageComposerAO() : // first-phase C++ constructor |
90 CImageComposerAO::CImageComposerAO() : // first-phase C++ constructor |
91 CActive( KHarvesterPriorityComposerPlugin ) |
91 CActive( KHarvesterPriorityComposerPlugin + 1 ) // To match image harvester plugin |
92 { |
92 { |
93 WRITELOG( "CImageComposerAO::CImageComposerAO()" ); |
93 WRITELOG( "CImageComposerAO::CImageComposerAO()" ); |
94 } |
94 } |
95 |
95 |
96 // --------------------------------------------------------------------------- |
96 // --------------------------------------------------------------------------- |
238 { |
238 { |
239 case ERequestGetObject: |
239 case ERequestGetObject: |
240 { |
240 { |
241 if( iItemQueue.Count() <= 0 ) |
241 if( iItemQueue.Count() <= 0 ) |
242 { |
242 { |
|
243 iItemQueue.Compress(); |
243 SetNextRequest( ERequestReady ); |
244 SetNextRequest( ERequestReady ); |
244 } |
245 } |
245 else |
246 else |
246 { |
247 { |
247 TItemId mdeObjectId = KNoId; |
248 TItemId mdeObjectId = KNoId; |
292 } |
293 } |
293 break; |
294 break; |
294 |
295 |
295 case ERequestReady: |
296 case ERequestReady: |
296 { |
297 { |
|
298 iForceObjectIds.Compress(); |
297 } |
299 } |
298 break; |
300 break; |
299 |
301 |
300 default: |
302 default: |
301 { |
303 { |
356 if( iItemQueue.Count() > 0 ) |
358 if( iItemQueue.Count() > 0 ) |
357 { |
359 { |
358 objectId = iItemQueue[0]; |
360 objectId = iItemQueue[0]; |
359 aMdEObjectId = objectId; |
361 aMdEObjectId = objectId; |
360 iItemQueue.Remove( 0 ); |
362 iItemQueue.Remove( 0 ); |
361 } |
|
362 else |
|
363 { |
|
364 iItemQueue.Compress(); |
|
365 } |
363 } |
366 |
364 |
367 // get object from db (NULL if not found) |
365 // get object from db (NULL if not found) |
368 CMdEObject* mdeObject = iSession->GetObjectL( objectId, *iImageObjectDef ); |
366 CMdEObject* mdeObject = iSession->GetObjectL( objectId, *iImageObjectDef ); |
369 |
367 |