Skip to content

Commit 9db1bdd

Browse files
tremblaptremblap
authored
Merge pull request #348 from flucoma/dev
[release] 1.0.5
2 parents bce1cbf + d3bad45 commit 9db1bdd

19 files changed

+17600
-310
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,4 @@ interfaces/flucoma-obj-qlookup.json
2222
release-packaging/**
2323
winbuild/*
2424
.DS_Store
25+
.vscode/*

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Minimal build steps below. For detailed guidance see https://github.com/flucoma/
88

99
## Prerequisites
1010

11-
* C++14 compliant compiler (clang, GCC or MSVC)
11+
* C++17 compliant compiler (clang, GCC or MSVC)
1212
* cmake
1313
* make (or Ninja or XCode or VisualStudio)
1414
* git

‎examples/bufcompose-example.maxpat‎

Lines changed: 58 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"appversion" : {
55
"major" : 8,
66
"minor" : 3,
7-
"revision" : 2,
7+
"revision" : 3,
88
"architecture" : "x64",
99
"modernui" : 1
1010
}
@@ -456,7 +456,7 @@
456456
"appversion" : {
457457
"major" : 8,
458458
"minor" : 3,
459-
"revision" : 2,
459+
"revision" : 3,
460460
"architecture" : "x64",
461461
"modernui" : 1
462462
}
@@ -502,7 +502,7 @@
502502
"appversion" : {
503503
"major" : 8,
504504
"minor" : 3,
505-
"revision" : 2,
505+
"revision" : 3,
506506
"architecture" : "x64",
507507
"modernui" : 1
508508
}
@@ -544,7 +544,7 @@
544544
"numoutlets" : 1,
545545
"outlettype" : [ "bang" ],
546546
"parameter_enable" : 0,
547-
"patching_rect" : [ 79.0, 347.0, 24.0, 24.0 ]
547+
"patching_rect" : [ 79.0, 341.0, 24.0, 24.0 ]
548548
}
549549

550550
}
@@ -1143,7 +1143,7 @@
11431143
"appversion" : {
11441144
"major" : 8,
11451145
"minor" : 3,
1146-
"revision" : 2,
1146+
"revision" : 3,
11471147
"architecture" : "x64",
11481148
"modernui" : 1
11491149
}
@@ -1178,6 +1178,18 @@
11781178
"subpatcher_template" : "",
11791179
"assistshowspatchername" : 0,
11801180
"boxes" : [ {
1181+
"box" : {
1182+
"id" : "obj-9",
1183+
"maxclass" : "button",
1184+
"numinlets" : 1,
1185+
"numoutlets" : 1,
1186+
"outlettype" : [ "bang" ],
1187+
"parameter_enable" : 0,
1188+
"patching_rect" : [ 142.0, 325.0, 24.0, 24.0 ]
1189+
}
1190+
1191+
}
1192+
, {
11811193
"box" : {
11821194
"id" : "obj-5",
11831195
"maxclass" : "newobj",
@@ -1364,7 +1376,7 @@
13641376
"numinlets" : 2,
13651377
"numoutlets" : 2,
13661378
"outlettype" : [ "bang", "" ],
1367-
"patching_rect" : [ 142.0, 377.0, 29.5, 22.0 ],
1379+
"patching_rect" : [ 142.0, 387.0, 29.5, 22.0 ],
13681380
"text" : "sel"
13691381
}
13701382

@@ -1376,7 +1388,7 @@
13761388
"numinlets" : 5,
13771389
"numoutlets" : 4,
13781390
"outlettype" : [ "int", "", "", "int" ],
1379-
"patching_rect" : [ 142.0, 337.0, 61.0, 22.0 ],
1391+
"patching_rect" : [ 142.0, 351.0, 61.0, 22.0 ],
13801392
"text" : "counter"
13811393
}
13821394

@@ -1493,7 +1505,7 @@
14931505
, {
14941506
"patchline" : {
14951507
"destination" : [ "obj-25", 1 ],
1496-
"midpoints" : [ 99.0, 367.0, 162.0, 367.0 ],
1508+
"midpoints" : [ 99.0, 377.0, 162.0, 377.0 ],
14971509
"source" : [ "obj-23", 0 ]
14981510
}
14991511

@@ -1514,7 +1526,7 @@
15141526
}
15151527
, {
15161528
"patchline" : {
1517-
"destination" : [ "obj-24", 0 ],
1529+
"destination" : [ "obj-9", 0 ],
15181530
"source" : [ "obj-26", 0 ]
15191531
}
15201532

@@ -1582,6 +1594,13 @@
15821594
"source" : [ "obj-5", 0 ]
15831595
}
15841596

1597+
}
1598+
, {
1599+
"patchline" : {
1600+
"destination" : [ "obj-24", 0 ],
1601+
"source" : [ "obj-9", 0 ]
1602+
}
1603+
15851604
}
15861605
],
15871606
"styles" : [ {
@@ -1659,7 +1678,7 @@
16591678
"appversion" : {
16601679
"major" : 8,
16611680
"minor" : 3,
1662-
"revision" : 2,
1681+
"revision" : 3,
16631682
"architecture" : "x64",
16641683
"modernui" : 1
16651684
}
@@ -1694,6 +1713,18 @@
16941713
"subpatcher_template" : "",
16951714
"assistshowspatchername" : 0,
16961715
"boxes" : [ {
1716+
"box" : {
1717+
"id" : "obj-12",
1718+
"maxclass" : "newobj",
1719+
"numinlets" : 1,
1720+
"numoutlets" : 1,
1721+
"outlettype" : [ "bang" ],
1722+
"patching_rect" : [ 142.0, 320.0, 22.0, 22.0 ],
1723+
"text" : "t b"
1724+
}
1725+
1726+
}
1727+
, {
16971728
"box" : {
16981729
"id" : "obj-9",
16991730
"maxclass" : "newobj",
@@ -1924,7 +1955,7 @@
19241955
"numinlets" : 1,
19251956
"numoutlets" : 2,
19261957
"outlettype" : [ "", "" ],
1927-
"patching_rect" : [ 142.0, 301.0, 108.0, 22.0 ],
1958+
"patching_rect" : [ 142.0, 295.0, 108.0, 22.0 ],
19281959
"text" : "fluid.bufcompose~"
19291960
}
19301961

@@ -1936,7 +1967,7 @@
19361967
"numinlets" : 2,
19371968
"numoutlets" : 2,
19381969
"outlettype" : [ "bang", "" ],
1939-
"patching_rect" : [ 142.0, 377.0, 29.5, 22.0 ],
1970+
"patching_rect" : [ 142.0, 385.0, 29.5, 22.0 ],
19401971
"text" : "sel"
19411972
}
19421973

@@ -1948,7 +1979,7 @@
19481979
"numinlets" : 5,
19491980
"numoutlets" : 4,
19501981
"outlettype" : [ "int", "", "", "int" ],
1951-
"patching_rect" : [ 142.0, 337.0, 61.0, 22.0 ],
1982+
"patching_rect" : [ 142.0, 347.0, 61.0, 22.0 ],
19521983
"text" : "counter"
19531984
}
19541985

@@ -2071,6 +2102,13 @@
20712102
"source" : [ "obj-11", 6 ]
20722103
}
20732104

2105+
}
2106+
, {
2107+
"patchline" : {
2108+
"destination" : [ "obj-24", 0 ],
2109+
"source" : [ "obj-12", 0 ]
2110+
}
2111+
20742112
}
20752113
, {
20762114
"patchline" : {
@@ -2112,7 +2150,7 @@
21122150
, {
21132151
"patchline" : {
21142152
"destination" : [ "obj-25", 1 ],
2115-
"midpoints" : [ 102.0, 364.5, 162.0, 364.5 ],
2153+
"midpoints" : [ 102.0, 375.5, 162.0, 375.5 ],
21162154
"source" : [ "obj-23", 0 ]
21172155
}
21182156

@@ -2133,7 +2171,7 @@
21332171
}
21342172
, {
21352173
"patchline" : {
2136-
"destination" : [ "obj-24", 0 ],
2174+
"destination" : [ "obj-12", 0 ],
21372175
"source" : [ "obj-26", 0 ]
21382176
}
21392177

@@ -2568,6 +2606,11 @@
25682606
}
25692607

25702608
}
2609+
],
2610+
"dependency_cache" : [ {
2611+
"name" : "fluid.bufcompose~.mxo",
2612+
"type" : "iLaX"
2613+
}
25712614
],
25722615
"autosave" : 0,
25732616
"styles" : [ {

‎examples/buffermanagement-example.maxpat‎

Lines changed: 40 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"appversion" : {
55
"major" : 8,
66
"minor" : 3,
7-
"revision" : 2,
7+
"revision" : 3,
88
"architecture" : "x64",
99
"modernui" : 1
1010
}
@@ -52,13 +52,13 @@
5252
"appversion" : {
5353
"major" : 8,
5454
"minor" : 3,
55-
"revision" : 2,
55+
"revision" : 3,
5656
"architecture" : "x64",
5757
"modernui" : 1
5858
}
5959
,
6060
"classnamespace" : "box",
61-
"rect" : [ 35.0, 113.0, 1370.0, 751.0 ],
61+
"rect" : [ 0.0, 26.0, 1370.0, 751.0 ],
6262
"bglocked" : 0,
6363
"openinpresentation" : 0,
6464
"default_fontsize" : 12.0,
@@ -600,7 +600,7 @@
600600
"appversion" : {
601601
"major" : 8,
602602
"minor" : 3,
603-
"revision" : 2,
603+
"revision" : 3,
604604
"architecture" : "x64",
605605
"modernui" : 1
606606
}
@@ -1309,7 +1309,7 @@
13091309
"appversion" : {
13101310
"major" : 8,
13111311
"minor" : 3,
1312-
"revision" : 2,
1312+
"revision" : 3,
13131313
"architecture" : "x64",
13141314
"modernui" : 1
13151315
}
@@ -1821,7 +1821,7 @@
18211821
"appversion" : {
18221822
"major" : 8,
18231823
"minor" : 3,
1824-
"revision" : 2,
1824+
"revision" : 3,
18251825
"architecture" : "x64",
18261826
"modernui" : 1
18271827
}
@@ -2220,7 +2220,7 @@
22202220
"numinlets" : 1,
22212221
"numoutlets" : 0,
22222222
"patching_rect" : [ 20.0, 90.0, 422.0, 84.0 ],
2223-
"text" : "The same principles of automatic management can be used with objects that use the fluid.dataset~ as inputs and outputs. \n\nLet's start by creating a simple synthetic dataset mde out of MFCC analysis."
2223+
"text" : "The same principles of automatic management can be used with objects that use the fluid.dataset~ as inputs and outputs. \n\nLet's start by creating a simple synthetic dataset made out of MFCC analysis."
22242224
}
22252225

22262226
}
@@ -2400,13 +2400,13 @@
24002400
"appversion" : {
24012401
"major" : 8,
24022402
"minor" : 3,
2403-
"revision" : 2,
2403+
"revision" : 3,
24042404
"architecture" : "x64",
24052405
"modernui" : 1
24062406
}
24072407
,
24082408
"classnamespace" : "box",
2409-
"rect" : [ 0.0, 26.0, 1370.0, 751.0 ],
2409+
"rect" : [ 35.0, 113.0, 1370.0, 751.0 ],
24102410
"bglocked" : 0,
24112411
"openinpresentation" : 0,
24122412
"default_fontsize" : 12.0,
@@ -2567,7 +2567,6 @@
25672567
"numinlets" : 1,
25682568
"numoutlets" : 0,
25692569
"patching_rect" : [ 506.0, 170.0, 134.0, 25.0 ],
2570-
"presentation_linecount" : 2,
25712570
"text" : "Trigger Processing"
25722571
}
25732572

@@ -2703,13 +2702,11 @@
27032702
"box" : {
27042703
"fontsize" : 13.0,
27052704
"id" : "obj-15",
2706-
"linecount" : 16,
27072705
"maxclass" : "message",
27082706
"numinlets" : 2,
27092707
"numoutlets" : 1,
27102708
"outlettype" : [ "" ],
2711-
"patching_rect" : [ 20.0, 435.0, 374.0, 241.0 ],
2712-
"text" : "80.85392 -18.580402 -12.486599 17.671347 -5.018889 6.870314 0.583963 5.357196 1.909947 5.076388 1.538079 3.983266 -1.002469 64.604294 26.2 22.253168 17.40172 9.390439 12.163238 8.727877 7.03929 6.216128 4.95892 3.990312 4.20789 4.292554 0.152482 -0.267312 0.302994 0.319663 0.231892 0.260999 0.221755 0.051956 0.291778 0.165382 -0.260913 0.016466 -0.505628 2.412833 2.86147 2.532662 2.543761 2.202866 2.314336 2.201277 2.271181 2.542523 2.470343 2.880286 2.878045 3.881855 -51.250549 -92.414146 -55.402786 -13.44823 -24.911613 -16.531027 -16.146517 -9.712333 -12.417332 -7.106012 -10.382634 -8.875776 -16.487474 87.073898 -19.064693 -12.623805 20.319082 -6.308255 6.022999 -0.071732 5.633561 1.034654 4.796767 1.858731 3.829453 -1.00049 219.073563 33.307629 41.742584 66.901405 15.837646 36.841446 20.432083 24.710594 16.992668 19.3 11.335212 16.138893 9.810827"
2709+
"patching_rect" : [ 20.0, 435.0, 374.0, 23.0 ]
27132710
}
27142711

27152712
}
@@ -2807,13 +2804,11 @@
28072804
"box" : {
28082805
"fontsize" : 13.0,
28092806
"id" : "obj-40",
2810-
"linecount" : 16,
28112807
"maxclass" : "message",
28122808
"numinlets" : 2,
28132809
"numoutlets" : 1,
28142810
"outlettype" : [ "" ],
2815-
"patching_rect" : [ 930.0, 382.0, 374.0, 241.0 ],
2816-
"text" : "80.85392 -18.580402 -12.486599 17.671347 -5.018889 6.870314 0.583963 5.357196 1.909947 5.076388 1.538079 3.983266 -1.002469 64.604294 26.2 22.253168 17.40172 9.390439 12.163238 8.727877 7.03929 6.216128 4.95892 3.990312 4.20789 4.292554 0.152482 -0.267312 0.302994 0.319663 0.231892 0.260999 0.221755 0.051956 0.291778 0.165382 -0.260913 0.016466 -0.505628 2.412833 2.86147 2.532662 2.543761 2.202866 2.314336 2.201277 2.271181 2.542523 2.470343 2.880286 2.878045 3.881855 -51.250549 -92.414146 -55.402786 -13.44823 -24.911613 -16.531027 -16.146517 -9.712333 -12.417332 -7.106012 -10.382634 -8.875776 -16.487474 87.073898 -19.064693 -12.623805 20.319082 -6.308255 6.022999 -0.071732 5.633561 1.034654 4.796767 1.858731 3.829453 -1.00049 219.073563 33.307629 41.742584 66.901405 15.837646 36.841446 20.432083 24.710594 16.992668 19.3 11.335212 16.138893 9.810827"
2811+
"patching_rect" : [ 930.0, 382.0, 374.0, 23.0 ]
28172812
}
28182813

28192814
}
@@ -3280,6 +3275,35 @@
32803275
}
32813276

32823277
}
3278+
],
3279+
"dependency_cache" : [ {
3280+
"name" : "fluid.buf2list.mxo",
3281+
"type" : "iLaX"
3282+
}
3283+
, {
3284+
"name" : "fluid.bufflatten~.mxo",
3285+
"type" : "iLaX"
3286+
}
3287+
, {
3288+
"name" : "fluid.bufloudness~.mxo",
3289+
"type" : "iLaX"
3290+
}
3291+
, {
3292+
"name" : "fluid.bufmfcc~.mxo",
3293+
"type" : "iLaX"
3294+
}
3295+
, {
3296+
"name" : "fluid.bufspectralshape~.mxo",
3297+
"type" : "iLaX"
3298+
}
3299+
, {
3300+
"name" : "fluid.bufstats~.mxo",
3301+
"type" : "iLaX"
3302+
}
3303+
, {
3304+
"name" : "fluid.libmanipulation.mxo",
3305+
"type" : "iLaX"
3306+
}
32833307
],
32843308
"autosave" : 0
32853309
}

0 commit comments

Comments
 (0)