Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

correct zoom level on expand

This commit is contained in:
Thomas Göttgens 2024-04-28 17:11:48 +00:00
parent 46f03da9ff
commit ffe80b981d
4 changed files with 20 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
legacy/application/assets.json
View File

@ -182,7 +182,7 @@
"js/waveformplaylist/track.js": "5456e6081ffedf55a9e38571bc178781",
"js/wavesurfer/cursor.js": "8ed17a7437f3ec84972d15d0073249b2",
"js/wavesurfer/cursor.min.js": "831165862b629e615cf59112fa00d963",
"js/wavesurfer/libretime.js": "ba0525136b7c2ec8860257844e821c12",
"js/wavesurfer/libretime.js": "dfaefa6d32657faa77af6145d9d191ae",
"js/wavesurfer/regions.js": "aafe4f696d3da50c976d11e472fd56d1",
"js/wavesurfer/regions.min.js": "2ed2f8b5880beee568942000a6139e85",
"js/wavesurfer/timeline.js": "0bd70779070513c2a4f34237a0f9f573",

8
legacy/application/forms/EditAudioMD.php
View File

@ -190,14 +190,6 @@ class Application_Form_EditAudioMD extends Zend_Form
]);
$this->addElement($mood);
// // Add replay gain field
// $replay_gain = new Zend_Form_Element_Hidden('replay_gain');
// $replay_gain->class = 'input_text replay_gain_' . $p_id;
// $replay_gain->setLabel(_('Replay Gain:'))
// ->addDecorator('HtmlTag', ['tag' => 'div', 'style' => 'display:none'])
// ->removeDecorator('Label');
// $this->addElement($replay_gain);
// Add bmp field
$bpm = new Zend_Form_Element_Text('bpm');
$bpm->class = 'input_text';

2
legacy/application/views/scripts/library/edit-file-md.phtml
View File

@ -105,6 +105,8 @@ $baseUrl = Config::getBasePath();
$(".editor_pane_wrapper").animate({
scrollTop: $(".collapsible-header").offset().top * 2
}, 500);
wavesurfer["t<?php echo $this->id; ?>"].drawer.containerWidth = wavesurfer["t<?php echo $this->id; ?>"].drawer.container.clientWidth;
eTrack.zoom(Number($(".zoom-slider-<?php echo $this->id; ?>").value));
});
// Counter field edit

144
legacy/public/js/wavesurfer/libretime.js
View File

