Browse Source

strings: rename vlc_strfinput to vlc_strfplayer

pull/91/head
Thomas Guillem 7 years ago
parent
commit
1f0a1aa7cd
  1. 6
      include/vlc_strings.h
  2. 4
      modules/gui/qt/components/player_controller.cpp
  3. 2
      src/libvlccore.sym
  4. 4
      src/text/strings.c

6
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;
}

4
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 )

2
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

4
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];

Loading…
Cancel
Save