From 4eb6e7427f8e15a70e2c197c0ffde4b7327cfc3d Mon Sep 17 00:00:00 2001 From: martii Date: Sun, 26 May 2013 12:42:08 +0200 Subject: [PATCH] libspark/audio_mixer: load alsa-lib temporarily only (fix) Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/f70b1457cc0227d9dce84e91642e0a518e9a7deb Author: martii Date: 2013-05-26 (Sun, 26 May 2013) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- Makefile.am | 1 - libspark/Makefile.am | 2 +- libspark/audio_mixer.cpp | 1 + libspark/audio_mixer.h | 1 + 4 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index f6d8f87..9a1589b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -43,7 +43,6 @@ libstb_hal_test_LDADD += \ @SWSCALE_LIBS@ endif if BOXTYPE_SPARK -libstb_hal_test_LDADD += -lasound SUBDIRS += libspark libeplayer3 libstb_hal_la_LIBADD += \ libspark/libspark.la \ diff --git a/libspark/Makefile.am b/libspark/Makefile.am index e4875f7..c41efe4 100644 --- a/libspark/Makefile.am +++ b/libspark/Makefile.am @@ -5,7 +5,7 @@ INCLUDES = \ noinst_LTLIBRARIES = libspark.la AM_CXXFLAGS = -fno-rtti -fno-exceptions -fno-strict-aliasing -AM_LDFLAGS = -lpthread -lasound +AM_LDFLAGS = -lpthread libspark_la_SOURCES = \ hardware_caps.c \ diff --git a/libspark/audio_mixer.cpp b/libspark/audio_mixer.cpp index 3f3b9ca..d8d67b7 100644 --- a/libspark/audio_mixer.cpp +++ b/libspark/audio_mixer.cpp @@ -42,6 +42,7 @@ mixerVolume::mixerVolume(const char *name, const char *card, long volume) { || !(this->snd_mixer_selem_get_playback_volume_range = (int (*)(snd_mixer_elem_t *, long *, long *)) dlsym(alsaLib, "snd_mixer_selem_get_playback_volume_range")) || !(this->snd_mixer_close = (int (*)(snd_mixer_t *)) dlsym(alsaLib, "snd_mixer_close")) || !(this->snd_mixer_selem_id_free = (void (*)(snd_mixer_selem_id_t *)) dlsym(alsaLib, "snd_mixer_selem_id_free")) + || !(this->snd_mixer_selem_id_sizeof = (size_t (*)(void)) dlsym(alsaLib, "snd_mixer_selem_id_sizeof")) || !(this->snd_mixer_selem_set_playback_volume_all = (int (*)(snd_mixer_elem_t *, long)) dlsym(alsaLib, "snd_mixer_selem_set_playback_volume_all"))) return; diff --git a/libspark/audio_mixer.h b/libspark/audio_mixer.h index b64e434..0ae037f 100644 --- a/libspark/audio_mixer.h +++ b/libspark/audio_mixer.h @@ -42,6 +42,7 @@ class mixerVolume int (*snd_mixer_close)(snd_mixer_t *mixer); void (*snd_mixer_selem_id_free)(snd_mixer_selem_id_t *obj); int (*snd_mixer_selem_set_playback_volume_all)(snd_mixer_elem_t *elem, long value); + size_t (*snd_mixer_selem_id_sizeof)(void); public: mixerVolume(const char *selem_name, const char *Card, long volume = -1); ~mixerVolume(void);