[longomatch] Rename video-utils to force Objective-C compilation. Make sure we properly export the symbols with n
- From: Andoni Morales Alastruey <amorales src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [longomatch] Rename video-utils to force Objective-C compilation. Make sure we properly export the symbols with n
- Date: Wed, 24 Sep 2014 20:29:27 +0000 (UTC)
commit 4c5b84a1f39d1fb531b2d87a0ed7b0f48b070507
Author: Julien Moutte <julien fluendo com>
Date: Thu Sep 11 11:45:40 2014 -0700
Rename video-utils to force Objective-C compilation. Make sure we properly export the symbols with no
decorators.
libcesarplayer/Makefile.am | 2 +-
libcesarplayer/liblongomatch.cproj | 29 ++++-----------------
libcesarplayer/video-utils.h | 4 +++
libcesarplayer/{video-utils.c => video-utils.mm} | 4 +-
4 files changed, 13 insertions(+), 26 deletions(-)
---
diff --git a/libcesarplayer/Makefile.am b/libcesarplayer/Makefile.am
index 7a9f0a8..790eabd 100644
--- a/libcesarplayer/Makefile.am
+++ b/libcesarplayer/Makefile.am
@@ -45,7 +45,7 @@ libcesarplayer_la_SOURCES = \
gst-video-encoder.h\
gst-nle-source.c\
gst-nle-source.h\
- video-utils.c\
+ video-utils.mm\
video-utils.h\
macros.h
diff --git a/libcesarplayer/liblongomatch.cproj b/libcesarplayer/liblongomatch.cproj
index 736598c..5350c14 100644
--- a/libcesarplayer/liblongomatch.cproj
+++ b/libcesarplayer/liblongomatch.cproj
@@ -3,11 +3,9 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>12.0.0</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{513A86B7-13B9-4209-91C3-3840E68CF2F8}</ProjectGuid>
<Packages>
- <Packages xmlns="">
+ <Packages>
<Package file="/usr/lib/pkgconfig/gdk-2.0.pc" name="GDK" IsProject="False" />
<Package file="/usr/lib/pkgconfig/gstreamer-0.10.pc" name="GStreamer" IsProject="False" />
<Package file="/usr/lib/pkgconfig/gstreamer-audio-0.10.pc" name="GStreamer Audio library"
IsProject="False" />
@@ -20,7 +18,7 @@
</Packages>
</Packages>
<Compiler>
- <Compiler ctype="GccCompiler" xmlns="" />
+ <Compiler ctype="GccCompiler" />
</Compiler>
<Language>C</Language>
<Target>Bin</Target>
@@ -34,7 +32,7 @@
<CompileTarget>SharedLibrary</CompileTarget>
<OutputName>libcesarplayer</OutputName>
<CodeGeneration>
- <CodeGeneration ctype="CCompilationParameters" xmlns="" />
+ <CodeGeneration ctype="CCompilationParameters" />
</CodeGeneration>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -47,7 +45,7 @@
<DefineSymbols>MONODEVELOP OSTYPE_LINUX</DefineSymbols>
<SourceDirectory>.</SourceDirectory>
<CodeGeneration>
- <CodeGeneration ctype="CCompilationParameters" xmlns="" />
+ <CodeGeneration ctype="CCompilationParameters" />
</CodeGeneration>
</PropertyGroup>
<ItemGroup>
@@ -71,26 +69,11 @@
<Compile Include="gst-smart-video-scaler.c" />
<Compile Include="gst-video-editor.c" />
<Compile Include="gstvideowidget.c" />
- <Compile Include="video-utils.c" />
<Compile Include="baconvideowidget-marshal.c" />
<Compile Include="gst-remuxer.c" />
<Compile Include="gst-video-encoder.c" />
- <Compile Include="lgm-video-player.c" />
<Compile Include="gst-nle-source.c" />
+ <Compile Include="video-utils.mm" />
+ <Compile Include="lgm-video-player.c" />
</ItemGroup>
- <ProjectExtensions>
- <MonoDevelop>
- <Properties xmlns="">
- <MonoDevelop.Autotools.MakefileInfo RelativeMakefileName="Makefile.am" IsAutotoolsProject="True"
RelativeConfigureInPath=".">
- <BuildFilesVar />
- <DeployFilesVar />
- <ResourcesVar />
- <OthersVar />
- <GacRefVar />
- <AsmRefVar />
- <ProjectRefVar />
- </MonoDevelop.Autotools.MakefileInfo>
- </Properties>
- </MonoDevelop>
- </ProjectExtensions>
</Project>
\ No newline at end of file
diff --git a/libcesarplayer/video-utils.h b/libcesarplayer/video-utils.h
index c44a941..9c867ec 100644
--- a/libcesarplayer/video-utils.h
+++ b/libcesarplayer/video-utils.h
@@ -41,6 +41,8 @@
#define EXPORT
#endif
+ G_BEGIN_DECLS
+
typedef enum {
GST_AUTOPLUG_SELECT_TRY,
GST_AUTOPLUG_SELECT_EXPOSE,
@@ -66,3 +68,5 @@ EXPORT GstElement * lgm_create_muxer (VideoMuxerType type,
GQuark quark, GError **err);
EXPORT GstAutoplugSelectResult lgm_filter_video_decoders (GstElement* object,
GstPad* arg0, GstCaps* arg1, GstElementFactory* arg2, gpointer user_data);
+
+G_END_DECLS
\ No newline at end of file
diff --git a/libcesarplayer/video-utils.c b/libcesarplayer/video-utils.mm
similarity index 98%
rename from libcesarplayer/video-utils.c
rename to libcesarplayer/video-utils.mm
index 51d231d..7616b9d 100644
--- a/libcesarplayer/video-utils.c
+++ b/libcesarplayer/video-utils.mm
@@ -174,7 +174,7 @@ lgm_discover_uri (
} else {
audios = gst_discoverer_info_get_audio_streams (info);
if (audios != NULL) {
- ainfo = audios->data;
+ ainfo = (GstDiscovererAudioInfo *) audios->data;
}
}
@@ -195,7 +195,7 @@ lgm_discover_uri (
} else {
videos = gst_discoverer_info_get_video_streams (info);
if (videos != NULL) {
- vinfo = videos->data;
+ vinfo = (GstDiscovererVideoInfo *) videos->data;
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]