ext/Makefile.am: Finish hooking up pulseaudio plugin to the build.

Original commit message from CVS:
* ext/Makefile.am:
Finish hooking up pulseaudio plugin to the build.
* ext/pulse/pulsemixerctrl.c:
Fix compilation error.
This commit is contained in:
Jan Schmidt 2008-07-19 13:50:53 +00:00
parent 08d27f468b
commit 1b221b2cf9
3 changed files with 21 additions and 2 deletions

View file

@ -1,3 +1,11 @@
2008-07-19 Jan Schmidt <jan.schmidt@sun.com>
* ext/Makefile.am:
Finish hooking up pulseaudio plugin to the build.
* ext/pulse/pulsemixerctrl.c:
Fix compilation error.
2008-07-19 Jan Schmidt <jan.schmidt@sun.com>
* po/LINGUAS:

View file

@ -94,6 +94,13 @@ else
DV1394_DIR =
endif
if USE_PULSE
PULSE_DIR = pulse
else
PULSE_DIR =
endif
if USE_SHOUT2
SHOUT2_DIR = shout2
else
@ -141,6 +148,7 @@ SUBDIRS = \
$(LIBMNG_DIR) \
$(LIBPNG_DIR) \
$(MIKMOD_DIR) \
$(PULSE_DIR) \
$(SHOUT2_DIR) \
$(SOUP_DIR) \
$(SPEEX_DIR) \
@ -162,6 +170,7 @@ DIST_SUBDIRS = \
ladspa \
libcaca \
libpng \
pulse \
raw1394 \
shout2 \
soup \

View file

@ -490,6 +490,9 @@ gst_pulsemixer_ctrl_timeout_event (pa_mainloop_api * a, pa_time_event * e,
static void
restart_time_event (GstPulseMixerCtrl * c)
{
struct timeval tv;
pa_mainloop_api *api;
g_assert (c);
if (c->time_event)
@ -498,9 +501,8 @@ restart_time_event (GstPulseMixerCtrl * c)
/* Updating the volume too often will cause a lot of traffic
* when accessing a networked server. Therefore we make sure
* to update the volume only once every 50ms */
struct timeval tv;
pa_mainloop_api *api = pa_threaded_mainloop_get_api (c->mainloop);
api = pa_threaded_mainloop_get_api (c->mainloop);
c->time_event =
api->time_new (api, pa_timeval_add (pa_gettimeofday (&tv), UPDATE_DELAY),