Skip to content

Commit d69af4e

Browse files
eflyncheflynch
committed
Updated chain.data
1 parent 013f9bd commit d69af4e

File tree

4 files changed

+161
-48
lines changed

4 files changed

+161
-48
lines changed

Diff for: ‎chain.data/chain.data.c

+8-3
Original file line numberDiff line numberDiff line change
@@ -174,11 +174,14 @@ void chain_data_doread(t_chain_data *x, t_symbol *s)
174174
} else {
175175
strcpy(filename, s->s_name);
176176
if (locatefile_extended(filename, &path, &outtype, &filetype, 1)){
177-
chain_error("%s: not found", s->s_name);
177+
// chain_error("%s: not found", s->s_name);
178+
// CACHE MISS
179+
outlet_anything(x->s_outlet2, gensym("read_miss"), 0L, NULL);
178180
return;
179181
}
180182
}
181183
chain_data_openfile(x, filename, path);
184+
outlet_anything(x->s_outlet2, gensym("read_done"), 0L, NULL);
182185
}
183186

184187
void chain_data_openfile(t_chain_data *x, char *filename, short path){
@@ -261,7 +264,7 @@ void chain_data_dowrite(t_chain_data *x, t_symbol *s)
261264
{
262265
if (!x->s_values || !x->s_offsets || !x->s_num_samples){
263266
// Fail silently
264-
chain_error("No data to write in chain.data");
267+
outlet_anything(x->s_outlet2, gensym("write_miss"), 0L, NULL);
265268
return;
266269
}
267270

@@ -277,6 +280,7 @@ void chain_data_dowrite(t_chain_data *x, t_symbol *s)
277280
path = path_getdefault();
278281
}
279282
chain_data_writefile(x, filename, path);
283+
outlet_anything(x->s_outlet2, gensym("write_done"), 0L, NULL);
280284
}
281285

282286
void chain_data_writefile(t_chain_data *x, char *filename, short path)
@@ -410,9 +414,10 @@ void chain_data_output_resampled_interleaved_list(t_chain_data *x)
410414
{
411415
if (!x->s_values || !x->s_offsets || !x->s_num_samples){
412416
// Fail silently
413-
chain_debug("No data saved in chain.data.");
417+
// chain_debug("No data saved in chain.data.");
414418
return;
415419
}
420+
// NOT IMPLMENTED !!!!!!!!!!!!!!!!!!!!!!!!!!
416421
}
417422

418423
void chain_data_clear(t_chain_data *x){

Diff for: ‎package/maxchain/help/chain.data.maxhelp

+15-15
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"modernui" : 1
1010
}
1111
,
12-
"rect" : [ 346.0, 79.0, 1165.0, 933.0 ],
12+
"rect" : [ 172.0, 79.0, 1165.0, 933.0 ],
1313
"bgcolor" : [ 1.0, 1.0, 1.0, 1.0 ],
1414
"editing_bgcolor" : [ 1.0, 1.0, 1.0, 1.0 ],
1515
"bglocked" : 0,
@@ -298,7 +298,7 @@
298298
"range" : 128,
299299
"size" : 128,
300300
"style" : "",
301-
"table_data" : [ 0, 21, 21, 20, 19, 19, 18, 17, 16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 17, 17, 17, 18, 19, 19, 20, 21, 22, 23, 23, 23, 24, 23, 23, 22, 21, 20, 19, 19, 19, 18, 16, 15, 15, 15, 15, 15, 14, 13, 14, 15, 16, 16, 17, 19, 24, 31, 30, 28, 21, 8, 4, 120, 0, 2, 10, 24, 35, 37, 49, 48, 56, 62, 56, 58, 60, 66, 69, 74, 73, 81, 82, 85, 88, 88, 87, 87, 85, 86, 86, 87, 90, 93, 96, 95, 98, 98, 99, 100, 96, 98, 94, 97, 94, 97, 68, 59, 55, 55, 57, 56, 61, 77, 90, 70, 45, 36, 29, 23, 17, 12, 9, 8, 5, 0, 0, 0, 0 ]
301+
"table_data" : [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 3, 7, 14, 21, 26, 31, 41, 52, 65, 72, 83, 87, 100, 60, 58, 81, 79, 30, 40, 36, 35, 24, 27, 23, 19, 23, 20, 20, 14, 12, 8, 3, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]
302302
}
303303

