Changeset 3699 for pjproject/trunk/pjsip-apps/src/vidgui/vidgui.cpp

Timestamp:

Aug 15, 2011 10:29:14 PM (13 years ago)

Author:

nanang

Message:

Re #1327, some fixes on the simple GUI app:

• Removed timer usage in resizing window, window resizing can be done real-time now (see r3698).
• Fixed linking problem on Windows platform: undefined 'main' function.
• Fixed build problem on Mac, compiling .cpp file containing objective C/C++ codes with g++ needs '-ObjC++' flag.
• Minor changes in vidgui, e.g: function/variable rename, cleaning up unused/junk lines.

File:

• pjproject/trunk/pjsip-apps/src/vidgui/vidgui.cpp (modified) (5 diffs)

pjproject/trunk/pjsip-apps/src/vidgui/vidgui.cpp

@@ -20 +20 @@
 #include "vidwin.h"
 
+#if defined(PJ_WIN32)
+#   define SDL_MAIN_HANDLED
+#endif
+
 #include <SDL.h>
 #include <assert.h>
@@ -51 +55 @@
 MainWin::~MainWin()
 {
+    quit();
     theInstance_ = NULL;
 }
@@ -95 +100 @@
     connect(hangupButton_, SIGNAL(clicked()), this, SLOT(hangup()));
     connect(quitButton_, SIGNAL(clicked()), this, SLOT(quit()));
-    connect(this, SIGNAL(close()), this, SLOT(quit()));
+    //connect(this, SIGNAL(close()), this, SLOT(quit()));
 }
 
@@ -168 +173 @@
         pjsua_vid_win_id wid;
         pjsua_vid_win_info wi;
+        pjsua_vid_preview_param pre_param;
         pj_status_t status;
 
-        status = pjsua_vid_preview_start(DEFAULT_CAP_DEV, NULL);
+        pj_bzero(&pre_param, sizeof(pre_param));
+        pre_param.rend_id = DEFAULT_REND_DEV;
+
+        status = pjsua_vid_preview_start(DEFAULT_CAP_DEV, &pre_param);
         if (status != PJ_SUCCESS) {
             char errmsg[PJ_ERR_MSG_SIZE];
@@ -180 +189 @@
         pjsua_vid_win_get_info(wid, &wi);
 
-        video_prev_= new VidWin(&wi.hwnd);
-        video_prev_->setMinimumSize(320,200);
+        video_prev_ = new VidWin(&wi.hwnd);
         vbox_left->addWidget(video_prev_, 1);