@ -4,19 +4,14 @@ var wavesurfer = [];
window.addEventListener("load",()=>{
let op=window.inputKnobsOptions||{};
op.knobWidth=op.knobWidth||op.knobDiameter||64;
op.knobHeight=op.knobHeight||op.knobDiameter||64;
op.sliderWidth=op.sliderWidth||op.sliderDiameter||128;
op.sliderHeight=op.sliderHeight||op.sliderDiameter||20;
op.switchWidth=op.switchWidth||op.switchDiameter||24;
op.switchHeight=op.switchHeight||op.switchDiameter||24;
op.fgcolor=op.fgcolor||"#f00";
op.bgcolor=op.bgcolor||"#000";
op.knobMode=op.knobMode||"linear";
op.sliderMode=op.sliderMode||"relative";
let styles=document.createElement("style");
styles.innerHTML=
`input[type=range].input-knob,input[type=range].input-slider{
`input[type=range].input-slider{
-webkit-appearance:none;
-moz-appearance:none;
border:none;
@ -28,52 +23,24 @@ window.addEventListener("load",()=>{
background-color:transparent;
touch-action:none;
}
input[type=range].input-knob{
width:${op.knobWidth}px; height:${op.knobHeight}px;
}
input[type=range].input-slider{
width:${op.sliderWidth}px; height:${op.sliderHeight}px;
}
input[type=range].input-knob::-webkit-slider-thumb,input[type=range].input-slider::-webkit-slider-thumb{
input[type=range].input-slider::-webkit-slider-thumb{
-webkit-appearance:none;
opacity:0;
}
input[type=range].input-knob::-moz-range-thumb,input[type=range].input-slider::-moz-range-thumb{
input[type=range].input-slider::-moz-range-thumb{
-moz-appearance:none;
height:0;
border:none;
}
input[type=range].input-knob::-moz-range-track,input[type=range].input-slider::-moz-range-track{
input[type=range].input-slider::-moz-range-track{
-moz-appearance:none;
height:0;
border:none;
}
input[type=checkbox].input-switch,input[type=radio].input-switch {
width:${op.switchWidth}px;
height:${op.switchHeight}px;
-webkit-appearance:none;
-moz-appearance:none;
background-size:100% 200%;
background-position:0% 0%;
background-repeat:no-repeat;
border:none;
border-radius:0;
background-color:transparent;
}
input[type=checkbox].input-switch:checked,input[type=radio].input-switch:checked {
background-position:0% 100%;
}`;
document.head.appendChild(styles);
let makeKnobFrames=(fr,fg,bg)=>{
let r=
`<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="${fr*64}" viewBox="0 0 64 ${fr*64}" preserveAspectRatio="none">
<defs><g id="K"><circle cx="32" cy="32" r="30" fill="${bg}"/>
<line x1="32" y1="28" x2="32" y2="7" stroke-linecap="round" stroke-width="6" stroke="${fg}"/></g></defs>
<use xlink:href="#K" transform="rotate(-135,32,32)"/>`;
for(let i=1;i<fr;++i)
r+=`<use xlink:href="#K" transform="translate(0,${64*i}) rotate(${-135+270*i/fr},32,32)"/>`;
return r+"</svg>";
}
let makeHSliderFrames=(fr,fg,bg,w,h)=>{
let r=
`<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="${w}" height="${fr*h}" viewBox="0 0 ${w} ${fr*h}" preserveAspectRatio="none">
@ -85,17 +52,6 @@ input[type=checkbox].input-switch:checked,input[type=radio].input-switch:checked
}
return r+"</svg>";
}
let makeVSliderFrames=(fr,fg,bg,w,h)=>{
let r=
`<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="${w}" height="${fr*h}" viewBox="0 0 ${w} ${fr*h}" preserveAspectRatio="none">
<defs><rect id="B" x="0" y="0" width="${w}" height="${h}" rx="${w/2}" ry="${w/2}" fill="${bg}"/>
<circle id="K" x="0" y="0" r="${w/2*0.9}" fill="${fg}"/></defs>`;
for(let i=0;i<fr;++i){
r+=`<use xlink:href="#B" transform="translate(0,${h*i})"/>`;
r+=`<use xlink:href="#K" transform="translate(${w/2} ${h*(i+1)-w/2-i*(h-w)/100})"/>`;
}
return r+"</svg>";
}
let initKnobs=(el)=>{
let w,h,d,fg,bg;
if(el.inputKnobs){
@ -111,22 +67,9 @@ input[type=checkbox].input-switch:checked,input[type=radio].input-switch:checked
bg=el.getAttribute("data-bgcolor")||op.bgcolor;
fg=el.getAttribute("data-fgcolor")||op.fgcolor;
ik.sensex=ik.sensey=200;
if(el.className.indexOf("input-knob")>=0)
ik.itype="k";
else{
if(w>=h){
ik.itype="h";
ik.sensex=w-h;
ik.sensey=Infinity;
el.style.backgroundSize="auto 100%";
}
else{
ik.itype="v";
ik.sensex="Infinity";
ik.sensey=h-w;
el.style.backgroundSize="100% auto";
}
}
ik.sensex=w-h;
ik.sensey=Infinity;
el.style.backgroundSize="auto 100%";
el.style.width=w+"px";
el.style.height=h+"px";
ik.frameheight=h;
@ -140,18 +83,11 @@ input[type=checkbox].input-switch:checked,input[type=radio].input-switch:checked
ik.sprites=0;
if(ik.sprites>=1)
el.style.backgroundSize=`100% ${(ik.sprites+1)*100}%`;
else if(ik.itype!="k"){
el.style.backgroundColor=bg;
el.style.borderRadius=Math.min(w,h)*0.25+"px";
}
el.style.backgroundColor=bg;
el.style.borderRadius=Math.min(w,h)*0.25+"px";
}
else{
let svg;
switch(ik.itype){
case "k": svg=makeKnobFrames(101,fg,bg); break;
case "h": svg=makeHSliderFrames(101,fg,bg,w,h); break;
case "v": svg=makeVSliderFrames(101,fg,bg,w,h); break;
}
let svg=makeHSliderFrames(101,fg,bg,w,h);
ik.sprites=100;
el.style.backgroundImage="url(data:image/svg+xml;base64,"+btoa(svg)+")";
el.style.backgroundSize=`100% ${(ik.sprites+1)*100}%`;
@ -180,12 +116,7 @@ input[type=checkbox].input-switch:checked,input[type=radio].input-switch:checked
let rc=el.getBoundingClientRect();
let cx=(rc.left+rc.right)*0.5,cy=(rc.top+rc.bottom)*0.5;
let dx=ev.clientX,dy=ev.clientY;
let da=Math.atan2(ev.clientX-cx,cy-ev.clientY);
if(ik.itype=="k"&&op.knobMode=="circularabs"){
dv=ik.valrange.min+(da/Math.PI*0.75+0.5)*(ik.valrange.max-ik.valrange.min);
el.setValue(dv);
}
if(ik.itype!="k"&&op.sliderMode=="abs"){
if(op.sliderMode=="abs"){
dv=(ik.valrange.min+ik.valrange.max)*0.5+((dx-cx)/ik.sensex-(dy-cy)/ik.sensey)*(ik.valrange.max-ik.valrange.min);
el.setValue(dv);
}
@ -206,40 +137,10 @@ input[type=checkbox].input-switch:checked,input[type=radio].input-switch:checked
if(ev.touches)
ev = ev.touches[0];
let dx=ev.clientX-ik.dragfrom.x,dy=ev.clientY-ik.dragfrom.y;
let da=Math.atan2(ev.clientX-cx,cy-ev.clientY);
switch(ik.itype){
case "k":
switch(op.knobMode){
case "linear":
dv=(dx/ik.sensex-dy/ik.sensey)*(ik.valrange.max-ik.valrange.min);
if(ev.shiftKey)
dv*=0.2;
el.setValue(ik.dragfrom.v+dv);
break;
case "circularabs":
if(!ev.shiftKey){
dv=ik.valrange.min+(da/Math.PI*0.75+0.5)*(ik.valrange.max-ik.valrange.min);
el.setValue(dv);
break;
}
case "circularrel":
if(da>ik.dragfrom.a+Math.PI) da-=Math.PI*2;
if(da<ik.dragfrom.a-Math.PI) da+=Math.PI*2;
da-=ik.dragfrom.a;
dv=da/Math.PI/1.5*(ik.valrange.max-ik.valrange.min);
if(ev.shiftKey)
dv*=0.2;
el.setValue(ik.dragfrom.v+dv);
}
break;
case "h":
case "v":
dv=(dx/ik.sensex-dy/ik.sensey)*(ik.valrange.max-ik.valrange.min);
if(ev.shiftKey)
dv*=0.2;
el.setValue(ik.dragfrom.v+dv);
break;
}
dv=(dx/ik.sensex-dy/ik.sensey)*(ik.valrange.max-ik.valrange.min);
if(ev.shiftKey)
dv*=0.2;
el.setValue(ik.dragfrom.v+dv);
};
ik.pointerup=()=>{
document.removeEventListener("mousemove",ik.pointermove);
@ -271,19 +172,8 @@ input[type=checkbox].input-switch:checked,input[type=radio].input-switch:checked
let v=(el.value-ik.valrange.min)/(ik.valrange.max-ik.valrange.min);
if(ik.sprites>=1)
el.style.backgroundPosition="0px "+(-((v*ik.sprites)|0)*ik.frameheight)+"px";
else{
switch(ik.itype){
case "k":
el.style.transform="rotate("+(270*v-135)+"deg)";
break;
case "h":
el.style.backgroundPosition=((w-h)*v)+"px 0px";
break;
case "v":
el.style.backgroundPosition="0px "+(h-w)*(1-v)+"px";
break;
}
}
else
el.style.backgroundPosition=((w-h)*v)+"px 0px";
ik.valueold=el.value;
}
};