[vlc-commits] strings: rename vlc_strfinput to vlc_strfplayer

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Fri Jun  7 10:25:58 2019 +0200| [1f0a1aa7cd3e447dcc24eb8ce5a4981294592252] | committer: Thomas Guillem

strings: rename vlc_strfinput to vlc_strfplayer

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

 include/vlc_strings.h                           | 6 +++---
 modules/gui/qt/components/player_controller.cpp | 4 ++--
 src/libvlccore.sym                              | 2 +-
 src/text/strings.c                              | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/include/vlc_strings.h b/include/vlc_strings.h
index 95988291d9..411f4a8ceb 100644
--- a/include/vlc_strings.h
+++ b/include/vlc_strings.h
@@ -168,14 +168,14 @@ VLC_API char *vlc_strftime( const char * );
  * @return the formated string, or NULL in case of error, the string need to be
  * freed with ()
  */
-VLC_API char *vlc_strfinput( vlc_player_t *player, input_item_t *item,
-                             const char *fmt );
+VLC_API char *vlc_strfplayer( vlc_player_t *player, input_item_t *item,
+                              const char *fmt );
 
 static inline char *str_format( vlc_player_t *player, input_item_t *item,
                                 const char *fmt )
 {
     char *s1 = vlc_strftime( fmt );
-    char *s2 = vlc_strfinput( player, item, s1 );
+    char *s2 = vlc_strfplayer( player, item, s1 );
     free( s1 );
     return s2;
 }
diff --git a/modules/gui/qt/components/player_controller.cpp b/modules/gui/qt/components/player_controller.cpp
index d64eaaee50..3e386daf69 100644
--- a/modules/gui/qt/components/player_controller.cpp
+++ b/modules/gui/qt/components/player_controller.cpp
@@ -26,7 +26,7 @@
 
 #include <vlc_actions.h>           /* ACTION_ID */
 #include <vlc_url.h>            /* vlc_uri_decode */
-#include <vlc_strings.h>        /* vlc_strfinput */
+#include <vlc_strings.h>        /* vlc_strfplayer */
 #include <vlc_aout.h>           /* audio_output_t */
 #include <vlc_es.h>
 #include <vlc_cxx_helpers.hpp>
@@ -76,7 +76,7 @@ void PlayerControllerPrivate::UpdateName(input_item_t* media)
     if (format != NULL)
     {
         vlc_player_Lock( m_player );
-        formatted = vlc_strfinput( m_player, media, format );
+        formatted = vlc_strfplayer( m_player, media, format );
         vlc_player_Unlock( m_player );
         free( format );
         if( formatted != NULL )
diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index f8252a8c61..d32515dc6c 100644
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -374,7 +374,7 @@ vlc_stream_fifo_New
 vlc_stream_fifo_Queue
 vlc_stream_fifo_Write
 vlc_stream_fifo_Close
-vlc_strfinput
+vlc_strfplayer
 vlc_strftime
 subpicture_Delete
 subpicture_New
diff --git a/src/text/strings.c b/src/text/strings.c
index 906770517b..fb22f9b0f8 100644
--- a/src/text/strings.c
+++ b/src/text/strings.c
@@ -42,7 +42,7 @@
 # define strcoll strcasecmp
 #endif
 
-/* Needed by vlc_strfinput */
+/* Needed by vlc_strfplayer */
 #include <vlc_meta.h>
 #include <vlc_aout.h>
 #include <vlc_memstream.h>
@@ -530,7 +530,7 @@ static int write_meta(struct vlc_memstream *stream, input_item_t *item,
     return 0;
 }
 
-char *vlc_strfinput(vlc_player_t *player, input_item_t *item, const char *s)
+char *vlc_strfplayer(vlc_player_t *player, input_item_t *item, const char *s)
 {
     struct vlc_memstream stream[1];