paraslash/mp.c, branch masterparaslash - network audio streaming toolshttps://git.tue.mpg.de/cgit/paraslash/atom?h=master2026-03-26T15:50:54ZMerge topic branch t/spdx into master2026-03-26T15:50:54ZAndre Nollmaan@tuebingen.mpg.de2026-03-26T15:50:08Zurn:sha1:c7d8695602cdde107a85cb63db846d92e48d9437
Switch to SPDX licence identifiers
A single patch which replaces the first comment line of most .c and .h files
containing the copyright notice by standardized SPDX (Software/System Package
Data Exchange) nomenclature.
* t/spdx:
Switch to SPDX identifiers.
Switch to SPDX identifiers.2026-03-17T22:45:43ZAndre Nollmaan@tuebingen.mpg.de2026-03-15T14:57:29Zurn:sha1:ea0cecf96e08c489fdcc94d046019f4ce46f58e2
Generated with
sed -i 's|Copyright.*Andre Noll.*|SPDX-License-Identifier: GPL-2.0 */|g' *.c *.h
followed by manually tweaking the result a bit. No license change intended.
Simplify and rename get_attribute_bitnum_by_name().2026-03-17T18:25:05ZAndre Nollmaan@tuebingen.mpg.de2026-03-01T22:54:54Zurn:sha1:32dd8568133e89b6efcd93d30ce6428859eb3a6c
Return the bit number directly, avoiding the result pointer argument for
the bit number. Remove the pointless "one" variable in one of the callers,
the touch callback, while at it.
Implement selector abstraction.2026-03-17T18:25:05ZAndre Nollmaan@tuebingen.mpg.de2026-02-23T18:10:32Zurn:sha1:8981b82878ca3e49fb36ce8405725eb41dd75836
Currently mood.c and playlist.c contain similar public functions. For example,
there is mood_load() and playlist_load(), mood_loop() and playlist_loop().
Introduce struct selector_ops which contains methods such as ->load()
and loop(). We define two instances of the new structure, one for the mood
selector and one for the playlist selector. The structures can be constant,
but need to be public. The methods can be static.
The score table is now regarded as owned by the mood or playlist. It is no
longer listed in afs_tables[] and afs_table_operations can go away.
We don't need the global score_table variable anymore because all public
functions of score.c now take a pointer to the table to operate on. Similarly,
current_mood and current_playlist can be removed.
attribute.c: Switch from unsigned char to uint8_t.2026-03-17T18:25:05ZAndre Nollmaan@tuebingen.mpg.de2026-03-01T12:29:53Zurn:sha1:4ae43673709b979251bca4dbc5cb215b2d7d704a
We perform arithmetical operations and use its value as the right hand side
of the shift operator, so uint8_t seems to be more natural than unsigned
char. Rename char_compare() to u8_compare() and simplify it a bit by
dereferencing the two pointers right away.
mood parser: Demote severity of parse errors.2025-10-19T09:33:19ZAndre Nollmaan@tuebingen.mpg.de2025-10-13T18:26:59Zurn:sha1:49d7cbc427f1826b289eda30561e72ba3fc0f073
These errors occur when the user adds a syntactically incorrect mood, an error
which is handled and which should not trigger a warning in the server log.
mp.c: Remove a dead store.2025-05-22T14:44:07ZAndre Nollmaan@tuebingen.mpg.de2025-05-20T20:13:54Zurn:sha1:094af0d6526ef2bc502daf1aad3a544bbe4e89eb
Found by the clang analyzer.
Include regex.h from para.h.2025-05-19T17:35:58ZAndre Nollmaan@tuebingen.mpg.de2025-05-18T20:05:45Zurn:sha1:67388cd4fae0cfd1674aada937f4f4d2faeeee1f
Every .c file includes it anyway.
Add missing newline in mp_init() error string.2025-04-07T15:28:42ZAndre Nollmaan@tuebingen.mpg.de2025-04-06T22:50:52Zurn:sha1:14c320a7a52e670913f8302c7acc49833611cb5a
Because callers expect this. Also print the message to the server log.
Rename mood_switch(), mood_close(), playlist_{open/close}.2022-10-17T18:36:21ZAndre Nollmaan@tuebingen.mpg.de2022-03-23T17:42:08Zurn:sha1:9055c71be97f1095dcdbd83da305b600f204f763
This naming is unfortunate because we also have the static
{mood,pl}_{open,close}() in blob.c which operate on the osl table. In
contrast, the functions renamed in this commit operate on blob objects
and change the current mood or playlist. Let's call these operations
load/unload to avoid confusion.