Dariaceli's Git
Browse code

Made room for multiple audio devices

Andrew Alderwick authored on 26/04/2021 17:52:46
Showing 20 changed files
projects/demos/bifurcan.usm
History View file @ 833f0ac
... ... 
@@ -14,8 +14,8 @@
14 14
15 15 
 |00 @System     [ &vector $2 &pad      $6 &r      $2 &g     $2 &b      $2 ]
16 16 
 |20 @Screen     [ &vector $2 &width    $2 &height $2 &pad   $2 &x      $2 &y      $2 &addr $2 &color $1 ]
17 
-|60 @Mouse      [ &vector $2 &x        $2 &y      $2 &state $1 &chord $1 ]
18 
-|a0 @DateTime   [ &year   $2 &month    $1 &day    $1 &hour  $1 &minute $1 &second $1 &dotw $1 &doty $2 &isdst $1 ]
17 
+|90 @Mouse      [ &vector $2 &x        $2 &y      $2 &state $1 &chord $1 ]
18 
+|b0 @DateTime   [ &year   $2 &month    $1 &day    $1 &hour  $1 &minute $1 &second $1 &dotw $1 &doty $2 &isdst $1 ]
19 19
20 20 
 ( variables )
21 21
projects/demos/musictracker.usm
History View file @ 833f0ac
... ... 
@@ -30,9 +30,9 @@
30 30 
 |10 @Console [ &vector $2 &pad $6 &char $1 &byte $1 &short $2 &string $2 ]
31 31 
 |20 @Screen [ &vector $2 &width $2 &height $2 &pad $2 &x $2 &y $2 &addr $2 &color $1 ]
32 32 
 |30 @Audio [ &pad $8 &adsr $2 &len $2 &addr $2 &volume $1 &pitch $1 ]
33 
-|40 @Controller [ &vector $2 &button $1 &key $1 ]
34 
-|60 @Mouse [ &vector $2 &x $2 &y $2 &state $1 &chord $1 ]
35 
-|70 @File [ &vector $2 &success $2 &offset $2 &pad $2 &name $2 &length $2 &load $2 &save $2 ]
33 
+|80 @Controller [ &vector $2 &button $1 &key $1 ]
34 
+|90 @Mouse [ &vector $2 &x $2 &y $2 &state $1 &chord $1 ]
35 
+|a0 @File [ &vector $2 &success $2 &offset $2 &pad $2 &name $2 &length $2 &load $2 &save $2 ]
36 36
37 37 
 ( vectors )
38 38
projects/demos/piano.usm
History View file @ 833f0ac
... ... 
@@ -13,9 +13,9 @@
13 13 
 |10 @Console    [ &pad    $8 &char     $1 &byte   $1 &short $2 &string $2 ]
14 14 
 |20 @Screen     [ &vector $2 &width    $2 &height $2 &pad   $2 &x      $2 &y     $2 &addr $2 &color $1 ]
15 15 
 |30 @Audio      [ &pad    $8 &adsr     $2 &length $2 &addr  $2 &volume $1 &pitch $1 ]
16 
-|40 @Controller [ &vector $2 &button   $1 &key    $1 ]
17 
-|60 @Mouse      [ &vector $2 &x        $2 &y      $2 &state $1 &chord  $1 ]
18 
-|90 @Midi       [ &vector $2 &message  $2 ]
16 
+|70 @Midi       [ &vector $2 &message  $2 ]
17 
+|80 @Controller [ &vector $2 &button   $1 &key    $1 ]
18 
+|90 @Mouse      [ &vector $2 &x        $2 &y      $2 &state $1 &chord  $1 ]
19 19
20 20 
 ( variables )
21 21
projects/demos/theme.usm
History View file @ 833f0ac
... ... 
@@ -11,7 +11,7 @@
11 11
12 12 
 |00 @System [ &vector $2 &pad $6 &r $2 &g $2 &b $2 ]
13 13 
 |20 @Screen [ &vector $2 &width $2 &height $2 &pad $2 &x $2 &y $2 &addr $2 &color $1 ]
14 
-|60 @Mouse [ &vector $2 &x $2 &y $2 &state $1 &chord $1 ]
14 
+|90 @Mouse [ &vector $2 &x $2 &y $2 &state $1 &chord $1 ]
15 15
16 16 
 ( variables )
