Page MenuHomeFreeBSD
Differential D45275

mixer(3): Implement mixer_get_path() function
ClosedPublic
Actions

Authored by christos on May 20 2024, 4:44 PM.
Tags
None
Referenced Files
F115163557: D45275.diff
Mon, Apr 21, 1:33 AM
Unknown Object (File)
Sat, Apr 12, 2:46 PM
Unknown Object (File)
Mar 16 2025, 8:22 AM
Unknown Object (File)
Feb 22 2025, 2:01 PM
Unknown Object (File)
Feb 2 2025, 8:19 AM
Unknown Object (File)
Jan 26 2025, 12:25 PM
Unknown Object (File)
Jan 26 2025, 4:33 AM
Unknown Object (File)
Jan 25 2025, 9:44 AM
View All 48 Files
Subscribers
imp

Details

Reviewers
markj
emaste
dev_submerge.ch
Commits
rG0a1eb394d7b6: mixer(3): Implement mixer_get_path() function
rG67c89b21b956: mixer(3): Implement mixer_get_path() function
Summary

This is better than hardcoding device paths in mixer applications.

Sponsored by: The FreeBSD Foundation
MFC after: 1 day

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Skipped
Unit
Tests Skipped
Build Status
Buildable 57803
Build 54691: arc lint + arc unit

Event Timeline

christos created this revision.May 20 2024, 4:44 PM
Herald added a subscriber: imp. · View Herald TranscriptMay 20 2024, 4:44 PM
christos requested review of this revision.May 20 2024, 4:44 PM
Harbormaster completed remote builds in B57795: Diff 138801.May 20 2024, 4:44 PM
christos added a child revision: D45276: mixer(8): Use mixer_get_path().May 20 2024, 4:44 PM
christos mentioned this in D45154: mixer.3: Showcase example of how to loop through all mixers.May 20 2024, 4:45 PM
dev_submerge.ch added inline comments.May 20 2024, 7:54 PM
lib/libmixer/mixer.c
503

With this check buffer size can still be insufficient to hold BASEPATH + unit + '\0'. We should return an error in that case. Maybe check after strlcpy() and sndprintf()?

christos added inline comments.May 20 2024, 8:06 PM
lib/libmixer/mixer.c
503

It will be insufficient indeed. I added this to make sure it *at least* fits "/dev/mixer". We could bump this to something like BASEPATH + 3 (are we gonna have more than 3-digit units) +'\0'.

dev_submerge.ch added inline comments.May 20 2024, 8:13 PM
lib/libmixer/mixer.c
503

I think there's an upper limit to the possible number of pcm devices somewhere, but I'd suggest to check the return values of strlcpy() and snprintf() instead. That's what they are there for.

christos updated this revision to Diff 138815.May 20 2024, 8:23 PM
christos marked 2 inline comments as done.

Address Florian's comments.

Harbormaster completed remote builds in B57803: Diff 138815.May 20 2024, 8:23 PM
christos updated this revision to Diff 138867.May 21 2024, 10:33 PM

Mention EXAMPLES section in mixer_get_nmixers().

Harbormaster completed remote builds in B57826: Diff 138867.May 21 2024, 10:33 PM
dev_submerge.ch accepted this revision.May 22 2024, 12:54 PM
This revision is now accepted and ready to land.May 22 2024, 12:54 PM
Closed by commit rG67c89b21b956: mixer(3): Implement mixer_get_path() function (authored by christos). · Explain WhyMay 23 2024, 12:58 AM
This revision was automatically updated to reflect the committed changes.
christos added a commit: rG67c89b21b956: mixer(3): Implement mixer_get_path() function.
christos added a commit: rG0a1eb394d7b6: mixer(3): Implement mixer_get_path() function.May 25 2024, 7:32 PM

Revision Contents
Changeset List

PathSize
lib/
libmixer/
1 line
4 lines
1 line
38 lines
25 lines

Diff 138815

View Options

lib/libmixer/Makefile

Show All 18 Lines
USES= compiler:c++11-lang python shebangfix USES= compiler:c++11-lang python shebangfix
HAS_CONFIGURE= yes HAS_CONFIGURE= yes
CONFIGURE_SCRIPT= configure.py CONFIGURE_SCRIPT= configure.py
CONFIGURE_ARGS= --taglib-inc-dir="${LOCALBASE}/include/taglib" \ CONFIGURE_ARGS= --taglib-inc-dir="${LOCALBASE}/include/taglib" \
--taglib-lib-dir="${LOCALBASE}/lib" \ --taglib-lib-dir="${LOCALBASE}/lib" \
--boost-inc-dir="${PYTHON_INCLUDEDIR},${LOCALBASE}/include" \ --boost-inc-dir="${PYTHON_INCLUDEDIR},${LOCALBASE}/include" \
--boost-lib-dir="${PYTHON_LIBDIR},${LOCALBASE}/lib" \ --boost-lib-dir="${PYTHON_LIBDIR},${LOCALBASE}/lib" \
--boost-python-libname="boost_python" --boost-python-libname="boost_python"
python_OLD_CMD= /usr/bin/env python
SHEBANG_FILES= configure.py SHEBANG_FILES= configure.py
USE_PYTHON= distutils autoplist USE_PYTHON= distutils autoplist
.include <bsd.port.mk> .include <bsd.port.mk>
View Options

lib/libmixer/Symbol.map

