[xiph-cvs] cvs commit: speex/libspeex speex_echo.h speex_jitter.h speex_preprocess.h speex_stereo.h

Jean-Marc Valin jm at xiph.org
Wed Jan 21 11:50:15 PST 2004



jm          04/01/21 14:50:15

  Modified:    libspeex speex_echo.h speex_jitter.h speex_preprocess.h
                        speex_stereo.h
  Log:
  include gards and c++ compatibility (extern "C")

Revision  Changes    Path
1.6       +12 -0     speex/libspeex/speex_echo.h

Index: speex_echo.h
===================================================================
RCS file: /usr/local/cvsroot/speex/libspeex/speex_echo.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- speex_echo.h	16 Sep 2003 18:35:45 -0000	1.5
+++ speex_echo.h	21 Jan 2004 19:50:03 -0000	1.6
@@ -30,6 +30,13 @@
    POSSIBILITY OF SUCH DAMAGE.
 */
 
+#ifndef SPEEX_ECHO_H
+#define SPEEX_ECHO_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct drft_lookup;
 
 typedef struct SpeexEchoState {
@@ -68,3 +75,8 @@
 /** Performs echo cancellation a frame */
 void speex_echo_cancel(SpeexEchoState *st, float *ref, float *echo, float *out, float *Y);
 
+#ifdef __cplusplus
+}
+#endif
+
+#endif

<p><p>1.3       +10 -2     speex/libspeex/speex_jitter.h

Index: speex_jitter.h
===================================================================
RCS file: /usr/local/cvsroot/speex/libspeex/speex_jitter.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- speex_jitter.h	8 Oct 2003 05:03:47 -0000	1.2
+++ speex_jitter.h	21 Jan 2004 19:50:03 -0000	1.3
@@ -32,11 +32,15 @@
 
 */
 
+#ifndef SPEEX_JITTER_H
+#define SPEEX_JITTER_H
+
 #include "speex.h"
 #include "speex_bits.h"
 
-#ifndef SPEEX_JITTER_H
-#define SPEEX_JITTER_H
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 #define SPEEX_JITTER_MAX_PACKET_SIZE 2000
 #define SPEEX_JITTER_MAX_BUFFER_SIZE 20
@@ -70,5 +74,9 @@
 
 void speex_jitter_get(SpeexJitter *jitter, short *out);
 
+#ifdef __cplusplus
+}
+#endif
+
 
 #endif

<p><p>1.11      +4 -0      speex/libspeex/speex_preprocess.h

Index: speex_preprocess.h
===================================================================
RCS file: /usr/local/cvsroot/speex/libspeex/speex_preprocess.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- speex_preprocess.h	8 Oct 2003 05:03:47 -0000	1.10
+++ speex_preprocess.h	21 Jan 2004 19:50:03 -0000	1.11
@@ -31,6 +31,8 @@
    POSSIBILITY OF SUCH DAMAGE.
 */
 
+#ifndef SPEEX_PREPROCESS_H
+#define SPEEX_PREPROCESS_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -126,3 +128,5 @@
 #ifdef __cplusplus
 }
 #endif
+
+#endif

<p><p>1.8       +9 -0      speex/libspeex/speex_stereo.h

Index: speex_stereo.h
===================================================================
RCS file: /usr/local/cvsroot/speex/libspeex/speex_stereo.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- speex_stereo.h	8 Oct 2003 05:03:47 -0000	1.7
+++ speex_stereo.h	21 Jan 2004 19:50:03 -0000	1.8
@@ -37,6 +37,10 @@
 
 #include "speex_bits.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /** State used for decoding (intensity) stereo information */
 typedef struct SpeexStereoState {
    float balance;      /**< Left/right balance info */
@@ -59,4 +63,9 @@
 /** Callback handler for intensity stereo info */
 int speex_std_stereo_request_handler(SpeexBits *bits, void *state, void *data);
 
+#ifdef __cplusplus
+}
+#endif
+
+
 #endif

<p><p>--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.



More information about the commits mailing list