Updated code

smasherprog · Mar 6, 2017 · 2a854b8 · 2a854b8
2 parents d05526b + 762fea7
commit 2a854b8
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 14 deletions.
diff --git a/Example/CMakeLists.txt b/Example/CMakeLists.txt
@@ -19,6 +19,7 @@ set(Screen_Capture_EXAMPLE_SRC
 )
 
 include_directories(${SCREEN_CAPTURE_INCLUDE_DIRS})
+
 add_executable(${PROJECT_NAME} ${Screen_Capture_EXAMPLE_SRC})
 target_link_libraries(${PROJECT_NAME} ${SCREEN_CAPTURE_LIB})
 target_link_libraries(${PROJECT_NAME} ${SYSTEM_LIBS})

diff --git a/include/Internal/SCCommon.h b/include/Internal/SCCommon.h
@@ -15,7 +15,7 @@ namespace SL {
 			//Offsets are the number of pixels that a monitor can be from the origin. For example, users can shuffle their monitors around so this affects their offset.
 			int OffsetX;
 			int OffsetY;
-			std::string Name;
+			char Name[128];
 		};
 		struct Image {
 			ImageRect Bounds;

diff --git a/include/ScreenCapture.h b/include/ScreenCapture.h
@@ -5,6 +5,7 @@
 #include <string>
 #include <ostream>
 
+
 namespace SL {
 	namespace Screen_Capture {
 
@@ -37,7 +38,7 @@ namespace SL {
 		int Id(const Monitor& mointor);
 		int OffsetX(const Monitor& mointor);
 		int OffsetY(const Monitor& mointor);
-		const std::string& Name(const Monitor& mointor);
+		const char* Name(const Monitor& mointor);
 		int Height(const Monitor& mointor);
 		int Width(const Monitor& mointor);
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -8,15 +8,15 @@ endif()
 
 if(WIN32)
     set(SCREEN_CAPTURE_PLATFORM_SRC     
-       ${CMAKE_CURRENT_SOURCE_DIR}/../src/windows/GetMonitors.cpp
-       ${CMAKE_CURRENT_SOURCE_DIR}/../include/windows/DXFrameProcessor.h
-       ${CMAKE_CURRENT_SOURCE_DIR}/../src/windows/DXFrameProcessor.cpp
+		${CMAKE_CURRENT_SOURCE_DIR}/../src/windows/GetMonitors.cpp
+		${CMAKE_CURRENT_SOURCE_DIR}/../include/windows/DXFrameProcessor.h
+		${CMAKE_CURRENT_SOURCE_DIR}/../src/windows/DXFrameProcessor.cpp
 		${CMAKE_CURRENT_SOURCE_DIR}/../include/windows/GDIHelpers.h
-       ${CMAKE_CURRENT_SOURCE_DIR}/../include/windows/GDIFrameProcessor.h
-       ${CMAKE_CURRENT_SOURCE_DIR}/../src/windows/GDIFrameProcessor.cpp
+		${CMAKE_CURRENT_SOURCE_DIR}/../include/windows/GDIFrameProcessor.h
+		${CMAKE_CURRENT_SOURCE_DIR}/../src/windows/GDIFrameProcessor.cpp
 		${CMAKE_CURRENT_SOURCE_DIR}/../include/windows/GDIMouseProcessor.h
-       ${CMAKE_CURRENT_SOURCE_DIR}/../src/windows/GDIMouseProcessor.cpp
-       ${CMAKE_CURRENT_SOURCE_DIR}/../src/windows/ThreadRunner.cpp
+		${CMAKE_CURRENT_SOURCE_DIR}/../src/windows/GDIMouseProcessor.cpp
+		${CMAKE_CURRENT_SOURCE_DIR}/../src/windows/ThreadRunner.cpp
     )
 
     set(SCREEN_CAPTURE_PLATFORM_INC     
@@ -98,10 +98,9 @@ set(SCREEN_CAPTURE_INCLUDE_DIRS
 	CACHE INTERNAL "${PROJECT_NAME}: Include Directories" FORCE
  )
 
-
 include_directories(${SCREEN_CAPTURE_INCLUDE_DIRS})
-
 add_library(${PROJECT_NAME} ${SCREEN_CAPTURE_COMMON_SRC} ${SCREEN_CAPTURE_PLATFORM_SRC})
+
 target_link_libraries(${PROJECT_NAME} ${SCREEN_CAPTURE_PLATFORM_LIBS})
 
 
diff --git a/src/Internal/SCCommon.cpp b/src/Internal/SCCommon.cpp
@@ -133,7 +133,8 @@ namespace SL {
 			ret->Index = index;
 			ret->Height = h;
 			ret->Id = id;
-			ret->Name = n;
+			assert(n.size() + 1 < sizeof(ret->Name));
+			memcpy(ret->Name, n.c_str(), n.size() + 1);
 			ret->OffsetX = ox;
 			ret->OffsetY = oy;
 			ret->Width = w;
@@ -152,7 +153,7 @@ namespace SL {
 		int Id(const Monitor& mointor) { return mointor.Id; }
 		int OffsetX(const Monitor& mointor) { return mointor.OffsetX; }
 		int OffsetY(const Monitor& mointor) { return mointor.OffsetY; }
-		const std::string& Name(const Monitor& mointor) { return mointor.Name; }
+		const char* Name(const Monitor& mointor) { return mointor.Name; }
 		int Height(const Monitor& mointor) { return mointor.Height; }
 		int Width(const Monitor& mointor) { return mointor.Width; }
 		int Height(const ImageRect& rect) { return rect.bottom - rect.top; }

diff --git a/src/windows/DXFrameProcessor.cpp b/src/windows/DXFrameProcessor.cpp
@@ -356,13 +356,16 @@ namespace SL {
 			std::unique_ptr<char[]> OldImageBuffer, NewImageBuffer;
 			size_t ImageBufferSize;
 			bool FirstRun;
+
 		};
 
 
 		DXFrameProcessor::DXFrameProcessor()
 		{
+
 			DXFrameProcessorImpl_ = std::make_unique<DXFrameProcessorImpl>();
 			DXFrameProcessorImpl_->ImageBufferSize = 0;
+
 		}
 
 		DXFrameProcessor::~DXFrameProcessor()
@@ -392,6 +395,7 @@ namespace SL {
 				DXFrameProcessorImpl_->OldImageBuffer = std::make_unique<char[]>(DXFrameProcessorImpl_->ImageBufferSize);
 			}
 			DXFrameProcessorImpl_->NewImageBuffer = std::make_unique<char[]>(DXFrameProcessorImpl_->ImageBufferSize);
+
 			return ret;
 		}
 
@@ -493,6 +497,7 @@ namespace SL {
 			ret.right = Width(DXFrameProcessorImpl_->Data->SelectedMonitor);
 
 			auto startsrc = (char*)MappingDesc.pData;
+
 			auto startdst = DXFrameProcessorImpl_->NewImageBuffer.get();
 			auto rowstride = PixelStride*Width(DXFrameProcessorImpl_->Data->SelectedMonitor);
 			if (rowstride == static_cast<int>(MappingDesc.RowPitch)) {//no need for multiple calls, there is no padding here
@@ -551,7 +556,6 @@ namespace SL {
 				std::swap(DXFrameProcessorImpl_->NewImageBuffer, DXFrameProcessorImpl_->OldImageBuffer);
 			}
 
-
 			return Ret;
 		}