From 77e6d19a4321a6069f9b069d52d3a7118251ad95 Mon Sep 17 00:00:00 2001 From: bossiel Date: Wed, 10 Jul 2013 03:40:30 +0000 Subject: [PATCH] Change VS project setting (release target to use full optimization -Ox-) --- .../doubango/bindings/csharp/tinyWRAP.vcproj | 6 +++--- .../pluginDirectShow/pluginDirectShow.vcproj | 2 +- .../internals/mf_display_watcher.cxx | 21 ++++++++++++++++++- .../internals/mf_display_watcher.h | 1 + .../plugins/pluginWinMF/pluginWinMF.vcproj | 10 ++++++++- .../plugin_win_mf_producer_video.cxx | 2 +- branches/2.0/doubango/tinyDAV/tinyDAV.vcproj | 7 ++++--- .../2.0/doubango/tinyHTTP/tinyHTTP.vcproj | 6 +++--- .../doubango/tinyIPSec/src/tinyipsec_config.h | 7 ------- .../2.0/doubango/tinyIPSec/tinyIPSec.vcproj | 5 +++-- .../2.0/doubango/tinyMEDIA/tinyMEDIA.vcproj | 6 +++--- .../2.0/doubango/tinyMSRP/tinyMSRP.vcproj | 6 +++--- branches/2.0/doubango/tinyNET/tinyNET.vcproj | 6 +++--- branches/2.0/doubango/tinyRTP/tinyRTP.vcproj | 6 +++--- branches/2.0/doubango/tinySAK/tinySAK.vcproj | 6 +++--- branches/2.0/doubango/tinySDP/tinySDP.vcproj | 6 +++--- .../doubango/tinySIGCOMP/tinySIGCOMP.vcproj | 6 +++--- branches/2.0/doubango/tinySIP/tinySIP.vcproj | 6 +++--- branches/2.0/doubango/tinySMS/tinySMS.vcproj | 6 +++--- .../2.0/doubango/tinyXCAP/tinyXCAP.vcproj | 6 +++--- 20 files changed, 75 insertions(+), 52 deletions(-) diff --git a/branches/2.0/doubango/bindings/csharp/tinyWRAP.vcproj b/branches/2.0/doubango/bindings/csharp/tinyWRAP.vcproj index 81e6c1a5..763e7e27 100644 --- a/branches/2.0/doubango/bindings/csharp/tinyWRAP.vcproj +++ b/branches/2.0/doubango/bindings/csharp/tinyWRAP.vcproj @@ -1,7 +1,7 @@ SetFullscreen(bEnabled); + HRESULT hr = m_pDisplayControl->SetFullscreen(bEnabled); + m_bFullScreen = SUCCEEDED(hr); + return hr; } + return E_FAIL; } @@ -125,6 +129,21 @@ LRESULT CALLBACK DisplayWatcher::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LP } break; } + + case WM_CHAR: + case WM_KEYUP: + { + DisplayWatcher* This = dynamic_cast((DisplayWatcher*)GetPropA(hWnd, "This")); + if(This) + { + if(This->m_bFullScreen && (wParam == 0x1B || wParam == VK_ESCAPE)) + { + This->SetFullscreen(FALSE); + } + } + + break; + } } return DefWindowProc(hWnd, uMsg, wParam, lParam); diff --git a/branches/2.0/doubango/plugins/pluginWinMF/internals/mf_display_watcher.h b/branches/2.0/doubango/plugins/pluginWinMF/internals/mf_display_watcher.h index e8b44480..332f1840 100644 --- a/branches/2.0/doubango/plugins/pluginWinMF/internals/mf_display_watcher.h +++ b/branches/2.0/doubango/plugins/pluginWinMF/internals/mf_display_watcher.h @@ -49,6 +49,7 @@ private: HWND m_hWnd; WNDPROC m_pWndProc; BOOL m_bStarted; + BOOL m_bFullScreen; }; #endif /* PLUGIN_WIN_MF_DISPLAY_WATCHER_H */ diff --git a/branches/2.0/doubango/plugins/pluginWinMF/pluginWinMF.vcproj b/branches/2.0/doubango/plugins/pluginWinMF/pluginWinMF.vcproj index 877d898c..525f5648 100644 --- a/branches/2.0/doubango/plugins/pluginWinMF/pluginWinMF.vcproj +++ b/branches/2.0/doubango/plugins/pluginWinMF/pluginWinMF.vcproj @@ -114,7 +114,7 @@ /> + + @@ -247,6 +251,10 @@ RelativePath=".\internals\mf_devices.h" > + + diff --git a/branches/2.0/doubango/plugins/pluginWinMF/plugin_win_mf_producer_video.cxx b/branches/2.0/doubango/plugins/pluginWinMF/plugin_win_mf_producer_video.cxx index fcf2aa71..a939ea12 100644 --- a/branches/2.0/doubango/plugins/pluginWinMF/plugin_win_mf_producer_video.cxx +++ b/branches/2.0/doubango/plugins/pluginWinMF/plugin_win_mf_producer_video.cxx @@ -95,7 +95,7 @@ static int plugin_win_mf_producer_video_set(tmedia_producer_t *self, const tmedi } } else if(param->value_type == tmedia_pvt_int32){ - if(tsk_striequals(param->key, "mute")){ + if(tsk_striequals(param->key, "mute")){ //producer->mute = (TSK_TO_INT32((uint8_t*)param->value) != 0); //if(producer->started){ // if(producer->mute){ diff --git a/branches/2.0/doubango/tinyDAV/tinyDAV.vcproj b/branches/2.0/doubango/tinyDAV/tinyDAV.vcproj index 4bd2cf80..9111cd95 100644 --- a/branches/2.0/doubango/tinyDAV/tinyDAV.vcproj +++ b/branches/2.0/doubango/tinyDAV/tinyDAV.vcproj @@ -42,7 +42,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\thirdparties\common\include;..\thirdparties\win32\include;include;..\tinyMSRP\include;..\tinyRTP\include;..\tinyMEDIA\include;..\tinySDP\include;..\tinyNET\src;..\tinySAK\src;..\thirdparties\win32\include\BroadVoice16\bvcommon;..\thirdparties\win32\include\BroadVoice16\bv16" - PreprocessorDefinitions="HAVE_SRTP=1;HAVE_CUDA=0;HAVE_G729=0;HAVE_BV16=0;HAVE_OPENCORE_AMR=1;HAVE_H264=1;HAVE_ILBC=0;HAVE_LIBGSM=1;HAVE_LIBOPUS=1;HAVE_DSOUND_H=1;HAVE_WAVE_API=0;HAVE_FFMPEG=1;HAVE_SPEEX_DSP=1;HAVE_WEBRTC=1;HAVE_SPEEX_JB=1;HAVE_LIB_SPEEX=1;HAVE_LIBVPX=1;HAVE_LIBYUV=1;G192BITSTREAM=0;DEBUG_LEVEL=DEBUG_LEVEL_INFO;WIN32;_DEBUG;_WINDOWS;_USRDLL;_WIN32_WINNT=0x0501;TINYDAV_EXPORTS" + PreprocessorDefinitions="HAVE_SRTP=1;HAVE_CUDA=0;HAVE_G729=0;HAVE_BV16=0;HAVE_OPENCORE_AMR=1;HAVE_H264=1;HAVE_ILBC=0;HAVE_LIBGSM=1;HAVE_LIBOPUS=1;HAVE_DSOUND_H=1;HAVE_WAVE_API=0;HAVE_FFMPEG=1;HAVE_SPEEX_DSP=1;HAVE_WEBRTC=1;HAVE_SPEEX_JB=1;HAVE_LIB_SPEEX=1;HAVE_LIBVPX=1;HAVE_LIBYUV=1;G192BITSTREAM=0;DEBUG_LEVEL=DEBUG_LEVEL_INFO;GOTHAM_CITY = 0;WIN32;_DEBUG;_WINDOWS;_USRDLL;_WIN32_WINNT=0x0501;TINYDAV_EXPORTS" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -120,9 +120,10 @@ /> -//# include -# include -#endif - - // // IPSEC // diff --git a/branches/2.0/doubango/tinyIPSec/tinyIPSec.vcproj b/branches/2.0/doubango/tinyIPSec/tinyIPSec.vcproj index a11195fe..e29bbbd0 100644 --- a/branches/2.0/doubango/tinyIPSec/tinyIPSec.vcproj +++ b/branches/2.0/doubango/tinyIPSec/tinyIPSec.vcproj @@ -1,7 +1,7 @@