Merge commit 'upstream/1.4'
Solved conflicts:
debian/changelog
Alessio Treglia
12 years ago
|
0 |
2011-06-07 rgareus <robin@gareus.org>
|
|
1 |
* clean-up manual page (thanks to Alessio Tregilia)
|
|
2 |
* small PREFIX makefile patch (also by Alessio)
|
|
3 |
* v1.4
|
|
4 |
|
| 0 | 5 |
2011-04-03 rgareus <robin@gareus.org>
|
| 1 | 6 |
* fixed jack-stdout write retry/abort
|
| 2 | 7 |
* increased default jack-stdin buffer-prefill to 50%
|
| 0 | 0 |
# override e.g. `make install PREFIX=/usr`
|
| 1 | |
PREFIX = /usr/local
|
|
1 |
PREFIX ?= /usr/local
|
| 2 | 2 |
|
| 3 | 3 |
CFLAGS=-Wall `pkg-config --cflags jack` -O3
|
| 4 | 4 |
LIBS=`pkg-config --libs jack` -lpthread -lm
|
| 59 | 59 |
\fB-p\fR, \fB--prebuffer\fR \fIPERCENT\fR
|
| 60 | 60 |
.RS
|
| 61 | 61 |
Pre-fill the buffer before starting audio output to JACK (default 50.0%).
|
| 62 | |
NOTE: disable pre-buffering (-p 0) or use a small buffer size to play back
|
|
62 |
NOTE: disable pre-buffering (\-p 0) or use a small buffer size to play back
|
| 63 | 63 |
very short samples.
|
| 64 | 64 |
.RE
|
| 65 | 65 |
|
|
| 94 | 94 |
.SH EXAMPLES
|
| 95 | 95 |
.nf
|
| 96 | 96 |
jack-stdout vlc_31994:out_1 vlc_31994:out_2 \\
|
| 97 | |
| sox -t raw -r 48k -e signed -b 16 -c 2 - \\
|
| 98 | |
-t raw -r 48k -e signed -b 16 -c 2 - \\
|
|
97 |
| sox \-t raw \-r 48k \-e signed \-b 16 \-c 2 \- \\
|
|
98 |
\-t raw \-r 48k \-e signed \-b 16 \-c 2 \- \\
|
| 99 | 99 |
tremolo 5 100 \\
|
| 100 | 100 |
| ./jack-stdin system:playback_1 system:playback_2
|
| 101 | 101 |
|
| 79 | 79 |
jack-stdout xmms_0:out_1 xmms_0:out_2 \\
|
| 80 | 80 |
| mono ~/Desktop/Downloads/JustePort.exe - 10.0.1.6 0
|
| 81 | 81 |
|
| 82 | |
jack-stdout -b 24 -e unsigned -B system:capture_1 system:capture_2 \\
|
| 83 | |
| sox -t raw -r 48k -e unsigned -b 24 -B -c 2 - /tmp/recording.wav
|
|
82 |
jack-stdout \-b 24 \-e unsigned \-B system:capture_1 system:capture_2 \\
|
|
83 |
| sox \-t raw \-r 48k \-e unsigned \-b 24 \-B \-c 2 \- /tmp/recording.wav
|
| 84 | 84 |
|
| 85 | 85 |
jack-stdout system:capture_1 system:capture_2 \\
|
| 86 | |
| oggenc -r -R 48000 -B 16 -C 2 - \\
|
|
86 |
| oggenc \-r \-R 48000 \-B 16 \-C 2 \- \\
|
| 87 | 87 |
> /tmp/recording.ogg
|
| 88 | 88 |
|
| 89 | 89 |
jack-stdout system:capture_1 \\
|
| 90 | |
| oggenc -r -R 48000 -B 16 -C 1 - \\
|
| 91 | |
| oggfwd -p -n "my live stream" localhost 5900 hackme live.ogg
|
|
90 |
| oggenc \-r \-R 48000 \-B 16 \-C 1 \- \\
|
|
91 |
| oggfwd \-p \-n "my live stream" localhost 5900 hackme live.ogg
|
| 92 | 92 |
.fi
|
| 93 | 93 |
.SH AUTHOR
|
| 94 | 94 |
Robin Gareus <robin@gareus.org>.
|