diff options
| author | Benny Prijono <bennylp@teluu.com> | 2011-08-15 10:04:35 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2011-08-15 10:04:35 +0000 |
| commit | f6958ee715db62435f5ee0411db96698cb0c3fa7 (patch) | |
| tree | bb58b39cc9fffa778137c4ad8e276513d849a17f /pjsip-apps | |
| parent | 5409213729f123c03ead144bf09975fee7a6a3bb (diff) | |
Re #1327 (vidgui):
- fixed wrong default capture device (was 1)
- fixed assertion if unable to open capture device
- in qmake project file (vidgui.pro):
- fixed INCLUDEPATH
- added debug and release setting
- added (disabled) static linking setting
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3697 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip-apps')
| -rw-r--r-- | pjsip-apps/src/vidgui/vidgui.cpp | 15 | ||||
| -rw-r--r-- | pjsip-apps/src/vidgui/vidgui.pro | 15 |
2 files changed, 26 insertions, 4 deletions
diff --git a/pjsip-apps/src/vidgui/vidgui.cpp b/pjsip-apps/src/vidgui/vidgui.cpp index d127dbdb..ca638634 100644 --- a/pjsip-apps/src/vidgui/vidgui.cpp +++ b/pjsip-apps/src/vidgui/vidgui.cpp @@ -21,17 +21,19 @@ #include <SDL.h> #include <assert.h> +#include <QMessageBox> #define LOG_FILE "vidgui.log" +// These configure SIP registration #define SIP_DOMAIN NULL //#define SIP_DOMAIN "pjsip.org" #define SIP_USERNAME "vidgui" #define SIP_PASSWORD "secret" #define SIP_PORT 5060 -//#define DEFAULT_CAP_DEV PJMEDIA_VID_DEFAULT_CAPTURE_DEV -#define DEFAULT_CAP_DEV 1 +#define DEFAULT_CAP_DEV PJMEDIA_VID_DEFAULT_CAPTURE_DEV +//#define DEFAULT_CAP_DEV 1 #define DEFAULT_REND_DEV PJMEDIA_VID_DEFAULT_RENDER_DEV MainWin *MainWin::theInstance_; @@ -165,8 +167,15 @@ void MainWin::preview() } else { pjsua_vid_win_id wid; pjsua_vid_win_info wi; + pj_status_t status; - pjsua_vid_preview_start(DEFAULT_CAP_DEV, NULL); + status = pjsua_vid_preview_start(DEFAULT_CAP_DEV, NULL); + if (status != PJ_SUCCESS) { + char errmsg[PJ_ERR_MSG_SIZE]; + pj_strerror(status, errmsg, sizeof(errmsg)); + QMessageBox::critical(0, "Error creating preview", errmsg); + return; + } wid = pjsua_vid_preview_get_win(DEFAULT_CAP_DEV); pjsua_vid_win_get_info(wid, &wi); diff --git a/pjsip-apps/src/vidgui/vidgui.pro b/pjsip-apps/src/vidgui/vidgui.pro index af116ed3..5bf74ca8 100644 --- a/pjsip-apps/src/vidgui/vidgui.pro +++ b/pjsip-apps/src/vidgui/vidgui.pro @@ -1,6 +1,19 @@ win32 { DEFINES += PJ_WIN32=1 - LIBS += ../../../lib/pjproject.lib Iphlpapi.lib dsound.lib \ + INCLUDEPATH += ../../../pjlib/include ../../../pjlib-util/include \ + ../../../pjnath/include ../../../pjmedia/include \ + ../../../pjsip/include + + # These to enable static linking + #CONFIG += static + #DEFINES += STATIC + + CONFIG(debug) { + LIBS += ../../../lib/libpjproject-i386-Win32-vc8-Debug.lib + } else { + LIBS += ../../../lib/libpjproject-i386-Win32-vc8-Release.lib + } + LIBS += Iphlpapi.lib dsound.lib \ dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib \ odbccp32.lib ole32.lib user32.lib gdi32.lib advapi32.lib } else { |