]> git.tue.mpg.de Git - paraslash.git/log
paraslash.git
18 years agoMerge branch 'xf_64_compile_warning_fixes'
Andre [Tue, 7 Mar 2006 13:20:09 +0000 (14:20 +0100)]
Merge branch 'xf_64_compile_warning_fixes'

18 years agoREADME: Mention the name of some debian packages
Andre [Tue, 7 Mar 2006 00:47:28 +0000 (01:47 +0100)]
README: Mention the name of some debian packages

libasound2-dev is needed for para_play, ogg vorbis support requires
libogg-dev and libvorbis-dev. Thanks to Steffen Klassert for this info.

18 years agoogg.c: use %z modifier
Andre [Tue, 7 Mar 2006 00:13:12 +0000 (01:13 +0100)]
ogg.c: use %z modifier

18 years agooggdec.c: %d -> %zd fixes
Andre [Tue, 7 Mar 2006 00:09:39 +0000 (01:09 +0100)]
oggdec.c: %d -> %zd fixes

18 years agoanother %d -> %zd fix
Andre [Mon, 6 Mar 2006 20:57:27 +0000 (21:57 +0100)]
another %d -> %zd fix

Noticed by Steffen Klassert

18 years agonet.h: use proper type for the addrlen parameter of para_accept() also in prototype
Andre [Mon, 6 Mar 2006 20:51:19 +0000 (21:51 +0100)]
net.h: use proper type for the addrlen parameter of para_accept() also in prototype

An earlier patch changed that parameter from size_t to socklen_t
but missed to update also the corresponding prototype in net.h. Thanks to
Steffen Klassert for pointing this out.

18 years agoSimplify for_each_line()
Andre [Sun, 5 Mar 2006 13:18:24 +0000 (14:18 +0100)]
Simplify for_each_line()

It is always called with the num parameter being zero. So nuke that
parameter and update the docs.

18 years agouse %zd instead of %d for size_t
Andre [Sun, 5 Mar 2006 12:14:09 +0000 (13:14 +0100)]
use %zd instead of %d for size_t

As of version 2.1 of glibc there is the %z modifier, so use it.
This avoids many warnings of the type

warning: int format, different type arg

on x86_64.

18 years agopara_accept(): Use socklen_t instead of size_t
Andre [Sun, 5 Mar 2006 12:08:35 +0000 (13:08 +0100)]
para_accept(): Use socklen_t instead of size_t

Fixes the following warning on x86_64:

net.c:76: warning: int format, different type arg (arg 4)

18 years ago(no log message)
Andre [Thu, 2 Mar 2006 21:33:14 +0000 (22:33 +0100)]
(no log message)

18 years agokill another superfluous '#include "gcc-compat.h"'
Andre [Thu, 2 Mar 2006 17:10:11 +0000 (18:10 +0100)]
kill another superfluous '#include "gcc-compat.h"'

Commit 4b4c68de8d7390f966e46d9402d5499d2e8ee227 missed one of these.

18 years agofix off-by-one error
Andre [Thu, 2 Mar 2006 14:08:38 +0000 (15:08 +0100)]
fix off-by-one error

Also, make "bufsize" const instead of static.

18 years agono need to include gcc-compat.h twice
Andre [Mon, 27 Feb 2006 09:19:39 +0000 (10:19 +0100)]
no need to include gcc-compat.h twice

It gets already included from para.h.

18 years agomake header_len an integer
Andre [Sun, 26 Feb 2006 17:03:54 +0000 (18:03 +0100)]
make header_len an integer

This fixes the following warning:

ortp_send.c:169: warning: pointer targets in passing argument 1 of 'af->get_header_info' differ in signedness

18 years agosimplify open_audiod_pipe(), remove a trailing newline which caused
Andre [Sun, 26 Feb 2006 16:17:05 +0000 (17:17 +0100)]
simplify open_audiod_pipe(), remove a trailing newline which caused
the top window to flicker if para_audiod is not running.

18 years agoMerge branch 'no_colon_separators'
Andre [Sat, 25 Feb 2006 09:16:22 +0000 (10:16 +0100)]
Merge branch 'no_colon_separators'

