- Add changelogs to debian package.

- Fix blocked render, occurring from time to time on linux, endless loop in portaudio.
- Fix re-invites and processing incoming media when format has changed.
cusax-fix
Damian Minkov 16 years ago
parent d73ffd2597
commit c6dbc987d8

Binary file not shown.

Binary file not shown.

@ -949,6 +949,21 @@
token="_PACKAGE_NAME_"
value="${package.name}"/>
<get src="http://bluejimp.com/sip-communicator/changelogs/changelog-${label}.txt"
dest="changelog-${label}.txt" ignoreerrors="true"/>
<loadfile property="latest.changelog"
srcFile="changelog-${label}.txt" failonerror="false"/>
<!-- Load a default value if file with changelogs is missing -->
<condition property="latest.changelog" value="Nightly builds">
<not>
<isset property="latest.changelog"/>
</not>
</condition>
<replace file="${inst.resrc}/debian/changelog"
token="_CHANGES_"
value="${latest.changelog}"/>
<delete file="changelog-${label}.txt"/>
<!-- Prepare the control file -->
<copy file="${inst.resrc}/debian/control.tmpl"
tofile="${inst.resrc}/debian/control"

@ -1,6 +1,6 @@
_PACKAGE_NAME_ (_VERSION_) unstable; urgency=low
* Nightly builds
* _CHANGES_
-- Martin Andre <mandre@dev.java.net> _DATE_

@ -63,3 +63,8 @@
-02 \
LIBS=-L$(PORTAUDIO_HOME)/lib/.libs -static -lportaudio -lspeexdsp -lwinmm -lm -lstdc++ -lole32 -luuid
$ make
NOTES:
The patch pa_linux_alsa.c.fix.blocked.renderer.patch must be applied after
applying pa_linux_alsa.c-by-Werner.patch.

@ -0,0 +1,39 @@
Index: pa_linux_alsa.c
===================================================================
--- pa_linux_alsa.c (revision 1418)
+++ pa_linux_alsa.c (working copy)
@@ -315,7 +315,10 @@
}
PaUtil_FreeMemory( alsaHostApi );
- snd_config_update_free_global();
+// damencho, removed fo compability with pulseaudio versions before 0.9.16
+// segfault application:
+// bugtrack alsa: 0002124: snd_config_update_free_global kills applications using user space alsa plugins
+// snd_config_update_free_global();
}
/** Determine max channels and default latencies.
@@ -1364,7 +1367,7 @@
ENSURE_( snd_pcm_sw_params_set_avail_min( self->pcm, swParams, self->framesPerBuffer ), paUnanticipatedHostError );
ENSURE_( snd_pcm_sw_params_set_xfer_align( self->pcm, swParams, 1 ), paUnanticipatedHostError );
- ENSURE_( snd_pcm_sw_params_set_tstamp_mode( self->pcm, swParams, SND_PCM_TSTAMP_ENABLE ), paUnanticipatedHostError );
+ ENSURE_( snd_pcm_sw_params_set_tstamp_mode( self->pcm, swParams, SND_PCM_TSTAMP_MMAP ), paUnanticipatedHostError );
/* Set the parameters! */
ENSURE_( snd_pcm_sw_params( self->pcm, swParams ), paUnanticipatedHostError );
@@ -2788,6 +2807,13 @@
*shouldPoll = 0;
}
+ else
+ {
+ // not actually used
+ unsigned long framesAvail = 0;
+ // now check for xrun
+ PaAlsaStreamComponent_GetAvailableFrames(self, &framesAvail, xrun );
+ }
error:
return result;
Loading…
Cancel
Save