Fixed warnings and possible bug

This commit is contained in:
Flamefire committed 2013-03-15 14:52:44 +01:00
1 parent fa43eaa119
commit 0012a21c90
8 files changed
+18 -9

No files matched your search

+1
View File
@@ -32,3 +32,4 @@ Output/Songs
*.ipch *.ipch
*.log *.log
/Output/x64/gstreamer/GstreamerHelper.dll
+8 -1
View File
@@ -65,7 +65,7 @@ DllExport bool CloseVideo(int Stream)
DllExport int GetVideoNumStreams() DllExport int GetVideoNumStreams()
{ {
return VideoStreams.size(); return (int) VideoStreams.size();
} }
DllExport float GetVideoLength(int Stream) DllExport float GetVideoLength(int Stream)
@@ -85,6 +85,13 @@ DllExport struct ApplicationFrame GetFrame(int Stream, float Time)
{ {
return it->second->GetFrame(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) DllExport bool Skip(int Stream, float Start, float Gap)
+2 -2
View File
@@ -180,7 +180,7 @@ struct ApplicationFrame GstreamerVideoStream::GetFrame(float Time)
gst_buffer_map(Buffer, &Mapinfo, GST_MAP_READ); 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, "width", &Width);
gst_structure_get_int (BufferStructure, "height", &Height); gst_structure_get_int (BufferStructure, "height", &Height);
VideoTime = (float) (Buffer->pts / GST_SECOND); VideoTime = (float) (Buffer->pts / GST_SECOND);
@@ -210,7 +210,7 @@ struct ApplicationFrame GstreamerVideoStream::GetFrame(float Time)
bool GstreamerVideoStream::Skip(float Start, float Gap) 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"); LogVideoError("Seek failed");
return true; return true;
+1 -1
View File
@@ -57,7 +57,7 @@ private:
volatile gboolean Copying; volatile gboolean Copying;
gboolean Paused; gboolean Paused;
gboolean Finished; bool Finished;
gfloat Duration; gfloat Duration;
Binary file not shown.
+1 -1
View File
@@ -42,7 +42,7 @@ namespace Vocaluxe.Lib.Video
i = CGstreamerVideoWrapper.LoadVideo(u.AbsoluteUri); i = CGstreamerVideoWrapper.LoadVideo(u.AbsoluteUri);
return i; return i;
} }
catch (Exception e) { } catch (Exception) { }
return i; return i;
} }
+4 -3
View File
@@ -13,6 +13,9 @@
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion> <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<IsWebBootstrapper>false</IsWebBootstrapper> <IsWebBootstrapper>false</IsWebBootstrapper>
<StartupObject>Vocaluxe.MainProgram</StartupObject>
<ApplicationIcon>Vocaluxe.ico</ApplicationIcon>
<TargetFrameworkProfile />
<PublishUrl>publish\</PublishUrl> <PublishUrl>publish\</PublishUrl>
<Install>true</Install> <Install>true</Install>
<InstallFrom>Disk</InstallFrom> <InstallFrom>Disk</InstallFrom>
@@ -27,9 +30,6 @@
<ApplicationVersion>1.0.0.%2a</ApplicationVersion> <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust> <UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled> <BootstrapperEnabled>true</BootstrapperEnabled>
<StartupObject>Vocaluxe.MainProgram</StartupObject>
<ApplicationIcon>Vocaluxe.ico</ApplicationIcon>
<TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugWin|x86' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugWin|x86' ">
<PlatformTarget>x86</PlatformTarget> <PlatformTarget>x86</PlatformTarget>
@@ -63,6 +63,7 @@
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies> <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<CodeAnalysisRuleSet>ExtendedCorrectnessRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseWin|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseWin|x64'">
<PlatformTarget>x64</PlatformTarget> <PlatformTarget>x64</PlatformTarget>
+1 -1
View File
@@ -70,7 +70,7 @@ vocaluxe_clock_get_internal_time (GstClock * clock)
_vocaluxeclock = GST_VOCALUXE_CLOCK_CAST (clock); _vocaluxeclock = GST_VOCALUXE_CLOCK_CAST (clock);
result = _vocaluxeclock->time * GST_SECOND; result = (GstClockTime) _vocaluxeclock->time * GST_SECOND;
return result; return result;
} }