Changeset 3643 for pjproject/branches/projects/2.0-dev/pjsip-apps/src/pjsua/main.c

Timestamp:

Jul 14, 2011 8:46:19 AM (13 years ago)

Author:

ming

Message:

Re #1278: NSApplication and NSAutoreleasePool management for Mac OS X

Application now needs to call pj_run_app() from its main() function and pass a pointer to the application's main function. For some examples, please refer to aviplay, pjmedia_test, and pjsua.

File:

• pjproject/branches/projects/2.0-dev/pjsip-apps/src/pjsua/main.c (modified) (4 diffs)

pjproject/branches/projects/2.0-dev/pjsip-apps/src/pjsua/main.c

@@ -18 +18 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
  */
-#include <pjmedia_videodev.h>
 #include <pjsua-lib/pjsua.h>
 
-#if defined(PJ_DARWINOS) && PJ_DARWINOS!=0
-#   include <CoreFoundation/CFRunLoop.h>
-#endif
 
 #define THIS_FILE       "main.c"
@@ -32 +28 @@
  */
 extern pj_bool_t app_restart;
-pj_bool_t is_quit = PJ_FALSE;
 pj_status_t app_init(int argc, char *argv[]);
 pj_status_t app_main(void);
@@ -81 +76 @@
 #endif
 
-#if defined(PJ_DARWINOS) && PJ_DARWINOS!=0
-static int main_func(void *data);
-int argc;
-char **argv;
-
-int main(int argcm, char *argvm[])
-{ 
-    pthread_t thread;
-
-    argc = argcm;
-    argv = (char **)argvm;
-    if (pthread_create(&thread, NULL, &main_func, NULL) == 0) {
-        while (!is_quit) {
-            CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0, false);
-        }
-    }
-
-    return 0;
-}
-static int main_func(void *data)
-#else
-int main(int argc, char *argv[])
-#endif
+static int main_func(int argc, char *argv[])
 {
     do {
@@ -120 +93 @@
     } while (app_restart);
 
-    is_quit = PJ_TRUE;
     return 0;
 }
 
+int main(int argc, char *argv[])
+{
+    return pj_run_app(&main_func, argc, argv, 0);
+}