Commit 70d808bb authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Rename str_format_meta() to strfinput()

Not the best naming convention known to mankind, but still better than
starting with "str".
parent 274f62f2
......@@ -132,12 +132,18 @@ VLC_API char * vlc_b64_decode( const char *psz_src );
* @return an allocated string (must be free()'d), or NULL on memory error.
*/
VLC_API char *vlc_strftime( const char * );
VLC_API char * str_format_meta( input_thread_t *, const char * );
/**
* Formats input meta-data.
*
* Formats input and input item meta-informations into a heap-allocated string.
*/
VLC_API char *vlc_strfinput( input_thread_t *, const char * );
static inline char *str_format( input_thread_t *input, const char *fmt )
{
char *s1 = vlc_strftime( fmt );
char *s2 = str_format_meta( input, s1 );
char *s2 = vlc_strfinput( input, s1 );
free( s1 );
return s2;
}
......
......@@ -309,7 +309,7 @@ static int BossCallback(vlc_object_t *p_this, const char *psz_var,
NSString *o_name = @"";
char *format = var_InheritString(getIntf(), "input-title-format");
if (format) {
char *formated = str_format_meta(p_input, format);
char *formated = vlc_strfinput(p_input, format);
free(format);
o_name = toNSStr(formated);
free(formated);
......
......@@ -691,7 +691,7 @@ static const float f_min_window_height = 307.;
if (!config_GetPsz(getIntf(), "video-title")) {
char *format = var_InheritString(getIntf(), "input-title-format");
if (format) {
char *formated = str_format_meta(p_input, format);
char *formated = vlc_strfinput(p_input, format);
free(format);
aString = toNSStr(formated);
free(formated);
......
......@@ -32,7 +32,7 @@
#include <vlc_keys.h> /* ACTION_ID */
#include <vlc_url.h> /* vlc_uri_decode */
#include <vlc_strings.h> /* str_format_meta */
#include <vlc_strings.h> /* vlc_strfinput */
#include <vlc_aout.h> /* audio_output_t */
#include <QApplication>
......@@ -520,7 +520,7 @@ void InputManager::UpdateName()
char *formatted = NULL;
if (format != NULL)
{
formatted = str_format_meta( p_input, format );
formatted = vlc_strfinput( p_input, format );
free( format );
if( formatted != NULL )
{
......
......@@ -744,7 +744,7 @@ void VlcProc::update_current_input()
char *psz_name = NULL;
if( psz_fmt != NULL )
{
psz_name = str_format_meta( pInput, psz_fmt );
psz_name = vlc_strfinput( pInput, psz_fmt );
free( psz_fmt );
}
......
......@@ -20,7 +20,7 @@ cat libvlccore.sym | grep -v \
-e '^net_' -e '^httpd_' \
-e '^config_' -e '^module_' -e '^var_' \
-e '^date_' -e '^sdp_' -e '^plane_' \
-e '^us_' -e '^utf8_' -e '^xml_' -e '^str_format_' -e '^GetLang_' \
-e '^us_' -e '^utf8_' -e '^xml_' -e '^GetLang_' \
-e '^m\(date\|sleep\|wait\)$' -e '^[A-Z][a-z]*Charset$' -e 'MD5$' \
-e '^NTPtime64$' -e '^secstotimestr$' \
&& exit 1
......
......@@ -405,7 +405,7 @@ stream_UrlNew
stream_vaControl
stream_ReadDir
stream_FilterDefaultReadDir
str_format_meta
vlc_strfinput
vlc_strftime
subpicture_Delete
subpicture_New
......
......@@ -39,7 +39,7 @@
#include <limits.h>
#include <math.h>
/* Needed by str_format_meta */
/* Needed by vlc_strfinput */
#include <vlc_input.h>
#include <vlc_meta.h>
#include <vlc_aout.h>
......@@ -524,7 +524,7 @@ static int write_meta(FILE *stream, input_item_t *item, vlc_meta_type_t type)
return ret;
}
char *str_format_meta(input_thread_t *input, const char *s)
char *vlc_strfinput(input_thread_t *input, const char *s)
{
char *str;
size_t len;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment