paraslash Paraslash Audio Streaming
About   News   Download   Documentation   Development


Development happens in topic branches where each topic corresponds to one branch. These topic branches are not pushed to the public repository, however, to keep the number of branches small, Instead, the topic branches are merged into an integration branch which is then pushed to the public repository.

Two integration branches named pu ("proposed updates") and next exist. Topics in early development are only merged into the pu branch. When the topic is feature-complete, has been tested and is fully documented, it graduates to next. Thus, topics in next are expected to be of higher quality than those in pu.

The table below shows the current development topics. Run git checkout pu to get all topics or git checkout next to enable only the mature topics.

Topic IB #C Description
afs-ls-a pu 1 ls: Allow for an optional argument to -a
afs-select pu 1 Implement --verbose for com_select()
btr pu 5 Speedups for to the buffer tree subsystem
fd pu 11 Cleanup of the file descriptor utilities
for-maint pu 0 Urgent fixes for old bugs
ls-L pu 1 Implement --limit for com_ls()
misc pu 0 Smallish miscellaneous changes for master
play pu 4 Improvements for para_play
sf_float pu 1 Support 32 bit float sample format

When a topic is merged into master, it vanishes from here since it is no longer considered as being in development.

Topic branch details

The SHA1 number shown as tip can be used to checkout a commit which only contains the changes introduced in this topic.


A single patch which implements a new feature for the ls command.

     afs.c                      | 14 +++----
     afs.h                      | 18 ++++++---
     aft.c                      | 47 +++++++++++++++++++---
     m4/lls/server_cmd.suite.m4 | 14 ++++++-
     mood.c                     | 92 +++++++++++++++++++++++++++++++++----------
     playlist.c                 | 97 +++++++++++++++++++++++++++++++++++-----------
     score.c                    | 82 ++++++++++++++++++++++++++-------------
     7 files changed, 275 insertions(+), 89 deletions(-)



Some helpers such as btr_get_input_queue_size() are very expensive if the buffer tree contains many buffers, which is the case for mp3 and aac streams. This is noticeable in particular with para_play, which spends more time in the btr subsystem than in the mp3 decoder if the file is large enough. This branch contains a few patches to improve that.

     aacdec_filter.c   |   3 +-
     afh_recv.c        |   2 +-
     buffer_tree.c     | 118 ++++++++++++++++++++++++++++++++++++------------------
     buffer_tree.h     |  80 ++++++++++++++++++------------------
     check_wav.c       |   2 +-
     flacdec_filter.c  |   2 +-
     list.h            |   2 +
     mp3dec_filter.c   |  10 ++---
     oggdec_filter.c   |   3 +-
     opusdec_filter.c  |   2 +-
     resample_filter.c |   3 +-
     spxdec_filter.c   |   2 +-
     wmadec_filter.c   |   3 +-
     13 files changed, 138 insertions(+), 94 deletions(-)


A rash of patches which clean up a good part of fd.c. Nothing major here, mostly simplifications and documentation improvements.

     afs.c           |  14 +--
     aft.c           |  48 +++++++++++
     client_common.c |   3 +-
     fd.c            | 264 +++++++++++++++-----------------------------------------
     fd.h            |   9 +-
     http_recv.c     |   2 +-
     http_send.c     |   2 +-
     play.c          |   4 +-
     8 files changed, 128 insertions(+), 218 deletions(-)


This branch accumulates small but significant hotfixes for known bugs in the most stable integration branch, “maint”. Only serious issues are fixed here, and no development takes place on this branch.

The purpose of the branch is to give such urgent fixes at least a small amount of testing in pu before they are incorporated into maint. During this time the patch can be tweaked, and the documentation can be improved. Usually the commits of this branch are merged quickly, however, and it it perfectly normal if this branch is empty.


A single patch which implements the new –limit option for the ls server command.

     aft.c                      | 28 ++++++++++++----------------
     m4/lls/server_cmd.suite.m4 | 10 ++++++++++
     2 files changed, 22 insertions(+), 16 deletions(-)


The stuff in here is too small to get its own topic branch. The commits are generally regarded as safe enough to be applied directly to “master” without cooking in “next” first. However, if a commit induces a merge conflict or is important enough to get mentioned in an item of the NEWS file, the commit should get a dedicated topic branch.

Unlike most other topic branches, this branch never promotes to “next”. When a set of commits is ready to graduate to “master”, the branch is rebased onto “master” and its commits are re-ordered so that the graduating commits appear at the beginning. The last such commit is merged to “master”. This always results in a fast-forward merge, so no merge message needs to be supplied.



A single patch which adds two new sample formats for 32 bit IEEE float waveform data.

     alsa_write.c                    |  2 ++
     ao_write.c                      |  2 ++
     check_wav.c                     | 20 +++++++++++++++++---
     m4/lls/include/sample-format.m4 |  4 +++-
     para.h                          |  2 ++
     5 files changed, 26 insertions(+), 4 deletions(-)