Merge branch 'master' of https://git.tk.informatik.tu-darmstadt.de/etri-smartspaces

Conflicts:
	bbiwarg.v11.suo

bbiwarg.sln

@@ -3,6 +3,8 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2012
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "bbiwarg", "bbiwarg\bbiwarg.csproj", "{12271049-82D6-436D-A51E-E6614C8E9C50}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "bbiwargOutputTest", "bbiwargOutputTest\bbiwargOutputTest.csproj", "{81A86DAA-B131-4974-8F02-56B5005ABE90}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -13,6 +15,10 @@ Global
 		{12271049-82D6-436D-A51E-E6614C8E9C50}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{12271049-82D6-436D-A51E-E6614C8E9C50}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{12271049-82D6-436D-A51E-E6614C8E9C50}.Release|Any CPU.Build.0 = Release|Any CPU
+		{81A86DAA-B131-4974-8F02-56B5005ABE90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{81A86DAA-B131-4974-8F02-56B5005ABE90}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{81A86DAA-B131-4974-8F02-56B5005ABE90}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{81A86DAA-B131-4974-8F02-56B5005ABE90}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

bbiwarg/OutputTest.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace bbiwarg
+{
+    class OutputTest
+    {
+        static void Main(string[] args)
+        {
+            IVideoDataSource source = new IIsuDataSource("..\\..\\videos\\1.skv");
+
+            source.init();
+            source.start();
+
+        }
+    }
+}

bbiwarg/bbiwarg.csproj

@@ -31,6 +31,9 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup>
+    <StartupObject>bbiwarg.OutputTest</StartupObject>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="iisuNet, Version=3.0.0.0, Culture=neutral, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>
@@ -53,9 +56,10 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="OutputTest.cs" />
     <Compile Include="DepthImage.cs" />
-    <Compile Include="IisuDataSource.cs" />
-    <Compile Include="IVideoDataSource.cs" />
+    <Compile Include="DataSource\IisuDataSource.cs" />
+    <Compile Include="DataSource\IVideoDataSource.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="TestDataSource.cs" />
   </ItemGroup>