17 17
projects/examples/blank.usm
History View file @ 833f0ac
... ... 
@@ -6,10 +6,10 @@
6 6 
 |10 @Console    [ &pad    $8 &char     $1 &byte   $1 &short $2 &string $2 ]
7 7 
 |20 @Screen     [ &vector $2 &width    $2 &height $2 &pad   $2 &x      $2 &y     $2 &addr $2 &color $1 ]
8 8 
 |30 @Audio      [ &wave   $2 &envelope $2 &pad    $4 &volume $1 &pitch $1 &play $1 &value $2 &delay $2 &finish $1 ]
9 
-|40 @Controller [ &vector $2 &button   $1 &key    $1 ]
10 
-|60 @Mouse      [ &vector $2 &x        $2 &y      $2 &state $1 &chord $1 ]
11 
-|70 @File       [ &vector $2 &success  $2 &offset $2 &pad   $2 &name  $2 &length $2 &load $2 &save $2 ]
12 
-|a0 @DateTime   [ &year   $2 &month    $1 &day    $1 &hour $1 &minute $1 &second $1 &dotw $1 &doty $2 &isdst $1 ]
9 
+|80 @Controller [ &vector $2 &button   $1 &key    $1 ]
10 
+|90 @Mouse      [ &vector $2 &x        $2 &y      $2 &state $1 &chord $1 ]
11 
+|a0 @File       [ &vector $2 &success  $2 &offset $2 &pad   $2 &name  $2 &length $2 &load $2 &save $2 ]
12 
+|b0 @DateTime   [ &year   $2 &month    $1 &day    $1 &hour $1 &minute $1 &second $1 &dotw $1 &doty $2 &isdst $1 ]
13 13
14 14 
 ( variables )
15 15
projects/examples/devices/controller.buttons.usm
History View file @ 833f0ac
... ... 
@@ -8,7 +8,7 @@
8 8
9 9 
 |00 @System     [ &vector $2 &pad    $6 &r      $2 &g     $2 &b      $2 ]
10 10 
 |20 @Screen     [ &vector $2 &width  $2 &height $2 &pad   $2 &x      $2 &y $2 &addr $2 &color $1 ]
11 
-|40 @Controller [ &vector $2 &button $1 &key    $1 ]
11 
+|80 @Controller [ &vector $2 &button $1 &key    $1 ]
12 12
13 13 
 ( variables )
14 14
projects/examples/devices/controller.keys.usm
History View file @ 833f0ac
... ... 
@@ -8,7 +8,7 @@
8 8
9 9 
 |00 @System     [ &vector $2 &pad    $6 &r      $2 &g     $2 &b      $2 ]
10 10 
 |20 @Screen     [ &vector $2 &width  $2 &height $2 &pad   $2 &x      $2 &y $2 &addr $2 &color $1 ]
11 
-|40 @Controller [ &vector $2 &button $1 &key    $1 ]
11 
+|80 @Controller [ &vector $2 &button $1 &key    $1 ]
12 12
13 13 
 ( init )
14 14
projects/examples/devices/datetime.usm
History View file @ 833f0ac
... ... 
@@ -11,7 +11,7 @@
11 11
12 12 
 |00 @System     [ &vector $2 &pad      $6 &r      $2 &g     $2 &b      $2 ]
13 13 
 |20 @Screen     [ &vector $2 &width    $2 &height $2 &pad   $2 &x      $2 &y      $2 &addr $2 &color $1 ]
14 
-|a0 @DateTime   [ &year   $2 &month    $1 &day    $1 &hour  $1 &minute $1 &second $1 &dotw $1 &doty $2 &isdst $1 ]
14 
+|b0 @DateTime   [ &year   $2 &month    $1 &day    $1 &hour  $1 &minute $1 &second $1 &dotw $1 &doty $2 &isdst $1 ]
15 15
16 16 
 ( variables )
17 17
projects/examples/devices/file.usm
History View file @ 833f0ac
... ... 
@@ -8,7 +8,7 @@
8 8 
 |00 @System     [ &vector $2 &pad    $6 &r      $2 &g     $2 &b      $2 ]
9 9 
 |10 @Console    [ &pad    $8 &char   $1 &byte   $1 &short $2 &string $2 ]
10 10 
 |20 @Screen     [ &vector $2 &width  $2 &height $2 &pad   $2 &x      $2 &y $2 &addr $2 &color $1 ]
