aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-06-30Merge pull request #164 from E5ten/cmake-standardTaylor Holberton
cmake: specify c99
2020-06-30Merge pull request #165 from E5ten/cmake-fix-includedirTaylor Holberton
cmake: fix header install location
2020-06-06cmake: fix header install locationEthan Sommer
2020-06-05cmake: specify c99Ethan Sommer
Set standard to c99, require it, disable language extensions. Define _POSIX_C_SOURCE to 200809L so time.h declares struct timespec. Add -Wpedantic to find use of language extensions. snd_card_plugin.c: remove one unnecessary ';' to make -Wpedantic work
2020-06-05include/tinyalsa/plugin.h: include time.hEthan Sommer
Older versions of linux's API header sound/asound.h accidentally rely on indirect declaration of struct timespec, which isn't reliable, so include time.h before it to support older versions of sound/asound.h properly
2020-06-05Merge pull request #156 from E5ten/cmake-improvedTaylor Holberton
Various cmake improvements
2020-06-04Various cmake improvementsEthan Sommer
Use scripts/version.sh, and set version in project() using its output. Instead of using a variable to store the definition of TINYALSA_USES_PLUGINS, and adding it as a compile option, use a generator expression to define it in target_compile_definitions when the option is enabled. Set BUILD_SHARED_LIBS to on by default. Add options to disable examples and utils. Instead of using SRCS and HDRS variables, set PUBLIC_HEADER property on tinyalsa to install the headers along with the target. Set library version, so the shared library will have version suffixes. Check that C warning flags are supported instead of adding them unconditionally. Use ${CMAKE_DL_LIBS} instead of hardcoding "dl", and add it to tinyalsa's link interface and link depends, instead of linking it in the examples and utils. Add the "include" directory as a PUBLIC include directory to tinyalsa, instead of making it PRIVATE and adding it to examples and utils as well, because anything linking the tinyalsa target will need to include "include". Instead of using macros for building examples and utils, use a for loop. Include cmake's GNUInstallDirs to automatically correctly populate installation dir variables, instead of doing it manually.
2020-06-03Merge pull request #163 from E5ten/tinywavinfo-unused-resultTaylor Holberton
tinywavinfo: add wrapper for fread to check its return value
2020-06-03tinywavinfo: add wrapper for fread to check its return valueEthan Sommer
2020-06-03Simplified tinywavinfoTaylor Holberton
2020-06-03Added tinywavinfo to CMake buildTaylor Holberton
2020-06-03Merge pull request #161 from E5ten/optparseTaylor Holberton
Add public domain header-only option-parsing library optparse
2020-06-03Merge pull request #160 from E5ten/posix_memalignTaylor Holberton
tinywavinfo: replace obsolete memalign with posix_memalign
2020-06-03tinyplay: replace manual option parsing with optparseEthan Sommer
This also removes the requirement for the file argument to come before options.
2020-06-03tinypcminfo: replace manual option parsing with optparseEthan Sommer
add equivalent longopts that are available in other commands
2020-06-03tinymix: replace getopt_long with optparseEthan Sommer
2020-06-03tinycap: replace manual option parsing with optparseEthan Sommer
2020-06-03utils: check in optparse.h, a public domain header-only optparsing libEthan Sommer
https://github.com/skeeto/optparse
2020-06-03tinywavinfo: replace obsolete memalign with posix_memalignEthan Sommer
2020-06-03Fix memory leakTaylor Holberton
2020-06-03Merge pull request #159 from rohkkumar/plugin_updateTaylor Holberton
Mixer event plugin update
2020-06-03Merge pull request #158 from E5ten/no-map_fileTaylor Holberton
src/pcm.c: remove MAP_FILE mmap flag
2020-06-03Merge pull request #157 from E5ten/version-posix-shTaylor Holberton
scripts/version.sh: switch from bash to POSIX sh
2020-06-02mixer: Fix memory leak and other issues in mixer eventRohit kumar
Fix memory leak in mixer_wait_event(). Also, poll should be unblocked after increasing event_cnt in mixer_plugin, otherwise event_cnt can become negative during read_event. Fix the same.
2020-06-02mixer: Add plugin support for mixer_consume/read_eventRohit kumar
snd_ctl_event is needed by client to get details of event received. Introduce mixer_read_event() with plugin support to support this.
2020-06-02tinyalsa: add mixer_consume_eventAndrew Chant
mixer_consume_event consumes subscribed events from the mixer in order to allow monitoring of mixer control value changed.
2020-05-24src/pcm.c: remove MAP_FILE mmap flagEthan Sommer
MAP_FILE is a non-standard mmap flag, and has no effect on conformant systems.
2020-05-22scripts/version.sh: switch from bash to POSIX shEthan Sommer
Change shebang to #!/bin/sh. Remove usage of non-POSIX 'local' builtin, and replace it with using a function's positional parameters to store variables, as they are local to the function.
2020-04-24Waiting for PCM to finish before exitingTaylor Holberton
2020-04-24Merge branch 'master' of github.com:tinyalsa/tinyalsaTaylor Holberton
2020-04-24Merge pull request #155 from Minecrell/strncpyTaylor Holberton
tinyalsa: use strncpy instead of memcpy to copy string constant
2020-04-24tinyalsa: mixer_plugin: remove dummy strings for sound cardMinecrell
There does not really seem to be an usage for these dummy string, so let's remove them.
2020-04-23tinyalsa: use strncpy instead of memcpy to copy string constantMinecrell
memcpy() is arguably wrong when copying these string constants. The string constants will usually just be as long as necessary, so we might copy some random memory behind it and eventually crash. Use strncpy() instead to avoid copying characters after the null terminator. For some reason the strings in snd_ctl_card_info use unsigned chars, so we need a cast to char* to make it compile unfortunately... This fixes the following compile error on ppc64le: In function 'mixer_plug_get_card_info', inlined from 'mixer_plug_ioctl' at mixer_plugin.c:371:15: mixer_plugin.c:333:5: error: 'memcpy' forming offset [9, 16] is out of the bounds [0, 8] [-Werror=array-bounds] 333 | memcpy(card_info->id, "card_id", sizeof(card_info->id)); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Not sure why that warning does not exist on other architectures.
2020-04-23Merge pull request #153 from Minecrell/ssize_tTaylor Holberton
tinyalsa: include <sys/types.h> for ssize_t
2020-04-23tinyalsa: include <sys/types.h> for ssize_tMinecrell
ssize_t is defined in <sys/types.h>, see https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/sys_types.h.html Add an include for it to avoid a compile error when building with musl: ../include/tinyalsa/plugin.h:184:5: error: expected specifier-qualifier-list before 'ssize_t' 184 | ssize_t (*read_event) (struct mixer_plugin *plugin, | ^~~~~~~
2020-04-22Removed whitespaceTaylor Holberton
2020-04-20Merge pull request #151 from mgaio/fix/pcm_open_failureTaylor Holberton
pcm_hw_close: avoid SIGSEGV when pcm_hw_open fail
2020-04-18pcm_hw_close: avoid SIGSEGV when pcm_hw_open failMiguel GAIO
Prevent the call to pcm->ops-close() if pcm->ops->open() fail. Fix memory leak in pcm_hw_open() in case of failure. * thread #1, name = 'ut', stop reason = signal SIGSEGV: invalid address (fault address: 0x8) frame #0: 0x00007ffff7f863e8 libtinyalsa.so.1`pcm_hw_close(data=0x0000000000000000) at pcm_hw.c:61:21 58 { 59 struct pcm_hw_data *hw_data = data; 60 -> 61 if (hw_data->fd > 0) 62 close(hw_data->fd); 63 64 free(hw_data); (lldb) bt * thread #1, name = 'ut', stop reason = signal SIGSEGV: invalid address (fault address: 0x8) * frame #0: 0x00007ffff7f863e8 libtinyalsa.so.1`pcm_hw_close(data=0x0000000000000000) at pcm_hw.c:61:21 frame #1: 0x00007ffff7f8491c libtinyalsa.so.1`pcm_close(pcm=0x0000000000a9eba0) at pcm.c:820:5 frame #2: 0x00007ffff7f84e0a libtinyalsa.so.1`pcm_open(card=128, device=0, flags=13, config=0x00007fffffffd000) at pcm.c:957:5 Signed-off-by: Miguel GAIO <mgaio35@gmail.com>
2020-04-14Merge pull request #150 from rohkkumar/pluginTaylor Holberton
tinyalsa: add plugin.h to install path
2020-04-14tinyalsa: add plugin.h to install pathPatrick Lai
Export plugin.h so that it can be used by tinyalsa clients. Signed-off-by: Rohit kumar <rohitkr@codeaurora.org>
2020-04-10Merge pull request #148 from lkundrak/lr/double-freeTaylor Holberton
pcm: avoid calling pcm_hw->close() twice
2020-04-10Merge pull request #149 from lkundrak/lr/-errnoTaylor Holberton
pcm: do not negate errno
2020-04-10pcm: do not negate errnoLubomir Rintel
sterror() surely doesn't appreciate that: cannot set hw params: Unknown error -22 where it should've been: cannot set hw params: Invalid argument
2020-04-10pcm: avoid calling pcm_hw->close() twiceLubomir Rintel
It would result in a double free: $ tinyplay example.wav failed to open for pcm 0,0 *** glibc detected *** ./utils/tinyplay: double free or corruption (fasttop): 0x402dc258 *** Aborted $ The crash happens here: Program received signal SIGABRT, Aborted. 0x40070e78 in raise () from /lib/libc.so.6 Missing separate debuginfos, use: debuginfo-install glibc-2.16-34.olpc.0.fc18.armv7hl libgcc-4.7.2-8.fc18.armv7hl (gdb) bt #0 0x40070e78 in raise () from /lib/libc.so.6 #1 0x400724b8 in abort () from /lib/libc.so.6 #2 0x400ad6e0 in ?? () from /lib/libc.so.6 #3 0x400b54e8 in ?? () from /lib/libc.so.6 #4 0x2a00486c in pcm_hw_close () #5 0x2a0032e0 in pcm_close () #6 0x2a0016b0 in ctx_init () #7 0x2a000c98 in main () (gdb) The previous free was done here: Breakpoint 1, 0x400b8b8c in free () from /lib/libc.so.6 (gdb) bt #0 0x400b8b8c in free () from /lib/libc.so.6 #1 0x2a00486c in pcm_hw_close () #2 0x2a003674 in pcm_open () #3 0x2a0015e8 in ctx_init () #4 0x2a000c98 in main () (gdb)
2020-02-27Added 'tinymix' to linker ruleTaylor Holberton
2020-02-27Merge pull request #147 from brunosmmm/fix-cross-compilationTaylor Holberton
Fix cross-compilation
2020-02-22Fix cross-compilationBruno Morais
Cross-compilation failing due to make library resolution.
2020-02-11Merge pull request #137 from codeauroraforum/plugin-supportTaylor Holberton
Plugin support
2020-02-07tinyalsa: add support for mixer pluginsBhalchandra Gajare
Update the mixer framework to support plugins. Add ability for physical card to have either kernel registered mixer controls or plugin registered mixer control or both. Split mixer controls into two groups, one for kernel registered (hw_grp) and the other for plugin registered (virtual_grp). Signed-off-by: Rohit kumar <rohitkr@codeaurora.org> Signed-off-by: Bhalchandra Gajare <gajare@codeaurora.org>
2020-02-07tinyalsa: add support for PCM pluginsBhalchandra Gajare
Update the pcm framework to support plugins. Resolve the pcm device node to be either kernel device or virtual device and setup function pointers accordingly. Implement framework functionality for pcm_plugin.c for ease of plugin development. Plugin itself is compiled as shared object (.so) and dynamically linked from pcm_plugin.c. Signed-off-by: Bhalchandra Gajare <gajare@codeaurora.org> Signed-off-by: Rohit kumar <rohitkr@codeaurora.org>