Changeset f501554a399ebfcf3a28673dc7ded7d6666203fb

Timestamp:

03/10/02 20:56:10 (6 years ago)

Author:

Sam Hocevar <sam@videolan.org>

git-committer:

Sam Hocevar <sam@videolan.org> 1033671370 +0000

git-parent:

[6dafa419846a89a815750f3de722d8d675699658]

git-author:

Sam Hocevar <sam@videolan.org> 1033671370 +0000

Message:

• ./configure.ac.in: duplicated arguments to AM_INIT_AUTOMAKE to fix
  locales breakage.
  
• ./src/libvlc.c: libvlc understands the VLC_VERBOSE environment variable,
  to be set between 0 and 4. Default value is 0 for a program using libvlc,
  but vlc sets it to 1 by default.
  
• ./src/misc/configuration.c: -v now works the old way (-v, -vv, -vvv) as
  well as the new way (-v0, -v1, -v4). -v1 is the same as -v, and -v0 is
  the same as -q (quiet). Hope it's all understandable.
  

Files:

• configure.ac.in (modified) (1 diff)
• include/main.h (modified) (3 diffs)
• mozilla/vlcshell.cpp (modified) (2 diffs)
• src/audio_output/output.c (modified) (3 diffs)
• src/libvlc.c (modified) (6 diffs)
• src/libvlc.h (modified) (3 diffs)
• src/misc/configuration.c (modified) (3 diffs)
• src/misc/messages.c (modified) (3 diffs)
• src/misc/modules.c (modified) (2 diffs)
• src/misc/objects.c (modified) (4 diffs)
• src/vlc.c (modified) (3 diffs)

configure.ac.in

@@ -12 +12 @@
-dnl XXX: we don't put any flags here, because automake 1.5 doesn't support
-dnl them. And we need the comma otherwize automake will choke on it.
-$PACKAGE, $VERSION
+vlc,0.5.0-cvs-am
-AM_CONFIG_HEADER(config.h)
-

include/main.h

@@ -4 +4 @@
- *****************************************************************************
- * Copyright (C) 1999, 2000, 2001, 2002 VideoLAN
-6 2002/10/03 13:21:54
+7 2002/10/03 18:56:09
- *
- * Authors: Vincent Seguin <seguin@via.ecp.fr>
@@ -39 +39 @@
-    /* CPU extensions */
-    u32                    i_cpu;
+
+    /* Generic settings */
+    int                    i_verbose;                       /* info messages */
+    vlc_bool_t             b_color;                       /* color messages? */
-
-    /* Object structure data */
@@ -86 +90 @@
-
-    /* Generic settings */
-    vlc_bool_t             b_quiet;                            /* be quiet ? */
-    vlc_bool_t             b_verbose;                     /* info messages ? */
-    vlc_bool_t             b_color;                      /* color messages ? */
-    mtime_t                i_desync;   /* relative desync of the audio ouput */
-
-    /* CPU extensions (inherited from libvlc_t) */
-    u32                    i_cpu;
-
-    /* Fast memcpy plugin used */

mozilla/vlcshell.cpp

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2002 VideoLAN
-2 2002/09/30 11:05:41
+3 2002/10/03 18:56:09
- *
- * Authors: Samuel Hocevar <sam@zoy.org>
@@ -166 +166 @@
-        , "--intf", "dummy"
-        /*, "--noaudio"*/
-        /*, "-q"*/
-        , "-v"
-    };
-

src/audio_output/output.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2002 VideoLAN
-6 2002/09/30 21:32:33 massiot
+7 2002/10/03 18:56:09 sam
- *
- * Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -57 +57 @@
-        /* Non-S/PDIF mixer only deals with float32 or fixed32. */
-        p_aout->output.output.i_format
-
+lib
-                        VLC_FOURCC('f','l','3','2') :
-                        VLC_FOURCC('f','i','3','2');
@@ -94 +94 @@
-        /* Non-S/PDIF mixer only deals with float32 or fixed32. */
-        p_aout->mixer.mixer.i_format
-
+lib
-                        VLC_FOURCC('f','l','3','2') :
-                        VLC_FOURCC('f','i','3','2');