11 
-|70 @File       [ &vector $2 &success $2 &offset $2 &pad $2 &name $2 &length $2 &load $2 &save $2 ]
11 
+|a0 @File       [ &vector $2 &success $2 &offset $2 &pad $2 &name $2 &length $2 &load $2 &save $2 ]
12 12
13 13 
 ( variables )
14 14
projects/examples/devices/mouse.usm
History View file @ 833f0ac
... ... 
@@ -7,7 +7,7 @@
7 7
8 8 
 |00 @System     [ &vector $2 &pad     $6 &r      $2 &g     $2 &b      $2 ]
9 9 
 |20 @Screen     [ &vector $2 &width   $2 &height $2 &pad   $2 &x      $2 &y     $2 &addr $2 &color $1 ]
10 
-|60 @Mouse      [ &vector $2 &x       $2 &y      $2 &state $1 &chord $1 ]
10 
+|90 @Mouse      [ &vector $2 &x       $2 &y      $2 &state $1 &chord $1 ]
11 11
12 12 
 |0000
13 13
projects/examples/gui/hover.usm
History View file @ 833f0ac
... ... 
@@ -6,7 +6,7 @@
6 6
7 7 
 |00 @System [ &vector $2 &pad $6 &r $2 &g $2 &b $2 ]
8 8 
 |20 @Screen [ &vector $2 &width $2 &height $2 &pad $2 &x $2 &y $2 &addr $2 &color $1 ]
9 
-|60 @Mouse [ &vector $2 &x $2 &y $2 &state $1 &chord $1 ]
9 
+|90 @Mouse [ &vector $2 &x $2 &y $2 &state $1 &chord $1 ]
10 10
11 11 
 ( variables )
12 12
projects/examples/gui/picture.usm
History View file @ 833f0ac
... ... 
@@ -8,7 +8,7 @@
8 8 
 |00 @System [ &vector $2 &pad $6 &r $2 &g $2 &b $2 ]
9 9 
 |10 @Console [ &vector $2 &pad $6 &char $1 &byte $1 &short $2 &string $2 ]
10 10 
 |20 @Screen [ &vector $2 &width $2 &height $2 &pad $2 &x $2 &y $2 &addr $2 &color $1 ]
11 
-|70 @File [ &vector $2 &success $2 &offset $2 &pad $2 &name $2 &length $2 &load $2 &save $2 ]
11 
+|a0 @File [ &vector $2 &success $2 &offset $2 &pad $2 &name $2 &length $2 &load $2 &save $2 ]
12 12
13 13 
 ( variables )
14 14
projects/examples/gui/wallpaper.usm
History View file @ 833f0ac
... ... 
@@ -4,10 +4,10 @@
4 4 
 |10 @Console [ &vector $2 &pad $6 &char $1 &byte $1 &short $2 &string $2 ]
5 5 
 |20 @Screen [ &vector $2 &width $2 &height $2 &pad $2 &x $2 &y $2 &addr $2 &color $1 ]
6 6 
 |30 @Audio [ &wave $2 &envelope $2 &pad $4 &volume $1 &pitch $1 &play $1 &value $2 &delay $2 &finish $1 ]
7 
-|40 @Controller [ &vector $2 &button $1 &key $1 ]
8 
-|60 @Mouse [ &vector $2 &x $2 &y $2 &state $1 &chord $1 ]
9 
-|70 @File [ &vector $2 &success $2 &offset $2 &pad $2 &name $2 &length $2 &load $2 &save $2 ]
10 
-|a0 @DateTime [ &year $2 &month $1 &day $1 &hour $1 &minute $1 &second $1 &dotw $1 &doty $2 &isdst $1 ]
7 
+|80 @Controller [ &vector $2 &button $1 &key $1 ]
8 
+|90 @Mouse [ &vector $2 &x $2 &y $2 &state $1 &chord $1 ]
9 
+|a0 @File [ &vector $2 &success $2 &offset $2 &pad $2 &name $2 &length $2 &load $2 &save $2 ]
10 
+|b0 @DateTime [ &year $2 &month $1 &day $1 &hour $1 &minute $1 &second $1 &dotw $1 &doty $2 &isdst $1 ]
11 11
12 12 
 ( variables )
13 13
projects/software/asma.usm
History View file @ 833f0ac
... ... 
@@ -10,10 +10,10 @@
10 10 
 |10 @Console [ &vector $2 &pad $6 &char $1 &byte $1 &short $2 &string $2 ]
