Skip to content

Commit

Permalink
reflect recent changes to abstractions
Browse files Browse the repository at this point in the history
  • Loading branch information
myQwil committed Jan 30, 2022
1 parent d77eb75 commit f9950a9
Show file tree
Hide file tree
Showing 11 changed files with 150 additions and 141 deletions.
2 changes: 1 addition & 1 deletion src/#&&.pd
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#N canvas 700 400 450 300 14;
#N canvas 400 200 450 300 14;
#X obj 200 170 &&;
#X obj 160 80 inlet;
#X obj 220 80 inlet;
Expand Down
2 changes: 1 addition & 1 deletion src/@-.pd
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#N canvas 700 400 450 300 14;
#N canvas 400 200 450 300 14;
#X obj 180 50 inlet;
#X obj 240 90 inlet;
#X obj 180 150 f \$1;
Expand Down
2 changes: 1 addition & 1 deletion src/@pow.pd
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#N canvas 700 400 450 300 14;
#N canvas 400 200 450 300 14;
#X obj 180 50 inlet;
#X obj 240 90 inlet;
#X obj 180 150 f \$1;
Expand Down
30 changes: 15 additions & 15 deletions src/cupqb-help.pd
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
#N canvas 730 390 520 330 14;
#X floatatom 220 280 0 0 0 0 - - - 0;
#X msg 330 190 25;
#X msg 230 150 123;
#X msg 180 190 50;
#X msg 200 150 1, f 2;
#X msg 270 150 1, f 2;
#X obj 300 150 bng 15 250 50 0 empty empty empty 17 7 0 10 #ff8300
#N canvas 400 200 570 340 14;
#X floatatom 250 280 0 0 0 0 - - - 0;
#X msg 360 190 25;
#X msg 260 150 123;
#X msg 210 190 50;
#X msg 230 150 1, f 2;
#X msg 300 150 1, f 2;
#X obj 330 150 bng 15 250 50 0 empty empty empty 17 7 0 10 #ff8300
#fcfcfc #fcfcfc;
#X obj 310 190 bng 15 250 50 0 empty empty empty 17 7 0 10 #ff8300
#X obj 340 190 bng 15 250 50 0 empty empty empty 17 7 0 10 #ff8300
#fcfcfc #fcfcfc;
#X obj 160 190 bng 15 250 50 0 empty empty empty 17 7 0 10 #ff8300
#X obj 190 190 bng 15 250 50 0 empty empty empty 17 7 0 10 #ff8300
#fcfcfc #fcfcfc;
#X obj 230 30 cnv 15 72 24 empty empty cupqb 4 12 0 18 #000000 #fcfcfc
#X obj 260 30 cnv 15 72 24 empty empty cupqb 4 12 0 18 #000000 #fcfcfc
0;
#X text 10 60 the left-most and right-most inlets will subtract and
#X text 40 60 the left-most and right-most inlets will subtract and
add to the current value respectively \, while the middle inlet will
output the current value and allow for it to be set to a different
value.;
#X msg 320 150 set 24;
#X obj 220 230 cupqb 42 2;
#X msg 330 220 set 10;
#X msg 350 150 set 24;
#X obj 250 230 cupqb 42 2;
#X msg 360 220 set 10;
#X connect 1 0 12 2;
#X connect 2 0 12 1;
#X connect 3 0 12 0;
Expand Down
68 changes: 34 additions & 34 deletions src/cupqb.pd
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
#N canvas 100 210 500 400 14;
#X obj 250 20 inlet;
#X obj 200 190 inlet;
#X obj 340 190 inlet;
#X obj 120 60 route set step - +;
#X obj 120 90 s \$0set;
#X obj 120 120 s \$0itr;
#X obj 280 60 s \$0tonbx;
#X obj 30 30 loadbang;
#X obj 50 100 \$1;
#X obj 50 130 sel;
#X msg 80 160 set \$1;
#X obj 80 190 s \$0tonbx;
#X obj 30 180 \$2;
#X obj 30 210 sel;
#X obj 60 240 s \$0itr;
#X floatatom 200 120 5 0 0 0 - \$0tonbx \$0frnbx 0;
#X obj 200 140 bng 20 250 50 0 \$0-sdummy \$0-rdummy empty 17 7 0 10
#N canvas 400 200 530 440 14;
#X obj 270 40 inlet;
#X obj 220 210 inlet;
#X obj 360 210 inlet;
#X obj 140 80 route set step - +;
#X obj 140 110 s \$0set;
#X obj 140 140 s \$0itr;
#X obj 300 80 s \$0tonbx;
#X obj 50 50 loadbang;
#X obj 70 120 \$1;
#X obj 70 150 sel;
#X msg 100 180 set \$1;
#X obj 100 210 s \$0tonbx;
#X obj 50 200 \$2;
#X obj 50 230 sel;
#X obj 80 260 s \$0itr;
#X floatatom 220 140 5 0 0 0 - \$0tonbx \$0frnbx 0;
#X obj 220 160 bng 20 250 50 0 \$0-sdummy \$0-rdummy empty 17 7 0 10
#ec8824 #4884ec #000000;
#X obj 220 140 bng 20 250 50 0 \$0-sdummy \$0-rdummy empty 17 7 0 10
#X obj 240 160 bng 20 250 50 0 \$0-sdummy \$0-rdummy empty 17 7 0 10
#ec8824 #4884ec #000000;
#X obj 200 220 route set;
#X obj 170 260 1;
#X obj 170 290 * -1;
#X obj 340 220 route set;
#X obj 310 260 1;
#X obj 210 260 r \$0itr;
#X obj 350 260 r \$0itr;
#X obj 270 320 + \$1;
#X obj 270 350 s \$0tonbx;
#X obj 310 290 r \$0set;
#X obj 380 290 r \$0frnbx;
#X obj 380 350 outlet;
#X text 280 130 number box with cup;
#X obj 320 100 cnv 15 74 24 empty empty cupqb 4 12 0 18 #000000 #fcfcfc
#X obj 220 240 route set;
#X obj 190 280 1;
#X obj 190 310 * -1;
#X obj 360 240 route set;
#X obj 330 280 1;
#X obj 230 280 r \$0itr;
#X obj 370 280 r \$0itr;
#X obj 290 340 + \$1;
#X obj 290 370 s \$0tonbx;
#X obj 330 310 r \$0set;
#X obj 400 310 r \$0frnbx;
#X obj 400 370 outlet;
#X text 300 150 number box with cup;
#X obj 340 120 cnv 15 74 24 empty empty cupqb 4 12 0 18 #000000 #fcfcfc
0;
#X connect 0 0 3 0;
#X connect 1 0 18 0;
Expand Down Expand Up @@ -65,4 +65,4 @@
#X connect 27 0 25 1;
#X connect 28 0 25 1;
#X connect 28 0 29 0;
#X coords 0 -1 1 1 42 47 2 200 117;
#X coords 0 -1 1 1 42 47 2 220 137;
116 changes: 60 additions & 56 deletions src/ffplay~-help.pd
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
#N canvas 660 130 560 660 14;
#X obj 220 520 *~;
#X obj 220 550 dac~;
#N canvas 400 200 570 680 14;
#X obj 230 530 *~;
#X obj 230 560 dac~;
#N canvas 710 780 450 300 (subpatch) 0;
#X array \$0ffplay 480 float 2;
#X coords 0 1.0833 480 -1.0833 120 130 1 0 0;
#X restore 390 140 graph;
#X obj 30 460 tgl 15 0 empty empty empty 17 7 0 10 #ff0400 #fcfcfc
#X restore 400 150 graph;
#X obj 40 470 tgl 15 0 empty empty empty 17 7 0 10 #ff0400 #fcfcfc
#fcfcfc 0 1;
#X floatatom 90 460 0 0 0 0 - - - 0;
#X obj 70 330 cupqb 1;
#X obj 130 200 openpanel;
#X obj 250 520 *~;
#X obj 250 200 bng 15 250 50 0 empty empty play/pause 19 7 0 11 #ff8300
#X floatatom 100 470 0 0 0 0 - - - 0;
#X obj 80 340 cupqb 1;
#X obj 140 210 openpanel;
#X obj 260 530 *~;
#X obj 260 210 bng 15 250 50 0 empty empty play/pause 19 7 0 11 #ff8300
#fcfcfc #7c7c7c;
#X msg 260 230 stop;
#X text 120 360 tracks;
#X obj 170 520 cos~;
#X obj 170 580 *~;
#X obj 290 520 cos~;
#X obj 290 580 *~;
#X obj 90 300 bng 15 250 50 0 empty empty restart 19 7 0 11 #ff8300
#X msg 270 240 stop;
#X text 130 350 tracks;
#X obj 180 530 cos~;
#X obj 180 590 *~;
#X obj 300 530 cos~;
#X obj 300 590 *~;
#X obj 100 310 bng 15 250 50 0 empty empty restart 19 7 0 11 #ff8300
#fcfcfc #7c7c7c;
#X obj 380 440 hsl 128 17 0.001 1 1 0 empty empty vol 25 9 0 12 #2f004d
#X obj 390 450 hsl 128 17 0.001 1 1 0 empty empty vol 25 9 0 12 #2f004d
#fcfcfc #fcfcfc 0 1;
#X obj 380 520 hsl 128 17 -0.001 -1 1 0 empty empty cos 25 9 0 12 #2f004d
#X obj 390 530 hsl 128 17 -0.001 -1 1 0 empty empty cos 25 9 0 12 #2f004d
#fcfcfc #fcfcfc 0 1;
#X floatatom 390 470 0 0 0 0 - - - 0;
#X floatatom 390 550 0 0 0 0 - - - 0;
#X obj 220 20 cnv 15 102 24 empty empty ffplay~ 4 12 0 18 #000000 #fcfcfc
#X floatatom 400 480 0 0 0 0 - - - 0;
#X floatatom 400 560 0 0 0 0 - - - 0;
#X obj 230 30 cnv 15 102 24 empty empty ffplay~ 4 12 0 18 #000000 #fcfcfc
0;
#N canvas 180 430 480 370 time 0;
#X obj 80 40 inlet;
Expand Down Expand Up @@ -132,11 +132,11 @@
#X connect 9 0 2 0;
#X connect 10 0 11 1;
#X connect 11 0 9 0;
#X restore 250 260 pd time;
#X obj 130 150 bng 15 250 50 0 empty empty previous_directory 19 7
#X restore 260 270 pd time;
#X obj 140 160 bng 15 250 50 0 empty empty previous_directory 19 7
0 11 #ff8300 #fcfcfc #7c7c7c;
#X obj 330 470 zp~ 15;
#X obj 330 550 zp~ 15;
#X obj 340 480 zp~ 15;
#X obj 340 560 zp~ 15;
#N canvas 1150 350 450 300 bounds 0;
#X obj 150 50 inlet;
#X obj 260 110 + 1;
Expand All @@ -154,42 +154,44 @@
#X connect 5 0 7 0;
#X connect 6 0 1 0;
#X connect 7 0 2 0;
#X restore 70 390 pd bounds;
#X restore 80 400 pd bounds;
#N canvas 120 600 490 300 route 0;
#X obj 50 30 inlet;
#X obj 40 90 s \$0n;
#X obj 160 90 sel;
#X obj 370 90 print -n;
#X obj 190 160 s \$0start;
#X obj 100 120 s \$0time;
#X obj 320 120 s \$0play;
#X obj 150 220 s \$0open;
#X obj 250 90 s \$0pos;
#X obj 210 120 s \$0done;
#X obj 50 60 inlet;
#X obj 40 120 s \$0n;
#X obj 170 120 sel;
#X obj 320 120 print -n;
#X obj 190 180 s \$0start;
#X obj 90 120 s \$0time;
#X obj 310 150 s \$0play;
#X obj 140 240 s \$0open;
#X obj 230 120 s \$0pos;
#X obj 220 150 s \$0done;
#X obj 50 180 print -n;
#X obj 50 60 route tracks time open done pos play;
#X msg 150 190 path \, tracks \, info %artist% - %album%;
#X obj 50 90 route tracks time open done pos play;
#X msg 140 210 path \, tracks \, info %artist% - %album%;
#X msg 50 150 \$1 track(s);
#X msg 170 40 \; pd dsp \$1;
#X connect 0 0 11 0;
#X connect 2 1 12 0;
#X connect 2 1 4 0;
#X connect 11 0 1 0;
#X connect 11 0 13 0;
#X connect 11 1 5 0;
#X connect 11 2 2 0;
#X connect 11 2 14 0;
#X connect 11 3 9 0;
#X connect 11 4 8 0;
#X connect 11 5 6 0;
#X connect 11 6 3 0;
#X connect 12 0 7 0;
#X connect 13 0 10 0;
#X restore 360 390 pd route;
#X symbolatom 300 290 0 0 0 0 - - - 0;
#X msg 140 170 symbol ~/Music;
#X msg 130 230 open \$1;
#X obj 30 490 metro 40;
#X obj 100 520 /~ 2;
#N canvas 360 600 660 190 trackbar 0;
#X restore 370 400 pd route;
#X symbolatom 310 300 0 0 0 0 - - - 0;
#X msg 150 180 symbol ~/Music;
#X msg 140 240 open \$1;
#X obj 40 500 metro 40;
#X obj 110 530 /~ 2;
#N canvas 100 670 660 190 trackbar 0;
#X obj 30 140 outlet;
#X msg 30 110 seek \$1;
#X obj 60 20 hsl 576 20 0 1 0 0 empty \$0trackbar empty -2 -8 0 10
Expand Down Expand Up @@ -274,7 +276,7 @@
#X connect 18 0 20 0;
#X connect 19 0 20 0;
#X connect 20 0 13 0;
#X restore 420 300 pd trackbar;
#X restore 430 310 pd trackbar;
#N canvas 300 510 480 490 metadata 0;
#X obj 50 440 outlet;
#X msg 50 30 info;
Expand All @@ -297,6 +299,7 @@
#X msg 190 270 send title;
#X msg 150 350 info %artist% - %title% (%album%);
#X msg 150 380 print from %album%\\\, released %date%;
#X msg 170 210 date;
#X connect 1 0 0 0;
#X connect 5 0 0 0;
#X connect 7 0 0 0;
Expand All @@ -308,19 +311,20 @@
#X connect 18 0 0 0;
#X connect 19 0 0 0;
#X connect 20 0 0 0;
#X restore 420 330 pd metadata;
#X obj 160 260 r \$0open;
#X connect 21 0 0 0;
#X restore 430 340 pd metadata;
#X obj 170 270 r \$0open;
#N canvas 160 270 720 300 http 0;
#X obj 180 210 outlet;
#X msg 20 40 open https://upload.wikimedia.org/wikipedia/en/1/10/Michael_Jackson_Thriller.ogg
, f 81;
#X connect 1 0 0 0;
#X restore 420 360 pd http;
#X symbolatom 280 320 0 0 0 0 - - - 0;
#X obj 220 610 dac~;
#X obj 30 550 tabwrite~ \$0ffplay;
#X obj 220 390 ffplay~ 1 2 5 6;
#X text 60 50 An implementation of the FFmpeg libraries for the audio
#X restore 430 370 pd http;
#X symbolatom 290 330 0 0 0 0 - - - 0;
#X obj 230 620 dac~;
#X obj 40 560 tabwrite~ \$0ffplay;
#X obj 230 400 ffplay~ 1 2 5 6;
#X text 70 60 An implementation of the FFmpeg libraries for the audio
playback of various media formats. Includes m3u playlist functionality
and playback speed manipulation.;
#N canvas 1220 280 450 300 next 0;
Expand All @@ -342,7 +346,7 @@ and playback speed manipulation.;
#X connect 7 0 4 1;
#X connect 7 0 8 0;
#X connect 8 0 5 1;
#X restore 50 260 pd next;
#X restore 60 270 pd next;
#X connect 0 0 1 0;
#X connect 3 0 30 0;
#X connect 4 0 30 1;
Expand Down
3 changes: 1 addition & 2 deletions src/ffplay~.c
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,7 @@ static t_int *ffplay_perform(t_int *w) {
out += nch;
data->output_frames_gen--;
continue; }

