New template for autogenerated files
authorXavi Artigas <xartigas@fluendo.com>
Tue, 30 Apr 2013 09:19:04 +0000 (11:19 +0200)
committerXavi Artigas <xartigas@fluendo.com>
Tue, 30 Apr 2013 09:19:04 +0000 (11:19 +0200)
gst-sdk/tutorials/xcode iOS/GStreamer iOS Tutorials.xcodeproj/project.pbxproj
gst-sdk/tutorials/xcode iOS/Tutorial 1/gst_ios_backend.c [deleted file]
gst-sdk/tutorials/xcode iOS/Tutorial 1/gst_ios_backend.h [deleted file]
gst-sdk/tutorials/xcode iOS/Tutorial 1/gst_ios_init.c [moved from gst-sdk/tutorials/xcode iOS/Tutorial 1/gst_ios_plugins.c with 99% similarity]
gst-sdk/tutorials/xcode iOS/Tutorial 1/gst_ios_init.h [moved from gst-sdk/tutorials/xcode iOS/Tutorial 1/gst_ios_plugins.h with 61% similarity]
gst-sdk/tutorials/xcode iOS/Tutorial 1/main.m

index c2faacf..2c6245e 100644 (file)
@@ -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 */
 
                C67B40EA172EBEA3008359CC /* en */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = en; path = en.lproj/MainStoryboard_iPad.storyboard; sourceTree = "<group>"; };
                C67B40EC172EBEA3008359CC /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = "<group>"; };
                C67B40ED172EBEA3008359CC /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = "<group>"; };
-               C67B40EF172EBEA3008359CC /* gst_ios_backend.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = gst_ios_backend.c; sourceTree = "<group>"; };
-               C67B40F1172EBEA3008359CC /* gst_ios_backend.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = gst_ios_backend.h; sourceTree = "<group>"; };
-               C67B40F2172EBEA3008359CC /* gst_ios_plugins.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = gst_ios_plugins.c; sourceTree = "<group>"; };
-               C67B40F4172EBEA4008359CC /* gst_ios_plugins.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = gst_ios_plugins.h; sourceTree = "<group>"; };
+               C67B40EF172EBEA3008359CC /* gst_ios_init.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = gst_ios_init.c; sourceTree = "<group>"; };
+               C67B40F1172EBEA3008359CC /* gst_ios_init.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = gst_ios_init.h; sourceTree = "<group>"; };
                C67B40F8172EC27D008359CC /* GStreamerBackend.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GStreamerBackend.h; sourceTree = "<group>"; };
                C67B40F9172EC27D008359CC /* GStreamerBackend.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GStreamerBackend.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
                                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 = "<group>";
                                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;
                                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 (file)
index f79c41c..0000000
+++ /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 (file)
index 71a7503..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef __GST_IOS_BACKEND_H__
-#define __GST_IOS_BACKEND_H__
-
-#include <gst/gst.h>
-
-void gst_backend_init ();
-
-#endif
@@ -1,7 +1,4 @@
-
-
-#include <gst/gst.h>
-#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
@@ -1,3 +1,11 @@
+#ifndef __GST_IOS_INIT_H__
+#define __GST_IOS_INIT_H__
+
+#include <gst/gst.h>
+
+/* 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
index 5484162..c71525a 100644 (file)
@@ -1,7 +1,7 @@
 #import <UIKit/UIKit.h>
 
 #import "AppDelegate.h"
-#include "gst_ios_backend.h"
+#include "gst_ios_init.h"
 
 int main(int argc, char *argv[])
 {