src/libvlc.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1998-2002 VideoLAN
-4 2002/10/03 13:21:55
+5 2002/10/03 18:56:09
- *
- * Authors: Vincent Seguin <seguin@via.ecp.fr>
@@ -157 +157 @@
-    if( !libvlc.b_ready )
-    {
+        char *psz_env;
+
-        vlc_mutex_init( &libvlc, &libvlc.structure_lock );
-        libvlc.p_global_data = NULL;
@@ -163 +165 @@
-        /* Guess what CPU we have */
-        libvlc.i_cpu = CPUCapabilities();
+
+        /* Find verbosity from VLC_VERBOSE environment variable */
+        psz_env = getenv( "VLC_VERBOSE" );
+        libvlc.i_verbose = psz_env ? atoi( psz_env ) : 0;
+
+#ifdef HAVE_ISATTY
+        libvlc.b_color = isatty( 2 ); /* 2 is for stderr */
+#else
+        libvlc.b_color = VLC_FALSE;
+#endif
-
-        /* Initialize message queue */
@@ -188 +200 @@
-
-    p_vlc->psz_object_name = "root";
-
-    p_vlc->b_verbose = VLC_TRUE;
-    p_vlc->b_quiet = VLC_FALSE; /* FIXME: delay message queue output! */
-
-    /* Initialize mutexes */
@@ -399 +408 @@
-
-    /*
+     * Message queue options
+     */
+    if( config_GetInt( p_vlc, "quiet" ) )
+    {
+        libvlc.i_verbose = 0;
+    }
+    else
+    {
+        int i_tmp = config_GetInt( p_vlc, "verbose" );
+        if( i_tmp >= 0 && i_tmp <= 4 )
+        {
+            libvlc.i_verbose = i_tmp;
+        }
+    }
+    libvlc.b_color = libvlc.b_color || config_GetInt( p_vlc, "color" );
+
+    /*
-     * Output messages that may still be in the queue
-     */
-    p_vlc->b_verbose = config_GetInt( p_vlc, "verbose" );
-    p_vlc->b_quiet = config_GetInt( p_vlc, "quiet" );
-    p_vlc->b_color = config_GetInt( p_vlc, "color" );
-    msg_Flush( p_vlc );
-
@@ -409 +432 @@
-    p_vlc->i_desync = config_GetInt( p_vlc, "desync" ) * (mtime_t)1000;
-
-    p_vlc->i_cpu = libvlc.i_cpu;
-
-#if defined( __i386__ )
-    if( !config_GetInt( p_vlc, "mmx" ) )
-p_vlc->
+libvlc.
-    if( !config_GetInt( p_vlc, "3dn" ) )
-p_vlc->
+libvlc.
-    if( !config_GetInt( p_vlc, "mmxext" ) )
-p_vlc->
+libvlc.
-    if( !config_GetInt( p_vlc, "sse" ) )
-p_vlc->
+libvlc.
-#endif
-#if defined( __powerpc__ ) || defined( SYS_DARWIN )
-    if( !config_GetInt( p_vlc, "altivec" ) )
-p_vlc->
+libvlc.
-#endif
-
-#define PRINT_CAPABILITY( capability, string )                              \
-p_vlc->
+libvlc.
-    {                                                                       \
-        strncat( p_capabilities, string " ",                                \

src/libvlc.h

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1998-2002 VideoLAN
-6 2002/10/01 22:29:09 massiot
+7 2002/10/03 18:56:09 sam
- *
- * Authors: Vincent Seguin <seguin@via.ecp.fr>
@@ -38 +38 @@
-    "available.")
-
-be verbose
+verbosity (0-4)
-#define VERBOSE_LONGTEXT N_( \
-
+
+
-
-#define QUIET_TEXT N_("be quiet")
@@ -352 +353 @@
-    add_module_with_short( "intf", 'I', "interface", NULL, NULL,
-                           INTF_TEXT, INTF_LONGTEXT );
-bool_with_short( "verbose", 'v', 0
-
+integer_with_short( "verbose", 'v', -1
+   
-    add_bool_with_short( "quiet", 'q', 0, NULL, QUIET_TEXT, QUIET_LONGTEXT );
-    add_bool( "color", 0, NULL, COLOR_TEXT, COLOR_LONGTEXT );

src/misc/configuration.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001 VideoLAN
-39 2002/09/29 18:19:53
+40 2002/10/03 18:56:09
- *
- * Authors: Gildas Bazin <gbazin@netcourrier.com>
@@ -1044 +1044 @@
-                    psz_shortopts[i_shortopts] = ':';
-                    i_shortopts++;
+
+                    if( p_item->i_short == 'v' )
+                    {
+                        psz_shortopts[i_shortopts] = ':';
+                        i_shortopts++;
+                    }
-                }
-            }
@@ -1108 +1114 @@
-                break;
-            case CONFIG_ITEM_INTEGER:
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                break;
-            case CONFIG_ITEM_BOOL:

src/misc/messages.c

@@ -5 +5 @@
- *****************************************************************************
- * Copyright (C) 1998-2002 VideoLAN
-1 2002/10/03 13:21:55
+2 2002/10/03 18:56:09
- *
- * Authors: Vincent Seguin <seguin@via.ecp.fr>
@@ -436 +436 @@
-    int i_type = p_item->i_type;
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
@@ -463 +468 @@
-
-    /* Send the message to stderr */
-/*p_this->p_vlc->b_color*/1
+p_this->p_libvlc->b_color
-    {
-        fprintf( stderr, "[" GREEN "%.6x" GRAY "] %s %s%s: %s%s" GRAY "\n",

src/misc/modules.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001 VideoLAN
-4 2002/10/03 13:21:55
+5 2002/10/03 18:56:10
- *
- * Authors: Samuel Hocevar <sam@zoy.org>
@@ -313 +313 @@
-
-        /* Test if we have the required CPU */
-
+lib
-        {
-            continue;

src/misc/objects.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2002 VideoLAN
-1 2002/10/03 13:21:55
+2 2002/10/03 18:56:10
- *
- * Authors: Samuel Hocevar <sam@zoy.org>
@@ -448 +448 @@
-        else
-        {
-
-
-
-
-
-
+
+
+
-        }
-    }
@@ -650 +647 @@
-{
-    char psz_children[20], psz_refcount[20], psz_thread[20], psz_name[50];
-    vlc_object_t *p_me;
-
-    psz_name[0] = '\0';
@@ -689 +685 @@
-    }
-
-
-
-
-
-
+
+
+
-}
-

src/vlc.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1998-2001 VideoLAN
-1 2002/09/29 18:19:53
+2 2002/10/03 18:56:09
- *
- * Authors: Vincent Seguin <seguin@via.ecp.fr>
@@ -51 +51 @@
-    fprintf( stderr, COPYRIGHT_MESSAGE "\n" );
-
-SYS_LINUX
+HAVE_PUTENV
-#   ifdef DEBUG
-    /* Activate malloc checking routines to detect heap corruptions. */
@@ -59 +59 @@
-    putenv( "GNOME_DISABLE_CRASH_DIALOG=1" );
-#   endif
+
+    /* If the user isn't using VLC_VERBOSE, set it to 1 by default */
+    if( getenv( "VLC_VERBOSE" ) == NULL )
+    {
+        putenv( "VLC_VERBOSE=1" );
+    }
-#endif
-