summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pjsip-apps/src/vidgui/vidgui.cpp4
-rw-r--r--pjsip-apps/src/vidgui/vidwin.cpp7
-rw-r--r--pjsip-apps/src/vidgui/vidwin.h3
-rw-r--r--pjsip/src/pjsua-lib/pjsua_vid.c1
4 files changed, 13 insertions, 2 deletions
diff --git a/pjsip-apps/src/vidgui/vidgui.cpp b/pjsip-apps/src/vidgui/vidgui.cpp
index 77f805d7..4a0b4d7d 100644
--- a/pjsip-apps/src/vidgui/vidgui.cpp
+++ b/pjsip-apps/src/vidgui/vidgui.cpp
@@ -260,7 +260,7 @@ void MainWin::preview()
pjsua_vid_win_get_info(wid, &wi);
video_prev_ = new VidWin(&wi.hwnd);
- vbox_left->addWidget(video_prev_, 1);
+ video_prev_->putIntoLayout(vbox_left);
//Using this will cause SDL window to display blank
//screen sometimes, probably because it's using different
//X11 Display
@@ -339,7 +339,7 @@ void MainWin::initVideoWindow()
pjsua_vid_win_get_info(ci.media[i].stream.vid.win_in, &wi);
video_= new VidWin(&wi.hwnd);
- vbox_left->addWidget(video_, 1);
+ video_->putIntoLayout(vbox_left);
break;
}
diff --git a/pjsip-apps/src/vidgui/vidwin.cpp b/pjsip-apps/src/vidgui/vidwin.cpp
index 654035c1..3e38b6cd 100644
--- a/pjsip-apps/src/vidgui/vidwin.cpp
+++ b/pjsip-apps/src/vidgui/vidwin.cpp
@@ -50,6 +50,13 @@ VidWin::~VidWin()
detach();
}
+void VidWin::putIntoLayout(QBoxLayout *box)
+{
+ box->addWidget(this, 1);
+ show();
+ activateWindow();
+}
+
bool VidWin::event(QEvent *e)
{
switch(e->type()) {
diff --git a/pjsip-apps/src/vidgui/vidwin.h b/pjsip-apps/src/vidgui/vidwin.h
index b784943b..8ab4a76d 100644
--- a/pjsip-apps/src/vidgui/vidwin.h
+++ b/pjsip-apps/src/vidgui/vidwin.h
@@ -21,6 +21,7 @@
#include <pjsua.h>
#include <QWidget>
+#include <QBoxLayout>
class VidWin : public QWidget
{
@@ -33,6 +34,8 @@ public:
virtual ~VidWin();
QSize sizeHint() const { return size_hint; }
+ void putIntoLayout(QBoxLayout *layout);
+
protected:
virtual bool event(QEvent *e);
diff --git a/pjsip/src/pjsua-lib/pjsua_vid.c b/pjsip/src/pjsua-lib/pjsua_vid.c
index daec253b..5b5f83a2 100644
--- a/pjsip/src/pjsua-lib/pjsua_vid.c
+++ b/pjsip/src/pjsua-lib/pjsua_vid.c
@@ -173,6 +173,7 @@ PJ_DEF(void) pjsua_vid_preview_param_default(pjsua_vid_preview_param *p)
{
p->rend_id = PJMEDIA_VID_DEFAULT_RENDER_DEV;
p->show = PJ_TRUE;
+ p->wnd_flags = 0;
}