Changeset 84:89c556ab2c0a in verona

Timestamp:

Mar 22, 2010 6:59:33 PM (3 years ago)

Author:

Nikita Kozlov <nikita@…>

Branch:

default

Message:

alsa and pulseaudio are working under linux

Files:

• cmake/Modules/Macros.cmake (modified) (1 diff)
• mediastreamer2/CMakeLists.txt (modified) (1 diff)
• mediastreamer2/src/CMakeLists.txt (modified) (4 diffs)
• mediastreamer2/src/mscommon.c (modified) (1 diff)
• mediastreamer2/tests/CMakeLists.txt (added)
• miniua/#miniua.c# (deleted)
• phapi/Thumbs.db (deleted)
• phapi/phapi.c (modified) (2 diffs)
• phapi/phms_audiostream.c (modified) (2 diffs)

cmake/Modules/Macros.cmake

@@ -1 +1 @@
 
 include(CheckFunctionExists)
+include(TestBigEndian)
+include(FindPortaudio)
 
 

mediastreamer2/CMakeLists.txt

@@ -8 +8 @@
 
 subdirs(src)
+subdirs(tests)

mediastreamer2/src/CMakeLists.txt

@@ -1 @@
-
 
 include(FindThreads)
@@ -17 +16 @@
   endif(ALSA)
   add_definitions(-DHAVE_DLOPEN)
-
 endif(LINUX)
-
-
 
 find_file(GSM_GSM_H gsm/gsm.h)
@@ -32 +28 @@
 endif(GSM_LIB)
 
-
-
 find_file(SPEEX_H speex/speex.h)
 if(SPEEX_H)
@@ -44 +38 @@
   set(MS_SRCS ${MS_SRCS} msresample.c msspeex.c)
 endif(SPEEX_LIB)
+
+
+
+if(PORTAUDIO_FOUND)
+#  add_definitions(
+#    -D__PORTAUDIO_ENABLED__
+#  )
+#  set(MS_SRCS  ${MS_SRCS} pasnd.c)
+#  set(MS_LIBS  ${MS_LIBS} ${PORTAUDIO_LIBRARIES})
+endif(PORTAUDIO_FOUND)
+
+TEST_BIG_ENDIAN(BIG_ENDIAN)
+if(BIG_ENDIAN)
+  add_definitions(
+    -DORTP_BIGENDIAN
+    -DWORDS_BIGENDIAN
+  )
+endif(BIG_ENDIAN)
 
 # We want to generated the alldescs.h file

mediastreamer2/src/mscommon.c

@@ -523 +523 @@
         }
 #endif
+
+#ifdef __PORTAUDIO_ENABLED__
+        ms_message("Portaudio ENABLED..");
+#endif
+
         ms_message("Registering all filters...");
         /* register builtin MSFilter's */

phapi/phapi.c

@@ -3966 +3966 @@
 #ifdef OLDOSIP
   ph_media_init(phcfg.use_tunnel, phcfg.plugin_path);
+#else
+  ph_media_init(phcfg.plugin_path);
 #endif
   if (phcfg.use_tunnel) {
@@ -5108 +5110 @@
   phCallStateInfo_t info;
   phcall_t *ca, *rca=0;
-  char *from = 0, *to = 0, *sdp = 0;
+  char *to = 0;
   int s;
 

phapi/phms_audiostream.c

@@ -178 +178 @@
         }
 //#endif
-        if (devnum)
+        if (devnum != -1)
                 return ms_snd_card_manager_get_card_by_idx(ms_snd_card_manager_get(),devnum);
         else
@@ -202 +202 @@
         }
 //#endif        
-        if (devnum)
+        if (devnum != -1)
                 return ms_snd_card_manager_get_card_by_idx(ms_snd_card_manager_get(),devnum);
         else