Expand and remove VLC_Version()

diff --git a/include/vlc_common.h b/include/vlc_common.h
index 4ef04b86c84cb97cbe41b4850cee9cd0adc28a92..c4f195025d2d13ea49df42f249a4c476a87facb3 100644 (file)
--- 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 0cb9c26e5ae8fd12b22f3836a075fae55ebf5b54..66a38265f50b677cb979eaa3d914f3b976a161a5 100644 (file)
--- 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 d56ed7f59ed5596f9c8194b6e5e57c188e56100b..9ebc8be7566599304d394f5711a0246c0ea29904 100644 (file)
--- 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\n%@", 

diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 21098e9c370a0183a735a55bf77feffe6e77fd78..689c4fa2a2f8387ee50c716d6a11860a8b17142b 100644 (file)
--- 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 ba012682832e1acc4e1ee5d14599dd0b053715c1..42b0d561aa2e7c20e30702de027bed6470f8a82b 100644 (file)
--- 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 708e7eab9f0233f1613534bff7f0b677707a40fa..15e6e72e01ad368014fa3e603ed74ca1c5de2ab5 100644 (file)
--- 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 561ae25e7bb749871ad354fc057773707badaa53..7a6cce349397a8ae8d51446a0a5eca3a5d09e9aa 100644 (file)
--- 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 8d05c37e3eb00bbf0fc03e63d24cb13efcc715ca..7ec9e4ee4850b37614d3d9355dbe205221438339 100644 (file)
--- 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 0dc70f3184b6369a84a59794b5114138d2052b55..238c3838840933ff925ccf12f4ccdc7a0387bd41 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -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