Skip to content

Commit

Permalink
Merge pull request #8 from Justin-Johnson/develop
Browse files Browse the repository at this point in the history 
Develop
  • Loading branch information
@Justin-Johnson
Justin-Johnson committed May 13, 2021
2 parents 123bf40 + e8fdf63 commit 05ab5c4
Showing 1 changed file with 78 additions and 56 deletions.
134 changes: 78 additions & 56 deletions ReEQ.jsfx
View file
@@ -1,7 +1,7 @@
desc: ReEQ
/*
ReEQ - A parametric graphic equalizer
Version: v1.0.11 <--- Make sure you change VERSION below if this changes!!
Version: v1.0.12 <--- Make sure you change VERSION below if this changes!!

The MIT License (MIT)

Expand Down Expand Up @@ -29,7 +29,6 @@ DONE:

TODO:


*/

slider1:Stereo_Mode=<0,1,1{Mid/Side,Left/Right}>-Stereo Mode
Expand Down Expand Up @@ -113,9 +112,9 @@ options:no_meter

@init

#VERSION = "1.0.11";

// This should be the same as in the comment header
#VERSION = "1.0.12";

gfx_ext_retina = 1;
ext_nodenorm = 1;
ext_noinit = 1;
Expand Down Expand Up @@ -762,6 +761,9 @@ init_rate != srate ? (
node_drag = 0;
node_drag_offx = 0;
node_drag_offy = 0;
node_drag_stablex = 0;
node_drag_stabley = 0;
node_drag_mouse_speed = 6;
node_drag_lock = 0;

gainDb = 1;
Expand All @@ -788,7 +790,6 @@ init_rate != srate ? (
listen_filter.m2 = listen_filter.t_m2;
listen_filter.iter_t = 1.0;

//jj
// Define filter index numbers
FILTER_PEAK = 0;
FILTER_LOW_CUT = 1;
Expand Down Expand Up @@ -1033,8 +1034,8 @@ function decodeMS(mid, side, l*, r*) (
r = mid - side;
);

spl0 += 0.00000001; // DeNorm fix
spl1 += 0.00000001; // DeNorm fix
spl0 += 0.0000000001; // DeNorm fix
spl1 += 0.0000000001; // DeNorm fix

spl0orig = spl0;
spl1orig = spl1;
Expand Down Expand Up @@ -1531,26 +1532,6 @@ Listen_Process ? (
// Overall gains
spl0list *= gainDb;
spl1list *= gainDb;

/*
// Stereo gains
spl0list *= gainML;
spl1list *= gainSR;

MidPolarity ? spl0list = -spl0list;
SidePolarity ? spl1list = -spl1list;

// Mid/Side decode
Stereo_Mode == 0 ? (
tmp = spl0list;
spl0list = tmp + spl1list;
spl1list = tmp - spl1list;
);

// Overall gains
spl0list *= gainDb;
spl1list *= gainDb;
*/
);

// Feed the correct buffers depending on spectrum modes
Expand Down Expand Up @@ -2329,7 +2310,7 @@ function draw_info_panel(note_select)
local(x, y, xbase, read_freq, read_amp, q, band, C0, semi, octave, note, cent, keys, nn, note_freq, centstr, width, rect_height, slope, panel_offset_x)
(
hide = 0;
mouse_within_window() ?
mouse_within_window() || node_drag_mode ?
(
gfx_set(0, 0.5, 1);
read_freq = note_select == 0 ? spectrum.x_to_freq(mouse_x) : note_select;
Expand All @@ -2339,6 +2320,7 @@ function draw_info_panel(note_select)
(
read_freq = Band_Frequency[node_drag];
read_amp = Band_Gain[node_drag];
q = Band_Q[node_drag];
);

node_drag_mode == 0 ? (
Expand Down Expand Up @@ -3695,7 +3677,7 @@ function is_mouse_number_dial() instance (x, y, r, v) local (rad)
* Handle the number style button
*/
function handle_number_dial(val) instance (x, y, r, v, width, menutext, label, drag, height, db, oldy, type)
local (oldy, md)
local (oldy, md, mouse_speed)
(
v = val;
(button_focus == -1 || button_focus == x) && node_drag_mode == 0 ? (
Expand All @@ -3712,8 +3694,9 @@ function handle_number_dial(val) instance (x, y, r, v, width, menutext, label, d
!(mouse_cap & 1) ? ( drag = 0; button_focus = -1; );
);

drag ? (
md = (mouse_y - oldy);
drag ? (
mouse_cap & 16 ? mouse_speed = 12 : mouse_speed = 1;
md = (mouse_y - oldy) / mouse_speed;

md > 0 ? v -= 0.01 * abs(md*0.5);
md < 0 ? v += 0.01 * abs(md*0.5);
Expand Down Expand Up @@ -4034,7 +4017,11 @@ mouse_within_window() ? (
draw_nodes();
) : (
listen_node != -1 ? draw_listen_helper();
node_drag_mode != 0 ? draw_nodes();
node_drag_mode != 0 ? (
draw_info_panel();

draw_nodes();
);
);

// Set the colors for the bands
Expand Down Expand Up @@ -4391,10 +4378,11 @@ do_general_mouse ? (
node_drag_offy = mouse_y - db_to_y(Band_Gain[band]);
node_drag_offx = mouse_x - freq_to_scx(Band_Frequency[band]);

node_drag_stablex = mouse_x;
node_drag_stabley = mouse_y;

mouse_cap & 4 ? (
node_drag_lock = 1;
) : mouse_cap & 16 ? (
node_drag_lock = 2;
) : node_drag_lock = 0;
) : (
mouse_y < gfx_h - BOTTOM_MARGIN - gfx_texth ? (
Expand All @@ -4406,49 +4394,83 @@ do_general_mouse ? (

node_drag_mode ? (

mouse_cap & 16 ? (
node_drag_mouse_speed == 1 ? (
// Changing speed - reset offsets
node_drag_offx = mouse_x - freq_to_scx(Band_Frequency[node_drag]);
node_drag_offy = mouse_y - db_to_y(Band_Gain[node_drag]);
node_drag_stablex = mouse_x;
node_drag_stabley = mouse_y;
);

node_drag_mouse_speed = 6;
) : (
node_drag_mouse_speed == 6 ? (
// Changing speed - reset offsets
node_drag_offx = mouse_x - freq_to_scx(Band_Frequency[node_drag]);
node_drag_offy = mouse_y - db_to_y(Band_Gain[node_drag]);
node_drag_stablex = mouse_x;
node_drag_stabley = mouse_y;
0;
);

node_drag_mouse_speed = 1;
);

mouse_cap & 4 ? (
node_drag_lock = 1;
) : mouse_cap & 16 ? (
node_drag_lock = 2;
) : (
node_drag_lock != 0 ? (
node_drag_offx = mouse_x - freq_to_scx(Band_Frequency[node_drag]);
node_drag_offy = mouse_y - db_to_y(Band_Gain[node_drag]);
node_drag_stablex = mouse_x;
node_drag_stabley = mouse_y;
);
node_drag_lock = 0;
);

// Normal drag?
node_drag_lock == 0 ? (
Band_Gain[node_drag] = y_to_db(mouse_y - node_drag_offy);
Band_Frequency[node_drag] = scx_to_freq(mouse_x - node_drag_offx);
node_drag_origy = mouse_y;

filters_to_sliders();
diffx = ((mouse_x - node_drag_stablex) / node_drag_mouse_speed) + ofx;
diffy = (node_drag_stabley - mouse_y) / node_drag_mouse_speed;

// Notify Reaper that a parameter change has happened
notify_touched_gain(node_drag);
notify_touched_frequency(node_drag);
);
mmx = (node_drag_stablex + diffx) - node_drag_offx;
mmy = (node_drag_stabley - diffy) - node_drag_offy;

Band_Frequency[node_drag] = scx_to_freq(mmx);
Band_Gain[node_drag] = y_to_db(mmy);

node_drag_lock == 2 ? (
Band_Gain[node_drag] = y_to_db(mouse_y - node_drag_offy);
node_drag_origy = mouse_y;

filters_to_sliders();

// Notify Reaper that a parameter change has happened
notify_touched_gain(node_drag);
notify_touched_frequency(node_drag);
);

// Fixed gain with Q control drag?
node_drag_lock == 1 ? (
Band_Frequency[node_drag] = scx_to_freq(mouse_x - node_drag_offx);

// If we're not pressing ALT then we can alter Q
!(mouse_cap & 16) ? (

md = node_drag_origy - mouse_y;
node_drag_origy = mouse_y;
diffx = (mouse_x - node_drag_stablex) / node_drag_mouse_speed;
diffy = (node_drag_stabley - mouse_y) / node_drag_mouse_speed;

scalar = 0.5 / gfx_ext_retina;
mmx = (node_drag_stablex + diffx) - node_drag_offx;
mmy = (node_drag_stabley - diffy) - node_drag_offy;

Band_Q[node_drag] = max(0.10, min(40, per_to_q(q_to_per(Band_Q[node_drag], 100) + md * scalar, 100)));
Band_Frequency[node_drag] = scx_to_freq(mmx);

notify_touched_Q(node_drag);
);
// Alter Q according to drag
md = (node_drag_origy - mouse_y) / node_drag_mouse_speed;
node_drag_origy = mouse_y;

scalar = 0.5 / gfx_ext_retina;

Band_Q[node_drag] = max(0.10, min(40, per_to_q(q_to_per(Band_Q[node_drag], 100) + md * scalar, 100)));

// Notify Reaper that a parameter change has happened
notify_touched_Q(node_drag);

filters_to_sliders();

Expand Down

0 comments on commit 05ab5c4

Please sign in to comment.