Merge branch 'gstreamer' into develop

Conflicts:
	.gitignore
	Vocaluxe/Vocaluxe.csproj

.gitignore

@@ -3,36 +3,21 @@ Output/Songs
 *.mp4
 *.pdb
 /Output/Benchmark.log
-
 /Output/CoverDB.sqlite
-
 /Output/HighscoreDB.sqlite
-
 /Output/PartyModes/*/Code/*
-
 /Output/Vocaluxe.exe*
-
 /Output/Vocaluxe.vshost.exe*
-
 /Output/VocaluxeLib.dll
-
 *.psess
-
 /*.vsp
-
 /*.ctl
-
 /Output/Registration.xml
-
 /Vocaluxe.suo
 /Vocaluxe/Vocaluxe.csproj.user
-
 /Output/Config.xml
-
 *.ipch
-
 *.log
-
 /Output/Playlists/*.xml
 /Output/x64/gstreamer/GstreamerHelper.dll
 *.tlog
@@ -42,8 +27,10 @@ Output/Songs
 *.pch
 *.idb
 *.exp
-
 *.ilk
 *.lib
 *.opensdf
 *.sdf
+*.codeanalysis*
+*.nativecodeanalysis*
+*.lastcodeanalysissucceeded

GstreamerHelper/GstreamerVideo.cpp

@@ -65,7 +65,7 @@ DllExport bool CloseVideo(int Stream)
 
 DllExport int GetVideoNumStreams()
 {
-	return VideoStreams.size();
+	return (int) VideoStreams.size();
 }
 
 DllExport float GetVideoLength(int Stream)
@@ -85,6 +85,13 @@ DllExport struct ApplicationFrame GetFrame(int Stream, float Time)
 	{
 		return it->second->GetFrame(Time);
 	}
+	struct ApplicationFrame returnFrame;
+	returnFrame.size=0;
+	returnFrame.width=0;
+	returnFrame.height=0;
+	returnFrame.data=NULL;
+	returnFrame.videotime=0;
+	return returnFrame;
 }
 
 DllExport bool Skip(int Stream, float Start, float Gap)

GstreamerHelper/GstreamerVideoStream.cpp

@@ -180,7 +180,7 @@ struct ApplicationFrame GstreamerVideoStream::GetFrame(float Time)
 
 				gst_buffer_map(Buffer, &Mapinfo, GST_MAP_READ);
 
-				Size = Mapinfo.size;
+				Size = (int) Mapinfo.size;
 				gst_structure_get_int (BufferStructure, "width", &Width);
 				gst_structure_get_int (BufferStructure, "height", &Height);
 				VideoTime = (float) (Buffer->pts / GST_SECOND);
@@ -210,7 +210,7 @@ struct ApplicationFrame GstreamerVideoStream::GetFrame(float Time)
 
 bool GstreamerVideoStream::Skip(float Start, float Gap)
 {
-	if(!gst_element_seek_simple(Element, GST_FORMAT_TIME, (GstSeekFlags)(GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_ACCURATE), (Start + Gap) * GST_SECOND))
+	if(!gst_element_seek_simple(Element, GST_FORMAT_TIME, (GstSeekFlags)(GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_ACCURATE), (gint64)((Start + Gap) * GST_SECOND)))
 	{
 		LogVideoError("Seek failed");
 		return true;

GstreamerHelper/GstreamerVideoStream.h

@@ -57,7 +57,7 @@ private:
 	volatile gboolean Copying;
 
 	gboolean Paused;
-	gboolean Finished;
+	bool Finished;
 
 	gfloat Duration;
 

Vocaluxe/Vocaluxe.csproj

@@ -13,6 +13,9 @@
     <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <IsWebBootstrapper>false</IsWebBootstrapper>
+    <StartupObject>Vocaluxe.MainProgram</StartupObject>
+    <ApplicationIcon>Vocaluxe.ico</ApplicationIcon>
+    <TargetFrameworkProfile />
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -27,9 +30,6 @@
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
-    <StartupObject>Vocaluxe.MainProgram</StartupObject>
-    <ApplicationIcon>Vocaluxe.ico</ApplicationIcon>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugWin|x86' ">
     <PlatformTarget>x86</PlatformTarget>

gstreamerhelper/VocaluxeClock.cpp

@@ -70,7 +70,7 @@ vocaluxe_clock_get_internal_time (GstClock * clock)
 
   _vocaluxeclock = GST_VOCALUXE_CLOCK_CAST (clock);
 
-  result = _vocaluxeclock->time * GST_SECOND;
+  result = (GstClockTime) _vocaluxeclock->time * GST_SECOND;
   return result;
 }