FreeCalypso > hg > freecalypso-tools
annotate ringtools/fc-imyplay @ 964:a96cb97b66a2
ringtools/imy: fix duplicate definition of tdma_durations[]
The bug was reported by Vadim Yanitskiy <fixeria@osmocom.org>,
although the present fix is slightly different from the contributed
patch: because main.c doesn't need this tdma_durations[] array
at all, let's simply remove the reference to this array from main.c
rather than turn it into an extern.
I no longer remember my original thought flow that resulted (by mistake)
in tdma_durations[] being multiply defined in main.c and durations.c.
My intent might have been to define all globals in main.c and have
the reference in durations.c be an extern - and I missed that extern -
but without clear memory, I have no certainty. In any case, having
this data array defined in the same module that fills it (durations.c)
is sensible, so let's make it the new way.
| author | Mychaela Falconia <falcon@freecalypso.org> |
|---|---|
| date | Thu, 31 Aug 2023 19:38:18 +0000 |
| parents | b8ecdf54a957 |
| children |
| rev | line source |
|---|---|
|
876
9998c015a687
ringtools/fc-meltest-pwt: shell script created, works as expected
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff
changeset
|
1 #!/bin/sh |
|
9998c015a687
ringtools/fc-meltest-pwt: shell script created, works as expected
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff
changeset
|
2 |
|
880
5b68ba735e98
fc-meltest-pwt: allow optional play volume argument
Mychaela Falconia <falcon@freecalypso.org>
parents:
876
diff
changeset
|
3 if [ $# -lt 1 -o $# -gt 2 ] |
|
876
9998c015a687
ringtools/fc-meltest-pwt: shell script created, works as expected
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff
changeset
|
4 then |
|
888
b8ecdf54a957
fc-imyplay script
Mychaela Falconia <falcon@freecalypso.org>
parents:
880
diff
changeset
|
5 echo "usage: $0 iMelody_file [volume]" 1>&2 |
|
876
9998c015a687
ringtools/fc-meltest-pwt: shell script created, works as expected
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff
changeset
|
6 exit 1 |
|
9998c015a687
ringtools/fc-meltest-pwt: shell script created, works as expected
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff
changeset
|
7 fi |
|
9998c015a687
ringtools/fc-meltest-pwt: shell script created, works as expected
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff
changeset
|
8 |
|
9998c015a687
ringtools/fc-meltest-pwt: shell script created, works as expected
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff
changeset
|
9 tmpfile=/tmp/fc-test-melody.bz |
|
9998c015a687
ringtools/fc-meltest-pwt: shell script created, works as expected
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff
changeset
|
10 |
|
880
5b68ba735e98
fc-meltest-pwt: allow optional play volume argument
Mychaela Falconia <falcon@freecalypso.org>
parents:
876
diff
changeset
|
11 if [ -n "$2" ] |
|
5b68ba735e98
fc-meltest-pwt: allow optional play volume argument
Mychaela Falconia <falcon@freecalypso.org>
parents:
876
diff
changeset
|
12 then |
|
5b68ba735e98
fc-meltest-pwt: allow optional play volume argument
Mychaela Falconia <falcon@freecalypso.org>
parents:
876
diff
changeset
|
13 volume="$2" |
|
5b68ba735e98
fc-meltest-pwt: allow optional play volume argument
Mychaela Falconia <falcon@freecalypso.org>
parents:
876
diff
changeset
|
14 else |
|
5b68ba735e98
fc-meltest-pwt: allow optional play volume argument
Mychaela Falconia <falcon@freecalypso.org>
parents:
876
diff
changeset
|
15 volume=64 |
|
5b68ba735e98
fc-meltest-pwt: allow optional play volume argument
Mychaela Falconia <falcon@freecalypso.org>
parents:
876
diff
changeset
|
16 fi |
|
5b68ba735e98
fc-meltest-pwt: allow optional play volume argument
Mychaela Falconia <falcon@freecalypso.org>
parents:
876
diff
changeset
|
17 |
|
876
9998c015a687
ringtools/fc-meltest-pwt: shell script created, works as expected
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff
changeset
|
18 set -ex |
|
9998c015a687
ringtools/fc-meltest-pwt: shell script created, works as expected
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff
changeset
|
19 |
|
888
b8ecdf54a957
fc-imyplay script
Mychaela Falconia <falcon@freecalypso.org>
parents:
880
diff
changeset
|
20 fc-imy2pwt "$1" | fc-pwt-comp - $tmpfile |
|
876
9998c015a687
ringtools/fc-meltest-pwt: shell script created, works as expected
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff
changeset
|
21 fc-fsio upload-file $tmpfile /buz/test.bz |
|
880
5b68ba735e98
fc-meltest-pwt: allow optional play volume argument
Mychaela Falconia <falcon@freecalypso.org>
parents:
876
diff
changeset
|
22 fc-shell 'at@buz="/buz/test.bz"'",$volume" |
