Skip to content

Commit 3459954

Browse files
timothyschoentimothyschoen
committed
Resolve merge conflict
2 parents 37cec40 + 15f6c96 commit 3459954

26 files changed

+300
-340
lines changed

‎CMakeLists.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ else()
8585
project(plugdata VERSION 0.9.2 LANGUAGES C CXX)
8686
endif()
8787

88-
8988
if(QUICK_BUILD)
9089
set(ENABLE_SFIZZ OFF)
9190
set(ENABLE_GEM OFF)

‎Resources/Patches/daw_storage.pd‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
#X text 469 194 <- Host DAW sends data to patch;
88
#X text 352 64 <- incoming extradata are stored as lists into a plugdata temporary struct. Those data will be dumped to the DAW when the session will be saved, f 41;
99
#X obj 344 277 t l l;
10-
#X obj 56 154 s to_daw_databuffer;
11-
#X obj 343 173 r from_daw_databuffer;
1210
#N canvas 1125 382 752 569 encodeBase32 0;
1311
#X obj 93 71 list fromsymbol;
1412
#X text 239 18 The way extradata are stored in plugdata (XmlElement structure) doesn't allow some special characters in tag name., f 45;
@@ -74,15 +72,17 @@
7472
#X obj 179 35 symbol \$1;
7573
#X obj 56 111 list prepend;
7674
#X obj 343 223 route symbol;
77-
#X connect 0 0 13 0;
78-
#X connect 2 0 14 0;
75+
#X obj 343 173 r __from_daw_databuffer;
76+
#X obj 56 154 s __to_daw_databuffer;
77+
#X connect 0 0 11 0;
78+
#X connect 2 0 12 0;
7979
#X connect 3 0 7 0;
8080
#X connect 7 0 1 0;
81-
#X connect 7 1 13 0;
82-
#X connect 9 0 2 0;
83-
#X connect 10 0 13 1;
84-
#X connect 10 0 14 1;
85-
#X connect 11 0 12 0;
86-
#X connect 12 0 10 0;
87-
#X connect 13 0 8 0;
88-
#X connect 14 0 3 0;
81+
#X connect 7 1 11 0;
82+
#X connect 8 0 11 1;
83+
#X connect 8 0 12 1;
84+
#X connect 9 0 10 0;
85+
#X connect 10 0 8 0;
86+
#X connect 11 0 14 0;
87+
#X connect 12 0 3 0;
88+
#X connect 13 0 2 0;

‎Resources/Patches/param-help.pd‎

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#N canvas 637 37 657 479 10;
1+
#N canvas 637 37 688 577 10;
22
#X obj 6 469 cnv 3 550 4 empty empty outlets 8 12 0 13 #dcdcdc #000000 0;
3-
#X obj 82 480 cnv 17 4 17 empty empty 0 5 9 0 16 #dcdcdc #9c9c9c 0;
3+
#X obj 83 474 cnv 17 4 17 empty empty 0 5 9 0 16 #dcdcdc #9c9c9c 0;
44
#X obj 305 6 cnv 15 250 40 empty empty empty 12 13 0 18 #7c7c7c #e0e4dc 0;
55
#N canvas 382 141 749 319 (subpatch) 0;
66
#X coords 0 -1 1 1 252 42 2 0 0;
@@ -20,19 +20,29 @@
2020
#X text 377 217 Use the paramname-gui-s and paramname-gui-r pair to send/receive values directly to GUI objects, f 55;
2121
#X obj 5 293 cnv 3 550 4 empty empty inlets 8 12 0 13 #dcdcdc #000000 0;
2222
#X obj 81 304 cnv 17 4 17 empty empty 0 5 9 0 16 #dcdcdc #9c9c9c 0;
23-
#X obj 82 439 cnv 17 4 17 empty empty 1 5 9 0 16 #dcdcdc #9c9c9c 0;
24-
#X text 127 303 float - set DAW parameter value, f 38;
25-
#X text 127 479 float - receive DAW parameter value;
23+
#X obj 83 433 cnv 17 4 17 empty empty 1 5 9 0 16 #dcdcdc #9c9c9c 0;
2624
#X obj 4 520 cnv 3 550 3 empty empty arguments 8 12 0 13 #dcdcdc #000000 0;
27-
#X text 127 434 float - inform DAW about parameter change state (0 = reading \, 1 = writing), f 50;
28-
#X text 98 531 1) float - automatically handle parameter change state when GUI objects are interacted with \, 1 is enabled (default 0), f 66;
29-
#X text 127 362 range<float \, float> - set parameter range, f 71;
3025
#X msg 4 150 create;
3126
#X msg 63 150 range 0 127;
32-
#X text 127 322 create - activates the automation paramter \, making it visible in the DAW and sidebar panel, f 71;
33-
#X text 127 388 mode<float> - set parameter mode (1=float \, 2=integer \, 3=logarithmic \, 4=exponential), f 71;
27+
#X text 201 303 float;
28+
#X text 185 359 destroy;
29+
#X text 145 321 create <float>;
30+
#X text 149 379 mode <float>;
31+
#X text 202 432 float;
32+
#X text 119 398 range<float \, float>;
33+
#X text 246 359 - destroy parameter, f 45;
34+
#X text 246 379 - set parameter mode (1=float \, 2=integer \, 3=logarithmic \, 4=exponential), f 71;
35+
#X text 246 398 - set parameter range;
36+
#X text 246 432 - inform DAW about parameter change state (0 = reading \, 1 = writing), f 75;
37+
#X text 202 473 float;
38+
#X text 246 473 - DAW parameter value;
39+
#X text 245 303 - set DAW parameter value, f 45;
40+
#X text 189 525 1) float;
41+
#X text 246 525 - automatically handle parameter change state when GUI objects are interacted with \, 1 is enabled (default 0);
42+
#X text 245 321 - create parameter \, optional argument sets default value \;, f 60;
43+
#X text 256 339 this makes the parameter active in the sidebar and the DAW;
3444
#X connect 8 0 9 0;
3545
#X connect 9 0 8 0;
3646
#X connect 10 0 8 1;
37-
#X connect 24 0 8 0;
38-
#X connect 25 0 8 0;
47+
#X connect 19 0 8 0;
48+
#X connect 20 0 8 0;