18 years agoMerge branch 'para_play_fixes'
Andre [Sat, 25 Feb 2006 09:15:54 +0000 (10:15 +0100)]
Merge branch 'para_play_fixes'

18 years agoUse whitespace instead of colons to separate receiver/filter args
Andre [Fri, 24 Feb 2006 15:13:57 +0000 (16:13 +0100)]
Use whitespace instead of colons to separate receiver/filter args

This is much nicer but the receiver/filter argument must now be quoted if any
options are present.

18 years agoanother typo in comment
Andre [Fri, 24 Feb 2006 13:09:42 +0000 (14:09 +0100)]
another typo in comment

ipc.c:44: Warning: expected whitespace after param command

18 years agoconfigurable input buffer size and prebuffering
Andre [Fri, 24 Feb 2006 11:21:33 +0000 (12:21 +0100)]
configurable input buffer size and prebuffering

18 years agoplay.c: pcm_write() aborts on errors. No need to check the return value.
Andre [Thu, 23 Feb 2006 17:34:59 +0000 (18:34 +0100)]
play.c: pcm_write() aborts on errors. No need to check the return value.

18 years agoFix --device bug
Andre [Thu, 23 Feb 2006 17:29:45 +0000 (18:29 +0100)]
Fix --device bug

Duuuh, the --device option never worked because "plug:swmix" was harcoded
in play.c instead of using the value from the configuration. Even worse,
the default in play.ggo was _also_ set to "plug:swmix". Replace that by
"plughw:0,0".

This patch also simplifies and optimizes play_pcm().

Anyway, software mixing is still recommended. Here's an aprropriate
/etc/asound.conf:

---------------------------------------------------- /etc/asound.conf
pcm.swmix {
type dmix
# any unique number here
ipc_key 313
        ipc_perm 0666

slave {
pcm "hw:0,0"
# these settings may require tweaking for different sound
# cards; this is for the Powerbook's built-in snd-powermac
# probably not required at all for well-behaved cards...
period_time 0
period_size 1024
buffer_size 8192
# mentioning rate fixes wrong speed/pitch in native ALSA stuff
# rate 44100
}
}

pcm.dsp0 {
type plug
slave.pcm "swmix"
}

ctl.mixer0 {
type hw
card 0
}

pcm.!default {
type plug
slave.pcm "swmix"
}
---------------------------------------------------------------------

a Use the
: Use a large input
buffer and For one, the

18 years agofix another typo in comment
Andre [Wed, 22 Feb 2006 12:06:14 +0000 (13:06 +0100)]
fix another typo in comment

18 years agoannounce gitweb
Andre [Wed, 22 Feb 2006 11:48:07 +0000 (12:48 +0100)]
announce gitweb

18 years agoadd more ipc documentation
Andre [Wed, 22 Feb 2006 11:21:09 +0000 (12:21 +0100)]
add more ipc documentation

Also, add a GPL header and replace "shared memory area" by "shared memory segment".

18 years agotypo
Andre [Wed, 22 Feb 2006 07:39:17 +0000 (08:39 +0100)]
typo

18 years agoreplace link to the changelog by link to gitweb
Andre [Wed, 22 Feb 2006 07:07:15 +0000 (08:07 +0100)]
replace link to the changelog by link to gitweb

18 years agoadd documentation of struct plm_client_data
Andre [Tue, 21 Feb 2006 23:25:48 +0000 (00:25 +0100)]
add documentation of struct plm_client_data

18 years agoreplace cvs checkout instructions by git clone command
Andre [Tue, 21 Feb 2006 21:25:32 +0000 (22:25 +0100)]
replace cvs checkout instructions by git clone command

18 years agofor those of us who are interested in history..
Andre [Tue, 21 Feb 2006 18:30:30 +0000 (19:30 +0100)]
for those of us who are interested in history..

18 years agoTypo
Andre [Tue, 21 Feb 2006 18:22:40 +0000 (19:22 +0100)]
Typo

18 years agoreplace link to cvs snapshot by git snapshot
Andre [Tue, 21 Feb 2006 18:07:37 +0000 (19:07 +0100)]
replace link to cvs snapshot by git snapshot

