Skip to content

Commit ba72c52

Browse files
smasherprogsmasherprog
committedNov 22, 2016
Working on tidying this up
Implemting a cross-plat screen capture codebase
·
v.912.0
1 parent 80fcb54 commit ba72c52

13 files changed

+293
-349
lines changed
 

‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ dlldata.c
5858
*.pidb
5959
*.svclog
6060
*.scc
61+
*.db
62+
*.opendb
6163

6264
# Chutzpah Test files
6365
_Chutzpah*

‎Screen_Capture/ReadMe.txt

-37
This file was deleted.

‎Screen_Capture/Screen.cpp

+135-61
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,148 @@
11
#include "stdafx.h"
22
#include "Screen.h"
3-
3+
#include "ScreenInfo.h"
4+
#include <assert.h>
5+
#include <algorithm>
46

57

68
namespace SL {
79
namespace Screen_Capture {
8-
struct Blk {
9-
size_t size = 0;
10-
char* data = nullptr;
11-
};
12-
}
13-
}
1410

15-
class BufferManager {
16-
size_t _Bytes_Allocated = 0;
17-
const size_t MAX_ALLOCATED_BYTES = 1024 * 1024 * 64;//64 MB MAX
18-
std::vector<std::shared_ptr<SL::Screen_Capture::Blk>> _Buffer;
19-
std::mutex _BufferLock;
20-
public:
21-
std::shared_ptr<SL::Screen_Capture::Blk> AquireBuffer(size_t req_bytes) {
22-
std::lock_guard<std::mutex> lock(_BufferLock);
23-
auto found = std::remove_if(begin(_Buffer), end(_Buffer), [=](std::shared_ptr<SL::Screen_Capture::Blk>& c) { return c->size >= req_bytes; });
24-
25-
if (found == _Buffer.end()) {
26-
auto b = new SL::Screen_Capture::Blk;
27-
b->data = new char[req_bytes];
28-
b->size = req_bytes;
29-
return std::shared_ptr<SL::Screen_Capture::Blk>(b, [](SL::Screen_Capture::Blk* b) { delete[] b->data; delete b; });
30-
}
31-
else {
32-
auto ret(*found);
33-
_Bytes_Allocated -= ret->size;
34-
_Buffer.erase(found);
11+
#if _WIN32
12+
13+
//RAII Objects to ensure proper destruction
14+
#define RAIIHDC(handle) std::unique_ptr<std::remove_pointer<HDC>::type, decltype(&::DeleteDC)>(handle, &::DeleteDC)
15+
#define RAIIHBITMAP(handle) std::unique_ptr<std::remove_pointer<HBITMAP>::type, decltype(&::DeleteObject)>(handle, &::DeleteObject)
16+
#define RAIIHANDLE(handle) std::unique_ptr<std::remove_pointer<HANDLE>::type, decltype(&::CloseHandle)>(handle, &::CloseHandle)
17+
18+
SL::Screen_Capture::Image CaptureDesktopImage(const std::vector<ScreenInfo>& screens)
19+
{
20+
Image ret;
21+
int left(0), top(0);
22+
for (const auto& mon : screens) {
23+
ret.Width += mon.Width;
24+
ret.Height = std::max(ret.Height, mon.Height);
25+
left = std::min(left, mon.Offsetx);
26+
top = std::min(top, mon.Offsety);
27+
}
28+
assert(ret.Width >= 0);
29+
assert(ret.Height >= 0);
30+
31+
static auto desktopdc(RAIIHDC(CreateDCA("DISPLAY", NULL, NULL, NULL)));
32+
static auto capturedc(RAIIHDC(CreateCompatibleDC(desktopdc.get())));
33+
static auto capturebmp(RAIIHBITMAP(CreateCompatibleBitmap(desktopdc.get(), ret.Width, ret.Height)));
34+
35+
if (!desktopdc || !capturedc || !capturebmp) return ret;
36+
37+
// Selecting an object into the specified DC
38+
auto originalBmp = SelectObject(capturedc.get(), capturebmp.get());
39+
40+
ret.Data = std::shared_ptr<char>(new char[get_imagesize(ret)], [](char* p) { delete[]p; });//always
41+
42+
if (BitBlt(capturedc.get(), 0, 0, ret.Width, ret.Height, desktopdc.get(), left, top, SRCCOPY | CAPTUREBLT) == FALSE) {
43+
//if the screen cannot be captured, set everything to 1 and return
44+
memset(ret.Data.get(), 1, get_imagesize(ret));
45+
SelectObject(capturedc.get(), originalBmp);
46+
return ret;
47+
}
48+
BITMAPINFO bmpInfo;
49+
memset(&bmpInfo, 0, sizeof(BITMAPINFO));
50+
51+
bmpInfo.bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
52+
bmpInfo.bmiHeader.biWidth = ret.Width;
53+
bmpInfo.bmiHeader.biHeight = -ret.Height;
54+
bmpInfo.bmiHeader.biPlanes = 1;
55+
bmpInfo.bmiHeader.biBitCount = get_pixelstride()*8;//always 32 bits damnit!!!
56+
bmpInfo.bmiHeader.biCompression = BI_RGB;
57+
bmpInfo.bmiHeader.biSizeImage = ((ret.Width * bmpInfo.bmiHeader.biBitCount + 31) / get_pixelstride() * 8) * get_pixelstride()* ret.Width;
58+
59+
GetDIBits(desktopdc.get(), capturebmp.get(), 0, (UINT)ret.Width, ret.Data.get(), (BITMAPINFO *)&bmpInfo, DIB_RGB_COLORS);
60+
61+
SelectObject(capturedc.get(), originalBmp);
62+
3563
return ret;
3664
}
37-
}
38-
void ReleaseBuffer(std::shared_ptr<SL::Screen_Capture::Blk>& buffer) {
39-
if (buffer == nullptr) return;
40-
if (_Bytes_Allocated < MAX_ALLOCATED_BYTES) {//ignore the fact that this will mean our buffer holds more than our maxsize
41-
std::lock_guard<std::mutex> lock(_BufferLock);
42-
auto found = std::find(begin(_Buffer), end(_Buffer), buffer);
43-
if (found == _Buffer.end()) {
44-
_Bytes_Allocated += buffer->size;
45-
_Buffer.emplace_back(buffer);
46-
}
47-
}//otherwise ignore and let it be reclaimed
48-
}
49-
};
5065

51-
static BufferManager Buffer_Manager;
66+
#elif __APPLE__
67+
#include "TargetConditionals.h"
68+
#if TARGET_IPHONE_SIMULATOR
69+
// iOS Simulator
70+
#elif TARGET_OS_IPHONE
71+
// iOS device
72+
#elif TARGET_OS_MAC
73+
// Other kinds of Mac OS
74+
#else
75+
# error "Unknown Apple platform"
76+
#endif
5277

53-
SL::Screen_Capture::Image::~Image() {
54-
Buffer_Manager.ReleaseBuffer(_Data);
55-
}
56-
char * SL::Screen_Capture::Image::getData() const
57-
{
58-
return _Data->data;
59-
}
60-
std::shared_ptr<SL::Screen_Capture::Blk> SL::Screen_Capture::AquireBuffer(size_t req_bytes) {
61-
return Buffer_Manager.AquireBuffer(req_bytes);
62-
}
63-
void SL::Screen_Capture::ReleaseBuffer(std::shared_ptr<Blk>& buffer) {
64-
Buffer_Manager.ReleaseBuffer(buffer);
65-
}
66-
size_t SL::Screen_Capture::getSize(const std::shared_ptr<Blk>& b)
67-
{
68-
return b->size;
78+
79+
#include <ApplicationServices/ApplicationServices.h>
80+
81+
std::shared_ptr<Image> CaptureDesktopImage()
82+
{
83+
auto image_ref = CGDisplayCreateImage(CGMainDisplayID());
84+
auto provider = CGImageGetDataProvider(image_ref);
85+
auto dataref = CGDataProviderCopyData(provider);
86+
size_t w, h;
87+
w = CGImageGetWidth(image_ref);
88+
h = CGImageGetHeight(image_ref);
89+
size_t bpp = CGImageGetBitsPerPixel(image_ref) / 8;
90+
91+
auto img = Image::CreateImage(h, w, (const char*)(CFDataGetBytePtr(dataref)), bpp);
92+
93+
CFRelease(dataref);
94+
CFRelease(provider);
95+
CGImageRelease(image_ref);
96+
return img;
97+
}
98+
99+
#elif __ANDROID__
100+
std::shared_ptr<Image> CaptureDesktopImage()
101+
{
102+
return Image::CreateImage(0, 0);
103+
}
104+
#elif __linux__
105+
106+
107+
std::shared_ptr<Image> CaptureDesktopImage()
108+
{
109+
auto display = XOpenDisplay(NULL);
110+
auto root = DefaultRootWindow(display);
111+
auto screen = XDefaultScreen(display);
112+
auto visual = DefaultVisual(display, screen);
113+
auto depth = DefaultDepth(display, screen);
114+
115+
XWindowAttributes gwa;
116+
XGetWindowAttributes(display, root, &gwa);
117+
auto width = gwa.width;
118+
auto height = gwa.height;
119+
120+
XShmSegmentInfo shminfo;
121+
auto image = XShmCreateImage(display, visual, depth, ZPixmap, NULL, &shminfo, width, height);
122+
shminfo.shmid = shmget(IPC_PRIVATE, image->bytes_per_line * image->height, IPC_CREAT | 0777);
123+
124+
shminfo.readOnly = False;
125+
shminfo.shmaddr = image->data = (char*)shmat(shminfo.shmid, 0, 0);
126+
127+
XShmAttach(display, &shminfo);
128+
129+
XShmGetImage(display, root, image, 0, 0, AllPlanes);
130+
131+
XShmDetach(display, &shminfo);
132+
133+
auto px = Image::CreateImage(height, width, (char*)shminfo.shmaddr, image->bits_per_pixel / 8);
134+
assert(image->bits_per_pixel == 32);//this should always be true... Ill write a case where it isnt, but for now it should be
135+
136+
XDestroyImage(image);
137+
shmdt(shminfo.shmaddr);
138+
shmctl(shminfo.shmid, IPC_RMID, 0);
139+
XCloseDisplay(display);
140+
141+
return px;
142+
143+
}
144+
#endif
145+
}
69146
}
70147

