ios: Sync gst_ios_init.[mh] with latest version

Fixes https://github.com/sdroege/gst-player/pull/154

2 files changed, 86 insertions, 20 deletions

diff --git a/ios/GstPlay/gst_ios_init.h b/ios/GstPlay/gst_ios_init.h
index a880bf6..870515b 100644
--- a/ios/GstPlay/gst_ios_init.h
+++ b/ios/GstPlay/gst_ios_init.h
@@ -15,6 +15,7 @@ G_PASTE(g_io_module_, G_PASTE(name, _load_static)) ()
  * You can also enable individual plugins. See gst_ios_init.c to see their names
  */
 
+//#define GST_IOS_PLUGINS_GES
 #define GST_IOS_PLUGINS_CORE
 //#define GST_IOS_PLUGINS_CAPTURE
 #define GST_IOS_PLUGINS_CODECS_RESTRICTED
@@ -27,7 +28,6 @@ G_PASTE(g_io_module_, G_PASTE(name, _load_static)) ()
 #define GST_IOS_PLUGINS_EFFECTS
 #define GST_IOS_PLUGINS_CODECS
 #define GST_IOS_PLUGINS_NET
-//#define GST_IOS_PLUGINS_EDITING
 
 
 #define GST_IOS_GIO_MODULE_GNUTLS
diff --git a/ios/GstPlay/gst_ios_init.m b/ios/GstPlay/gst_ios_init.m
index 403f9f9..214b2e8 100644
--- a/ios/GstPlay/gst_ios_init.m
+++ b/ios/GstPlay/gst_ios_init.m
@@ -1,5 +1,8 @@
 #include "gst_ios_init.h"
 
+#if defined(GST_IOS_PLUGIN_NLE) || defined(GST_IOS_PLUGINS_GES)
+GST_PLUGIN_STATIC_DECLARE(nle);
+#endif
 #if defined(GST_IOS_PLUGIN_COREELEMENTS) || defined(GST_IOS_PLUGINS_CORE)
 GST_PLUGIN_STATIC_DECLARE(coreelements);
 #endif
@@ -111,6 +114,12 @@ GST_PLUGIN_STATIC_DECLARE(realmedia);
 #if defined(GST_IOS_PLUGIN_X264) || defined(GST_IOS_PLUGINS_CODECS_RESTRICTED)
 GST_PLUGIN_STATIC_DECLARE(x264);
 #endif
+#if defined(GST_IOS_PLUGIN_LAME) || defined(GST_IOS_PLUGINS_CODECS_RESTRICTED)
+GST_PLUGIN_STATIC_DECLARE(lame);
+#endif
+#if defined(GST_IOS_PLUGIN_MPG123) || defined(GST_IOS_PLUGINS_CODECS_RESTRICTED)
+GST_PLUGIN_STATIC_DECLARE(mpg123);
+#endif
 #if defined(GST_IOS_PLUGIN_LIBAV) || defined(GST_IOS_PLUGINS_CODECS_RESTRICTED)
 GST_PLUGIN_STATIC_DECLARE(libav);
 #endif
@@ -255,15 +264,15 @@ GST_PLUGIN_STATIC_DECLARE(gaudieffects);
 #if defined(GST_IOS_PLUGIN_GEOMETRICTRANSFORM) || defined(GST_IOS_PLUGINS_EFFECTS)
 GST_PLUGIN_STATIC_DECLARE(geometrictransform);
 #endif
+#if defined(GST_IOS_PLUGIN_INTER) || defined(GST_IOS_PLUGINS_EFFECTS)
+GST_PLUGIN_STATIC_DECLARE(inter);
+#endif
 #if defined(GST_IOS_PLUGIN_INTERLACE) || defined(GST_IOS_PLUGINS_EFFECTS)
 GST_PLUGIN_STATIC_DECLARE(interlace);
 #endif
 #if defined(GST_IOS_PLUGIN_IVTC) || defined(GST_IOS_PLUGINS_EFFECTS)
 GST_PLUGIN_STATIC_DECLARE(ivtc);
 #endif
