Author: titmuss
Date: Fri Aug 8 12:50:09 2008
New Revision: 2820
URL: http://svn.slimdevices.com?rev=2820&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r2819): titmuss | 2008-08-08 20:49:15 +0100
Bug: N/A
Description:
Don't always include portaudio header.
Modified:
7.4/trunk/ (props changed)
7.4/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_portaudio.c
Propchange: 7.4/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Fri Aug 8 12:50:09 2008
@@ -2,7 +2,7 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/branches/discovery-refactor:2596
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/trunk:2813
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.2/trunk:2815
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:2816
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:2819
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:2013
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified:
7.4/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_portaudio.c
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_portaudio.c?rev=2820&root=Jive&r1=2819&r2=2820&view=diff
==============================================================================
--- 7.4/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_portaudio.c
(original)
+++ 7.4/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_portaudio.c
Fri Aug 8 12:50:09 2008
@@ -8,8 +8,6 @@
#include "common.h"
-#include "portaudio.h"
-
#include "audio/fifo.h"
#include "audio/mqueue.h"
#include "audio/decode/decode.h"
@@ -17,6 +15,8 @@
#ifdef HAVE_LIBPORTAUDIO
+
+#include "portaudio.h"
/* Portaudio stream */
static PaStreamParameters outputParam;
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