11 11 
 |20 @Screen [ &vector $2 &width $2 &height $2 &pad $2 &x $2 &y $2 &addr $2 &color $1 ]
12 12 
 |30 @Audio [ &wave $2 &envelope $2 &pad $4 &volume $1 &pitch $1 &play $1 &value $2 &delay $2 &finish $1 ]
13 
-|40 @Controller [ &vector $2 &button $1 &key $1 ]
14 
-|60 @Mouse [ &vector $2 &x $2 &y $2 &state $1 &chord $1 ]
15 
-|70 @File [ &vector $2 &success $2 &offset $2 &pad $2 &name $2 &length $2 &load $2 &save $2 ]
16 
-|a0 @DateTime [ &year $2 &month $1 &day $1 &hour $1 &minute $1 &second $1 &dotw $1 &doty $2 &isdst $1 ]
13 
+|80 @Controller [ &vector $2 &button $1 &key $1 ]
14 
+|90 @Mouse [ &vector $2 &x $2 &y $2 &state $1 &chord $1 ]
15 
+|a0 @File [ &vector $2 &success $2 &offset $2 &pad $2 &name $2 &length $2 &load $2 &save $2 ]
16 
+|b0 @DateTime [ &year $2 &month $1 &day $1 &hour $1 &minute $1 &second $1 &dotw $1 &doty $2 &isdst $1 ]
17 17
18 18 
 ( variables )
19 19
projects/software/left.usm
History View file @ 833f0ac
... ... 
@@ -31,9 +31,9 @@
31 31 
 |00 @System [ &vector $2 &pad $6 &r $2 &g $2 &b $2 ]
32 32 
 |10 @Console [ &vector $2 &pad $6 &char $1 &byte $1 &short $2 &string $2 ]
33 33 
 |20 @Screen [ &vector $2 &width $2 &height $2 &pad $2 &x $2 &y $2 &addr $2 &color $1 ]
34 
-|40 @Controller [ &vector $2 &button $1 &key $1 ]
35 
-|60 @Mouse [ &vector $2 &x $2 &y $2 &state $1 &chord $1 ]
36 
-|70 @File [ &vector $2 &success $2 &offset $2 &pad $2 &name $2 &length $2 &load $2 &save $2 ]
34 
+|80 @Controller [ &vector $2 &button $1 &key $1 ]
35 
+|90 @Mouse [ &vector $2 &x $2 &y $2 &state $1 &chord $1 ]
36 
+|a0 @File [ &vector $2 &success $2 &offset $2 &pad $2 &name $2 &length $2 &load $2 &save $2 ]
37 37
38 38 
 ( variables )
39 39
projects/software/nasu.usm
History View file @ 833f0ac
... ... 
@@ -43,9 +43,9 @@
43 43 
 |00 @System [ &vector $2 &pad $6 &r $2 &g $2 &b $2 ]
44 44 
 |10 @Console [ &vector $2 &pad $6 &char $1 &byte $1 &short $2 &string $2 ]
45 45 
 |20 @Screen [ &vector $2 &width $2 &height $2 &pad $2 &x $2 &y $2 &addr $2 &color $1 ]
46 
-|40 @Controller [ &vector $2 &button $1 &key $1 ]
47 
-|60 @Mouse [ &vector $2 &x $2 &y $2 &state $1 &chord $1 ]
48 
-|70 @File [ &vector $2 &success $2 &offset $2 &pad $2 &name $2 &length $2 &load $2 &save $2 ]
46 
+|80 @Controller [ &vector $2 &button $1 &key $1 ]
47 
+|90 @Mouse [ &vector $2 &x $2 &y $2 &state $1 &chord $1 ]
48 
+|a0 @File [ &vector $2 &success $2 &offset $2 &pad $2 &name $2 &length $2 &load $2 &save $2 ]
49 49
50 50 
 ( variables )
51 51
projects/software/neralie.usm
History View file @ 833f0ac
... ... 
@@ -14,7 +14,7 @@
14 14 
 |00 @System [ &vector $2 &pad $6 &r $2 &g $2 &b $2 ]
15 15 
 |10 @Console [ &vector $2 &pad $6 &char $1 &byte $1 &short $2 &string $2 ]
16 16 
 |20 @Screen [ &vector $2 &width $2 &height $2 &pad $2 &x $2 &y $2 &addr $2 &color $1 ]