-#if defined(GST_IOS_PLUGIN_LIVEADDER) || defined(GST_IOS_PLUGINS_EFFECTS)
-GST_PLUGIN_STATIC_DECLARE(liveadder);
-#endif
 #if defined(GST_IOS_PLUGIN_RAWPARSE) || defined(GST_IOS_PLUGINS_EFFECTS)
 GST_PLUGIN_STATIC_DECLARE(rawparse);
 #endif
@@ -279,9 +288,18 @@ GST_PLUGIN_STATIC_DECLARE(smooth);
 #if defined(GST_IOS_PLUGIN_SPEED) || defined(GST_IOS_PLUGINS_EFFECTS)
 GST_PLUGIN_STATIC_DECLARE(speed);
 #endif
+#if defined(GST_IOS_PLUGIN_SOUNDTOUCH) || defined(GST_IOS_PLUGINS_EFFECTS)
+GST_PLUGIN_STATIC_DECLARE(soundtouch);
+#endif
 #if defined(GST_IOS_PLUGIN_VIDEOFILTERSBAD) || defined(GST_IOS_PLUGINS_EFFECTS)
 GST_PLUGIN_STATIC_DECLARE(videofiltersbad);
 #endif
+#if defined(GST_IOS_PLUGIN_AUDIOMIXER) || defined(GST_IOS_PLUGINS_EFFECTS)
+GST_PLUGIN_STATIC_DECLARE(audiomixer);
+#endif
+#if defined(GST_IOS_PLUGIN_COMPOSITOR) || defined(GST_IOS_PLUGINS_EFFECTS)
+GST_PLUGIN_STATIC_DECLARE(compositor);
+#endif
 #if defined(GST_IOS_PLUGIN_SUBPARSE) || defined(GST_IOS_PLUGINS_CODECS)
 GST_PLUGIN_STATIC_DECLARE(subparse);
 #endif
@@ -294,6 +312,9 @@ GST_PLUGIN_STATIC_DECLARE(theora);
 #if defined(GST_IOS_PLUGIN_VORBIS) || defined(GST_IOS_PLUGINS_CODECS)
 GST_PLUGIN_STATIC_DECLARE(vorbis);
 #endif
+#if defined(GST_IOS_PLUGIN_OPUS) || defined(GST_IOS_PLUGINS_CODECS)
+GST_PLUGIN_STATIC_DECLARE(opus);
+#endif
 #if defined(GST_IOS_PLUGIN_IVORBISDEC) || defined(GST_IOS_PLUGINS_CODECS)
 GST_PLUGIN_STATIC_DECLARE(ivorbisdec);
 #endif
@@ -384,8 +405,8 @@ GST_PLUGIN_STATIC_DECLARE(dvbsuboverlay);
 #if defined(GST_IOS_PLUGIN_DVDSPU) || defined(GST_IOS_PLUGINS_CODECS)
 GST_PLUGIN_STATIC_DECLARE(dvdspu);
 #endif
-#if defined(GST_IOS_PLUGIN_FRAGMENTED) || defined(GST_IOS_PLUGINS_CODECS)
-GST_PLUGIN_STATIC_DECLARE(fragmented);
+#if defined(GST_IOS_PLUGIN_HLS) || defined(GST_IOS_PLUGINS_CODECS)
+GST_PLUGIN_STATIC_DECLARE(hls);
 #endif
 #if defined(GST_IOS_PLUGIN_ID3TAG) || defined(GST_IOS_PLUGINS_CODECS)
 GST_PLUGIN_STATIC_DECLARE(id3tag);
@@ -399,8 +420,11 @@ GST_PLUGIN_STATIC_DECLARE(midi);
 #if defined(GST_IOS_PLUGIN_MXF) || defined(GST_IOS_PLUGINS_CODECS)
 GST_PLUGIN_STATIC_DECLARE(mxf);
 #endif
