Changeset 8857
- Timestamp:
- 03/03/07 21:54:57 (5 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Jav_Audio/com/scenari/m/audio/facet/audioassemb/FacetAudioAssemb.java
r7927 r8857 233 233 public IHSource getFacet(IHItemDef pItem, String pIdSubItem, HParamsQueryString pQueryString) throws Exception { 234 234 File vRes = xGetFacet(pItem, pIdSubItem, pQueryString); 235 return vRes != null ? new SourceFacet(new HSourceFs(null, vRes.getCanonicalPath()), -1, TransformerSox.getEncod(pQueryString.hGetValue(TransformerSox.PARAM_ENCOD)) == TransformerSox.ENCOD_WAV ? "audio/x-wav" : "audio/x-mp3") : null;235 return vRes != null ? new SourceFacet(new HSourceFs(null, vRes.getCanonicalPath()), SourceFacet.GET_WRAPPED_SOURCE, TransformerSox.getEncod(pQueryString.hGetValue(TransformerSox.PARAM_ENCOD)) == TransformerSox.ENCOD_WAV ? "audio/x-wav" : "audio/x-mp3") : null; 236 236 } 237 237 … … 316 316 IHItemDef vItemDef = (vIdSubItem != null) ? (IHItemDef) vWsp.hGetItem(vSpace, vCode, null) : vWsp.hGetItemDef(vSpace, vCode, null); 317 317 IHItemType vItemType = vWsp.hGetItemType(vItemDef.hGetIdSs()); 318 boolean vDepAdded = false; 318 319 if (vItemType != null) { 319 320 ISgnModule vModule = vItemType.hGetSgnModule(hGetCodeModule(), vIdSubItem != null ? ((IHItem) vItemDef).hGetSubItemSgn(vIdSubItem) : vItemDef.hGetSignature()); … … 324 325 vSeg.fFilePath = vSource.hGetUrlFileFormat(); 325 326 vFacetCache.addDependance(vItemDef, vIdSubItem, vParams, vSource.hGetLastModifWithChilds()); 327 vDepAdded = true; 326 328 } 327 329 } 328 330 } 331 //Mémorise la dépendance même si source null, forcera le recalcul si la source n'est plus nulle. 332 if(! vDepAdded) vFacetCache.addDependance(vItemDef, vIdSubItem, null, IHSource.LAST_MODIF_SRCNULL); 329 333 if (vSeg.fFilePath == null) { 330 334 // TODO On construit un silence...
Note: See TracChangeset
for help on using the changeset viewer.