304304
}
@@ -557,8 +557,8 @@
557557
"id" : "obj-82",
558558
"maxclass" : "newobj",
559559
"numinlets" : 1,
560-
"numoutlets" : 2,
561-
"outlettype" : [ "int", "" ],
560+
"numoutlets" : 3,
561+
"outlettype" : [ "int", "", "" ],
562562
"patching_rect" : [ 280.0, 212.0, 147.0, 22.0 ],
563563
"style" : "",
564564
"text" : "chain.time datahelp"
@@ -583,8 +583,8 @@
583583
"id" : "obj-78",
584584
"maxclass" : "newobj",
585585
"numinlets" : 1,
586-
"numoutlets" : 2,
587-
"outlettype" : [ "int", "" ],
586+
"numoutlets" : 3,
587+
"outlettype" : [ "int", "", "" ],
588588
"patching_rect" : [ 127.0, 212.0, 147.0, 22.0 ],
589589
"style" : "",
590590
"text" : "chain.time datahelp"
@@ -1496,14 +1496,15 @@
14961496
"styles" : [ {
14971497
"name" : "maxchain",
14981498
"default" : {
1499+
"bgcolor" : [ 0.095481, 0.100396, 0.100293, 1.0 ],
14991500
"color" : [ 0.960784, 0.827451, 0.156863, 1.0 ],
1500-
"fontface" : [ 0 ],
15011501
"accentcolor" : [ 0.0, 0.0, 0.0, 1.0 ],
15021502
"elementcolor" : [ 0.282353, 0.309804, 0.266667, 1.0 ],
1503-
"textjustification" : [ 0 ],
1503+
"fontname" : [ "Courier" ],
15041504
"textcolor_inverse" : [ 1.0, 1.0, 1.0, 1.0 ],
15051505
"patchlinecolor" : [ 0.639216, 0.458824, 0.070588, 0.9 ],
1506-
"fontname" : [ "Courier" ],
1506+
"fontface" : [ 0 ],
1507+
"textjustification" : [ 0 ],
15071508
"bgfillcolor" : {
15081509
"type" : "color",
15091510
"color" : [ 0.639216, 0.458824, 0.070588, 1.0 ],
@@ -1513,8 +1514,7 @@
15131514
"proportion" : 0.39,
15141515
"autogradient" : 0
15151516
}
1516-
,
1517-
"bgcolor" : [ 0.095481, 0.100396, 0.100293, 1.0 ]
1517+
15181518
}
15191519
,
15201520
"parentstyle" : "",
@@ -1532,8 +1532,8 @@
15321532
, {
15331533
"name" : "maxchain-subtitle",
15341534
"default" : {
1535-
"fontsize" : [ 20.0 ],
1536-
"textcolor" : [ 0.870588, 0.415686, 0.062745, 1.0 ]
1535+
"textcolor" : [ 0.870588, 0.415686, 0.062745, 1.0 ],
1536+
"fontsize" : [ 20.0 ]
15371537
}
15381538
,
15391539
"parentstyle" : "",
@@ -1542,9 +1542,9 @@
15421542
, {
15431543
"name" : "maxchain-title",
15441544
"default" : {
1545-
"fontsize" : [ 48.0 ],
1546-
"textcolor" : [ 0.960784, 0.827451, 0.156863, 1.0 ],
15471545
"fontname" : [ "Courier Bold" ],
1546+
"textcolor" : [ 0.960784, 0.827451, 0.156863, 1.0 ],
1547+
"fontsize" : [ 48.0 ],
15481548
"clearcolor" : [ 0.317647, 0.654902, 0.976471, 0.0 ]
15491549
}
15501550
,

Diff for: ‎package/maxchain/patchers/chain.datatable.maxpat

+36-14
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,18 @@
3737
"style" : "",
3838
"subpatcher_template" : "",
3939
"boxes" : [ {
40+
"box" : {
41+
"comment" : "Cashe Miss",
42+
"id" : "obj-8",
43+
"maxclass" : "outlet",
44+
"numinlets" : 1,
45+
"numoutlets" : 0,
46+
"patching_rect" : [ 705.0, 375.0, 30.0, 30.0 ],
47+
"style" : ""
48+
}
49+
50+
}
51+
, {
4052
"box" : {
4153
"id" : "obj-5",
4254
"maxclass" : "newobj",
@@ -537,6 +549,16 @@
537549
"source" : [ "obj-1", 0 ]
538550
}
539551

552+
}
553+
, {
554+
"patchline" : {
555+
"destination" : [ "obj-8", 0 ],
556+
"disabled" : 0,
557+
"hidden" : 0,
558+
"midpoints" : [ 279.5, 158.5, 714.5, 158.5 ],
559+
"source" : [ "obj-1", 1 ]
560+
}
561+
540562
}
541563
, {
542564
"patchline" : {
@@ -632,14 +654,6 @@
632654
"styles" : [ {
633655
"name" : "maxchain",
634656
"default" : {
635-
"color" : [ 0.960784, 0.827451, 0.156863, 1.0 ],
636-
"fontface" : [ 0 ],
637-
"accentcolor" : [ 0.0, 0.0, 0.0, 1.0 ],
638-
"elementcolor" : [ 0.282353, 0.309804, 0.266667, 1.0 ],
639-
"textjustification" : [ 0 ],
640-
"textcolor_inverse" : [ 1.0, 1.0, 1.0, 1.0 ],
641-
"patchlinecolor" : [ 0.639216, 0.458824, 0.070588, 0.9 ],
642-
"fontname" : [ "Courier" ],
643657
"bgfillcolor" : {
644658
"type" : "color",
645659
"color" : [ 0.639216, 0.458824, 0.070588, 1.0 ],
@@ -650,7 +664,15 @@
650664
"autogradient" : 0
651665
}
652666
,
653-
"bgcolor" : [ 0.095481, 0.100396, 0.100293, 1.0 ]
667+
"textjustification" : [ 0 ],
668+
"bgcolor" : [ 0.095481, 0.100396, 0.100293, 1.0 ],
669+
"accentcolor" : [ 0.0, 0.0, 0.0, 1.0 ],
670+
"elementcolor" : [ 0.282353, 0.309804, 0.266667, 1.0 ],
671+
"fontname" : [ "Courier" ],
672+
"textcolor_inverse" : [ 1.0, 1.0, 1.0, 1.0 ],
673+
"patchlinecolor" : [ 0.639216, 0.458824, 0.070588, 0.9 ],
674+
"color" : [ 0.960784, 0.827451, 0.156863, 1.0 ],
675+
"fontface" : [ 0 ]
654676
}
655677
,
656678
"parentstyle" : "",
@@ -668,8 +690,8 @@
668690
, {
669691
"name" : "maxchain-subtitle",
670692
"default" : {
671-
"fontsize" : [ 20.0 ],
672-
"textcolor" : [ 0.870588, 0.415686, 0.062745, 1.0 ]
693+
"textcolor" : [ 0.870588, 0.415686, 0.062745, 1.0 ],
694+
"fontsize" : [ 20.0 ]
673695
}
674696
,
675697
"parentstyle" : "",
@@ -678,10 +700,10 @@
678700
, {
679701
"name" : "maxchain-title",
680702
"default" : {
681-
"fontsize" : [ 48.0 ],
682-
"textcolor" : [ 0.960784, 0.827451, 0.156863, 1.0 ],
683703
"fontname" : [ "Courier Bold" ],
684-
"clearcolor" : [ 0.317647, 0.654902, 0.976471, 0.0 ]
704+
"textcolor" : [ 0.960784, 0.827451, 0.156863, 1.0 ],
705+
"clearcolor" : [ 0.317647, 0.654902, 0.976471, 0.0 ],
706+
"fontsize" : [ 48.0 ]
685707
}
686708
,
687709
"parentstyle" : "",

0 commit comments

Comments
 (0)