diff options
author | Sebastian Dröge <sebastian@centricular.com> | 2014-03-12 12:04:08 +0100 |
---|---|---|
committer | Sebastian Dröge <sebastian@centricular.com> | 2014-03-12 12:04:08 +0100 |
commit | 7f71f10357f41d6035de484b0f5b40b8057c63a3 (patch) | |
tree | 4105e9f0978a58439ae8d07b922e00fd317645d6 | |
parent | f8c9748d2040aa6c0746148dee50fab48dc6c727 (diff) |
Stop namespace pollution and claiming to come from gstreamer.com
12 files changed, 28 insertions, 28 deletions
diff --git a/data/ndk-build/GStreamer.java b/data/ndk-build/GStreamer.java index 29e539ba..4fececc2 100644 --- a/data/ndk-build/GStreamer.java +++ b/data/ndk-build/GStreamer.java @@ -1,4 +1,4 @@ -package com.gstreamer; +package org.freedesktop.gstreamer; import java.io.File; import java.io.FileOutputStream; diff --git a/data/ndk-build/gstreamer-1.0.mk b/data/ndk-build/gstreamer-1.0.mk index 5ec02162..eb86cb7c 100755 --- a/data/ndk-build/gstreamer-1.0.mk +++ b/data/ndk-build/gstreamer-1.0.mk @@ -210,14 +210,14 @@ buildsharedlibrary_$(TARGET_ARCH_ABI): $(GSTREAMER_ANDROID_O) @$(PRIV_CMD) copyjavasource_$(TARGET_ARCH_ABI): - @$(call host-mkdir,src/com/gstreamer) - @$(call host-cp,$(GSTREAMER_NDK_BUILD_PATH)/GStreamer.java,src/com/gstreamer) + @$(call host-mkdir,src/org/freedesktop/gstreamer) + @$(call host-cp,$(GSTREAMER_NDK_BUILD_PATH)/GStreamer.java,src/org/freedesktop/gstreamer) ifeq ($(GSTREAMER_INCLUDE_FONTS), yes) - @$(HOST_SED) -i "s;@INCLUDE_FONTS@;;g" src/com/gstreamer/GStreamer.java - @$(HOST_SED) -i "s;@INCLUDE_COPY_FILE@;;g" src/com/gstreamer/GStreamer.java + @$(HOST_SED) -i "s;@INCLUDE_FONTS@;;g" src/org/freedesktop/gstreamer/GStreamer.java + @$(HOST_SED) -i "s;@INCLUDE_COPY_FILE@;;g" src/org/freedesktop/gstreamer/GStreamer.java else - @$(HOST_SED) -i "s;@INCLUDE_FONTS@;//;g" src/com/gstreamer/GStreamer.java - @$(HOST_SED) -i "s;@INCLUDE_COPY_FILE@;//;g" src/com/gstreamer/GStreamer.java + @$(HOST_SED) -i "s;@INCLUDE_FONTS@;//;g" src/org/freedesktop/gstreamer/GStreamer.java + @$(HOST_SED) -i "s;@INCLUDE_COPY_FILE@;//;g" src/org/freedesktop/gstreamer/GStreamer.java endif copyfontsres_$(TARGET_ARCH_ABI): diff --git a/data/ndk-build/gstreamer.mk b/data/ndk-build/gstreamer.mk index e1f9dbf1..742dcdef 100755 --- a/data/ndk-build/gstreamer.mk +++ b/data/ndk-build/gstreamer.mk @@ -185,8 +185,8 @@ buildsharedlibrary: $(GSTREAMER_ANDROID_O) @$(GSTREAMER_ANDROID_CMD) copyjavasource: - @$(call host-mkdir,src/com/gstreamer) - @$(call host-cp,$(GSTREAMER_NDK_BUILD_PATH)/GStreamer.java,src/com/gstreamer) + @$(call host-mkdir,src/org/freedesktop/gstreamer) + @$(call host-cp,$(GSTREAMER_NDK_BUILD_PATH)/GStreamer.java,src/org/freedesktop/gstreamer) copyfontsres: @$(call host-mkdir,assets/fontconfig) diff --git a/data/ndk-build/gstreamer_android-1.0.c.in b/data/ndk-build/gstreamer_android-1.0.c.in index 5438071c..9a2ee86b 100644 --- a/data/ndk-build/gstreamer_android-1.0.c.in +++ b/data/ndk-build/gstreamer_android-1.0.c.in @@ -411,16 +411,16 @@ JNI_OnLoad (JavaVM * vm, void *reserved) "Could not retrieve JNIEnv"); return 0; } - jclass klass = (*env)->FindClass (env, "com/gstreamer/GStreamer"); + jclass klass = (*env)->FindClass (env, "org/freedesktop/gstreamer/GStreamer"); if (!klass) { __android_log_print (ANDROID_LOG_ERROR, "GStreamer", - "Could not retrieve class com.gstreamer.GStreamer"); + "Could not retrieve class org.freedesktop.gstreamer.GStreamer"); return 0; } if ((*env)->RegisterNatives (env, klass, native_methods, G_N_ELEMENTS (native_methods))) { __android_log_print (ANDROID_LOG_ERROR, "GStreamer", - "Could not register native methods for com.gstreamer.GStreamer"); + "Could not register native methods for org.freedesktop.gstreamer.GStreamer"); return 0; } diff --git a/data/ndk-build/gstreamer_android.c.in b/data/ndk-build/gstreamer_android.c.in index 46b2e108..c7bde635 100644 --- a/data/ndk-build/gstreamer_android.c.in +++ b/data/ndk-build/gstreamer_android.c.in @@ -409,16 +409,16 @@ JNI_OnLoad (JavaVM * vm, void *reserved) "Could not retrieve JNIEnv"); return 0; } - jclass klass = (*env)->FindClass (env, "com/gstreamer/GStreamer"); + jclass klass = (*env)->FindClass (env, "org/freedesktop/gstreamer/GStreamer"); if (!klass) { __android_log_print (ANDROID_LOG_ERROR, "GStreamer", - "Could not retrieve class com.gstreamer.GStreamer"); + "Could not retrieve class org.freedesktop.gstreamer.GStreamer"); return 0; } if ((*env)->RegisterNatives (env, klass, native_methods, G_N_ELEMENTS (native_methods))) { __android_log_print (ANDROID_LOG_ERROR, "GStreamer", - "Could not register native methods for com.gstreamer.GStreamer"); + "Could not register native methods for org.freedesktop.gstreamer.GStreamer"); return 0; } diff --git a/data/xcode/templates/ios/GStreamer Base.xctemplate/TemplateInfo.plist b/data/xcode/templates/ios/GStreamer Base.xctemplate/TemplateInfo.plist index 2a1b9fc8..cf97287d 100644 --- a/data/xcode/templates/ios/GStreamer Base.xctemplate/TemplateInfo.plist +++ b/data/xcode/templates/ios/GStreamer Base.xctemplate/TemplateInfo.plist @@ -3,7 +3,7 @@ <plist version="1.0"> <dict> <key>Identifier</key> - <string>com.gstreamersdk.ios.templates.base</string> + <string>org.freedesktop.gstreamer.ios.templates.base</string> <key>Kind</key> <string>Xcode.Xcode3.ProjectTemplateUnitKind</string> <key>Definitions</key> diff --git a/data/xcode/templates/ios/GStreamer Empty Application.xctemplate/TemplateInfo.plist b/data/xcode/templates/ios/GStreamer Empty Application.xctemplate/TemplateInfo.plist index bc10a1d4..4ab1ef34 100644 --- a/data/xcode/templates/ios/GStreamer Empty Application.xctemplate/TemplateInfo.plist +++ b/data/xcode/templates/ios/GStreamer Empty Application.xctemplate/TemplateInfo.plist @@ -5,7 +5,7 @@ <key>Ancestors</key> <array> <string>com.apple.dt.unit.emptyApplication</string> - <string>com.gstreamersdk.ios.templates.base</string> + <string>org.freedesktop.gstreamer.ios.templates.base</string> </array> <key>Concrete</key> @@ -13,7 +13,7 @@ <key>Description</key> <string>This template provides a starting point for any application. It provides just an application delegate and a window.</string> <key>Identifier</key> - <string>com.gstreamersdk.io.templates.emptyApplication</string> + <string>org.freedesktop.gstreamer.ios.templates.emptyApplication</string> <key>Kind</key> <string>Xcode.Xcode3.ProjectTemplateUnitKind</string> <key>SortOrder</key> diff --git a/data/xcode/templates/ios/GStreamer Master-Detail Application.xctemplate/TemplateInfo.plist b/data/xcode/templates/ios/GStreamer Master-Detail Application.xctemplate/TemplateInfo.plist index 7d31b3f9..3c8c674c 100644 --- a/data/xcode/templates/ios/GStreamer Master-Detail Application.xctemplate/TemplateInfo.plist +++ b/data/xcode/templates/ios/GStreamer Master-Detail Application.xctemplate/TemplateInfo.plist @@ -5,7 +5,7 @@ <key>Ancestors</key> <array> <string>com.apple.dt.unit.masterDetailApplication</string> - <string>com.gstreamersdk.ios.templates.base</string> + <string>org.freedesktop.gstreamer.ios.templates.base</string> </array> <key>Concrete</key> @@ -13,7 +13,7 @@ <key>Description</key> <string>This template provides a starting point for a master-detail application. It provides a user interface configured with a navigation controller to display a list of items and also a split view on iPad.</string> <key>Identifier</key> - <string>com.gstreamersdk.io.templates.masterDetailApplication</string> + <string>org.freedesktop.gstreamer.ios.templates.masterDetailApplication</string> <key>Kind</key> <string>Xcode.Xcode3.ProjectTemplateUnitKind</string> <key>SortOrder</key> diff --git a/data/xcode/templates/ios/GStreamer Page-Based Application.xctemplate/TemplateInfo.plist b/data/xcode/templates/ios/GStreamer Page-Based Application.xctemplate/TemplateInfo.plist index ef3cfaa8..cd7860dc 100644 --- a/data/xcode/templates/ios/GStreamer Page-Based Application.xctemplate/TemplateInfo.plist +++ b/data/xcode/templates/ios/GStreamer Page-Based Application.xctemplate/TemplateInfo.plist @@ -5,7 +5,7 @@ <key>Ancestors</key> <array> <string>com.apple.dt.unit.pageBasedApplication</string> - <string>com.gstreamersdk.ios.templates.base</string> + <string>org.freedesktop.gstreamer.ios.templates.base</string> </array> <key>Concrete</key> @@ -13,7 +13,7 @@ <key>Description</key> <string>This template provides a starting point for a page-based application that uses a page view controller. </string> <key>Identifier</key> - <string>com.gstreamersdk.io.templates.pageBasedApplication</string> + <string>org.freedesktop.gstreamer.ios.templates.pageBasedApplication</string> <key>Kind</key> <string>Xcode.Xcode3.ProjectTemplateUnitKind</string> <key>SortOrder</key> diff --git a/data/xcode/templates/ios/GStreamer Single View Application.xctemplate/TemplateInfo.plist b/data/xcode/templates/ios/GStreamer Single View Application.xctemplate/TemplateInfo.plist index 64f2f4a0..1250fa8f 100644 --- a/data/xcode/templates/ios/GStreamer Single View Application.xctemplate/TemplateInfo.plist +++ b/data/xcode/templates/ios/GStreamer Single View Application.xctemplate/TemplateInfo.plist @@ -5,7 +5,7 @@ <key>Ancestors</key> <array> <string>com.apple.dt.unit.singleViewApplication</string> - <string>com.gstreamersdk.ios.templates.base</string> + <string>org.freedesktop.gstreamer.ios.templates.base</string> </array> <key>Concrete</key> @@ -13,7 +13,7 @@ <key>Description</key> <string>This template provides a starting point for an application that uses a single view. It provides a view controller to manage the view, and a storyboard or nib file that contains the view.</string> <key>Identifier</key> - <string>com.gstreamersdk.io.templates.singleViewApplication</string> + <string>org.freedesktop.gstreamer.ios.templates.singleViewApplication</string> <key>Kind</key> <string>Xcode.Xcode3.ProjectTemplateUnitKind</string> <key>SortOrder</key> diff --git a/data/xcode/templates/ios/GStreamer Tabbed Application.xctemplate/TemplateInfo.plist b/data/xcode/templates/ios/GStreamer Tabbed Application.xctemplate/TemplateInfo.plist index bb770a9c..dc5b0c8a 100644 --- a/data/xcode/templates/ios/GStreamer Tabbed Application.xctemplate/TemplateInfo.plist +++ b/data/xcode/templates/ios/GStreamer Tabbed Application.xctemplate/TemplateInfo.plist @@ -5,7 +5,7 @@ <key>Ancestors</key> <array> <string>com.apple.dt.unit.tabbedApplication</string> - <string>com.gstreamersdk.ios.templates.base</string> + <string>org.freedesktop.gstreamer.ios.templates.base</string> </array> <key>Concrete</key> @@ -13,7 +13,7 @@ <key>Description</key> <string>This template provides a starting point for an application that uses a tab bar. It provides a user interface configured with a tab bar controller, and view controllers for the tab bar items.</string> <key>Identifier</key> - <string>com.gstreamersdk.io.templates.tabbedApplication</string> + <string>org.freedesktop.gstreamer.ios.templates.tabbedApplication</string> <key>Kind</key> <string>Xcode.Xcode3.ProjectTemplateUnitKind</string> <key>SortOrder</key> diff --git a/data/xcode/templates/ios/GStreamer Utility Application.xctemplate/TemplateInfo.plist b/data/xcode/templates/ios/GStreamer Utility Application.xctemplate/TemplateInfo.plist index afe7d149..aca692ea 100644 --- a/data/xcode/templates/ios/GStreamer Utility Application.xctemplate/TemplateInfo.plist +++ b/data/xcode/templates/ios/GStreamer Utility Application.xctemplate/TemplateInfo.plist @@ -5,7 +5,7 @@ <key>Ancestors</key> <array> <string>com.apple.dt.unit.utilityApplication</string> - <string>com.gstreamersdk.ios.templates.base</string> + <string>org.freedesktop.gstreamer.ios.templates.base</string> </array> <key>Concrete</key> @@ -13,7 +13,7 @@ <key>Description</key> <string>This template provides a starting point for a utility application that has a main view and an alternate view. For iPhone, it sets up an Info button to flip the main view to the alternate view. For iPad, it sets up an Info bar button that shows the alternate view in a popover.</string> <key>Identifier</key> - <string>com.gstreamersdk.io.templates.utilityApplication</string> + <string>org.freedesktop.gstreamer.ios.templates.utilityApplication</string> <key>Kind</key> <string>Xcode.Xcode3.ProjectTemplateUnitKind</string> <key>SortOrder</key> |