diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2011-08-15 22:29:14 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2011-08-15 22:29:14 +0000 |
| commit | c025a52704d7f98d47a39ff51bc3f4b9f4e13f23 (patch) | |
| tree | 0172b2423051baf626a4a67e56e7e42397fc5132 /pjsip-apps/src/vidgui/vidgui.cpp | |
| parent | 2f5438b0eab01ab38093964d9658331aaac3aea2 (diff) | |
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.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3699 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip-apps/src/vidgui/vidgui.cpp')
| -rw-r--r-- | pjsip-apps/src/vidgui/vidgui.cpp | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/pjsip-apps/src/vidgui/vidgui.cpp b/pjsip-apps/src/vidgui/vidgui.cpp index ca638634..4615ccdb 100644 --- a/pjsip-apps/src/vidgui/vidgui.cpp +++ b/pjsip-apps/src/vidgui/vidgui.cpp @@ -19,6 +19,10 @@ #include "vidgui.h" #include "vidwin.h" +#if defined(PJ_WIN32) +# define SDL_MAIN_HANDLED +#endif + #include <SDL.h> #include <assert.h> #include <QMessageBox> @@ -50,6 +54,7 @@ MainWin::MainWin(QWidget *parent) MainWin::~MainWin() { + quit(); theInstance_ = NULL; } @@ -94,7 +99,7 @@ void MainWin::initLayout() connect(callButton_, SIGNAL(clicked()), this, SLOT(call())); 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())); } void MainWin::quit() @@ -167,9 +172,13 @@ void MainWin::preview() } else { 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]; pj_strerror(status, errmsg, sizeof(errmsg)); @@ -179,8 +188,7 @@ void MainWin::preview() wid = pjsua_vid_preview_get_win(DEFAULT_CAP_DEV); 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); previewButton_->setText(tr("Stop Preview")); |