if (data->input_frames > 0)
else if (data->input_frames > 0)
{ resample:
data->data_out = out = x->out;
src_process(x->state ,data);
Expand Down
Binary file added src/ffplay~.pd_linux
Binary file not shown.
43 changes: 23 additions & 20 deletions src/hms.pd
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#N canvas 570 180 420 420 14;
#N canvas 400 200 420 430 14;
#X obj 280 40 inlet;
#X obj 160 150 loadbang;
#X msg 160 210 0;
Expand All @@ -23,25 +23,25 @@
#X obj 60 150 t f f;
#X obj 230 240 change;
#X obj 230 270 div 60;
#N canvas 220 260 350 340 format 0;
#X obj 40 20 inlet;
#X obj 40 50 t f f f f;
#X obj 110 90 i;
#X obj 70 90 ==;
#X obj 70 120 sel;
#X msg 100 180 symbol;
#X obj 40 190 lead0;
#X obj 170 20 * 10;
#X obj 170 50 t f f;
#X obj 210 90 i;
#X obj 170 90 ==;
#X obj 170 120 sel;
#X msg 200 180 symbol;
#X obj 40 220 pack s s s;
#X msg 40 250 symbol \$1\$2\$3;
#X obj 40 280 outlet;
#X msg 100 150 symbol .\0;
#X msg 200 150 symbol \0;
#N canvas 220 260 360 350 format 0;
#X obj 60 30 inlet;
#X obj 60 60 t f f f f;
#X obj 130 100 i;
#X obj 90 100 ==;
#X obj 90 130 sel;
#X msg 120 190 symbol;
#X obj 60 200 lead0;
#X obj 190 30 * 10;
#X obj 190 60 t f f;
#X obj 230 100 i;
#X obj 190 100 ==;
#X obj 190 130 sel;
#X msg 220 190 symbol;
#X obj 60 230 pack s s s;
#X msg 60 260 symbol \$1\$2\$3;
#X obj 60 290 outlet;
#X msg 120 160 symbol .\0;
#X msg 220 160 symbol \0;
#X connect 0 0 1 0;
#X connect 1 0 6 0;
#X connect 1 1 3 0;
Expand Down Expand Up @@ -73,6 +73,9 @@
#X obj 60 180 / 10;
#X obj 140 310 pack s s f s;
#X msg 140 340 symbol \$4\$3:\$2:\$1;
#X obj 120 30 cnv 15 48 24 empty empty hms 4 12 0 18 #000000 #fcfcfc
0;
#X text 40 60 hour:minute:second display;
#X connect 0 0 5 0;
#X connect 1 0 2 0;
#X connect 2 0 3 0;
Expand Down
Loading

0 comments on commit f9950a9

Please sign in to comment.