‎Resources/Patches/param.pd‎

Lines changed: 50 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,50 @@
1-
#N canvas 536 141 700 308 12;
2-
#X obj 364 341 outlet;
3-
#X obj 368 215 s param;
4-
#X obj 691 172 s param_change, f 15;
5-
#X obj 223 16 inlet;
6-
#X obj 691 98 inlet;
7-
#X obj 368 161 list prepend \$1;
8-
#X obj 691 134 list prepend \$1;
9-
#X obj 364 278 r \$1;
10-
#X text 348 -38 Receive value from pd and send to DAW;
11-
#X text 348 242 Receive value from DAW and send to pd, f 35;
12-
#X text 653 45 Receive param changing state from pd and send to DAW;
13-
#X obj 419 341 s \$1-gui-r;
14-
#X obj 477 16 r \$1-gui-s;
15-
#X obj 691 304 loadmess \$2;
16-
#X obj 691 397 gate;
17-
#X obj 731 330 r gui;
18-
#X obj 731 360 route mouse;
19-
#X obj 691 432 s \$0-param-change;
20-
#X obj 745 98 r \$0-param-change;
21-
#X text 653 235 If the first argument is 1 \, automatically send DAW parameter state changes when GUI objects are interacted with, f 45;
22-
#X obj -68 218 s param_create;
23-
#X obj -68 180 symbol \$1;
24-
#X text 15 98 Handle parameter create mesage;
25-
#X obj 149 177 list prepend \$1;
26-
#X obj 250 177 list prepend \$1;
27-
#X obj 149 215 s param_range;
28-
#X obj 250 215 s param_mode;
29-
#X obj 368 107 router;
30-
#X obj 477 60 t f f;
31-
#X text 542 106 Prevent feedback;
32-
#X obj 364 304 t f f f;
33-
#X obj 488 87 -;
34-
#X obj 488 116 abs;
35-
#X obj 488 142 < 0.001;
36-
#X obj 223 60 route create destroy range mode;
37-
#X obj 37 180 symbol \$1;
38-
#X obj 37 218 s param_destroy;
39-
#X connect 3 0 34 0;
40-
#X connect 4 0 6 0;
41-
#X connect 5 0 1 0;
42-
#X connect 6 0 2 0;
43-
#X connect 7 0 30 0;
44-
#X connect 12 0 28 0;
45-
#X connect 13 0 14 0;
46-
#X connect 14 0 17 0;
47-
#X connect 15 0 16 0;
48-
#X connect 16 0 14 1;
49-
#X connect 18 0 6 0;
50-
#X connect 21 0 20 0;
51-
#X connect 23 0 25 0;
52-
#X connect 24 0 26 0;
53-
#X connect 27 0 5 0;
54-
#X connect 28 0 27 0;
55-
#X connect 28 1 31 0;
56-
#X connect 30 0 0 0;
57-
#X connect 30 1 11 0;
58-
#X connect 30 2 31 1;
59-
#X connect 31 0 32 0;
60-
#X connect 32 0 33 0;
61-
#X connect 33 0 27 1;
62-
#X connect 34 0 21 0;
63-
#X connect 34 1 35 0;
64-
#X connect 34 2 23 0;
65-
#X connect 34 3 24 0;
66-
#X connect 34 4 28 0;
67-
#X connect 35 0 36 0;
1+
#N canvas 536 141 844 548 12;
2+
#X obj 109 199 outlet;
3+
#X obj 125 49 inlet;
4+
#X obj 311 304 inlet;
5+
#X obj 109 136 r \$1;
6+
#X text 319 273 Receive param changing state from pd and send to DAW;
7+
#X obj 164 199 s \$1-gui-r;
8+
#X obj 35 96 r \$1-gui-s;
9+
#X obj 373 103 loadmess \$2;
10+
#X obj 373 196 gate;
11+
#X obj 413 129 r gui;
12+
#X obj 413 159 route mouse;
13+
#X obj 373 231 s \$0-param-change;
14+
#X obj 365 304 r \$0-param-change;
15+
#X text 366 34 If the first argument is 1 \, automatically send DAW parameter state changes when GUI objects are interacted with, f 45;
16+
#X obj 35 289 router;
17+
#X obj 35 160 t f f, f 5;
18+
#X text 116 253 Prevent feedback;
19+
#X obj 109 162 t f f f;
20+
#X obj 56 199 -;
21+
#X obj 56 228 abs;
22+
#X obj 56 254 < 0.001;
23+
#X obj 269 374 list prepend \$1;
24+
#X obj 269 409 s __param;
25+
#X obj 311 341 list prepend change;
26+
#X obj 35 322 list prepend float;
27+
#X obj 125 84 routetype float, f 23;
28+
#X connect 1 0 25 0;
29+
#X connect 2 0 23 0;
30+
#X connect 3 0 17 0;
31+
#X connect 6 0 15 0;
32+
#X connect 7 0 8 0;
33+
#X connect 8 0 11 0;
34+
#X connect 9 0 10 0;
35+
#X connect 10 0 8 1;
36+
#X connect 12 0 23 0;
37+
#X connect 14 0 24 0;
38+
#X connect 15 0 14 0;
39+
#X connect 15 1 18 0;
40+
#X connect 17 0 0 0;
41+
#X connect 17 1 5 0;
42+
#X connect 17 2 18 1;
43+
#X connect 18 0 19 0;
44+
#X connect 19 0 20 0;
45+
#X connect 20 0 14 1;
46+
#X connect 21 0 22 0;
47+
#X connect 23 0 21 0;
48+
#X connect 24 0 21 0;
49+
#X connect 25 0 15 0;
50+
#X connect 25 1 21 0;