-#if defined(GST_IOS_PLUGIN_OPUS) || defined(GST_IOS_PLUGINS_CODECS)
-GST_PLUGIN_STATIC_DECLARE(opus);
+#if defined(GST_IOS_PLUGIN_OPENH264) || defined(GST_IOS_PLUGINS_CODECS)
+GST_PLUGIN_STATIC_DECLARE(openh264);
+#endif
+#if defined(GST_IOS_PLUGIN_OPUSPARSE) || defined(GST_IOS_PLUGINS_CODECS)
+GST_PLUGIN_STATIC_DECLARE(opusparse);
 #endif
 #if defined(GST_IOS_PLUGIN_PCAPPARSE) || defined(GST_IOS_PLUGINS_CODECS)
 GST_PLUGIN_STATIC_DECLARE(pcapparse);
@@ -438,6 +462,12 @@ GST_PLUGIN_STATIC_DECLARE(gdp);
 #if defined(GST_IOS_PLUGIN_RSVG) || defined(GST_IOS_PLUGINS_CODECS)
 GST_PLUGIN_STATIC_DECLARE(rsvg);
 #endif
+#if defined(GST_IOS_PLUGIN_OPENJPEG) || defined(GST_IOS_PLUGINS_CODECS)
+GST_PLUGIN_STATIC_DECLARE(openjpeg);
+#endif
+#if defined(GST_IOS_PLUGIN_SPANDSP) || defined(GST_IOS_PLUGINS_CODECS)
+GST_PLUGIN_STATIC_DECLARE(spandsp);
+#endif
 #if defined(GST_IOS_PLUGIN_TCP) || defined(GST_IOS_PLUGINS_NET)
 GST_PLUGIN_STATIC_DECLARE(tcp);
 #endif
@@ -462,8 +492,11 @@ GST_PLUGIN_STATIC_DECLARE(dataurisrc);
 #if defined(GST_IOS_PLUGIN_SDP) || defined(GST_IOS_PLUGINS_NET)
 GST_PLUGIN_STATIC_DECLARE(sdp);
 #endif
-#if defined(GST_IOS_PLUGIN_GNONLIN) || defined(GST_IOS_PLUGINS_EDITING)
-GST_PLUGIN_STATIC_DECLARE(gnonlin);
+#if defined(GST_IOS_PLUGIN_SRTP) || defined(GST_IOS_PLUGINS_NET)
+GST_PLUGIN_STATIC_DECLARE(srtp);
+#endif
+#if defined(GST_IOS_PLUGIN_RTSPCLIENTSINK) || defined(GST_IOS_PLUGINS_NET)
+GST_PLUGIN_STATIC_DECLARE(rtspclientsink);
 #endif
 
 #if defined(GST_IOS_GIO_MODULE_GNUTLS)
@@ -506,7 +539,10 @@ gst_ios_init (void)
     
   gst_init (NULL, NULL);
 
-  #if defined(GST_IOS_PLUGIN_COREELEMENTS) || defined(GST_IOS_PLUGINS_CORE)
+  #if defined(GST_IOS_PLUGIN_NLE) || defined(GST_IOS_PLUGINS_GES)
+    GST_PLUGIN_STATIC_REGISTER(nle);
+#endif
+#if defined(GST_IOS_PLUGIN_COREELEMENTS) || defined(GST_IOS_PLUGINS_CORE)
     GST_PLUGIN_STATIC_REGISTER(coreelements);
 #endif
 #if defined(GST_IOS_PLUGIN_ADDER) || defined(GST_IOS_PLUGINS_CORE)
@@ -617,6 +653,12 @@ gst_ios_init (void)
 #if defined(GST_IOS_PLUGIN_X264) || defined(GST_IOS_PLUGINS_CODECS_RESTRICTED)
     GST_PLUGIN_STATIC_REGISTER(x264);
 #endif