18 years agocvs->git update
Andre [Tue, 21 Feb 2006 17:38:02 +0000 (18:38 +0100)]
cvs->git update

18 years agoAvoid busy loop if someone nasty removes the semaphores currently in use.
Andre [Tue, 21 Feb 2006 17:04:43 +0000 (18:04 +0100)]
Avoid busy loop if someone nasty removes the semaphores currently in use.

Just die if semop failed 500 times.

18 years agochange version.
Andre [Tue, 21 Feb 2006 16:52:23 +0000 (17:52 +0100)]
change version.

The shiny new git tree was still called "cvs".

18 years agomention plm and update the mysql description.
Andre [Tue, 21 Feb 2006 16:48:54 +0000 (17:48 +0100)]
mention plm and update the mysql description.

Also, selector is now the prefered word, rather than dbtool.

18 years agouse the random dbtool as default
Andre [Tue, 21 Feb 2006 16:07:56 +0000 (17:07 +0100)]
use the random dbtool as default

That simplifies the code quite a bit.

18 years agomake para_server use the new ipc subsystem
Andre [Tue, 21 Feb 2006 15:42:12 +0000 (16:42 +0100)]
make para_server use the new ipc subsystem

Straight-forward conversion.

This BTW gets rid of the ancient /dev/zero hack which worked pretty
well for all the years but is not general enough for the plm dbtool.

Another 42 also disappeared ;)

18 years agofix the plm database tool
Andre [Tue, 21 Feb 2006 14:52:45 +0000 (15:52 +0100)]
fix the plm database tool

(Re)loading the playlist uses the new mutex and
shm helpers and is hopefully a race-free implementation.

It works as follows:

The plm init function (parent, server context) reserves
a shared memory area (client data) as well as two unlocked
mutexes. The first mutex serializes access for racing clients
that want to replace the playlist. The second mutex serializes
the access between parent and child (com_lpl()).

com_lpl() loads the playlist from the client into a tmp buffer.
It then creates a shm area (client_shm) and copies that buffer
to the area.  Further, another mutex (shm) is created. This
mutex is initially locked.

Next, it grabs the client lock and the server lock, and updates
client_data with the id of client_shm. Then the parent is
woken up (SIGUSR1) and the server lock is released. com_lpl()
finally goes to sleep by acquiring the shm lock.

In this situation, only the parent may run. It grabs the
server lock, reads client_data to attach client_shm and
reloads the playlist with data from client_shm. When ready,
the parent detaches client_shm, and drops the shm lock and
the server lock.

This wakes up com_lpl() which destroys client_shm, the
shm mutex and the tmp buffer.

18 years agoMerge branch 'dbtool_preselect'
Andre [Tue, 21 Feb 2006 08:22:36 +0000 (09:22 +0100)]
Merge branch 'dbtool_preselect'

18 years agoMerge branch 'ipc'
Andre [Tue, 21 Feb 2006 08:20:30 +0000 (09:20 +0100)]
Merge branch 'ipc'

Conflicts:

configure.ac
error.h

Fix these conflicts.

18 years agoadd dbtool hooks
Andre [Tue, 21 Feb 2006 08:09:36 +0000 (09:09 +0100)]
add dbtool hooks

pre_select/post_select. Also, add a private_dbtool pointer for
each audio format to mmd.

18 years agoThe new ipc subsystem
Andre [Tue, 21 Feb 2006 07:12:46 +0000 (08:12 +0100)]
The new ipc subsystem

Contains functions for dealing with mutexes and shared memory.

18 years agothe new plm database tool
Andre [Tue, 21 Feb 2006 06:06:17 +0000 (07:06 +0100)]
the new plm database tool

does not work yet as the ipc problems are not solved.

18 years agorename dopey to random
Andre [Mon, 20 Feb 2006 06:25:59 +0000 (07:25 +0100)]
rename dopey to random

It isn't so dopey anymore and the upcoming plm database tool
won't be much smarter, so..

18 years agoinitial git commit
Andre [Mon, 20 Feb 2006 06:03:36 +0000 (07:03 +0100)]
initial git commit

Let's try if this works out.