[prev in list] [next in list] [prev in thread] [next in thread] 

List:       helix-audio-cvs
Subject:    [Audio-cvs] device/pub/platform/unix audAndroid.h,1.1.2.4,1.1.2.5
From:       qluo () helixcommunity ! org
Date:       2009-12-04 18:28:48
Message-ID: 200912041941.nB4JffJ1021766 () mailer ! progressive-comp ! com
[Download RAW message or body]

Update of /cvsroot/audio/device/pub/platform/unix
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv30073/pub/platform/unix

Modified Files:
      Tag: hxclient_3_1_0_atlas
	audAndroid.h 
Log Message:
fix for android eclair.  CR:sfu@real.com


Index: audAndroid.h
===================================================================
RCS file: /cvsroot/audio/device/pub/platform/unix/audAndroid.h,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -d -r1.1.2.4 -r1.1.2.5
--- audAndroid.h	20 Jul 2009 23:27:19 -0000	1.1.2.4
+++ audAndroid.h	4 Dec 2009 18:28:45 -0000	1.1.2.5
@@ -56,10 +56,31 @@
 #include <sys/prctl.h>
 #include <sys/resource.h>
 
+#if defined(ANDROID_ECLAIR)
+#include <binder/MemoryHeapBase.h>
+#include <binder/MemoryBase.h>
+#else
 #include <utils/MemoryHeapBase.h>
 #include <utils/MemoryBase.h>
+#endif
+
+// undefine helix REF to avoid conflict with android's refcount REF class
+#if defined(ANDROID_ECLAIR)
+#undef REF
+#endif
+
 #include <media/MediaPlayerInterface.h>
 #include <media/AudioTrack.h>
+
+// redefine helix REF for reference parameters
+#if defined(ANDROID_ECLAIR)
+#if defined(__cplusplus)
+#define REF(type)   type&
+#else
+#define REF(type)   const type * const
+#endif
+#endif
+
 using namespace android;
 
 //------------------------------------------------


_______________________________________________
Audio-cvs mailing list
Audio-cvs@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/audio-cvs
[prev in list] [next in list] [prev in thread] [next in thread]