Added misc flags and modify Makefiles to allow exclusion of PortAudio and specific codec during compilation

git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@320 74dad513-b988-da41-8d7b-12977e46ad98

6 files changed, 44 insertions, 46 deletions

diff --git a/pjmedia/include/pjmedia-codec.h b/pjmedia/include/pjmedia-codec.h
index c37fc5ca..8b975839 100644
--- a/pjmedia/include/pjmedia-codec.h
+++ b/pjmedia/include/pjmedia-codec.h
@@ -16,40 +16,12 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
  */
-#ifndef __PJMEDIA_CODEC1_H__
-#define __PJMEDIA_CODEC1_H__
+#ifndef __PJMEDIA_CODEC_PJMEDIA_CODEC_H__
+#define __PJMEDIA_CODEC_PJMEDIA_CODEC_H__
 
 #include <pjmedia-codec/gsm.h>
 #include <pjmedia-codec/speex.h>
 
 
-PJ_BEGIN_DECL
-
-
-/**
- * Initialize pjmedia-codec library, and register all codec factories
- * in this library. If application wants to controll the order of
- * the codec, it MUST NOT call this function, but instead register
- * each codec individually.
- *
- * @param endpt	    The pjmedia endpoint.
- *
- * @return	    PJ_SUCCESS on success.
- */
-PJ_DECL(pj_status_t) pjmedia_codec_init(pjmedia_endpt *endpt);
-
-
-/**
- * Deinitialize pjmedia-codec library, and unregister all codec factories
- * in this library.
- *
- * @return	    PJ_SUCCESS on success.
- */
-PJ_DECL(pj_status_t) pjmedia_codec_deinit(void);
-
-
-PJ_END_DECL
-
-
-#endif	/* __PJMEDIA_CODEC_H__ */
+#endif	/* __PJMEDIA_CODEC_PJMEDIA_CODEC_H__ */
 
diff --git a/pjmedia/include/pjmedia-codec/config.h b/pjmedia/include/pjmedia-codec/config.h
index 9b93c5a1..a9cdbfaf 100644
--- a/pjmedia/include/pjmedia-codec/config.h
+++ b/pjmedia/include/pjmedia-codec/config.h
@@ -22,19 +22,19 @@
 #include <pjmedia/types.h>
 
 
-/*
- * Include GSM codec?
+/**
+ * Unless specified otherwise, GSM codec is included by default.
  */
-#ifndef PJMEDIA_CODEC_HAS_GSM
-#   define PJMEDIA_CODEC_HAS_GSM    1
+#ifndef PJMEDIA_HAS_GSM_CODEC
+#   define PJMEDIA_HAS_GSM_CODEC    1
 #endif
 
 
-/*
- * Include Speex codec?
+/**
+ * Unless specified otherwise, Speex codec is included by default.
  */
-#ifndef PJMEDIA_CODEC_HAS_SPEEX
-#   define PJMEDIA_CODEC_HAS_SPEEX    1
+#ifndef PJMEDIA_HAS_SPEEX_CODEC
+#   define PJMEDIA_HAS_SPEEX_CODEC    1
 #endif
 
 
diff --git a/pjmedia/include/pjmedia-codec/types.h b/pjmedia/include/pjmedia-codec/types.h
index ce5c258c..af847543 100644
--- a/pjmedia/include/pjmedia-codec/types.h
+++ b/pjmedia/include/pjmedia-codec/types.h
@@ -19,7 +19,7 @@
 #ifndef __PJMEDIA_CODEC_TYPES_H__
 #define __PJMEDIA_CODEC_TYPES_H__
 
-#include <pjmedia/types.h>
+#include <pjmedia-codec/config.h>
 
 
 #endif	/* __PJMEDIA_CODEC_TYPES_H__ */
diff --git a/pjmedia/include/pjmedia/config.h b/pjmedia/include/pjmedia/config.h
index 236d011c..66f42d5e 100644
--- a/pjmedia/include/pjmedia/config.h
+++ b/pjmedia/include/pjmedia/config.h
@@ -16,8 +16,35 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
  */
-#ifndef __PJMED_CONFIG_H__
-#define __PJMED_CONFIG_H__
+#ifndef __PJMEDIA_CONFIG_H__
+#define __PJMEDIA_CONFIG_H__
 
+#include <pj/config.h>
 
-#endif	/* __PJMED_CONFIG_H__ */
+/**
+ * Unless specified otherwise, PortAudio is enabled by default.
+ */
+#ifndef PJMEDIA_HAS_PORTAUDIO_SOUND
+#   define PJMEDIA_HAS_PORTAUDIO_SOUND	    1
+#endif
+
+
+/**
+ * Unless specified otherwise, Null sound is disabled.
+ * This option is mutually exclusive with PortAudio sound, or otherwise
+ * duplicate symbols error will occur.
+ */
+#ifndef PJMEDIA_HAS_NULL_SOUND
+#   define PJMEDIA_HAS_NULL_SOUND	    0
+#endif
+
+
+/**
+ * Unless specified otherwise, G711 codec is included by default.
+ */
+#ifndef PJMEDIA_HAS_G711_CODEC
+#   define PJMEDIA_HAS_G711_CODEC	    1
+#endif
+
+
+#endif	/* __PJMEDIA_CONFIG_H__ */
diff --git a/pjmedia/include/pjmedia/sound.h b/pjmedia/include/pjmedia/sound.h
index ec7564fa..5719c0f9 100644
--- a/pjmedia/include/pjmedia/sound.h
+++ b/pjmedia/include/pjmedia/sound.h
@@ -24,7 +24,7 @@
  * @file sound.h
  * @brief Sound player and recorder device framework.
  */
-
+#include <pjmedia/types.h>
 #include <pj/pool.h>
 
 PJ_BEGIN_DECL
diff --git a/pjmedia/include/pjmedia/types.h b/pjmedia/include/pjmedia/types.h
index b0bda7e4..ac3af4e8 100644
--- a/pjmedia/include/pjmedia/types.h
+++ b/pjmedia/include/pjmedia/types.h
@@ -19,10 +19,9 @@
 #ifndef __PJMEDIA_TYPES_H__
 #define __PJMEDIA_TYPES_H__
 
-#include <pj/types.h>
+#include <pjmedia/config.h>
 #include <pj/sock.h>
 
-
 /** 
  * Top most media type. 
  */