+#if defined(GST_IOS_PLUGIN_LAME) || defined(GST_IOS_PLUGINS_CODECS_RESTRICTED)
+    GST_PLUGIN_STATIC_REGISTER(lame);
+#endif
+#if defined(GST_IOS_PLUGIN_MPG123) || defined(GST_IOS_PLUGINS_CODECS_RESTRICTED)
+    GST_PLUGIN_STATIC_REGISTER(mpg123);
+#endif
 #if defined(GST_IOS_PLUGIN_LIBAV) || defined(GST_IOS_PLUGINS_CODECS_RESTRICTED)
     GST_PLUGIN_STATIC_REGISTER(libav);
 #endif
@@ -761,15 +803,15 @@ gst_ios_init (void)
 #if defined(GST_IOS_PLUGIN_GEOMETRICTRANSFORM) || defined(GST_IOS_PLUGINS_EFFECTS)
     GST_PLUGIN_STATIC_REGISTER(geometrictransform);
 #endif
+#if defined(GST_IOS_PLUGIN_INTER) || defined(GST_IOS_PLUGINS_EFFECTS)
+    GST_PLUGIN_STATIC_REGISTER(inter);
+#endif
 #if defined(GST_IOS_PLUGIN_INTERLACE) || defined(GST_IOS_PLUGINS_EFFECTS)
     GST_PLUGIN_STATIC_REGISTER(interlace);
 #endif
 #if defined(GST_IOS_PLUGIN_IVTC) || defined(GST_IOS_PLUGINS_EFFECTS)
     GST_PLUGIN_STATIC_REGISTER(ivtc);
 #endif
-#if defined(GST_IOS_PLUGIN_LIVEADDER) || defined(GST_IOS_PLUGINS_EFFECTS)
-    GST_PLUGIN_STATIC_REGISTER(liveadder);
-#endif
 #if defined(GST_IOS_PLUGIN_RAWPARSE) || defined(GST_IOS_PLUGINS_EFFECTS)
     GST_PLUGIN_STATIC_REGISTER(rawparse);
 #endif
@@ -785,9 +827,18 @@ gst_ios_init (void)
 #if defined(GST_IOS_PLUGIN_SPEED) || defined(GST_IOS_PLUGINS_EFFECTS)
     GST_PLUGIN_STATIC_REGISTER(speed);
 #endif
+#if defined(GST_IOS_PLUGIN_SOUNDTOUCH) || defined(GST_IOS_PLUGINS_EFFECTS)
+    GST_PLUGIN_STATIC_REGISTER(soundtouch);
+#endif
 #if defined(GST_IOS_PLUGIN_VIDEOFILTERSBAD) || defined(GST_IOS_PLUGINS_EFFECTS)
     GST_PLUGIN_STATIC_REGISTER(videofiltersbad);
 #endif
+#if defined(GST_IOS_PLUGIN_AUDIOMIXER) || defined(GST_IOS_PLUGINS_EFFECTS)
+    GST_PLUGIN_STATIC_REGISTER(audiomixer);
+#endif
+#if defined(GST_IOS_PLUGIN_COMPOSITOR) || defined(GST_IOS_PLUGINS_EFFECTS)
+    GST_PLUGIN_STATIC_REGISTER(compositor);
+#endif
 #if defined(GST_IOS_PLUGIN_SUBPARSE) || defined(GST_IOS_PLUGINS_CODECS)
     GST_PLUGIN_STATIC_REGISTER(subparse);
 #endif
@@ -800,6 +851,9 @@ gst_ios_init (void)
 #if defined(GST_IOS_PLUGIN_VORBIS) || defined(GST_IOS_PLUGINS_CODECS)
     GST_PLUGIN_STATIC_REGISTER(vorbis);
 #endif
+#if defined(GST_IOS_PLUGIN_OPUS) || defined(GST_IOS_PLUGINS_CODECS)
+    GST_PLUGIN_STATIC_REGISTER(opus);
+#endif
 #if defined(GST_IOS_PLUGIN_IVORBISDEC) || defined(GST_IOS_PLUGINS_CODECS)
     GST_PLUGIN_STATIC_REGISTER(ivorbisdec);
 #endif