17 
-|a0 @DateTime [ &year $2 &month $1 &day $1 &hour $1 &minute $1 &second $1 &dotw $1 &doty $2 &isdst $1 ]
17 
+|b0 @DateTime [ &year $2 &month $1 &day $1 &hour $1 &minute $1 &second $1 &dotw $1 &doty $2 &isdst $1 ]
18 18
19 19 
 ( variables )
20 20
projects/software/noodle.usm
History View file @ 833f0ac
... ... 
@@ -30,9 +30,9 @@
30 30 
 |00 @System [ &vector $2 &pad $6 &r $2 &g $2 &b $2 ]
31 31 
 |10 @Console [ &vector $2 &pad $6 &char $1 &byte $1 &short $2 &string $2 ]
32 32 
 |20 @Screen [ &vector $2 &width $2 &height $2 &pad $2 &x $2 &y $2 &addr $2 &color $1 ]
33 
-|40 @Controller [ &vector $2 &button $1 &key $1 ]
34 
-|60 @Mouse [ &vector $2 &x $2 &y $2 &state $1 &chord $1 ]
35 
-|70 @File [ &vector $2 &success $2 &offset $2 &pad $2 &name $2 &length $2 &load $2 &save $2 ]
33 
+|80 @Controller [ &vector $2 &button $1 &key $1 ]
34 
+|90 @Mouse [ &vector $2 &x $2 &y $2 &state $1 &chord $1 ]
35 
+|a0 @File [ &vector $2 &success $2 &offset $2 &pad $2 &name $2 &length $2 &load $2 &save $2 ]
36 36
37 37 
 ( variables )
38 38
projects/software/orca.usm
History View file @ 833f0ac
... ... 
@@ -41,8 +41,8 @@
41 41 
 |00 @System [ &vector $2 &pad $6 &r $2 &g $2 &b $2 ]
42 42 
 |10 @Console [ &vector $2 &pad $6 &char $1 &byte $1 &short $2 &string $2 ]
43 43 
 |20 @Screen [ &vector $2 &width $2 &height $2 &pad $2 &x $2 &y $2 &addr $2 &color $1 ]
44 
-|40 @Controller [ &vector $2 &button $1 &key $1 ]
45 
-|60 @Mouse [ &vector $2 &x $2 &y $2 &state $1 &chord $1 ]
44 
+|80 @Controller [ &vector $2 &button $1 &key $1 ]
45 
+|90 @Mouse [ &vector $2 &x $2 &y $2 &state $1 &chord $1 ]
46 46
47 47 
 ( variables )
48 48
src/emulator.c
History View file @ 833f0ac
... ... 
@@ -379,14 +379,14 @@ main(int argc, char **argv)
379 379 
 	portuxn(&u, 0x1, "console", console_talk);
380 380 
 	devscreen = portuxn(&u, 0x2, "screen", screen_talk);
381 381 
 	portuxn(&u, 0x3, "audio", audio_talk);
382 
-	devctrl = portuxn(&u, 0x4, "controller", nil_talk);
382 
+	portuxn(&u, 0x4, "---", nil_talk);
383 383 
 	portuxn(&u, 0x5, "---", nil_talk);
384 
-	devmouse = portuxn(&u, 0x6, "mouse", nil_talk);
385 
-	portuxn(&u, 0x7, "file", file_talk);
386 
-	portuxn(&u, 0x8, "---", nil_talk);
387 
-	devmidi = portuxn(&u, 0x9, "midi", midi_talk);
388 
-	portuxn(&u, 0xa, "datetime", datetime_talk);
389 
-	portuxn(&u, 0xb, "---", nil_talk);
384 
+	portuxn(&u, 0x6, "---", nil_talk);
385 
+	devmidi = portuxn(&u, 0x7, "midi", midi_talk);
386 
+	devctrl = portuxn(&u, 0x8, "controller", nil_talk);
387 
+	devmouse = portuxn(&u, 0x9, "mouse", nil_talk);
388 
+	portuxn(&u, 0xa, "file", file_talk);
389 
+	portuxn(&u, 0xb, "datetime", datetime_talk);
390 390 
 	portuxn(&u, 0xc, "---", nil_talk);
391 391 
 	portuxn(&u, 0xd, "---", nil_talk);
392 392 
 	portuxn(&u, 0xe, "---", nil_talk);