diff --git a/app/static/js/app.jsx b/app/static/js/app.jsx index b3fee43..f07cab2 100644 --- a/app/static/js/app.jsx +++ b/app/static/js/app.jsx @@ -28199,20 +28199,31 @@ const App = () => { _lastMasterStats = { lufs: res.lufs, true_peak_db: res.true_peak_db }; const lufsTxt = (res.lufs !== null && res.lufs !== undefined) ? res.lufs + ' LUFS' : '-- LUFS'; const tpTxt = (res.true_peak_db !== null && res.true_peak_db !== undefined) ? res.true_peak_db + ' dBTP' : '-- dBTP'; - showToast(`Mastering xong — ${lufsTxt} / ${tpTxt}${res.mono_warning ? ' • ' + res.mono_warning : ''}`, 'success', 'Tải về', async () => { - try { - const br = await fetch(res.url); - if (!br.ok) throw new Error('HTTP ' + br.status); + // Tự tải file về exportDir đã chọn (không chờ click "Tải về") — giống + // bounce cũ: render xong là file xuất hiện ngay. + try { + const br = await fetch(res.url); + if (br.ok) { const b = await br.blob(); const sp = await saveExportViaDialog((projectName || 'Project') + '_master.' + outExt, b); - if (sp) showToast(`Đã lưu → ${sp}`, 'success'); - } catch (e) { + if (sp) showToast(`Đã lưu → ${sp} • ${lufsTxt} / ${tpTxt}`, 'success'); + else showToast(`Mastering xong — ${lufsTxt} / ${tpTxt}`, 'success'); + } else { + showToast(`Mastering xong — ${lufsTxt} / ${tpTxt}`, 'success', 'Tải về', async () => { + const a = document.createElement('a'); + a.href = res.url; + a.download = 'master.' + outExt; + a.click(); + }); + } + } catch (e) { + showToast(`Mastering xong — ${lufsTxt} / ${tpTxt}`, 'success', 'Tải về', async () => { const a = document.createElement('a'); a.href = res.url; a.download = 'master.' + outExt; a.click(); - } - }); + }); + } } catch (e) { showToast('Render mastering lỗi: ' + (e.message || e), 'error'); } finally { diff --git a/app/static/js/app.precompiled.js b/app/static/js/app.precompiled.js index e4af72e..d1fb8cc 100644 --- a/app/static/js/app.precompiled.js +++ b/app/static/js/app.precompiled.js @@ -2139,7 +2139,9 @@ clientSideExport(exportTracks);}finally{setIsExporting(false);setShowExportProgr clientSideExport(exportTracks,{loopStart,loopDur});}};// ── D4: Mastering render qua engine (D3 export stage) ── // /api/v1/plugins/render — project schema + mastering chain qua native_bridge // (VST3 masterbus), resample/normalize/dither PCM, mono side/mid check. -const renderMasteringExport=async()=>{if(isExporting)return;if(serverStatus!=='connected'){showToast('Cần kết nối server để render mastering.','warning');return;}setIsExporting(true);try{const schema=serializeProjectToSchema(currentProjectId||'temp_project',projectName||'Dự án tạm chưa lưu',bpm,tracks,subTabs,sessionTabs,masteringSettings,masterVolume,{volL:masterVolL,volR:masterVolR,link:masterLink,muted:masterMuted});const isFloat=exportSettings.bitDepth==='float';const outExt=exportSettings.format==='ogg'?'ogg':'wav';const res=await window.SonicAPI.renderProject(schema,'master_'+Date.now()+'.'+outExt,{bit_depth:isFloat?32:parseInt(exportSettings.bitDepth)||16,sample_rate:parseInt(exportSettings.sampleRate)||44100,dither:!!exportSettings.dither,normalize:!!exportSettings.normalize,normalize_target:exportSettings.normalizeTarget||'-1dbtp',mono_check:!!exportSettings.monoCheck,metadata:{title:exportSettings.metaTitle||'',artist:exportSettings.metaArtist||'',isrc:exportSettings.metaIsrc||''}});_lastMasterStats={lufs:res.lufs,true_peak_db:res.true_peak_db};const lufsTxt=res.lufs!==null&&res.lufs!==undefined?res.lufs+' LUFS':'-- LUFS';const tpTxt=res.true_peak_db!==null&&res.true_peak_db!==undefined?res.true_peak_db+' dBTP':'-- dBTP';showToast(`Mastering xong — ${lufsTxt} / ${tpTxt}${res.mono_warning?' • '+res.mono_warning:''}`,'success','Tải về',async()=>{try{const br=await fetch(res.url);if(!br.ok)throw new Error('HTTP '+br.status);const b=await br.blob();const sp=await saveExportViaDialog((projectName||'Project')+'_master.'+outExt,b);if(sp)showToast(`Đã lưu → ${sp}`,'success');}catch(e){const a=document.createElement('a');a.href=res.url;a.download='master.'+outExt;a.click();}});}catch(e){showToast('Render mastering lỗi: '+(e.message||e),'error');}finally{setIsExporting(false);}};// ── Realtime Bounce Export (đầy đủ MIDI + FX Rack + Mastering) ── +const renderMasteringExport=async()=>{if(isExporting)return;if(serverStatus!=='connected'){showToast('Cần kết nối server để render mastering.','warning');return;}setIsExporting(true);try{const schema=serializeProjectToSchema(currentProjectId||'temp_project',projectName||'Dự án tạm chưa lưu',bpm,tracks,subTabs,sessionTabs,masteringSettings,masterVolume,{volL:masterVolL,volR:masterVolR,link:masterLink,muted:masterMuted});const isFloat=exportSettings.bitDepth==='float';const outExt=exportSettings.format==='ogg'?'ogg':'wav';const res=await window.SonicAPI.renderProject(schema,'master_'+Date.now()+'.'+outExt,{bit_depth:isFloat?32:parseInt(exportSettings.bitDepth)||16,sample_rate:parseInt(exportSettings.sampleRate)||44100,dither:!!exportSettings.dither,normalize:!!exportSettings.normalize,normalize_target:exportSettings.normalizeTarget||'-1dbtp',mono_check:!!exportSettings.monoCheck,metadata:{title:exportSettings.metaTitle||'',artist:exportSettings.metaArtist||'',isrc:exportSettings.metaIsrc||''}});_lastMasterStats={lufs:res.lufs,true_peak_db:res.true_peak_db};const lufsTxt=res.lufs!==null&&res.lufs!==undefined?res.lufs+' LUFS':'-- LUFS';const tpTxt=res.true_peak_db!==null&&res.true_peak_db!==undefined?res.true_peak_db+' dBTP':'-- dBTP';// Tự tải file về exportDir đã chọn (không chờ click "Tải về") — giống +// bounce cũ: render xong là file xuất hiện ngay. +try{const br=await fetch(res.url);if(br.ok){const b=await br.blob();const sp=await saveExportViaDialog((projectName||'Project')+'_master.'+outExt,b);if(sp)showToast(`Đã lưu → ${sp} • ${lufsTxt} / ${tpTxt}`,'success');else showToast(`Mastering xong — ${lufsTxt} / ${tpTxt}`,'success');}else{showToast(`Mastering xong — ${lufsTxt} / ${tpTxt}`,'success','Tải về',async()=>{const a=document.createElement('a');a.href=res.url;a.download='master.'+outExt;a.click();});}}catch(e){showToast(`Mastering xong — ${lufsTxt} / ${tpTxt}`,'success','Tải về',async()=>{const a=document.createElement('a');a.href=res.url;a.download='master.'+outExt;a.click();});}}catch(e){showToast('Render mastering lỗi: '+(e.message||e),'error');}finally{setIsExporting(false);}};// ── Realtime Bounce Export (đầy đủ MIDI + FX Rack + Mastering) ── // MIDI/soundfont chạy qua FluidSynth (ScriptProcessor) — không render được // trong OfflineAudioContext. Vì vậy bounce REALTIME: chạy lại toàn bộ project // (audio + MIDI + sections qua FX racks + mastering chain, đúng như nghe) và diff --git a/app/templates/index.html b/app/templates/index.html index dc1cf61..8f42a8a 100644 --- a/app/templates/index.html +++ b/app/templates/index.html @@ -51,7 +51,7 @@ - +