[vlc-commits] Rename "ios2 vout" into "ios vout"

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon Feb 27 17:48:38 2017 +0100| [b753d1c650131f10235eaf5a6042bc20037d5ade] | committer: Jean-Baptiste Kempf

Rename "ios2 vout" into "ios vout"

It does not make sense anymore

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b753d1c650131f10235eaf5a6042bc20037d5ade
---

 modules/MODULES_LIST                   |  2 +-
 modules/video_output/Makefile.am       | 10 +++++-----
 modules/video_output/{ios2.m => ios.m} |  6 +++---
 po/POTFILES.in                         |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/modules/MODULES_LIST b/modules/MODULES_LIST
index d767c8c..1b0ce61 100644
--- a/modules/MODULES_LIST
+++ b/modules/MODULES_LIST
@@ -436,7 +436,7 @@ $Id$
  * vod_rtsp: RTSP VoD module
  * volume_neon: audio volume optimized for ARM NEON
  * vorbis: a vorbis audio decoder/packetizer using the libvorbis library
- * vout_ios2: iOS video provider using OpenGL ES 2
+ * vout_ios: iOS video provider using OpenGL ES 2
  * vout_macosx: Mac OS X OpenGL provider
  * vout_sdl: video output module using the SDL library
  * vpx: WebM encoder and decoder (VP8/VP9)
diff --git a/modules/video_output/Makefile.am b/modules/video_output/Makefile.am
index ab35948..483a197 100644
--- a/modules/video_output/Makefile.am
+++ b/modules/video_output/Makefile.am
@@ -43,16 +43,16 @@ libcaopengllayer_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' \
 vout_LTLIBRARIES += libvout_macosx_plugin.la libcaopengllayer_plugin.la
 endif
 
-libvout_ios2_plugin_la_SOURCES = video_output/ios2.m $(OPENGL_COMMONSOURCES)
-libvout_ios2_plugin_la_CFLAGS = $(AM_CFLAGS) $(OPENGL_COMMONCFLAGS)
-libvout_ios2_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' \
+libvout_ios_plugin_la_SOURCES = video_output/ios.m $(OPENGL_COMMONSOURCES)
+libvout_ios_plugin_la_CFLAGS = $(AM_CFLAGS) $(OPENGL_COMMONCFLAGS)
+libvout_ios_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' \
 	-Wl,-framework,OpenGLES,-framework,QuartzCore,-framework,UIKit \
 	$(OPENGL_COMMONLDFLAGS)
 if HAVE_IOS
-vout_LTLIBRARIES += libvout_ios2_plugin.la
+vout_LTLIBRARIES += libvout_ios_plugin.la
 endif
 if HAVE_TVOS
-vout_LTLIBRARIES += libvout_ios2_plugin.la
+vout_LTLIBRARIES += libvout_ios_plugin.la
 endif
 
 ### OpenGL ###
diff --git a/modules/video_output/ios2.m b/modules/video_output/ios.m
similarity index 99%
rename from modules/video_output/ios2.m
rename to modules/video_output/ios.m
index 605dc2a..7777c2c 100644
--- a/modules/video_output/ios2.m
+++ b/modules/video_output/ios.m
@@ -1,7 +1,7 @@
 /*****************************************************************************
- * ios2.m: iOS OpenGL ES 2 provider
+ * ios.m: iOS OpenGL ES provider
  *****************************************************************************
- * Copyright (C) 2001-2016 VLC authors and VideoLAN
+ * Copyright (C) 2001-2017 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Pierre d'Herbemont <pdherbemont at videolan dot org>
@@ -81,7 +81,7 @@ vlc_module_begin ()
     set_capability("vout display", 300)
     set_callbacks(Open, Close)
 
-    add_shortcut("vout_ios2")
+    add_shortcut("vout_ios2", "vout_ios")
 vlc_module_end ()
 
 @interface VLCOpenGLES2VideoView : UIView {
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 1c95822..8ed7a90 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1126,7 +1126,7 @@ modules/video_output/drawable.c
 modules/video_output/evas.c
 modules/video_output/fb.c
 modules/video_output/glx.c
-modules/video_output/ios2.m
+modules/video_output/ios.m
 modules/video_output/kva.c
 modules/video_output/macosx.m
 modules/video_output/opengl/display.c