vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sat Nov 6 18:09:44 2010 +0200| [8e1c86a065feec0152e1039bde222984edf08f3c] | committer: Rémi Denis-Courmont
Expand and remove VLC_Version() > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8e1c86a065feec0152e1039bde222984edf08f3c --- include/vlc_common.h | 1 - modules/control/http/http.c | 2 +- modules/gui/macosx/about.m | 2 +- modules/gui/macosx/intf.m | 2 +- modules/misc/lua/libs/misc.c | 2 +- src/control/core.c | 2 +- src/libvlc.c | 2 +- src/libvlccore.sym | 1 - src/version.c | 10 ---------- 9 files changed, 6 insertions(+), 18 deletions(-) diff --git a/include/vlc_common.h b/include/vlc_common.h index 4ef04b8..c4f1950 100644 --- a/include/vlc_common.h +++ b/include/vlc_common.h @@ -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 ); diff --git a/modules/control/http/http.c b/modules/control/http/http.c index 0cb9c26..66a3826 100644 --- a/modules/control/http/http.c +++ b/modules/control/http/http.c @@ -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", diff --git a/modules/gui/macosx/about.m b/modules/gui/macosx/about.m index d56ed7f..9ebc8be 100644 --- a/modules/gui/macosx/about.m +++ b/modules/gui/macosx/about.m @@ -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%@", diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m index 21098e9..689c4fa 100644 --- a/modules/gui/macosx/intf.m +++ b/modules/gui/macosx/intf.m @@ -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 diff --git a/modules/misc/lua/libs/misc.c b/modules/misc/lua/libs/misc.c index ba01268..42b0d56 100644 --- a/modules/misc/lua/libs/misc.c +++ b/modules/misc/lua/libs/misc.c @@ -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; } diff --git a/src/control/core.c b/src/control/core.c index 708e7ea..15e6e72 100644 --- a/src/control/core.c +++ b/src/control/core.c @@ -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) diff --git a/src/libvlc.c b/src/libvlc.c index 561ae25..7a6cce3 100644 --- a/src/libvlc.c +++ b/src/libvlc.c @@ -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__ ); diff --git a/src/libvlccore.sym b/src/libvlccore.sym index 8d05c37..7ec9e4e 100644 --- a/src/libvlccore.sym +++ b/src/libvlccore.sym @@ -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 diff --git a/src/version.c b/src/version.c index 0dc70f3..238c383 100644 --- a/src/version.c +++ b/src/version.c @@ -31,16 +31,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 *****************************************************************************/ _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