@@ -890,8 +944,8 @@ gst_ios_init (void)
 #if defined(GST_IOS_PLUGIN_DVDSPU) || defined(GST_IOS_PLUGINS_CODECS)
     GST_PLUGIN_STATIC_REGISTER(dvdspu);
 #endif
-#if defined(GST_IOS_PLUGIN_FRAGMENTED) || defined(GST_IOS_PLUGINS_CODECS)
-    GST_PLUGIN_STATIC_REGISTER(fragmented);
+#if defined(GST_IOS_PLUGIN_HLS) || defined(GST_IOS_PLUGINS_CODECS)
+    GST_PLUGIN_STATIC_REGISTER(hls);
 #endif
 #if defined(GST_IOS_PLUGIN_ID3TAG) || defined(GST_IOS_PLUGINS_CODECS)
     GST_PLUGIN_STATIC_REGISTER(id3tag);
@@ -905,8 +959,11 @@ gst_ios_init (void)
 #if defined(GST_IOS_PLUGIN_MXF) || defined(GST_IOS_PLUGINS_CODECS)
     GST_PLUGIN_STATIC_REGISTER(mxf);
 #endif
-#if defined(GST_IOS_PLUGIN_OPUS) || defined(GST_IOS_PLUGINS_CODECS)
-    GST_PLUGIN_STATIC_REGISTER(opus);
+#if defined(GST_IOS_PLUGIN_OPENH264) || defined(GST_IOS_PLUGINS_CODECS)
+    GST_PLUGIN_STATIC_REGISTER(openh264);
+#endif
+#if defined(GST_IOS_PLUGIN_OPUSPARSE) || defined(GST_IOS_PLUGINS_CODECS)
+    GST_PLUGIN_STATIC_REGISTER(opusparse);
 #endif
 #if defined(GST_IOS_PLUGIN_PCAPPARSE) || defined(GST_IOS_PLUGINS_CODECS)
     GST_PLUGIN_STATIC_REGISTER(pcapparse);
@@ -944,6 +1001,12 @@ gst_ios_init (void)
 #if defined(GST_IOS_PLUGIN_RSVG) || defined(GST_IOS_PLUGINS_CODECS)
     GST_PLUGIN_STATIC_REGISTER(rsvg);
 #endif
+#if defined(GST_IOS_PLUGIN_OPENJPEG) || defined(GST_IOS_PLUGINS_CODECS)
+    GST_PLUGIN_STATIC_REGISTER(openjpeg);
+#endif
+#if defined(GST_IOS_PLUGIN_SPANDSP) || defined(GST_IOS_PLUGINS_CODECS)
+    GST_PLUGIN_STATIC_REGISTER(spandsp);
+#endif
 #if defined(GST_IOS_PLUGIN_TCP) || defined(GST_IOS_PLUGINS_NET)
     GST_PLUGIN_STATIC_REGISTER(tcp);
 #endif
@@ -968,8 +1031,11 @@ gst_ios_init (void)
 #if defined(GST_IOS_PLUGIN_SDP) || defined(GST_IOS_PLUGINS_NET)
     GST_PLUGIN_STATIC_REGISTER(sdp);
 #endif
-#if defined(GST_IOS_PLUGIN_GNONLIN) || defined(GST_IOS_PLUGINS_EDITING)
-    GST_PLUGIN_STATIC_REGISTER(gnonlin);
+#if defined(GST_IOS_PLUGIN_SRTP) || defined(GST_IOS_PLUGINS_NET)
+    GST_PLUGIN_STATIC_REGISTER(srtp);
+#endif
+#if defined(GST_IOS_PLUGIN_RTSPCLIENTSINK) || defined(GST_IOS_PLUGINS_NET)
+    GST_PLUGIN_STATIC_REGISTER(rtspclientsink);
 #endif
 
 #if defined(GST_IOS_GIO_MODULE_GNUTLS)