Changeset 1375:cc4c4148e0cb in mediastreamer2

Timestamp:

Apr 29, 2011 9:33:28 PM (2 years ago)

Author:

Simon Morlat <simon.morlat@…>

Branch:

default

Parents:

1374:0d7b7bd49671 (diff), 1366:a623ef968c1a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'dev_videomac' of ​git://git.linphone.org/mediastreamer2 into dev_videomac

Conflicts:

tests/mediastream.c

Files:

• tests/mediastream.c (modified) (1 diff)
• tests/mediastream.c (modified) (3 diffs)

tests/mediastream.c

@@ -473 +473 @@
                 }
         #endif // target MAC
-                                        }
+        }
         
         printf("stopping all...\n");

tests/mediastream.c

@@ -41 +41 @@
 #include <stdlib.h>
 #include <string.h>
+
+#ifdef __APPLE__
+#include <CoreFoundation/CFRunLoop.h>
+#endif
 
 static int cond=1;
@@ -435 +439 @@
         }else{  /* no interactive stuff - continuous debug output */
                 rtp_session_register_event_queue(session,q);
+
+                #ifdef __APPLE__
+                CFRunLoopRun();
+                #else
                 while(cond)
                 {
@@ -464 +472 @@
                         }
                 }
+        #endif // target MAC
         }