generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added missing .h files to .gypi files so they will show up in xcode / vc projects.

Browse Source 
BUG=
TEST=

Review URL: http://webrtc-codereview.appspot.com/304008

git-svn-id: http://webrtc.googlecode.com/svn/trunk@1117 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
phoglund@webrtc.org 2011-12-07 10:34:35 +00:00
parent 58927e8d8f
commit 5b343aedcc
5 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/modules/video_render/main/source/video_render.gypi
View File

@ -148,6 +148,7 @@
], ],
'sources': [ 'sources': [
'../test/testAPI/testAPI.cpp', '../test/testAPI/testAPI.cpp',
'../test/testAPI/testAPI.h',
'../test/testAPI/testAPI_mac.mm', '../test/testAPI/testAPI_mac.mm',
], ],
'conditions': [ 'conditions': [

16
src/modules/video_render/main/test/testAPI/testAPI.cpp
View File

@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "testApi.h" #include "testAPI.h"
#include <stdio.h> #include <stdio.h>
@ -194,13 +194,13 @@ int WebRtcCreateWindow(Window *outWindow, Display **outDisplay, int winNum, int
// get screen number // get screen number
screen = DefaultScreen(_display); screen = DefaultScreen(_display);
// put desired visual info for the screen in vinfo // put desired visual info for the screen in vinfo
if( XMatchVisualInfo(_display, screen, 24, TrueColor, &vinfo) != 0 ) if( XMatchVisualInfo(_display, screen, 24, TrueColor, &vinfo) != 0 )
{ {
//printf( "Screen visual info match!\n" ); //printf( "Screen visual info match!\n" );
} }
// set window attributes // set window attributes
xswa.colormap = XCreateColormap(_display, DefaultRootWindow(_display), vinfo.visual, AllocNone); xswa.colormap = XCreateColormap(_display, DefaultRootWindow(_display), vinfo.visual, AllocNone);
xswa.event_mask = StructureNotifyMask | ExposureMask; xswa.event_mask = StructureNotifyMask | ExposureMask;
xswa.background_pixel = 0; xswa.background_pixel = 0;
@ -245,7 +245,7 @@ int WebRtcCreateWindow(Window *outWindow, Display **outDisplay, int winNum, int
XSetIconName(_display, _window, "VE MM Remote Window"); XSetIconName(_display, _window, "VE MM Remote Window");
} }
// make x report events for mask // make x report events for mask
XSelectInput(_display, _window, StructureNotifyMask); XSelectInput(_display, _window, StructureNotifyMask);
// map the window to the display // map the window to the display
@ -437,15 +437,15 @@ int TestBitmapText(VideoRender* renderModule) {
// Sleep and let all frames be rendered before closing // Sleep and let all frames be rendered before closing
SLEEP(renderDelayMs*2); SLEEP(renderDelayMs*2);
// Shut down // Shut down
printf("Closing...\n"); printf("Closing...\n");
ColorKey.dwColorSpaceHighValue = RGB(0,0,0); ColorKey.dwColorSpaceHighValue = RGB(0,0,0);
ColorKey.dwColorSpaceLowValue = RGB(0,0,0); ColorKey.dwColorSpaceLowValue = RGB(0,0,0);
renderModule->SetBitmap(NULL, 0, &ColorKey, 0.0f, 0.0f, 0.0f, 0.0f); renderModule->SetBitmap(NULL, 0, &ColorKey, 0.0f, 0.0f, 0.0f, 0.0f);
renderModule->SetText(1, NULL, 20, RGB(255,255,255), renderModule->SetText(1, NULL, 20, RGB(255,255,255),
RGB(0,0,0), 0.0f, 0.0f, 0.0f, 0.0f); RGB(0,0,0), 0.0f, 0.0f, 0.0f, 0.0f);
error = renderModule->StopRender(streamId0); error = renderModule->StopRender(streamId0);
assert(error == 0); assert(error == 0);

0
src/modules/video_render/main/test/testAPI/testApi.h → src/modules/video_render/main/test/testAPI/testAPI.h
View File

2
src/modules/video_render/main/test/testAPI/testAPI_mac.mm
View File

@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "testApi.h" #include "testAPI.h"
#include <iostream> #include <iostream>

9
src/video_engine/test/auto_test/vie_auto_test.gypi
View File

@ -44,24 +44,33 @@
'interface/vie_autotest_main.h', 'interface/vie_autotest_main.h',
'interface/vie_autotest_window_manager_interface.h', 'interface/vie_autotest_window_manager_interface.h',
'interface/vie_autotest_windows.h', 'interface/vie_autotest_windows.h',
'interface/vie_window_manager_factory.h',
# Helper classes # Helper classes
'helpers/vie_fake_camera.cc', 'helpers/vie_fake_camera.cc',
'helpers/vie_fake_camera.h',
'helpers/vie_file_capture_device.cc', 'helpers/vie_file_capture_device.cc',
'helpers/vie_file_capture_device.h',
'helpers/vie_to_file_renderer.cc', 'helpers/vie_to_file_renderer.cc',
'helpers/vie_to_file_renderer.h',
'helpers/vie_window_creator.cc', 'helpers/vie_window_creator.cc',
'helpers/vie_window_creator.h',
# New, fully automated tests # New, fully automated tests
'automated/vie_api_integration_test.cc', 'automated/vie_api_integration_test.cc',
'automated/vie_comparison_test.cc', 'automated/vie_comparison_test.cc',
'automated/vie_extended_integration_test.cc', 'automated/vie_extended_integration_test.cc',
'automated/vie_integration_test_base.cc', 'automated/vie_integration_test_base.cc',
'automated/vie_integration_test_base.h',
'automated/vie_standard_integration_test.cc', 'automated/vie_standard_integration_test.cc',
# Test primitives # Test primitives
'primitives/base_primitives.cc', 'primitives/base_primitives.cc',
'primitives/base_primitives.h',
'primitives/codec_primitives.cc', 'primitives/codec_primitives.cc',
'primitives/codec_primitives.h',
'primitives/general_primitives.cc', 'primitives/general_primitives.cc',
'primitives/general_primitives.h',
# Platform independent # Platform independent
'source/tb_capture_device.cc', 'source/tb_capture_device.cc',