From 8817f9330e53cc71e974c585c9792f0c7853de9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= Date: Thu, 15 Sep 2016 16:27:36 -0400 Subject: [PATCH] Replace references to gstreamer.com to gstreamer.freedesktop.org --- gst-sdk/tutorials/android-tutorial-4/jni/Android.mk | 1 + .../src/com/gst_sdk_tutorials/tutorial_4/Tutorial4.java | 2 +- .../src/com/gst_sdk_tutorials/tutorial_5/Tutorial5.java | 2 +- gst-sdk/tutorials/basic-tutorial-1.c | 2 +- gst-sdk/tutorials/basic-tutorial-12.c | 2 +- gst-sdk/tutorials/basic-tutorial-13.c | 2 +- gst-sdk/tutorials/basic-tutorial-15.c | 2 +- gst-sdk/tutorials/basic-tutorial-3.c | 2 +- gst-sdk/tutorials/basic-tutorial-4.c | 2 +- gst-sdk/tutorials/basic-tutorial-5.c | 2 +- gst-sdk/tutorials/basic-tutorial-9.c | 2 +- gst-sdk/tutorials/playback-tutorial-1.c | 2 +- gst-sdk/tutorials/playback-tutorial-2.c | 4 ++-- gst-sdk/tutorials/playback-tutorial-4.c | 2 +- gst-sdk/tutorials/playback-tutorial-5.c | 2 +- gst-sdk/tutorials/playback-tutorial-7.c | 2 +- gst-sdk/tutorials/xcode iOS/Tutorial 4/VideoViewController.m | 2 +- .../tutorials/xcode iOS/Tutorial 5/LibraryViewController.m | 2 +- 18 files changed, 19 insertions(+), 18 deletions(-) diff --git a/gst-sdk/tutorials/android-tutorial-4/jni/Android.mk b/gst-sdk/tutorials/android-tutorial-4/jni/Android.mk index b4028cbb21..3586fa16cb 100644 --- a/gst-sdk/tutorials/android-tutorial-4/jni/Android.mk +++ b/gst-sdk/tutorials/android-tutorial-4/jni/Android.mk @@ -17,5 +17,6 @@ endif GSTREAMER_NDK_BUILD_PATH := $(GSTREAMER_ROOT)/share/gst-android/ndk-build/ include $(GSTREAMER_NDK_BUILD_PATH)/plugins.mk GSTREAMER_PLUGINS := $(GSTREAMER_PLUGINS_CORE) $(GSTREAMER_PLUGINS_PLAYBACK) $(GSTREAMER_PLUGINS_CODECS) $(GSTREAMER_PLUGINS_NET) $(GSTREAMER_PLUGINS_SYS) +G_IO_MODULES := gnutls GSTREAMER_EXTRA_DEPS := gstreamer-video-1.0 include $(GSTREAMER_NDK_BUILD_PATH)/gstreamer-1.0.mk diff --git a/gst-sdk/tutorials/android-tutorial-4/src/com/gst_sdk_tutorials/tutorial_4/Tutorial4.java b/gst-sdk/tutorials/android-tutorial-4/src/com/gst_sdk_tutorials/tutorial_4/Tutorial4.java index 4eda8b01fc..f3d5977a36 100644 --- a/gst-sdk/tutorials/android-tutorial-4/src/com/gst_sdk_tutorials/tutorial_4/Tutorial4.java +++ b/gst-sdk/tutorials/android-tutorial-4/src/com/gst_sdk_tutorials/tutorial_4/Tutorial4.java @@ -38,7 +38,7 @@ public class Tutorial4 extends Activity implements SurfaceHolder.Callback, OnSee private int desired_position; // Position where the users wants to seek to private String mediaUri; // URI of the clip being played - private final String defaultMediaUri = "http://docs.gstreamer.com/media/sintel_trailer-368p.ogv"; + private final String defaultMediaUri = "https://www.freedesktop.org/software/gstreamer-sdk/data/media/sintel_trailer-480p.ogv"; // Called when the activity is first created. @Override diff --git a/gst-sdk/tutorials/android-tutorial-5/src/com/gst_sdk_tutorials/tutorial_5/Tutorial5.java b/gst-sdk/tutorials/android-tutorial-5/src/com/gst_sdk_tutorials/tutorial_5/Tutorial5.java index e51ecb3348..c86ebd8f80 100644 --- a/gst-sdk/tutorials/android-tutorial-5/src/com/gst_sdk_tutorials/tutorial_5/Tutorial5.java +++ b/gst-sdk/tutorials/android-tutorial-5/src/com/gst_sdk_tutorials/tutorial_5/Tutorial5.java @@ -44,7 +44,7 @@ public class Tutorial5 extends Activity implements SurfaceHolder.Callback, OnSee private int desired_position; // Position where the users wants to seek to private String mediaUri; // URI of the clip being played - private final String defaultMediaUri = "http://docs.gstreamer.com/media/sintel_trailer-368p.ogv"; + private final String defaultMediaUri = "https://www.freedesktop.org/software/gstreamer-sdk/data/media/sintel_trailer-480p.ogv"; static private final int PICK_FILE_CODE = 1; private String last_folder; diff --git a/gst-sdk/tutorials/basic-tutorial-1.c b/gst-sdk/tutorials/basic-tutorial-1.c index 12667866dd..1656353c15 100644 --- a/gst-sdk/tutorials/basic-tutorial-1.c +++ b/gst-sdk/tutorials/basic-tutorial-1.c @@ -9,7 +9,7 @@ int main(int argc, char *argv[]) { gst_init (&argc, &argv); /* Build the pipeline */ - pipeline = gst_parse_launch ("playbin uri=http://docs.gstreamer.com/media/sintel_trailer-480p.webm", NULL); + pipeline = gst_parse_launch ("playbin uri=https://www.freedesktop.org/software/gstreamer-sdk/data/media/sintel_trailer-480p.webm", NULL); /* Start playing */ gst_element_set_state (pipeline, GST_STATE_PLAYING); diff --git a/gst-sdk/tutorials/basic-tutorial-12.c b/gst-sdk/tutorials/basic-tutorial-12.c index 76aa9e3678..ab877e7f9a 100644 --- a/gst-sdk/tutorials/basic-tutorial-12.c +++ b/gst-sdk/tutorials/basic-tutorial-12.c @@ -68,7 +68,7 @@ int main(int argc, char *argv[]) { memset (&data, 0, sizeof (data)); /* Build the pipeline */ - pipeline = gst_parse_launch ("playbin uri=http://docs.gstreamer.com/media/sintel_trailer-480p.webm", NULL); + pipeline = gst_parse_launch ("playbin uri=https://www.freedesktop.org/software/gstreamer-sdk/data/media/sintel_trailer-480p.webm", NULL); bus = gst_element_get_bus (pipeline); /* Start playing */ diff --git a/gst-sdk/tutorials/basic-tutorial-13.c b/gst-sdk/tutorials/basic-tutorial-13.c index 084e269026..1447407004 100644 --- a/gst-sdk/tutorials/basic-tutorial-13.c +++ b/gst-sdk/tutorials/basic-tutorial-13.c @@ -111,7 +111,7 @@ int main(int argc, char *argv[]) { " 'Q' to quit\n"); /* Build the pipeline */ - data.pipeline = gst_parse_launch ("playbin uri=http://docs.gstreamer.com/media/sintel_trailer-480p.webm", NULL); + data.pipeline = gst_parse_launch ("playbin uri=https://www.freedesktop.org/software/gstreamer-sdk/data/media/sintel_trailer-480p.webm", NULL); /* Add a keyboard watch so we get notified of keystrokes */ #ifdef G_OS_WIN32 diff --git a/gst-sdk/tutorials/basic-tutorial-15.c b/gst-sdk/tutorials/basic-tutorial-15.c index 29e68cb5b9..f9a18f0e1a 100644 --- a/gst-sdk/tutorials/basic-tutorial-15.c +++ b/gst-sdk/tutorials/basic-tutorial-15.c @@ -57,7 +57,7 @@ int main(int argc, char *argv[]) { g_signal_connect (texture, "size-change", G_CALLBACK (size_change), NULL); /* Build the GStreamer pipeline */ - pipeline = gst_parse_launch ("playbin uri=http://docs.gstreamer.com/media/sintel_trailer-480p.webm", NULL); + pipeline = gst_parse_launch ("playbin uri=https://www.freedesktop.org/software/gstreamer-sdk/data/media/sintel_trailer-480p.webm", NULL); /* Instantiate the Clutter sink */ sink = gst_element_factory_make ("autocluttersink", NULL); diff --git a/gst-sdk/tutorials/basic-tutorial-3.c b/gst-sdk/tutorials/basic-tutorial-3.c index bbb1524322..8ec0dca33a 100644 --- a/gst-sdk/tutorials/basic-tutorial-3.c +++ b/gst-sdk/tutorials/basic-tutorial-3.c @@ -44,7 +44,7 @@ int main(int argc, char *argv[]) { } /* Set the URI to play */ - g_object_set (data.source, "uri", "http://docs.gstreamer.com/media/sintel_trailer-480p.webm", NULL); + g_object_set (data.source, "uri", "https://www.freedesktop.org/software/gstreamer-sdk/data/media/sintel_trailer-480p.webm", NULL); /* Connect to the pad-added signal */ g_signal_connect (data.source, "pad-added", G_CALLBACK (pad_added_handler), &data); diff --git a/gst-sdk/tutorials/basic-tutorial-4.c b/gst-sdk/tutorials/basic-tutorial-4.c index 2924602fd7..37f162e191 100644 --- a/gst-sdk/tutorials/basic-tutorial-4.c +++ b/gst-sdk/tutorials/basic-tutorial-4.c @@ -37,7 +37,7 @@ int main(int argc, char *argv[]) { } /* Set the URI to play */ - g_object_set (data.playbin, "uri", "http://docs.gstreamer.com/media/sintel_trailer-480p.webm", NULL); + g_object_set (data.playbin, "uri", "https://www.freedesktop.org/software/gstreamer-sdk/data/media/sintel_trailer-480p.webm", NULL); /* Start playing */ ret = gst_element_set_state (data.playbin, GST_STATE_PLAYING); diff --git a/gst-sdk/tutorials/basic-tutorial-5.c b/gst-sdk/tutorials/basic-tutorial-5.c index 46eeb79850..c0af9202c0 100644 --- a/gst-sdk/tutorials/basic-tutorial-5.c +++ b/gst-sdk/tutorials/basic-tutorial-5.c @@ -340,7 +340,7 @@ int main(int argc, char *argv[]) { } /* Set the URI to play */ - g_object_set (data.playbin, "uri", "http://docs.gstreamer.com/media/sintel_trailer-480p.webm", NULL); + g_object_set (data.playbin, "uri", "https://www.freedesktop.org/software/gstreamer-sdk/data/media/sintel_trailer-480p.webm", NULL); /* Connect to interesting signals in playbin */ g_signal_connect (G_OBJECT (data.playbin), "video-tags-changed", (GCallback) tags_cb, &data); diff --git a/gst-sdk/tutorials/basic-tutorial-9.c b/gst-sdk/tutorials/basic-tutorial-9.c index 5477efec37..3e185e8aea 100644 --- a/gst-sdk/tutorials/basic-tutorial-9.c +++ b/gst-sdk/tutorials/basic-tutorial-9.c @@ -164,7 +164,7 @@ static void on_finished_cb (GstDiscoverer *discoverer, CustomData *data) { int main (int argc, char **argv) { CustomData data; GError *err = NULL; - gchar *uri = "http://docs.gstreamer.com/media/sintel_trailer-480p.webm"; + gchar *uri = "https://www.freedesktop.org/software/gstreamer-sdk/data/media/sintel_trailer-480p.webm"; /* if a URI was provided, use it instead of the default one */ if (argc > 1) { diff --git a/gst-sdk/tutorials/playback-tutorial-1.c b/gst-sdk/tutorials/playback-tutorial-1.c index ddd399fe88..b142fa7f0c 100644 --- a/gst-sdk/tutorials/playback-tutorial-1.c +++ b/gst-sdk/tutorials/playback-tutorial-1.c @@ -46,7 +46,7 @@ int main(int argc, char *argv[]) { } /* Set the URI to play */ - g_object_set (data.playbin, "uri", "http://docs.gstreamer.com/media/sintel_cropped_multilingual.webm", NULL); + g_object_set (data.playbin, "uri", "https://www.freedesktop.org/software/gstreamer-sdk/data/media/sintel_cropped_multilingual.webm", NULL); /* Set flags to show Audio and Video but ignore Subtitles */ g_object_get (data.playbin, "flags", &flags, NULL); diff --git a/gst-sdk/tutorials/playback-tutorial-2.c b/gst-sdk/tutorials/playback-tutorial-2.c index 19f55f7e89..52d3f6faec 100644 --- a/gst-sdk/tutorials/playback-tutorial-2.c +++ b/gst-sdk/tutorials/playback-tutorial-2.c @@ -46,10 +46,10 @@ int main(int argc, char *argv[]) { } /* Set the URI to play */ - g_object_set (data.playbin, "uri", "http://docs.gstreamer.com/media/sintel_trailer-480p.ogv", NULL); + g_object_set (data.playbin, "uri", "https://www.freedesktop.org/software/gstreamer-sdk/data/media/sintel_trailer-480p.ogv", NULL); /* Set the subtitle URI to play and some font description */ - g_object_set (data.playbin, "suburi", "http://docs.gstreamer.com/media/sintel_trailer_gr.srt", NULL); + g_object_set (data.playbin, "suburi", "https://www.freedesktop.org/software/gstreamer-sdk/data/media/sintel_trailer_gr.srt", NULL); g_object_set (data.playbin, "subtitle-font-desc", "Sans, 18", NULL); /* Set flags to show Audio, Video and Subtitles */ diff --git a/gst-sdk/tutorials/playback-tutorial-4.c b/gst-sdk/tutorials/playback-tutorial-4.c index 403d17dcc4..cfcf434340 100644 --- a/gst-sdk/tutorials/playback-tutorial-4.c +++ b/gst-sdk/tutorials/playback-tutorial-4.c @@ -127,7 +127,7 @@ int main(int argc, char *argv[]) { data.buffering_level = 100; /* Build the pipeline */ - pipeline = gst_parse_launch ("playbin uri=http://docs.gstreamer.com/media/sintel_trailer-480p.webm", NULL); + pipeline = gst_parse_launch ("playbin uri=https://www.freedesktop.org/software/gstreamer-sdk/data/media/sintel_trailer-480p.webm", NULL); bus = gst_element_get_bus (pipeline); /* Set the download flag */ diff --git a/gst-sdk/tutorials/playback-tutorial-5.c b/gst-sdk/tutorials/playback-tutorial-5.c index acc534ed3f..0b3f0a10e2 100644 --- a/gst-sdk/tutorials/playback-tutorial-5.c +++ b/gst-sdk/tutorials/playback-tutorial-5.c @@ -114,7 +114,7 @@ int main(int argc, char *argv[]) { " 'Q' to quit\n"); /* Build the pipeline */ - data.pipeline = gst_parse_launch ("playbin uri=http://docs.gstreamer.com/media/sintel_trailer-480p.webm", NULL); + data.pipeline = gst_parse_launch ("playbin uri=https://www.freedesktop.org/software/gstreamer-sdk/data/media/sintel_trailer-480p.webm", NULL); /* Add a keyboard watch so we get notified of keystrokes */ #ifdef G_OS_WIN32 diff --git a/gst-sdk/tutorials/playback-tutorial-7.c b/gst-sdk/tutorials/playback-tutorial-7.c index edfa89ff05..4bdc66bc6b 100644 --- a/gst-sdk/tutorials/playback-tutorial-7.c +++ b/gst-sdk/tutorials/playback-tutorial-7.c @@ -10,7 +10,7 @@ int main(int argc, char *argv[]) { gst_init (&argc, &argv); /* Build the pipeline */ - pipeline = gst_parse_launch ("playbin uri=http://docs.gstreamer.com/media/sintel_trailer-480p.webm", NULL); + pipeline = gst_parse_launch ("playbin uri=https://www.freedesktop.org/software/gstreamer-sdk/data/media/sintel_trailer-480p.webm", NULL); /* Create the elements inside the sink bin */ equalizer = gst_element_factory_make ("equalizer-3bands", "equalizer"); diff --git a/gst-sdk/tutorials/xcode iOS/Tutorial 4/VideoViewController.m b/gst-sdk/tutorials/xcode iOS/Tutorial 4/VideoViewController.m index 656dae598d..b213a00c25 100644 --- a/gst-sdk/tutorials/xcode iOS/Tutorial 4/VideoViewController.m +++ b/gst-sdk/tutorials/xcode iOS/Tutorial 4/VideoViewController.m @@ -66,7 +66,7 @@ media_width = 320; media_height = 240; - uri = @"http://docs.gstreamer.com/media/sintel_trailer-368p.ogv"; + uri = @"https://www.freedesktop.org/software/gstreamer-sdk/data/media/sintel_trailer-480p.ogv"; gst_backend = [[GStreamerBackend alloc] init:self videoView:video_view]; } diff --git a/gst-sdk/tutorials/xcode iOS/Tutorial 5/LibraryViewController.m b/gst-sdk/tutorials/xcode iOS/Tutorial 5/LibraryViewController.m index f1aead5648..4abf1a8cd6 100644 --- a/gst-sdk/tutorials/xcode iOS/Tutorial 5/LibraryViewController.m +++ b/gst-sdk/tutorials/xcode iOS/Tutorial 5/LibraryViewController.m @@ -157,7 +157,7 @@ static NSString *CellIdentifier = @"CellIdentifier"; // Non-existing entries (to debug error reporting facilities) [entries addObject:@"http://non-existing.org/Non_Existing_Server"]; - [entries addObject:@"http://docs.gstreamer.com/Non_Existing_File"]; + [entries addObject:@"https://www.freedesktop.org/software/gstreamer-sdk/data/media/Non_Existing_File"]; self->onlineEntries = entries; }