summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
6ba21d4)
(closes #57).
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1431
fefdeb5f-60dc-0310-8127-
8f9354f1896f
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
# USA.
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
# USA.
-EXTRA_DIST = bootstrap.sh LICENSE GPL LGPL doxygen/Makefile.am doxygen/Makefile.in doxygen/doxygen.conf.in README todo
-SUBDIRS=libltdl src doxygen
+EXTRA_DIST = config.rpath m4/ChangeLog bootstrap.sh LICENSE GPL LGPL doxygen/Makefile.am doxygen/Makefile.in doxygen/doxygen.conf.in README todo
+SUBDIRS= libltdl src doxygen
MAINTAINERCLEANFILES =
noinst_DATA =
MAINTAINERCLEANFILES =
noinst_DATA =
$(MAKE) -C doxygen doxygen
.PHONY: homepage distcleancheck doxygen
$(MAKE) -C doxygen doxygen
.PHONY: homepage distcleancheck doxygen
+
+ACLOCAL_AMFLAGS = -I m4
AC_CONFIG_FILES([
Makefile
src/Makefile
AC_CONFIG_FILES([
Makefile
src/Makefile
libpulse.pc
libpulse-simple.pc
libpulse-browse.pc
libpulse.pc
libpulse-simple.pc
libpulse-browse.pc
memchunk = &u->memchunk;
}
memchunk = &u->memchunk;
}
- assert(memchunk->memblock && memchunk->memblock->data && memchunk->length && memchunk->memblock->length && (memchunk->length % u->frame_size) == 0);
+ assert(memchunk->memblock);
+ assert(memchunk->memblock->data);
+ assert(memchunk->length);
+ assert(memchunk->memblock->length);
+ assert((memchunk->length % u->frame_size) == 0);
if ((frames = snd_pcm_writei(u->pcm_handle, (uint8_t*) memchunk->memblock->data + memchunk->index, memchunk->length / u->frame_size)) < 0) {
if (frames == -EAGAIN)
if ((frames = snd_pcm_writei(u->pcm_handle, (uint8_t*) memchunk->memblock->data + memchunk->index, memchunk->length / u->frame_size)) < 0) {
if (frames == -EAGAIN)
+ /* ALSA might tweak the sample spec, so recalculate the frame size */
+ frame_size = pa_frame_size(&ss);
+
if (ss.channels != map.channels)
/* Seems ALSA didn't like the channel number, so let's fix the channel map */
pa_channel_map_init_auto(&map, ss.channels, PA_CHANNEL_MAP_ALSA);
if (ss.channels != map.channels)
/* Seems ALSA didn't like the channel number, so let's fix the channel map */
pa_channel_map_init_auto(&map, ss.channels, PA_CHANNEL_MAP_ALSA);