Date: Sun, 4 Oct 2020 14:34:33 +0000 (UTC) From: Steve Wills <swills@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r551428 - in head/audio/kmix: . files Message-ID: <202010041434.094EYXkG070423@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Sun Oct 4 14:34:33 2020 New Revision: 551428 URL: https://svnweb.freebsd.org/changeset/ports/551428 Log: audio/kmix: fix MAX_MIXDEVS Prevents kmix logging errors continuously Approved by: tcberner Added: head/audio/kmix/files/ head/audio/kmix/files/patch-backends_mixer__oss.cpp (contents, props changed) Modified: head/audio/kmix/Makefile (contents, props changed) Modified: head/audio/kmix/Makefile ============================================================================== --- head/audio/kmix/Makefile Sun Oct 4 14:27:18 2020 (r551427) +++ head/audio/kmix/Makefile Sun Oct 4 14:34:33 2020 (r551428) @@ -2,6 +2,7 @@ PORTNAME= kmix DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= audio kde kde-applications MAINTAINER= kde@FreeBSD.org Added: head/audio/kmix/files/patch-backends_mixer__oss.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/kmix/files/patch-backends_mixer__oss.cpp Sun Oct 4 14:34:33 2020 (r551428) @@ -0,0 +1,39 @@ +--- backends/mixer_oss.cpp.orig 2020-10-03 12:41:46 UTC ++++ backends/mixer_oss.cpp +@@ -52,9 +52,9 @@ + The #define below is only there for internal reasons. + In other words: Don't play around with this value + */ +-#define MAX_MIXDEVS 32 ++#define MAX_MIXDEVS 25 + +-const char* MixerDevNames[32]={ ++const char* MixerDevNames[25]={ + I18N_NOOP("Volume"), I18N_NOOP("Bass"), I18N_NOOP("Treble"), + I18N_NOOP("Synth"), I18N_NOOP("Pcm"), I18N_NOOP("Speaker"), + I18N_NOOP("Line"), I18N_NOOP("Microphone"), I18N_NOOP("CD"), +@@ -63,11 +63,9 @@ const char* MixerDevNames[32]={ + I18N_NOOP("Line2"), I18N_NOOP("Line3"), I18N_NOOP("Digital1"), + I18N_NOOP("Digital2"), I18N_NOOP("Digital3"), I18N_NOOP("PhoneIn"), + I18N_NOOP("PhoneOut"), I18N_NOOP("Video"), I18N_NOOP("Radio"), +- I18N_NOOP("Monitor"), I18N_NOOP("3D-depth"), I18N_NOOP("3D-center"), +- I18N_NOOP("unknown"), I18N_NOOP("unknown"), I18N_NOOP("unknown"), +- I18N_NOOP("unknown") , I18N_NOOP("unused") }; ++ I18N_NOOP("Monitor") }; + +-const MixDevice::ChannelType MixerChannelTypes[32] = { ++const MixDevice::ChannelType MixerChannelTypes[25] = { + MixDevice::VOLUME, MixDevice::BASS, MixDevice::TREBLE, + MixDevice::MIDI, MixDevice::AUDIO, MixDevice::SPEAKER, + MixDevice::EXTERNAL, MixDevice::MICROPHONE, MixDevice::CD, +@@ -76,9 +74,7 @@ const MixDevice::ChannelType MixerChannelTypes[32] = { + MixDevice::EXTERNAL, MixDevice::EXTERNAL, MixDevice::DIGITAL, + MixDevice::DIGITAL, MixDevice::DIGITAL, MixDevice::EXTERNAL, + MixDevice::EXTERNAL, MixDevice::VIDEO, MixDevice::EXTERNAL, +- MixDevice::EXTERNAL, MixDevice::VOLUME, MixDevice::VOLUME, +- MixDevice::UNKNOWN, MixDevice::UNKNOWN, MixDevice::UNKNOWN, +- MixDevice::UNKNOWN, MixDevice::UNKNOWN }; ++ MixDevice::EXTERNAL }; + + Mixer_Backend* OSS_getMixer( Mixer* mixer, int device ) + {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202010041434.094EYXkG070423>