[Pkg-voip-commits] [portaudio19] 85/114: Refresh audacity-portmixer.patch.
Benjamin Drung
bdrung at moszumanska.debian.org
Sun Dec 25 20:05:39 UTC 2016
This is an automated email from the git hooks/post-receive script.
bdrung pushed a commit to branch master
in repository portaudio19.
commit f6495d35d9107464b7ee1ff4be6e52e4827fbd0e
Author: Benjamin Drung <bdrung at debian.org>
Date: Sat Mar 5 11:57:02 2011 +0000
Refresh audacity-portmixer.patch.
---
debian/patches/audacity-portmixer.patch | 76 ++++++++++++++++-----------------
1 file changed, 38 insertions(+), 38 deletions(-)
diff --git a/debian/patches/audacity-portmixer.patch b/debian/patches/audacity-portmixer.patch
index 440608b..29f7e07 100644
--- a/debian/patches/audacity-portmixer.patch
+++ b/debian/patches/audacity-portmixer.patch
@@ -2,9 +2,9 @@ Description: Add features needed to make portmixer work with audacity.
Author: Audacity Team
Last-Update: 2010-02-21
---- portaudio19-19+svn20100220.orig/include/pa_win_ds.h
-+++ portaudio19-19+svn20100220/include/pa_win_ds.h
-@@ -92,6 +92,21 @@ typedef struct PaWinDirectSoundStreamInf
+--- a/include/pa_win_ds.h
++++ b/include/pa_win_ds.h
+@@ -91,6 +91,21 @@
}PaWinDirectSoundStreamInfo;
@@ -26,9 +26,9 @@ Last-Update: 2010-02-21
#ifdef __cplusplus
---- portaudio19-19+svn20100220.orig/include/portaudio.h
-+++ portaudio19-19+svn20100220/include/portaudio.h
-@@ -1106,6 +1106,15 @@ signed long Pa_GetStreamReadAvailable( P
+--- a/include/portaudio.h
++++ b/include/portaudio.h
+@@ -1121,6 +1121,15 @@
signed long Pa_GetStreamWriteAvailable( PaStream* stream );
@@ -45,7 +45,7 @@ Last-Update: 2010-02-21
--- /dev/null
-+++ portaudio19-19+svn20100220/include/pa_unix_oss.h
++++ b/include/pa_unix_oss.h
@@ -0,0 +1,104 @@
+#ifndef PA_UNIX_OSS_H
+#define PA_UNIX_OSS_H
@@ -151,9 +151,9 @@ Last-Update: 2010-02-21
+#endif
+
+#endif
---- portaudio19-19+svn20100220.orig/src/common/pa_front.c
-+++ portaudio19-19+svn20100220/src/common/pa_front.c
-@@ -1211,8 +1211,10 @@ PaError Pa_OpenStream( PaStream** stream
+--- a/src/common/pa_front.c
++++ b/src/common/pa_front.c
+@@ -1199,8 +1199,10 @@
hostApiInputParametersPtr, hostApiOutputParametersPtr,
sampleRate, framesPerBuffer, streamFlags, streamCallback, userData );
@@ -165,7 +165,7 @@ Last-Update: 2010-02-21
PA_LOGAPI(("Pa_OpenStream returned:\n" ));
-@@ -1724,6 +1726,32 @@ signed long Pa_GetStreamWriteAvailable(
+@@ -1712,6 +1714,32 @@
return result;
}
@@ -198,9 +198,9 @@ Last-Update: 2010-02-21
PaError Pa_GetSampleSize( PaSampleFormat format )
{
---- portaudio19-19+svn20100220.orig/src/common/pa_stream.c
-+++ portaudio19-19+svn20100220/src/common/pa_stream.c
-@@ -93,6 +93,8 @@ void PaUtil_InitializeStreamRepresentati
+--- a/src/common/pa_stream.c
++++ b/src/common/pa_stream.c
+@@ -93,6 +93,8 @@
streamRepresentation->streamInfo.inputLatency = 0.;
streamRepresentation->streamInfo.outputLatency = 0.;
streamRepresentation->streamInfo.sampleRate = 0.;
@@ -209,9 +209,9 @@ Last-Update: 2010-02-21
}
---- portaudio19-19+svn20100220.orig/src/common/pa_stream.h
-+++ portaudio19-19+svn20100220/src/common/pa_stream.h
-@@ -152,6 +152,7 @@ typedef struct PaUtilStreamRepresentatio
+--- a/src/common/pa_stream.h
++++ b/src/common/pa_stream.h
+@@ -152,6 +152,7 @@
PaStreamFinishedCallback *streamFinishedCallback;
void *userData;
PaStreamInfo streamInfo;
@@ -219,8 +219,8 @@ Last-Update: 2010-02-21
} PaUtilStreamRepresentation;
---- portaudio19-19+svn20100220.orig/src/hostapi/coreaudio/pa_mac_core_blocking.c
-+++ portaudio19-19+svn20100220/src/hostapi/coreaudio/pa_mac_core_blocking.c
+--- a/src/hostapi/coreaudio/pa_mac_core_blocking.c
++++ b/src/hostapi/coreaudio/pa_mac_core_blocking.c
@@ -66,6 +66,9 @@
#ifdef MOSX_USE_NON_ATOMIC_FLAG_BITS
# define OSAtomicOr32( a, b ) ( (*(b)) |= (a) )
@@ -231,9 +231,9 @@ Last-Update: 2010-02-21
#else
# include <libkern/OSAtomic.h>
#endif
---- portaudio19-19+svn20100220.orig/src/hostapi/alsa/pa_linux_alsa.c
-+++ portaudio19-19+svn20100220/src/hostapi/alsa/pa_linux_alsa.c
-@@ -134,6 +134,7 @@ typedef struct
+--- a/src/hostapi/alsa/pa_linux_alsa.c
++++ b/src/hostapi/alsa/pa_linux_alsa.c
+@@ -607,6 +607,7 @@
StreamDirection streamDir;
snd_pcm_channel_area_t *channelAreas; /* Needed for channel adaption */
@@ -241,49 +241,49 @@ Last-Update: 2010-02-21
} PaAlsaStreamComponent;
/* Implementation specific stream structure */
-@@ -1161,6 +1162,7 @@ static PaError PaAlsaStreamComponent_Ini
+@@ -1802,6 +1803,7 @@
{
PaError result = paNoError;
- PaSampleFormat userSampleFormat = params->sampleFormat, hostSampleFormat;
+ PaSampleFormat userSampleFormat = params->sampleFormat, hostSampleFormat = paNoError;
+ snd_pcm_info_t* pcmInfo;
assert( params->channelCount > 0 );
/* Make sure things have an initial value */
-@@ -1181,6 +1183,9 @@ static PaError PaAlsaStreamComponent_Ini
+@@ -1822,6 +1824,9 @@
self->device = params->device;
PA_ENSURE( AlsaOpen( &alsaApi->baseHostApiRep, params, streamDir, &self->pcm ) );
+
+ snd_pcm_info_alloca( &pcmInfo );
+ self->card = snd_pcm_info_get_card( pcmInfo );
- self->nfds = snd_pcm_poll_descriptors_count( self->pcm );
- hostSampleFormat = PaUtil_SelectClosestAvailableFormat( GetAvailableFormats( self->pcm ), userSampleFormat );
+ self->nfds = alsa_snd_pcm_poll_descriptors_count( self->pcm );
-@@ -3646,9 +3651,7 @@ PaError PaAlsa_GetStreamInputCard(PaStre
+ PA_ENSURE( hostSampleFormat = PaUtil_SelectClosestAvailableFormat( GetAvailableFormats( self->pcm ), userSampleFormat ) );
+@@ -4514,9 +4519,7 @@
/* XXX: More descriptive error? */
PA_UNLESS( stream->capture.pcm, paDeviceUnavailable );
-- snd_pcm_info_alloca( &pcmInfo );
-- PA_ENSURE( snd_pcm_info( stream->capture.pcm, pcmInfo ) );
-- *card = snd_pcm_info_get_card( pcmInfo );
+- alsa_snd_pcm_info_alloca( &pcmInfo );
+- PA_ENSURE( alsa_snd_pcm_info( stream->capture.pcm, pcmInfo ) );
+- *card = alsa_snd_pcm_info_get_card( pcmInfo );
+ *card = stream->capture.card;
error:
return result;
-@@ -3664,9 +3667,7 @@ PaError PaAlsa_GetStreamOutputCard(PaStr
+@@ -4532,9 +4535,7 @@
/* XXX: More descriptive error? */
PA_UNLESS( stream->playback.pcm, paDeviceUnavailable );
-- snd_pcm_info_alloca( &pcmInfo );
-- PA_ENSURE( snd_pcm_info( stream->playback.pcm, pcmInfo ) );
-- *card = snd_pcm_info_get_card( pcmInfo );
+- alsa_snd_pcm_info_alloca( &pcmInfo );
+- PA_ENSURE( alsa_snd_pcm_info( stream->playback.pcm, pcmInfo ) );
+- *card = alsa_snd_pcm_info_get_card( pcmInfo );
+ *card = stream->playback.card;
error:
return result;
---- portaudio19-19+svn20100220.orig/src/hostapi/oss/pa_unix_oss.c
-+++ portaudio19-19+svn20100220/src/hostapi/oss/pa_unix_oss.c
-@@ -1989,3 +1989,26 @@ error:
+--- a/src/hostapi/oss/pa_unix_oss.c
++++ b/src/hostapi/oss/pa_unix_oss.c
+@@ -2028,3 +2028,26 @@
#endif
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/portaudio19.git
More information about the Pkg-voip-commits
mailing list