71-
char * SL::Screen_Capture::getData(const std::shared_ptr<Blk>& b)
72-
{
73-
return b->data;
74-
}
148+

‎Screen_Capture/Screen.h

+10-45
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,21 @@
11
#pragma once
2-
32
#include <memory>
43
#include <vector>
5-
#include <algorithm>
6-
#include <mutex>
7-
#include <memory>
84

95
namespace SL {
106
namespace Screen_Capture {
7+
//forward declare
8+
struct ScreenInfo;
119

12-
struct Screen_Info {
13-
int Width = 0;//width in pixels of the screen
14-
int Height = 0;//Height in pixels of the screen
15-
int Depth = 0;//Depth in pixels of the screen, i.e. 32 bit
16-
char Device[32];//name of the screen
17-
int Offsetx = 0;//distance in pixels from the MOST left screen. This can be negative because the primary monitor starts at 0, but this screen could be layed out to the left of the primary, in which case the offset is negative
18-
int Offsety = 0;//distance in pixels from the MOST bottom of the screen
19-
int Index = 0;//Index of the screen from LEFT to right of the physical monitors
20-
};
21-
struct Blk;
22-
size_t getSize(const std::shared_ptr<Blk>& b);
23-
char* getData(const std::shared_ptr<Blk>&b);
24-
25-
std::shared_ptr<Blk> AquireBuffer(size_t req_bytes);
26-
void ReleaseBuffer(std::shared_ptr<Blk>& buffer);
27-
28-
class Image {
29-
std::shared_ptr<Blk> _Data;
30-
size_t _Height;
31-
size_t _Width;
32-
public:
33-
Image() {}
34-
Image(Image&& img) : _Height(std::move(img._Height)), _Width(std::move(img._Width)), _Data(std::move(img._Data)) {}
35-
Image(size_t h, size_t w, std::shared_ptr<Blk>& d) : _Height(h), _Width(w), _Data(d) {}
36-
~Image();
37-
//data is always rgba 32 bit stride
38-
char* getData() const;
39-
size_t Height() const{ return _Height; }
40-
size_t Width() const{ return _Width; }
41-
42-
10+
struct Image {
11+
std::shared_ptr<char> Data;
12+
int Height = 0;
13+
int Width = 0;
4314
};
44-
inline void Reorder(std::vector<SL::Screen_Capture::Screen_Info>& screens) {
45-
//organize the monitors so that the ordering is left to right for displaying purposes
46-
std::sort(begin(screens), end(screens), [](const SL::Screen_Capture::Screen_Info& i, const SL::Screen_Capture::Screen_Info& j) { return i.Offsetx < j.Offsetx; });
47-
auto index = 0;
48-
for (auto& x : screens) x.Index = index++;
49-
}
50-
//getmonitors will give you information about the attached monitors, from left to right
51-
std::vector<SL::Screen_Capture::Screen_Info> GetMoitors();
52-
//if capturemouse == true, the mouse will be included in the output image.
53-
Image CaptureDesktop(bool capturemouse);
15+
constexpr int get_pixelstride() { return 4; }
16+
inline int get_imagesize(const Image& img) { return get_pixelstride()*img.Height *img.Width; }
5417

18+
//this will capture the monitors passed
19+
Image CaptureDesktopImage(const std::vector<ScreenInfo>& screens);
5520
}
5621
};

‎Screen_Capture/ScreenGrab_Win.cpp

-135
This file was deleted.

‎Screen_Capture/ScreenInfo.cpp

+112
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,112 @@
1+
#include "stdafx.h"
2+
#include "ScreenInfo.h"
3+
#include <algorithm>
4+
5+
#if _WIN32
6+
std::vector<SL::Screen_Capture::ScreenInfo> SL::Screen_Capture::GetMoitors()
7+
{
8+
std::vector<SL::Screen_Capture::ScreenInfo> ret;
9+
DISPLAY_DEVICEA dd;
10+
ZeroMemory(&dd, sizeof(dd));
11+
dd.cb = sizeof(dd);
12+
for (auto i = 0; EnumDisplayDevicesA(NULL, i, &dd, 0); i++) {
13+
//monitor must be attached to desktop and not a mirroring device
14+
if ((dd.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP) & !(dd.StateFlags & DISPLAY_DEVICE_MIRRORING_DRIVER)) {
15+
SL::Screen_Capture::ScreenInfo temp;
16+
DEVMODEA devMode;
17+
devMode.dmSize = sizeof(devMode);
18+
EnumDisplaySettingsA(dd.DeviceName, ENUM_CURRENT_SETTINGS, &devMode);
19+
strncpy_s(temp.Device, dd.DeviceName, ARRAYSIZE(dd.DeviceName));
20+
temp.Offsetx = devMode.dmPosition.x;
21+
temp.Offsety = devMode.dmPosition.y;
22+
temp.Width = devMode.dmPelsWidth;
23+
temp.Height = devMode.dmPelsHeight;
24+
temp.Depth = devMode.dmBitsPerPel;
25+
ret.push_back(temp);
26+
}
27+
}
28+
//always reorder the screens left to right... as it should be, right?
29+
Reorder(ret);
30+
return ret;
31+
}
32+
33+
void SL::Screen_Capture::Reorder(std::vector<SL::Screen_Capture::ScreenInfo>& screens)
34+
{
35+
//organize the monitors so that the ordering is left to right for displaying purposes
36+
std::sort(begin(screens), end(screens), [](const SL::Screen_Capture::ScreenInfo& i, const SL::Screen_Capture::ScreenInfo& j) { return i.Offsetx < j.Offsetx; });
37+
auto index = 0;
38+
for (auto& x : screens) x.Index = index++;
39+
}
40+
41+
42+
#elif __APPLE__
43+
#include "TargetConditionals.h"
44+
#if TARGET_IPHONE_SIMULATOR
45+
// iOS Simulator
46+
#elif TARGET_OS_IPHONE
47+
// iOS device
48+
#elif TARGET_OS_MAC
49+
// Other kinds of Mac OS
50+
#else
51+
# error "Unknown Apple platform"
52+
#endif
53+
54+
55+
#include <ApplicationServices/ApplicationServices.h>
56+
57+
std::vector<SL::Screen_Capture::ScreenInfo> SL::Screen_Capture::GetMoitors()
58+
{
59+
static XRectangle screens[16];
60+
static float dpi_h[16];
61+
static float dpi_v[16];
62+
CGDirectDisplayID displays[16];
63+
CGDisplayCount count, i;
64+
CGRect r;
65+
CGGetActiveDisplayList(16, displays, &count);
66+
for (i = 0; i < count; i++) {
67+
r = CGDisplayBounds(displays[i]);
68+
screens[i].x = int(r.origin.x);
69+
screens[i].y = int(r.origin.y);
70+
screens[i].width = int(r.size.width);
71+
screens[i].height = int(r.size.height);
72+
//fprintf(stderr,"screen %d %dx%dx%dx%d\n",i,screens[i].x,screens[i].y,screens[i].width,screens[i].height);
73+
if (CGDisplayScreenSize != NULL) {
74+
CGSize s = CGDisplayScreenSize(displays[i]); // from 10.3
75+
dpi_h[i] = screens[i].width / (s.width / 25.4);
76+
dpi_v[i] = screens[i].height / (s.height / 25.4);
77+
}
78+
else {
79+
dpi_h[i] = dpi_v[i] = 75.;
80+
}
81+
}
82+
}
83+
84+
#elif __ANDROID__
85+
std::vector<SL::Screen_Capture::ScreenInfo> SL::Screen_Capture::GetMoitors()
86+
{
87+
return Image::CreateImage(0, 0);
88+
}
89+
#elif __linux__
90+
91+
92+
std::vector<SL::Screen_Capture::ScreenInfo> SL::Screen_Capture::GetMoitors()
93+
{
94+
num_screens = ScreenCount(fl_display);
95+
if (num_screens > MAX_SCREENS) num_screens = MAX_SCREENS;
96+
97+
for (int i = 0; i < num_screens; i++) {
98+
screens[i].x_org = 0;
99+
screens[i].y_org = 0;
100+
screens[i].width = DisplayWidth(fl_display, i);
101+
screens[i].height = DisplayHeight(fl_display, i);
102+
103+
int mm = DisplayWidthMM(fl_display, i);
104+
dpi[i][0] = mm ? DisplayWidth(fl_display, i)*25.4f / mm : 0.0f;
105+
mm = DisplayHeightMM(fl_display, i);
106+
dpi[i][1] = mm ? DisplayHeight(fl_display, i)*25.4f / mm : 0.0f;
107+
}
108+
109+
}
110+
#endif
111+
112+

‎Screen_Capture/ScreenInfo.h

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
#pragma once
2+
#include <vector>
3+
4+
namespace SL {
5+
namespace Screen_Capture {
6+
struct ScreenInfo {
7+
int Width = 0;//width in pixels of the screen
8+
int Height = 0;//Height in pixels of the screen
9+
int Depth = 0;//Depth in pixels of the screen, i.e. 32 bit
10+
char Device[32];//name of the screen
11+
int Offsetx = 0;//distance in pixels from the MOST left screen. This can be negative because the primary monitor starts at 0, but this screen could be layed out to the left of the primary, in which case the offset is negative
12+
int Offsety = 0;//distance in pixels from the TOP MOST screen
13+
int Index = 0;//Index of the screen from LEFT to right of the physical monitors
14+
};
15+
//monitors are returned pre-sorted left to right
16+
std::vector<ScreenInfo> GetMoitors();
17+
void Reorder(std::vector<SL::Screen_Capture::ScreenInfo>& screens);
18+
19+
}
20+
}

‎Screen_Capture/Screen_Capture.vcxproj

+4-6
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
<Optimization>Disabled</Optimization>
7878
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
7979
<SDLCheck>true</SDLCheck>
80-
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
80+
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
8181
</ClCompile>
8282
<Link>
8383
<SubSystem>Windows</SubSystem>
@@ -95,7 +95,7 @@
9595
<Optimization>Disabled</Optimization>
9696
<PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
9797
<SDLCheck>true</SDLCheck>
98-
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
98+
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
9999
</ClCompile>
100100
<Link>
101101
<SubSystem>Windows</SubSystem>
@@ -136,15 +136,13 @@
136136
<OptimizeReferences>true</OptimizeReferences>
137137
</Link>
138138
</ItemDefinitionGroup>
139-
<ItemGroup>
140-
<Text Include="ReadMe.txt" />
141-
</ItemGroup>
142139
<ItemGroup>
143140
<ClInclude Include="Screen.h" />
141+
<ClInclude Include="ScreenInfo.h" />
144142
<ClInclude Include="stdafx.h" />
145143
</ItemGroup>
146144
<ItemGroup>
147-
<ClCompile Include="ScreenGrab_Win.cpp" />
145+
<ClCompile Include="ScreenInfo.cpp" />
148146
<ClCompile Include="stdafx.cpp">
149147
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
150148
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>

‎Screen_Capture/Screen_Capture.vcxproj.filters

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@
1414
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
1515
</Filter>
1616
</ItemGroup>
17-
<ItemGroup>
18-
<Text Include="ReadMe.txt" />
19-
</ItemGroup>
2017
<ItemGroup>
2118
<ClInclude Include="stdafx.h">
2219
<Filter>Header Files</Filter>
2320
</ClInclude>
2421
<ClInclude Include="Screen.h">
2522
<Filter>Header Files</Filter>
2623
</ClInclude>
24+
<ClInclude Include="ScreenInfo.h">
25+
<Filter>Header Files</Filter>
26+
</ClInclude>
2727
</ItemGroup>
2828
<ItemGroup>
2929
<ClCompile Include="stdafx.cpp">
@@ -32,7 +32,7 @@
3232
<ClCompile Include="Screen.cpp">
3333
<Filter>Source Files</Filter>
3434
</ClCompile>
35-
<ClCompile Include="ScreenGrab_Win.cpp">
35+
<ClCompile Include="ScreenInfo.cpp">
3636
<Filter>Source Files</Filter>
3737
</ClCompile>
3838
</ItemGroup>

‎Test/ReadMe.txt

-40
This file was deleted.

‎Test/Test.cpp

+4-11
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@
33

44
#include "stdafx.h"
55
#include "..\Screen_Capture\Screen.h"
6+
#include "..\Screen_Capture\ScreenInfo.h"
67
#include <iostream>
78
#include <chrono>
89

910
int main()
1011
{
11-
auto monitorinfo = SL::Screen_Capture::GetMoitors();
12-
for (auto& a : monitorinfo) {
12+
auto monitors = SL::Screen_Capture::GetMoitors();
13+
for (const auto& a : monitors) {
1314
std::cout << "MonitorName: " << a.Device << std::endl;
1415
std::cout << "Width: " << a.Width << std::endl;
1516
std::cout << "Height: " << a.Height << std::endl;
@@ -20,17 +21,9 @@ int main()
2021
}
2122

2223
auto start = std::chrono::high_resolution_clock::now();
23-
auto screens = SL::Screen_Capture::GetScreens(true);//pass -1 to get all, which is the default
24+
auto screen = SL::Screen_Capture::CaptureDesktopImage(monitors);
2425
std::cout << "took " << std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::high_resolution_clock::now() - start).count() << "ms\n";
2526

26-
start = std::chrono::high_resolution_clock::now();
27-
screens = SL::Screen_Capture::GetScreens(false, -1 );//do not include the mouse
28-
std::cout << "took " << std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::high_resolution_clock::now() - start).count() << "ms\n";
29-
for (auto& a : screens) {
30-
//Do something with the raw data here..
31-
//a->get_data();
32-
}
33-
3427

3528

3629
int k;

‎Test/Test.vcxproj

+2-3
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@
8888
<Optimization>Disabled</Optimization>
8989
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
9090
<SDLCheck>true</SDLCheck>
91+
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
9192
</ClCompile>
9293
<Link>
9394
<SubSystem>Console</SubSystem>
@@ -101,6 +102,7 @@
101102
<Optimization>Disabled</Optimization>
102103
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
103104
<SDLCheck>true</SDLCheck>
105+
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
104106
</ClCompile>
105107
<Link>
106108
<SubSystem>Console</SubSystem>
@@ -141,9 +143,6 @@
141143
<OptimizeReferences>true</OptimizeReferences>
142144
</Link>
143145
</ItemDefinitionGroup>
144-
<ItemGroup>
145-
<Text Include="ReadMe.txt" />
146-
</ItemGroup>
147146
<ItemGroup>
148147
<ClInclude Include="stdafx.h" />
149148
</ItemGroup>

‎Test/Test.vcxproj.filters

-7
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,6 @@
99
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
1010
<Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
1111
</Filter>
12-
<Filter Include="Resource Files">
13-
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
14-
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
15-
</Filter>
16-
</ItemGroup>
17-
<ItemGroup>
18-
<Text Include="ReadMe.txt" />
1912
</ItemGroup>
2013
<ItemGroup>
2114
<ClInclude Include="stdafx.h">

0 commit comments

Comments
 (0)
Please sign in to comment.