‎Resources/Patches/playhead.pd‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
#N canvas 536 141 700 308 12;
2-
#X obj 27 38 r _playhead;
3-
#X obj 23 72 route playing recording looping edittime framerate bpm
4-
lastbar timesig position, f 81;
2+
#X obj 23 72 route playing recording looping edittime framerate bpm lastbar timesig position, f 81;
53
#X obj 20 136 outlet;
64
#X obj 85 136 outlet;
75
#X obj 145 136 outlet;
@@ -11,13 +9,14 @@ lastbar timesig position, f 81;
119
#X obj 400 136 outlet;
1210
#X obj 461 136 outlet;
1311
#X obj 524 136 outlet;
12+
#X obj 27 38 r __playhead;
1413
#X connect 0 0 1 0;
15-
#X connect 1 0 2 0;
16-
#X connect 1 1 3 0;
17-
#X connect 1 2 4 0;
18-
#X connect 1 3 5 0;
19-
#X connect 1 4 6 0;
20-
#X connect 1 5 7 0;
21-
#X connect 1 6 8 0;
22-
#X connect 1 7 9 0;
23-
#X connect 1 8 10 0;
14+
#X connect 0 1 2 0;
15+
#X connect 0 2 3 0;
16+
#X connect 0 3 4 0;
17+
#X connect 0 4 5 0;
18+
#X connect 0 5 6 0;
19+
#X connect 0 6 7 0;
20+
#X connect 0 7 8 0;
21+
#X connect 0 8 9 0;
22+
#X connect 10 0 0 0;

