diff options
author | Aaron Bockover <aaron@abock.org> | 2006-07-12 21:49:32 +0000 |
---|---|---|
committer | Aaron Bockover <aaron@abock.org> | 2006-07-12 21:49:32 +0000 |
commit | 448405d86af65ecf1b3c988f1b0e73ea13ee8e28 (patch) | |
tree | bbcb771afa0dd5b231f19732847e07037bf85edf | |
parent | 28b533f8ecf52bb01602a570e6cc55572828ac5e (diff) |
2006-07-12 Aaron Bockover <aaron@abock.org>
* gstreamer-sharp.mds:
* gstreamer-sharp.mdp: Updated MonoDevelo project/solution
* source/gstreamer-sharp-source.xml: Cleaned up a bit
* sample/DecodeBinTranscoder.cs: Updated to reflect renaming of
Clock.GstSecond to Clock.Second, etc.
* gstreamer-sharp/glue/clock.c: Added gstsharp_gst_clock_get_time_none
and gstsharp_gst_clock_time_is_valid
* gstreamer-sharp/Clock.custom: Added bindings for new clock glue
and renamed GstNSecond to NSecond (and friends)
git-svn-id: svn://anonsvn.mono-project.com/source/branches/abock/gstreamer-sharp@62535 e3ebcda4-bce8-0310-ba0a-eca2169e7518
-rw-r--r-- | ChangeLog | 16 | ||||
-rw-r--r-- | gstreamer-sharp.mdp | 9 | ||||
-rw-r--r-- | gstreamer-sharp.mds | 5 | ||||
-rw-r--r-- | gstreamer-sharp/Clock.custom | 22 | ||||
-rw-r--r-- | gstreamer-sharp/glue/clock.c | 11 | ||||
-rw-r--r-- | sample/DecodeBinTranscoder.cs | 4 | ||||
-rw-r--r-- | source/gstreamer-sharp-source.xml | 23 |
7 files changed, 61 insertions, 29 deletions
@@ -1,3 +1,19 @@ +2006-07-12 Aaron Bockover <aaron@abock.org> + + * gstreamer-sharp.mds: + * gstreamer-sharp.mdp: Updated MonoDevelo project/solution + + * source/gstreamer-sharp-source.xml: Cleaned up a bit + + * sample/DecodeBinTranscoder.cs: Updated to reflect renaming of + Clock.GstSecond to Clock.Second, etc. + + * gstreamer-sharp/glue/clock.c: Added gstsharp_gst_clock_get_time_none + and gstsharp_gst_clock_time_is_valid + + * gstreamer-sharp/Clock.custom: Added bindings for new clock glue + and renamed GstNSecond to NSecond (and friends) + 2006-06-21 Khaled Mohammed <khaled.mohammed@gmail.com> * gstreamer-sharp/DynamicSignalHandlerGenerator.cs: This class is diff --git a/gstreamer-sharp.mdp b/gstreamer-sharp.mdp index e37560b..08c5906 100644 --- a/gstreamer-sharp.mdp +++ b/gstreamer-sharp.mdp @@ -1,18 +1,19 @@ -<Project name="gstreamer-sharp" fileversion="2.0" language="C#" ctype="DotNetProject"> +<Project name="gstreamer-sharp" fileversion="2.0" language="C#" clr-version="Net_1_1" ctype="DotNetProject"> <Configurations active="Debug"> <Configuration name="Debug" ctype="DotNetProjectConfiguration"> <Output directory="./bin/Debug" assembly="gstreamer-sharp" /> <Build debugmode="True" target="Exe" /> - <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" /> + <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_1_1" /> <CodeGeneration compiler="Csc" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" /> </Configuration> <Configuration name="Release" ctype="DotNetProjectConfiguration"> <Output directory="./bin/Release" assembly="gstreamer-sharp" /> <Build debugmode="False" target="Exe" /> - <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" /> + <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_1_1" /> <CodeGeneration compiler="Csc" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" /> </Configuration> </Configurations> + <DeployTargets /> <DeploymentInformation strategy="File"> <excludeFiles /> </DeploymentInformation> @@ -38,6 +39,8 @@ <File name="./gstreamer-sharp/plugins-base/DecodeBin.cs" subtype="Code" buildaction="Compile" /> <File name="./sample/PlayBinPlayer.cs" subtype="Code" buildaction="Compile" /> <File name="./sample/DecodeBinTranscoder.cs" subtype="Code" buildaction="Compile" /> + <File name="./gstreamer-sharp/DynamicSignalHandlerGenerator.cs" subtype="Code" buildaction="Compile" /> + <File name="./gstreamer-sharp/DynamicSignalMarshalHandler.cs" subtype="Code" buildaction="Compile" /> </Contents> <References /> </Project>
\ No newline at end of file diff --git a/gstreamer-sharp.mds b/gstreamer-sharp.mds index 60fb1ba..a91a1e0 100644 --- a/gstreamer-sharp.mds +++ b/gstreamer-sharp.mds @@ -1,12 +1,13 @@ <Combine name="gstreamer-sharp" fileversion="2.0"> <Configurations active="Debug"> <Configuration name="Debug" ctype="CombineConfiguration"> - <Entry configuration="Debug" build="True" name="gstreamer-sharp" /> + <Entry build="True" name="gstreamer-sharp" configuration="Debug" /> </Configuration> <Configuration name="Release" ctype="CombineConfiguration"> - <Entry configuration="Debug" build="True" name="gstreamer-sharp" /> + <Entry build="True" name="gstreamer-sharp" configuration="Debug" /> </Configuration> </Configurations> + <DeployTargets /> <StartMode startupentry="gstreamer-sharp" single="True"> <Execute type="None" entry="gstreamer-sharp" /> </StartMode> diff --git a/gstreamer-sharp/Clock.custom b/gstreamer-sharp/Clock.custom index 71d568b..e547ee8 100644 --- a/gstreamer-sharp/Clock.custom +++ b/gstreamer-sharp/Clock.custom @@ -2,19 +2,33 @@ [DllImport("gstsharpglue-0.10")] private extern static ulong gstsharp_gst_clock_get_gst_second(); - public static readonly ulong GstSecond = gstsharp_gst_clock_get_gst_second(); + public static readonly ulong Second = gstsharp_gst_clock_get_gst_second(); [DllImport("gstsharpglue-0.10")] private extern static ulong gstsharp_gst_clock_get_gst_msecond(); - public static readonly ulong GstMSecond = gstsharp_gst_clock_get_gst_second(); + public static readonly ulong MSecond = gstsharp_gst_clock_get_gst_second(); [DllImport("gstsharpglue-0.10")] private extern static ulong gstsharp_gst_clock_get_gst_usecond(); - public static readonly ulong GstUSecond = gstsharp_gst_clock_get_gst_second(); + public static readonly ulong USecond = gstsharp_gst_clock_get_gst_second(); [DllImport("gstsharpglue-0.10")] private extern static ulong gstsharp_gst_clock_get_gst_nsecond(); - public static readonly ulong GstNSecond = gstsharp_gst_clock_get_gst_second(); + public static readonly ulong NSecond = gstsharp_gst_clock_get_gst_second(); + + [DllImport("gstsharpglue-0.10")] + private extern static ulong gstsharp_gst_clock_get_clock_time_none(); + + public static readonly ulong TimeNone = gstsharp_gst_clock_get_clock_time_none(); + + [DllImport("gstsharpglue-0.10")] + private extern static bool gstsharp_gst_clock_time_is_valid(ulong time); + + public static bool TimeIsValid(ulong time) + { + return gstsharp_gst_clock_time_is_valid(time); + } + diff --git a/gstreamer-sharp/glue/clock.c b/gstreamer-sharp/glue/clock.c index 83f89ee..d6bf704 100644 --- a/gstreamer-sharp/glue/clock.c +++ b/gstreamer-sharp/glue/clock.c @@ -20,3 +20,14 @@ guint64 gstsharp_gst_clock_get_gst_nsecond() { return GST_NSECOND; } + +guint64 gstsharp_gst_clock_get_time_none() +{ + return GST_CLOCK_TIME_NONE; +} + +gboolean gstsharp_gst_clock_time_is_valid(GstClockTime time) +{ + return GST_CLOCK_TIME_IS_VALID(time); +} + diff --git a/sample/DecodeBinTranscoder.cs b/sample/DecodeBinTranscoder.cs index b12285e..ba14c20 100644 --- a/sample/DecodeBinTranscoder.cs +++ b/sample/DecodeBinTranscoder.cs @@ -184,8 +184,8 @@ public class DecodeBinTranscoder : IDisposable transcoder.Progress += delegate(object o, ProgressArgs args) { Console.Write("\rEncoding: {0} / {1} ({2:00.00}%) ", - new TimeSpan((args.Position / (long) Clock.GstSecond) * TimeSpan.TicksPerSecond), - new TimeSpan((args.Duration / (long) Clock.GstSecond) * TimeSpan.TicksPerSecond), + new TimeSpan((args.Position / (long) Clock.Second) * TimeSpan.TicksPerSecond), + new TimeSpan((args.Duration / (long) Clock.Second) * TimeSpan.TicksPerSecond), ((double)args.Position / (double)args.Duration) * 100.0); }; diff --git a/source/gstreamer-sharp-source.xml b/source/gstreamer-sharp-source.xml index 2ca15aa..ab51676 100644 --- a/source/gstreamer-sharp-source.xml +++ b/source/gstreamer-sharp-source.xml @@ -3,29 +3,16 @@ <library name="gstreamer-0.10.dll"> <namespace name="Gst"> <dir>gstreamer-0.10.3/gst</dir> - <!-- - <dir>gstreamer-0.10.3/gst/autoplug</dir> - --> <exclude>gstreamer-0.10.3/gst/gstinterface.h</exclude> <exclude>gstreamer-0.10.3/gst/gsturi.h</exclude> </namespace> - </library> - <!-- - <library name="gstplay-0.8"> - <namespace name="Gst"> - <dir>gst-plugins-0.8.7/gst-libs/gst/play</dir> - </namespace> - </library> - <library name="gstinterfaces-0.8"> +<!-- <namespace name="Gst"> - <dir>gst-plugins-0.8.7/gst-libs/gst/colorbalance</dir> - <dir>gst-plugins-0.8.7/gst-libs/gst/mixer/</dir> - <dir>gst-plugins-0.8.7/gst-libs/gst/navigation</dir> - <dir>gst-plugins-0.8.7/gst-libs/gst/propertyprobe</dir> - <dir>gst-plugins-0.8.7/gst-libs/gst/tuner</dir> - <dir>gst-plugins-0.8.7/gst-libs/gst/xoverlay</dir> + <file>gst-plugins-base-0.10.3/gst-libs/gst/interfaces/xoverlay.h</file> + <dir>gst-plugins-base-0.10.3/gst-libs/gst/video</dir> + <exclude>gst-plugins-base-0.10.3/gst-libs/gst/video/video.h</exclude> </namespace> +--> </library> - --> </api> </gapi-parser-input> |