mirrors/libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/libstb-hal.git synced 2025-08-26 23:13:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

libspark/audio_mixer: load alsa-lib temporarily only (fix)

Browse Source
This commit is contained in:
martii
2013-05-26 12:42:08 +02:00
parent c09fc914a4
commit f70b1457cc
4 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.am
View File

@@ -43,7 +43,6 @@ libstb_hal_test_LDADD += \
@SWSCALE_LIBS@ @SWSCALE_LIBS@
endif endif
if BOXTYPE_SPARK if BOXTYPE_SPARK
libstb_hal_test_LDADD += -lasound
SUBDIRS += libspark libeplayer3 SUBDIRS += libspark libeplayer3
libstb_hal_la_LIBADD += \ libstb_hal_la_LIBADD += \
libspark/libspark.la \ libspark/libspark.la \

2
libspark/Makefile.am
View File

@@ -5,7 +5,7 @@ INCLUDES = \
noinst_LTLIBRARIES = libspark.la noinst_LTLIBRARIES = libspark.la
AM_CXXFLAGS = -fno-rtti -fno-exceptions -fno-strict-aliasing AM_CXXFLAGS = -fno-rtti -fno-exceptions -fno-strict-aliasing
AM_LDFLAGS = -lpthread -lasound AM_LDFLAGS = -lpthread
libspark_la_SOURCES = \ libspark_la_SOURCES = \
hardware_caps.c \ hardware_caps.c \

1
libspark/audio_mixer.cpp
View File

@@ -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_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_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_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"))) || !(this->snd_mixer_selem_set_playback_volume_all = (int (*)(snd_mixer_elem_t *, long)) dlsym(alsaLib, "snd_mixer_selem_set_playback_volume_all")))
return; return;

1
libspark/audio_mixer.h
View File

@@ -42,6 +42,7 @@ class mixerVolume
int (*snd_mixer_close)(snd_mixer_t *mixer); int (*snd_mixer_close)(snd_mixer_t *mixer);
void (*snd_mixer_selem_id_free)(snd_mixer_selem_id_t *obj); 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); int (*snd_mixer_selem_set_playback_volume_all)(snd_mixer_elem_t *elem, long value);
size_t (*snd_mixer_selem_id_sizeof)(void);
public: public:
mixerVolume(const char *selem_name, const char *Card, long volume = -1); mixerVolume(const char *selem_name, const char *Card, long volume = -1);
~mixerVolume(void); ~mixerVolume(void);