![[BACK]](/icons/back.gif){kind=icon}
Up to [local] / src / usr.bin / aucat
Request diff between arbitrary revisions
Default branch: MAIN
Revision 1.26 / (download) - annotate - [select for diffs], Wed Jan 21 08:43:55 2015 UTC (9 years, 3 months ago) by ratchov
Branch: MAIN
CVS Tags: OPENBSD_7_5_BASE,
OPENBSD_7_5,
OPENBSD_7_4_BASE,
OPENBSD_7_4,
OPENBSD_7_3_BASE,
OPENBSD_7_3,
OPENBSD_7_2_BASE,
OPENBSD_7_2,
OPENBSD_7_1_BASE,
OPENBSD_7_1,
OPENBSD_7_0_BASE,
OPENBSD_7_0,
OPENBSD_6_9_BASE,
OPENBSD_6_9,
OPENBSD_6_8_BASE,
OPENBSD_6_8,
OPENBSD_6_7_BASE,
OPENBSD_6_7,
OPENBSD_6_6_BASE,
OPENBSD_6_6,
OPENBSD_6_5_BASE,
OPENBSD_6_5,
OPENBSD_6_4_BASE,
OPENBSD_6_4,
OPENBSD_6_3_BASE,
OPENBSD_6_3,
OPENBSD_6_2_BASE,
OPENBSD_6_2,
OPENBSD_6_1_BASE,
OPENBSD_6_1,
OPENBSD_6_0_BASE,
OPENBSD_6_0,
OPENBSD_5_9_BASE,
OPENBSD_5_9,
OPENBSD_5_8_BASE,
OPENBSD_5_8,
OPENBSD_5_7_BASE,
OPENBSD_5_7,
HEAD
Changes since 1.25: +13 -100 lines
Diff to previous 1.25 (colored)
Simplify internals and rewrite file header parsing code: - remove -M, -t, -w, -C, -x flags that don't make sense anymore - make "-j off" the default (sndiod already does the job) - don't limit the number of played/recorded files. - add support for floating-point encoded files. - add support for apple .aiff and sun/next .au files
Revision 1.25 / (download) - annotate - [select for diffs], Wed Apr 11 06:05:43 2012 UTC (12 years, 1 month ago) by ratchov
Branch: MAIN
CVS Tags: OPENBSD_5_6_BASE,
OPENBSD_5_6,
OPENBSD_5_5_BASE,
OPENBSD_5_5,
OPENBSD_5_4_BASE,
OPENBSD_5_4,
OPENBSD_5_3_BASE,
OPENBSD_5_3,
OPENBSD_5_2_BASE,
OPENBSD_5_2
Changes since 1.24: +31 -31 lines
Diff to previous 1.24 (colored)
Use "unsigned int" rather than "unsigned". No object change. suggested by deraadt@
Revision 1.24 / (download) - annotate - [select for diffs], Tue Nov 15 20:41:54 2011 UTC (12 years, 6 months ago) by ratchov
Branch: MAIN
CVS Tags: OPENBSD_5_1_BASE,
OPENBSD_5_1
Changes since 1.23: +4 -1 lines
Diff to previous 1.23 (colored)
make midi 'owner' pointer per-output
Revision 1.23 / (download) - annotate - [select for diffs], Thu Oct 21 18:57:42 2010 UTC (13 years, 7 months ago) by ratchov
Branch: MAIN
CVS Tags: OPENBSD_5_0_BASE,
OPENBSD_5_0,
OPENBSD_4_9_BASE,
OPENBSD_4_9
Changes since 1.22: +3 -7 lines
Diff to previous 1.22 (colored)
use MODE_xxx and XRUN_xxx macros everywhere, and zap corresponding AMSG_xxx macros, which in turns simplifies the code
Revision 1.22 / (download) - annotate - [select for diffs], Tue Apr 6 20:07:01 2010 UTC (14 years, 1 month ago) by ratchov
Branch: MAIN
CVS Tags: OPENBSD_4_8_BASE,
OPENBSD_4_8
Changes since 1.21: +8 -21 lines
Diff to previous 1.21 (colored)
aucat (server):
- make the ``-m mode'' option per subdevice, allowing
subdevices to be play-only or rec-only even if the
server is full-duplex
- add ``monitoring'' mode (with ``-m mon''). This is a
record-only stream from which played streams can be
recorded (kind of ``record what you hear'').
- allow MIDI devices to be subscribed to the controlling
MIDI port of the server, ie what midicat does (with -f
option), but using the -q option.
- add flow control to the protocol, and serialize clock
ticks (sio_onmove() calls) and data chunks. This should
fix certain full-duplex programs, broken with ``magic''
block/buffer size combinations.
- enable 3 block latency which is the minimum theoretical.
Make -z and -b options correspond to device parameters.
- make sio_getcap(3) the same for aucat and sun backends,
ie return whatever is supported (``everything'' in the
aucat case, since everything is actulally supported).
aucat (player):
- enable ``-m mode'' option to select between monitoring
and recording when ``-o file'' is used.
- plug MIDI code to non-server codepath. The MIDI control
device is specified with the ``-q device'' option, as in
server mode.
- impliment lseek()'ing within files (controlled
through MIDI). Necessary to use aucat with a MIDI
sequencer.
midicat (thrubox):
- rename ``-f'' flag to ``-q'', so it has the
same name as in aucat (-f is still working)
ok jakemsr@, tweaks from jmc@
Revision 1.21 / (download) - annotate - [select for diffs], Sat Apr 3 17:59:17 2010 UTC (14 years, 1 month ago) by ratchov
Branch: MAIN
Changes since 1.20: +20 -7 lines
Diff to previous 1.20 (colored)
backout last change, committed by mistake, sorry...
Revision 1.20 / (download) - annotate - [select for diffs], Sat Apr 3 17:40:33 2010 UTC (14 years, 1 month ago) by ratchov
Branch: MAIN
Changes since 1.19: +8 -21 lines
Diff to previous 1.19 (colored)
doc fixes from jmc
Revision 1.19 / (download) - annotate - [select for diffs], Fri Oct 9 16:49:48 2009 UTC (14 years, 7 months ago) by ratchov
Branch: MAIN
CVS Tags: OPENBSD_4_7_BASE,
OPENBSD_4_7
Changes since 1.18: +42 -29 lines
Diff to previous 1.18 (colored)
Make abuf structure smaller: - put aproc-specific parameters into unions since they are never used together - remove constant ``data'' pointer always pointing the end of the abuf structure
Revision 1.18 / (download) - annotate - [select for diffs], Sun Sep 27 11:51:20 2009 UTC (14 years, 7 months ago) by ratchov
Branch: MAIN
Changes since 1.17: +2 -1 lines
Diff to previous 1.17 (colored)
remove all debug traces
Revision 1.17 / (download) - annotate - [select for diffs], Sat Jul 25 08:44:27 2009 UTC (14 years, 9 months ago) by ratchov
Branch: MAIN
Changes since 1.16: +12 -3 lines
Diff to previous 1.16 (colored)
Currently midi capable programs can control midi hardware, but cannot cooperate with other programs. The aim of this change is to allow any program to send midi data to other programs as they were midi hardware. For instance, this change should solve the longstanding problem of using a midi sequencer with software synthesizers. More precisely: - new midicat(1) utility (actually hardlink to aucat(1)). it creates software midi thru boxes, allowing programs to send midi messages to other programs as they were midi(4) hardware. - new midi api in libsndio (see mio_open(3)), to access midi(4) devices and midicat(1) sockets in a uniform way. - new device naming scheme <service>:<unit>[.<option>], common to audio and midi. - new sndio(7) manual describing concepts and naming The current audio device naming still works, but people having scripts or configuration files containing device names could read the sndio(7) man page and slowly start updating device names. discussed with jakemsr@ and deraadt@, help form jmc@
Revision 1.16 / (download) - annotate - [select for diffs], Fri Feb 13 20:48:49 2009 UTC (15 years, 3 months ago) by ratchov
Branch: MAIN
CVS Tags: OPENBSD_4_6_BASE,
OPENBSD_4_6,
OPENBSD_4_5_BASE,
OPENBSD_4_5
Changes since 1.15: +3 -4 lines
Diff to previous 1.15 (colored)
style and typos fixes from Thomas Pfaff
Revision 1.15 / (download) - annotate - [select for diffs], Fri Jan 23 17:38:15 2009 UTC (15 years, 3 months ago) by ratchov
Branch: MAIN
Changes since 1.14: +4 -4 lines
Diff to previous 1.14 (colored)
spacing + typo fix from Matt Jibson <matt.jibson(at)gmail.com>
Revision 1.14 / (download) - annotate - [select for diffs], Sun Nov 16 16:30:22 2008 UTC (15 years, 6 months ago) by ratchov
Branch: MAIN
Changes since 1.13: +4 -3 lines
Diff to previous 1.13 (colored)
Make clients inherit the volume parameter when the -v option is used in server mode. It gives the maximum volume a client may have. This wastes dynamic range, but allows volume to stay constant when other clients connect or disconnect.
Revision 1.13 / (download) - annotate - [select for diffs], Mon Nov 10 23:25:37 2008 UTC (15 years, 6 months ago) by ratchov
Branch: MAIN
Changes since 1.12: +3 -2 lines
Diff to previous 1.12 (colored)
add a per-stream ``soft volume'' knob and the corresponding -v option. The code will be useful later for the volume knob in the sndio API.
Revision 1.12 / (download) - annotate - [select for diffs], Sun Nov 9 16:26:07 2008 UTC (15 years, 6 months ago) by ratchov
Branch: MAIN
Changes since 1.11: +2 -1 lines
Diff to previous 1.11 (colored)
make aucat(1) stop automatically the audio(1) device if it's idle. This way, when in server mode, it consumes no CPU if there are no clients. Later, this will allow to start aucat(1) at session or system startup.
Revision 1.11 / (download) - annotate - [select for diffs], Mon Nov 3 22:55:34 2008 UTC (15 years, 6 months ago) by ratchov
Branch: MAIN
Changes since 1.10: +5 -5 lines
Diff to previous 1.10 (colored)
rename mixxxx and subxxx fields of struct abuf to avoid confusion: Add ``i'' to offsets in the input buffer and ``o'' to offsets in the output buffer. This is necessary because input and output use no more the same frame size.
Revision 1.10 / (download) - annotate - [select for diffs], Mon Nov 3 22:25:13 2008 UTC (15 years, 6 months ago) by ratchov
Branch: MAIN
Changes since 1.9: +7 -5 lines
Diff to previous 1.9 (colored)
A small optimization: handle most N-channel <-> M-channel conversions inside the mixer and the demultiplexer. This way, aucat will not trigger the heavy conversion code when only channel conversions are required. Cuts ~50% of the CPU usage on envy(4) devices, can improve surround 4.0, 5.1 and 7.1 capable devices. No functionnal change.
Revision 1.9 / (download) - annotate - [select for diffs], Sun Oct 26 08:49:43 2008 UTC (15 years, 6 months ago) by ratchov
Branch: MAIN
Changes since 1.8: +12 -3 lines
Diff to previous 1.8 (colored)
add minimal server capability to aucat(1). When started in server mode, it listens on an unix socket and mixes/demultiplexes any number of full-duplex streams, doing necessary format conversions and resampling on the fly. programs can use the new libsa(3) library to play and record audio. The library provides a very simple API to connect to the audio server; if aucat(1) isn't running, it uses the audio(4) driver transparently instead.
Revision 1.8 / (download) - annotate - [select for diffs], Thu Aug 14 15:25:16 2008 UTC (15 years, 9 months ago) by ratchov
Branch: MAIN
Changes since 1.7: +2 -2 lines
Diff to previous 1.7 (colored)
fix comments suggested by eric@, remove stupid DPRINTF()
Revision 1.7 / (download) - annotate - [select for diffs], Thu Aug 14 09:46:36 2008 UTC (15 years, 9 months ago) by ratchov
Branch: MAIN
Changes since 1.6: +2 -1 lines
Diff to previous 1.6 (colored)
add a bytes counter to abuf structures to count the number of bytes that entered the FIFO. The counter may overflow, so it should be used with "modulo 2^32" arithmetic. The counter will be used later to synchronize playback to record. No behaviour change. ok jakemsr
Revision 1.6 / (download) - annotate - [select for diffs], Thu Aug 14 09:44:15 2008 UTC (15 years, 9 months ago) by ratchov
Branch: MAIN
Changes since 1.5: +4 -4 lines
Diff to previous 1.5 (colored)
move mix/sub underrun/overrun handling code and data in the generic abuf structure, so it can reused. Required for an audio server. No behaviour change. ok jakemsr
Revision 1.5 / (download) - annotate - [select for diffs], Thu Aug 14 09:39:16 2008 UTC (15 years, 9 months ago) by ratchov
Branch: MAIN
Changes since 1.4: +3 -1 lines
Diff to previous 1.4 (colored)
factor code that discards data from abuf strucure into a single abuf_rdiscard() routine. Similarly add abuf_wcommit() routine for writing. The purpose is to stop manupulating FIFO pointers in various places outiside abuf.c, its too error prone. No behaviour change. ok jakemsr
Revision 1.4 / (download) - annotate - [select for diffs], Mon Jun 2 17:06:36 2008 UTC (15 years, 11 months ago) by ratchov
Branch: MAIN
CVS Tags: OPENBSD_4_4_BASE,
OPENBSD_4_4
Changes since 1.3: +11 -2 lines
Diff to previous 1.3 (colored)
allow the user to choose the aucat behaviour when underruns/overruns occur on a per-stream basis, using -Xx flags. There are 3 possible policies: - ignore : ignores underruns/overruns, for instance, this mode could be used for creating simple pipes with utilities; like in your last cdio diff. - sync : insert/discard samples in order to keep all streams in sync, useful for multi-tracker-like apps and/or to sync midi/video/whatever on audio streams (this was the previous behaviour) - error : if overruns/underruns occur, consider it as fatal error and kill the corresponding stream (without disturbing others). Useful, for reliable recordings (and/or debugging aucat itself:). ok jakemsr
Revision 1.3 / (download) - annotate - [select for diffs], Mon Jun 2 17:03:25 2008 UTC (15 years, 11 months ago) by ratchov
Branch: MAIN
Changes since 1.2: +3 -1 lines
Diff to previous 1.2 (colored)
Allows any input/output stream to underrun/overrun without disturbing other streams. Beside making aucat usable with slow apps (eg. cdio), this change will ease turning aucat into an audio server later if one of the input buffers underruns, then silence is generated in place of the missing samples. Later, as many samples are dropped in order to maintain the stream in sync with the rest if one of the output buffers overruns then newer samples are discarded. Later silence is generated in order to maintain the stream in sync with the rest. ok jakemsr
Revision 1.2 / (download) - annotate - [select for diffs], Sun May 25 21:16:37 2008 UTC (15 years, 11 months ago) by ratchov
Branch: MAIN
Changes since 1.1: +2 -2 lines
Diff to previous 1.1 (colored)
give argument to LIST_END(), don't use variable lenght arrays as last field of structures. from deraadt@
Revision 1.1 / (download) - annotate - [select for diffs], Fri May 23 07:15:46 2008 UTC (16 years ago) by ratchov
Branch: MAIN
add support for: - recording, full-duplex operation - format conversions and resampling on the fly - mixing on the fly of multiple inputs of different formats - up to 16 channels, simplistic "routing" of channel ranges - more linear encodings (in raw and wav files) the old behaviour is fully preserved if none of the new -i and -o options are used. code and fixes from jakemsr@ and eric@, suggestions by others. ok "go ahead" deraadt@