Remove never set, never used Pentium Pro capability

[vlc] / src / libvlc.c

diff --git a/src/libvlc.c b/src/libvlc.c
index 9860d54527f44163524809bb26ed993ea62c6c2c..3eb5abdc0052f57e583bc3b67f7eae444a394ec6 100644 (file)
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -768,7 +768,6 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
     p_capabilities[0] = '\0';
     PRINT_CAPABILITY( CPU_CAPABILITY_486, "486" );
     PRINT_CAPABILITY( CPU_CAPABILITY_586, "586" );
-    PRINT_CAPABILITY( CPU_CAPABILITY_PPRO, "Pentium Pro" );
     PRINT_CAPABILITY( CPU_CAPABILITY_MMX, "MMX" );
     PRINT_CAPABILITY( CPU_CAPABILITY_3DNOW, "3DNow!" );
     PRINT_CAPABILITY( CPU_CAPABILITY_MMXEXT, "MMXEXT" );
@@ -782,6 +781,8 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
      * Choose the best memcpy module
      */
     priv->p_memcpy_module = module_need( p_libvlc, "memcpy", "$memcpy", false );
+    /* Avoid being called "memcpy":*/
+    vlc_object_set_name( p_libvlc, "main" );
 
     priv->b_stats = config_GetInt( p_libvlc, "stats" ) > 0;
     priv->i_timers = 0;
@@ -814,6 +815,10 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
                          p_keys );
     }
 
+    /* variables for signalling creation of new files */
+    var_Create( p_libvlc, "snapshot-file", VLC_VAR_STRING );
+    var_Create( p_libvlc, "record-file", VLC_VAR_STRING );
+
     /* Initialize playlist and get commandline files */
     p_playlist = playlist_Create( VLC_OBJECT(p_libvlc) );
     if( !p_playlist )
@@ -854,6 +859,10 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
     /*
      * Load background interfaces
      */
+    /* Create volume callback system. (this variable must be created before
+       all interfaces as they can use it) */
+    var_Create( p_libvlc, "volume-change", VLC_VAR_BOOL );
+
     psz_modules = config_GetPsz( p_libvlc, "extraintf" );
     psz_control = config_GetPsz( p_libvlc, "control" );
 
@@ -977,8 +986,6 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
     var_Create( p_libvlc, "drawable-clip-bottom", VLC_VAR_INTEGER );
     var_Create( p_libvlc, "drawable-clip-right", VLC_VAR_INTEGER );
 
-    /* Create volume callback system. */
-    var_Create( p_libvlc, "volume-change", VLC_VAR_BOOL );
 
     /* Create a variable for showing the fullscreen interface from hotkeys */
     var_Create( p_libvlc, "intf-show", VLC_VAR_BOOL );