Show All 18 Lines
USES= compiler:c++11-lang python shebangfix USES= compiler:c++11-lang python shebangfix
HAS_CONFIGURE= yes HAS_CONFIGURE= yes
CONFIGURE_SCRIPT= configure.py CONFIGURE_SCRIPT= configure.py
CONFIGURE_ARGS= --taglib-inc-dir="${LOCALBASE}/include/taglib" \ CONFIGURE_ARGS= --taglib-inc-dir="${LOCALBASE}/include/taglib" \
--taglib-lib-dir="${LOCALBASE}/lib" \ --taglib-lib-dir="${LOCALBASE}/lib" \
--boost-inc-dir="${PYTHON_INCLUDEDIR},${LOCALBASE}/include" \ --boost-inc-dir="${PYTHON_INCLUDEDIR},${LOCALBASE}/include" \
--boost-lib-dir="${PYTHON_LIBDIR},${LOCALBASE}/lib" \ --boost-lib-dir="${PYTHON_LIBDIR},${LOCALBASE}/lib" \
--boost-python-libname="boost_python" --boost-python-libname="boost_python"
python_OLD_CMD= /usr/bin/env python
SHEBANG_FILES= configure.py SHEBANG_FILES= configure.py
USE_PYTHON= distutils autoplist USE_PYTHON= distutils autoplist
.include <bsd.port.mk> .include <bsd.port.mk>
View Options

lib/libmixer/mixer.h

Show All 18 Lines
USES= compiler:c++11-lang python shebangfix USES= compiler:c++11-lang python shebangfix
HAS_CONFIGURE= yes HAS_CONFIGURE= yes
CONFIGURE_SCRIPT= configure.py CONFIGURE_SCRIPT= configure.py
CONFIGURE_ARGS= --taglib-inc-dir="${LOCALBASE}/include/taglib" \ CONFIGURE_ARGS= --taglib-inc-dir="${LOCALBASE}/include/taglib" \
--taglib-lib-dir="${LOCALBASE}/lib" \ --taglib-lib-dir="${LOCALBASE}/lib" \
--boost-inc-dir="${PYTHON_INCLUDEDIR},${LOCALBASE}/include" \ --boost-inc-dir="${PYTHON_INCLUDEDIR},${LOCALBASE}/include" \
--boost-lib-dir="${PYTHON_LIBDIR},${LOCALBASE}/lib" \ --boost-lib-dir="${PYTHON_LIBDIR},${LOCALBASE}/lib" \
--boost-python-libname="boost_python" --boost-python-libname="boost_python"
python_OLD_CMD= /usr/bin/env python
SHEBANG_FILES= configure.py SHEBANG_FILES= configure.py
USE_PYTHON= distutils autoplist USE_PYTHON= distutils autoplist
.include <bsd.port.mk> .include <bsd.port.mk>
View Options

lib/libmixer/mixer.3

Show All 18 Lines
USES= compiler:c++11-lang python shebangfix USES= compiler:c++11-lang python shebangfix
HAS_CONFIGURE= yes HAS_CONFIGURE= yes
CONFIGURE_SCRIPT= configure.py CONFIGURE_SCRIPT= configure.py
CONFIGURE_ARGS= --taglib-inc-dir="${LOCALBASE}/include/taglib" \ CONFIGURE_ARGS= --taglib-inc-dir="${LOCALBASE}/include/taglib" \
--taglib-lib-dir="${LOCALBASE}/lib" \ --taglib-lib-dir="${LOCALBASE}/lib" \
--boost-inc-dir="${PYTHON_INCLUDEDIR},${LOCALBASE}/include" \ --boost-inc-dir="${PYTHON_INCLUDEDIR},${LOCALBASE}/include" \
--boost-lib-dir="${PYTHON_LIBDIR},${LOCALBASE}/lib" \ --boost-lib-dir="${PYTHON_LIBDIR},${LOCALBASE}/lib" \
--boost-python-libname="boost_python" --boost-python-libname="boost_python"
python_OLD_CMD= /usr/bin/env python
SHEBANG_FILES= configure.py SHEBANG_FILES= configure.py
USE_PYTHON= distutils autoplist USE_PYTHON= distutils autoplist
.include <bsd.port.mk> .include <bsd.port.mk>
View Options

lib/libmixer/mixer.c

Show All 18 Lines
USES= compiler:c++11-lang python shebangfix USES= compiler:c++11-lang python shebangfix
HAS_CONFIGURE= yes HAS_CONFIGURE= yes
CONFIGURE_SCRIPT= configure.py CONFIGURE_SCRIPT= configure.py
CONFIGURE_ARGS= --taglib-inc-dir="${LOCALBASE}/include/taglib" \ CONFIGURE_ARGS= --taglib-inc-dir="${LOCALBASE}/include/taglib" \
--taglib-lib-dir="${LOCALBASE}/lib" \ --taglib-lib-dir="${LOCALBASE}/lib" \
--boost-inc-dir="${PYTHON_INCLUDEDIR},${LOCALBASE}/include" \ --boost-inc-dir="${PYTHON_INCLUDEDIR},${LOCALBASE}/include" \
--boost-lib-dir="${PYTHON_LIBDIR},${LOCALBASE}/lib" \ --boost-lib-dir="${PYTHON_LIBDIR},${LOCALBASE}/lib" \
--boost-python-libname="boost_python" --boost-python-libname="boost_python"
python_OLD_CMD= /usr/bin/env python
SHEBANG_FILES= configure.py SHEBANG_FILES= configure.py
USE_PYTHON= distutils autoplist USE_PYTHON= distutils autoplist
.include <bsd.port.mk> .include <bsd.port.mk>