Commit 8e1c86a0 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Expand and remove VLC_Version()

parent 362dbda8
......@@ -856,7 +856,6 @@ static inline void *xrealloc (void *ptr, size_t len)
/*****************************************************************************
* libvlc features
*****************************************************************************/
VLC_EXPORT( const char *, VLC_Version, ( void ) LIBVLC_USED );
VLC_EXPORT( const char *, VLC_CompileBy, ( void ) LIBVLC_USED );
VLC_EXPORT( const char *, VLC_CompileHost, ( void ) LIBVLC_USED );
VLC_EXPORT( const char *, VLC_Compiler, ( void ) LIBVLC_USED );
......
......@@ -413,7 +413,7 @@ static void ParseExecute( httpd_file_sys_t *p_args, char *p_buffer,
mvar_AppendNewVar( p_args->vars, "url_param",
i_request > 0 ? "1" : "0" );
mvar_AppendNewVar( p_args->vars, "url_value", p_request );
mvar_AppendNewVar( p_args->vars, "version", VLC_Version() );
mvar_AppendNewVar( p_args->vars, "version", VERSION_MESSAGE );
mvar_AppendNewVar( p_args->vars, "copyright", COPYRIGHT_MESSAGE );
mvar_AppendNewVar( p_args->vars, "vlc_compile_by", VLC_CompileBy() );
mvar_AppendNewVar( p_args->vars, "vlc_compile_host",
......
......@@ -96,7 +96,7 @@ static VLAboutBox *_o_sharedInstance = nil;
[NSString stringWithFormat: _NS("Compiled by %s"), VLC_CompileBy()]];
/* Setup the nameversion field */
[o_name_version_field setStringValue: [NSString stringWithFormat:@"Version %s (%s)", VLC_Version(), PLATFORM]];
[o_name_version_field setStringValue: [NSString stringWithFormat:@"Version %s (%s)", VERSION_MESSAGE, PLATFORM]];
/* setup the authors and thanks field */
[o_credits_textview setString: [NSString stringWithFormat: @"%@\n\n\n\n%@\n%@\n\n%@",
......
......@@ -2594,7 +2594,7 @@ end:
[saveFolderPanel setCanSelectHiddenExtension: NO];
[saveFolderPanel setCanCreateDirectories: YES];
[saveFolderPanel setRequiredFileType: @"rtfd"];
[saveFolderPanel beginSheetForDirectory:nil file: [NSString stringWithFormat: _NS("VLC Debug Log (%s).rtfd"), VLC_Version()] modalForWindow: o_msgs_panel modalDelegate:self didEndSelector:@selector(saveDebugLogAsRTF:returnCode:contextInfo:) contextInfo:nil];
[saveFolderPanel beginSheetForDirectory:nil file: [NSString stringWithFormat: _NS("VLC Debug Log (%s).rtfd"), VERSION_MESSAGE] modalForWindow: o_msgs_panel modalDelegate:self didEndSelector:@selector(saveDebugLogAsRTF:returnCode:contextInfo:) contextInfo:nil];
}
- (void)saveDebugLogAsRTF: (NSSavePanel *)sheet returnCode: (int)returnCode contextInfo: (void *)contextInfo
......
......@@ -103,7 +103,7 @@ int vlclua_push_ret( lua_State *L, int i_error )
*****************************************************************************/
static int vlclua_version( lua_State *L )
{
lua_pushstring( L, VLC_Version() );
lua_pushstring( L, VERSION_MESSAGE );
return 1;
}
......
......@@ -153,7 +153,7 @@ void libvlc_set_user_agent (libvlc_instance_t *p_i,
const char * libvlc_get_version(void)
{
return VLC_Version();
return VERSION_MESSAGE;
}
const char * libvlc_get_compiler(void)
......
......@@ -1865,7 +1865,7 @@ static void Version( void )
ShowConsole( true );
#endif
utf8_fprintf( stdout, _("VLC version %s (%s)\n"), VLC_Version(),
utf8_fprintf( stdout, _("VLC version %s (%s)\n"), VERSION_MESSAGE,
psz_vlc_changeset );
utf8_fprintf( stdout, _("Compiled by %s on %s (%s)\n"),
VLC_CompileBy(), VLC_CompileHost(), __DATE__" "__TIME__ );
......
......@@ -618,7 +618,6 @@ vlc_timer_destroy
vlc_timer_getoverrun
vlc_timer_schedule
vlc_ureduce
VLC_Version
vlc_epg_Init
vlc_epg_Clean
vlc_epg_New
......
......@@ -30,16 +30,6 @@
#include <vlc_common.h>
/*****************************************************************************
* VLC_Version: return the libvlc version.
*****************************************************************************
* This function returns full version string (numeric version and codename).
*****************************************************************************/
char const * VLC_Version( void )
{
return VERSION_MESSAGE;
}
/*****************************************************************************
* VLC_CompileBy, VLC_CompileHost
* VLC_Compiler, VLC_Changeset
......
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