‎Resources/Patches/plugin_latency.pd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#N canvas 536 141 700 308 12;
22
#X obj 68 110 inlet;
33
#X text 48 74 send plugin latency compensation value to DAW;
4-
#X obj 68 139 s latency_compensation;
4+
#X obj 68 139 s __latency_compensation;
55
#X connect 0 0 2 0;

‎Source/CanvasViewport.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -736,8 +736,8 @@ class CanvasViewport final : public Viewport
736736
auto const offset = currentCentre - newCentre;
737737
setViewPosition(getViewPosition() + offset);
738738

739-
// This fixes some graphical glitches on macOS and Linux, but causes resize issues on Windows
740-
#if !JUCE_WINDOWS
739+
// This fixes some graphical glitches on macOS, but causes terrible glitches anywhere else
740+
#if JUCE_MAC
741741
if(!scaleChanged) {
742742
editor->nvgSurface.renderAll();
743743
}

‎Source/Components/ArrowPopupMenu.h‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,7 @@ class ArrowPopupMenu final : public Component
4848
if (direction == ArrowDirection::TopBottom) {
4949
menuToAttachTo->setBounds(menuToAttachTo->getBounds().translated(-15, menuMargin - 3));
5050
} else {
51-
// adjust the popupMenu to be in the correct y position
52-
auto const menuBounds = menuToAttachTo->getScreenBounds().reduced(menuMargin + 5);
53-
auto const targetBounds = targetComponent->getScreenBounds();
54-
55-
auto const yOffset = targetBounds.getBottom() - menuBounds.getBottom();
56-
57-
menuToAttachTo->setBounds(menuToAttachTo->getBounds().translated(20, yOffset));
51+
menuToAttachTo->setBounds(menuToAttachTo->getBounds().translated(30, -40));
5852
}
5953
}
6054

‎Source/Components/CheckedTooltip.h‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,6 @@ class CheckedTooltip final : public TooltipWindow {
1919
{
2020
}
2121

22-
float getDesktopScaleFactor() const override
23-
{
24-
return Component::getDesktopScaleFactor();
25-
}
26-
2722
void setVisible(bool const shouldBeVisible) override
2823
{
2924
if (shouldBeVisible && !isVisible()) {

‎Source/Dialogs/AboutPanel.h‎

Lines changed: 22 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -52,38 +52,35 @@ class AboutPanel final : public Component {
5252
};
5353

5454
StringArray const sponsors = {
55-
"Naskomusic",
56-
"epsil0ndelta",
55+
"Nasko",
5756
"polarity",
58-
"chee",
59-
"ghjameslo",
6057
"ludnny",
61-
"merspir",
62-
"phevosccp",
63-
"Radialarray",
64-
"bla9kdog",
65-
"EwanBristow1400",
66-
"JoshuaACNewman",
67-
"vasilymilovidov",
68-
"LuigiCosi",
69-
"notagoodidea",
70-
"o-g-sus",
58+
"Joshua A.C. Newman",
59+
"seppog",
60+
"yuichkun",
61+
"Ewan Bristow",
62+
"meownoid",
63+
"Ben Wesch",
64+
"tobenaibousi",
65+
"kilon",
66+
"motekulo",
7167
"pyrodogg",
68+
"rgreset",
69+
"NothanUmber",
7270
"alexandrotrevino",
73-
"angelfaraldo",
74-
"bruzketta",
75-
"brylie",
76-
"cotik1",
77-
"DavidWahlund",
71+
"anxefaraldo",
7872
"Enkerli",
79-
"grabanton",
73+
"Epic233-officiale",
8074
"jamescorrea",
81-
"motekulo",
82-
"nawarajkhatri",
83-
"NothanUmber",
84-
"olbotta",
8575
"KPY7030P",
86-
"duddex",
76+
"Damian",
77+
"Dan Friedman",
78+
"el mono",
79+
"igozbeubzbeub",
80+
"Jonathan",
81+
"Steven Donahue",
82+
"vasilymilovidov",
83+
"duddex"
8784
};
8885

8986
public:

0 commit comments

Comments
 (0)