From d8c0c43ffb35c2552b655fa76b3e588e3da5eae6 Mon Sep 17 00:00:00 2001 From: Xavi Artigas Date: Tue, 30 Apr 2013 11:19:04 +0200 Subject: [PATCH] New template for autogenerated files --- .../project.pbxproj | 19 +++++++------------ .../xcode iOS/Tutorial 1/gst_ios_backend.c | 9 --------- .../xcode iOS/Tutorial 1/gst_ios_backend.h | 8 -------- .../{gst_ios_plugins.c => gst_ios_init.c} | 9 ++++----- .../{gst_ios_plugins.h => gst_ios_init.h} | 13 ++++++++++++- gst-sdk/tutorials/xcode iOS/Tutorial 1/main.m | 2 +- 6 files changed, 24 insertions(+), 36 deletions(-) delete mode 100644 gst-sdk/tutorials/xcode iOS/Tutorial 1/gst_ios_backend.c delete mode 100644 gst-sdk/tutorials/xcode iOS/Tutorial 1/gst_ios_backend.h rename gst-sdk/tutorials/xcode iOS/Tutorial 1/{gst_ios_plugins.c => gst_ios_init.c} (99%) rename gst-sdk/tutorials/xcode iOS/Tutorial 1/{gst_ios_plugins.h => gst_ios_init.h} (61%) diff --git a/gst-sdk/tutorials/xcode iOS/GStreamer iOS Tutorials.xcodeproj/project.pbxproj b/gst-sdk/tutorials/xcode iOS/GStreamer iOS Tutorials.xcodeproj/project.pbxproj index c2faacf816..2c6245efe1 100644 --- a/gst-sdk/tutorials/xcode iOS/GStreamer iOS Tutorials.xcodeproj/project.pbxproj +++ b/gst-sdk/tutorials/xcode iOS/GStreamer iOS Tutorials.xcodeproj/project.pbxproj @@ -20,8 +20,7 @@ C67B40E8172EBEA3008359CC /* MainStoryboard_iPhone.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = C67B40E6172EBEA3008359CC /* MainStoryboard_iPhone.storyboard */; }; C67B40EB172EBEA3008359CC /* MainStoryboard_iPad.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = C67B40E9172EBEA3008359CC /* MainStoryboard_iPad.storyboard */; }; C67B40EE172EBEA3008359CC /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C67B40ED172EBEA3008359CC /* ViewController.m */; }; - C67B40F0172EBEA3008359CC /* gst_ios_backend.c in Sources */ = {isa = PBXBuildFile; fileRef = C67B40EF172EBEA3008359CC /* gst_ios_backend.c */; }; - C67B40F3172EBEA3008359CC /* gst_ios_plugins.c in Sources */ = {isa = PBXBuildFile; fileRef = C67B40F2172EBEA3008359CC /* gst_ios_plugins.c */; }; + C67B40F0172EBEA3008359CC /* gst_ios_init.c in Sources */ = {isa = PBXBuildFile; fileRef = C67B40EF172EBEA3008359CC /* gst_ios_init.c */; }; C67B40FA172EC27D008359CC /* GStreamerBackend.m in Sources */ = {isa = PBXBuildFile; fileRef = C67B40F9172EC27D008359CC /* GStreamerBackend.m */; }; /* End PBXBuildFile section */ @@ -44,10 +43,8 @@ C67B40EA172EBEA3008359CC /* en */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = en; path = en.lproj/MainStoryboard_iPad.storyboard; sourceTree = ""; }; C67B40EC172EBEA3008359CC /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = ""; }; C67B40ED172EBEA3008359CC /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = ""; }; - C67B40EF172EBEA3008359CC /* gst_ios_backend.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = gst_ios_backend.c; sourceTree = ""; }; - C67B40F1172EBEA3008359CC /* gst_ios_backend.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = gst_ios_backend.h; sourceTree = ""; }; - C67B40F2172EBEA3008359CC /* gst_ios_plugins.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = gst_ios_plugins.c; sourceTree = ""; }; - C67B40F4172EBEA4008359CC /* gst_ios_plugins.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = gst_ios_plugins.h; sourceTree = ""; }; + C67B40EF172EBEA3008359CC /* gst_ios_init.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = gst_ios_init.c; sourceTree = ""; }; + C67B40F1172EBEA3008359CC /* gst_ios_init.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = gst_ios_init.h; sourceTree = ""; }; C67B40F8172EC27D008359CC /* GStreamerBackend.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GStreamerBackend.h; sourceTree = ""; }; C67B40F9172EC27D008359CC /* GStreamerBackend.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GStreamerBackend.m; sourceTree = ""; }; /* End PBXFileReference section */ @@ -121,10 +118,8 @@ C67B40E0172EBEA3008359CC /* Default.png */, C67B40E2172EBEA3008359CC /* Default@2x.png */, C67B40E4172EBEA3008359CC /* Default-568h@2x.png */, - C67B40EF172EBEA3008359CC /* gst_ios_backend.c */, - C67B40F1172EBEA3008359CC /* gst_ios_backend.h */, - C67B40F2172EBEA3008359CC /* gst_ios_plugins.c */, - C67B40F4172EBEA4008359CC /* gst_ios_plugins.h */, + C67B40EF172EBEA3008359CC /* gst_ios_init.c */, + C67B40F1172EBEA3008359CC /* gst_ios_init.h */, ); name = "Supporting Files"; sourceTree = ""; @@ -198,8 +193,7 @@ C67B40DB172EBEA3008359CC /* main.m in Sources */, C67B40DF172EBEA3008359CC /* AppDelegate.m in Sources */, C67B40EE172EBEA3008359CC /* ViewController.m in Sources */, - C67B40F0172EBEA3008359CC /* gst_ios_backend.c in Sources */, - C67B40F3172EBEA3008359CC /* gst_ios_plugins.c in Sources */, + C67B40F0172EBEA3008359CC /* gst_ios_init.c in Sources */, C67B40FA172EC27D008359CC /* GStreamerBackend.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -397,6 +391,7 @@ C67B40F6172EBEA4008359CC /* Release */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; /* End XCConfigurationList section */ }; diff --git a/gst-sdk/tutorials/xcode iOS/Tutorial 1/gst_ios_backend.c b/gst-sdk/tutorials/xcode iOS/Tutorial 1/gst_ios_backend.c deleted file mode 100644 index f79c41c549..0000000000 --- a/gst-sdk/tutorials/xcode iOS/Tutorial 1/gst_ios_backend.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "gst_ios_backend.h" -#include "gst_ios_plugins.h" - -void -gst_backend_init (void) -{ - gst_init (NULL, NULL); - gst_backend_register_plugins (); -} diff --git a/gst-sdk/tutorials/xcode iOS/Tutorial 1/gst_ios_backend.h b/gst-sdk/tutorials/xcode iOS/Tutorial 1/gst_ios_backend.h deleted file mode 100644 index 71a75035e9..0000000000 --- a/gst-sdk/tutorials/xcode iOS/Tutorial 1/gst_ios_backend.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef __GST_IOS_BACKEND_H__ -#define __GST_IOS_BACKEND_H__ - -#include - -void gst_backend_init (); - -#endif diff --git a/gst-sdk/tutorials/xcode iOS/Tutorial 1/gst_ios_plugins.c b/gst-sdk/tutorials/xcode iOS/Tutorial 1/gst_ios_init.c similarity index 99% rename from gst-sdk/tutorials/xcode iOS/Tutorial 1/gst_ios_plugins.c rename to gst-sdk/tutorials/xcode iOS/Tutorial 1/gst_ios_init.c index 237d1b31b9..df885e0411 100644 --- a/gst-sdk/tutorials/xcode iOS/Tutorial 1/gst_ios_plugins.c +++ b/gst-sdk/tutorials/xcode iOS/Tutorial 1/gst_ios_init.c @@ -1,7 +1,4 @@ - - -#include -#include "gst_ios_plugins.h" +#include "gst_ios_init.h" #if defined(GST_IOS_PLUGIN_COREELEMENTS) || defined(GST_IOS_PLUGINS_CORE) GST_PLUGIN_STATIC_DECLARE(coreelements); @@ -497,8 +494,10 @@ GST_PLUGIN_STATIC_DECLARE(sdp); #endif void -gst_backend_register_plugins (void) +gst_backend_init (void) { + gst_init (NULL, NULL); + #if defined(GST_IOS_PLUGIN_COREELEMENTS) || defined(GST_IOS_PLUGINS_CORE) GST_PLUGIN_STATIC_REGISTER(coreelements); #endif diff --git a/gst-sdk/tutorials/xcode iOS/Tutorial 1/gst_ios_plugins.h b/gst-sdk/tutorials/xcode iOS/Tutorial 1/gst_ios_init.h similarity index 61% rename from gst-sdk/tutorials/xcode iOS/Tutorial 1/gst_ios_plugins.h rename to gst-sdk/tutorials/xcode iOS/Tutorial 1/gst_ios_init.h index 757104de0c..7231619816 100644 --- a/gst-sdk/tutorials/xcode iOS/Tutorial 1/gst_ios_plugins.h +++ b/gst-sdk/tutorials/xcode iOS/Tutorial 1/gst_ios_init.h @@ -1,3 +1,11 @@ +#ifndef __GST_IOS_INIT_H__ +#define __GST_IOS_INIT_H__ + +#include + +/* Uncomment each line to enable the plugin categories that your application needs. + * You can also enable individual plugins. See gst_ios_init.c to see their names + */ #define GST_IOS_PLUGINS_CORE //#define GST_IOS_PLUGINS_CAPTURE //#define GST_IOS_PLUGINS_CODECS_RESTRICTED @@ -11,4 +19,7 @@ //#define GST_IOS_PLUGINS_EFFECTS //#define GST_IOS_PLUGINS_CODECS //#define GST_IOS_PLUGINS_NET -void gst_backend_register_plugins (void); \ No newline at end of file + +void gst_backend_init (); + +#endif diff --git a/gst-sdk/tutorials/xcode iOS/Tutorial 1/main.m b/gst-sdk/tutorials/xcode iOS/Tutorial 1/main.m index 54841628d7..c71525ad7b 100644 --- a/gst-sdk/tutorials/xcode iOS/Tutorial 1/main.m +++ b/gst-sdk/tutorials/xcode iOS/Tutorial 1/main.m @@ -1,7 +1,7 @@ #import #import "AppDelegate.h" -#include "gst_ios_backend.h" +#include "gst_ios_init.h" int main(int argc, char *argv[]) {