Strings review in visualization/ (Refs:#438)

diff --git a/modules/visualization/galaktos/plugin.c b/modules/visualization/galaktos/plugin.c
index d22628c973465113951e13c3eb91a6aaca2f34c5..0fd8633518ad9095ace1bad14f8a8002816a83eb 100644 (file)
--- a/modules/visualization/galaktos/plugin.c
+++ b/modules/visualization/galaktos/plugin.c
@@ -219,7 +219,7 @@ static void Thread( vlc_object_t *p_this )
         module_Need( p_thread->p_opengl, "opengl provider", NULL, 0 );
     if( p_thread->p_module == NULL )
     {
-        msg_Err( p_thread, "no OpenGL provider found" );
+        msg_Err( p_thread, "unable to initialize OpenGL" );
         vlc_object_detach( p_thread->p_opengl );
         vlc_object_destroy( p_thread->p_opengl );
         return;

diff --git a/modules/visualization/goom.c b/modules/visualization/goom.c
index 1789fd425bd91b91ac0f14f234308df0bfee31ea..64e14aafb47533c7e93f23c670a450b8664549fa 100644 (file)
--- a/modules/visualization/goom.c
+++ b/modules/visualization/goom.c
@@ -57,12 +57,12 @@ static void Close        ( vlc_object_t * );
 
 #define WIDTH_TEXT N_("Goom display width")
 #define HEIGHT_TEXT N_("Goom display height")
-#define RES_LONGTEXT N_("Allows you to change the resolution of the " \
+#define RES_LONGTEXT N_("This allows you to set the resolution of the " \
   "Goom display (bigger resolution will be prettier but more CPU intensive).")
 
 #define SPEED_TEXT N_("Goom animation speed")
-#define SPEED_LONGTEXT N_("Allows you to reduce the speed of the animation " \
-  "(default 6, max 10).")
+#define SPEED_LONGTEXT N_("This allows you to set the animation speed " \
+  "(between 1 and 10, defaults to 6).")
 
 #define MAX_SPEED 10
 

diff --git a/modules/visualization/visual/effects.c b/modules/visualization/visual/effects.c
index 21324316821039324d0b4391bf78b3ff04f4cc2d..86b8c59d3333eb3019672e5de36fa21b14d1eb74 100644 (file)
--- a/modules/visualization/visual/effects.c
+++ b/modules/visualization/visual/effects.c
@@ -831,56 +831,3 @@ int scope_Run(visual_effect_t * p_effect, aout_instance_t *p_aout,
         }
         return 0;
 }
-
-/*****************************************************************************
- * blur_Run:  blur effect
- *****************************************************************************/
-#if 0
-  /* This code is totally crappy */
-int blur_Run(visual_effect_t * p_effect, aout_instance_t *p_aout,
-              aout_buffer_t * p_buffer , picture_t * p_picture)
-{
-    uint8_t * p_pictures;
-    int i,j;
-    int i_size;   /* Total size of one image */
-
-    i_size = (p_picture->p[0].i_pitch * p_picture->p[0].i_lines +
-              p_picture->p[1].i_pitch * p_picture->p[1].i_lines +
-              p_picture->p[2].i_pitch * p_picture->p[2].i_lines );
-
-    if( !p_effect->p_data )
-    {
-        p_effect->p_data=(void *)malloc( 5 * i_size *sizeof(uint8_t));
-
-        if( !p_effect->p_data)
-        {
-            msg_Err(p_aout,"Out of memory");
-            return -1;
-        }
-        p_pictures = (uint8_t *)p_effect->p_data;
-    }
-    else
-    {
-        p_pictures =(uint8_t *)p_effect->p_data;
-    }
-
-    for( i = 0 ; i < 5 ; i++)
-    {
-        for ( j = 0 ; j< p_picture->p[0].i_pitch * p_picture->p[0].i_lines; i++)
-            p_picture->p[0].p_pixels[j] =
-                    p_pictures[i * i_size + j] * (100 - 20 * i) /100 ;
-        for ( j = 0 ; j< p_picture->p[1].i_pitch * p_picture->p[1].i_lines; i++)
-            p_picture->p[1].p_pixels[j] =
-                    p_pictures[i * i_size +
-                    p_picture->p[0].i_pitch * p_picture->p[0].i_lines + j ];
-        for ( j = 0 ; j< p_picture->p[2].i_pitch * p_picture->p[2].i_lines; i++)
-            p_picture->p[2].p_pixels[j] =
-                    p_pictures[i * i_size +
-                    p_picture->p[0].i_pitch * p_picture->p[0].i_lines +
-                    p_picture->p[1].i_pitch * p_picture->p[1].i_lines
-                    + j ];
-    }
-
-    memcpy ( &p_pictures[ i_size ] , &p_pictures[0] , 4 * i_size * sizeof(uint8_t) );
-}
-#endif

diff --git a/modules/visualization/visual/visual.c b/modules/visualization/visual/visual.c
index 2e018a5971d805bd76591c821aa27ada4ecc4c38..cc2cdae67663ee8d166ef71445074f57086419c8 100644 (file)
--- a/modules/visualization/visual/visual.c
+++ b/modules/visualization/visual/visual.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * visual.c : Visualisation system
  *****************************************************************************
- * Copyright (C) 2002 the VideoLAN team
+ * Copyright (C) 2002-2006 the VideoLAN team
  * $Id$
  *
  * Authors: Clément Stenac <zorglub@via.ecp.fr>
@@ -64,15 +64,15 @@
 
 #define PEAKS_TEXT N_( "Enable peaks" )
 #define PEAKS_LONGTEXT N_( \
-        "Defines whether to draw peaks." )
+        "This will draw \"peaks\" in the spectrum analyzer" )
 
 #define ORIG_TEXT N_( "Enable original graphic spectrum" )
 #define ORIG_LONGTEXT N_( \
-        "Defines whether to draw the original spectrum graphic routine." )
+        "This enabled the \"flat\" spectrum analyzer in the spectrometer" )
 
 #define BANDS_TEXT N_( "Enable bands" )
 #define BANDS_LONGTEXT N_( \
-        "Defines whether to draw the bands." )
+        "This draws bands in the spectrometer." )
 
 #define BASE_TEXT N_( "Enable base" )
 #define BASE_LONGTEXT N_( \
@@ -100,7 +100,7 @@
 
 #define STARS_TEXT N_( "Number of stars" )
 #define STARS_LONGTEXT N_( \
-        "Defines the number of stars to draw with random effect." )
+        "This defines the number of stars to draw with random effect." )
 
 static int  Open         ( vlc_object_t * );
 static void Close        ( vlc_object_t * );
@@ -319,7 +319,6 @@ static int Open( vlc_object_t *p_this )
     p_filter->pf_do_work = DoWork;
     p_filter->b_in_place= 1;
 
-    msg_Dbg( p_filter,"Visualizer initialized");
     return VLC_SUCCESS;
 }
 

diff --git a/modules/visualization/visual/visual.h b/modules/visualization/visual/visual.h
index 7d0997279968ed5841bb928118e308c3b2527e03..dbd4a9de83d293bcc721671ff9e0736139d4bfae 100644 (file)
--- a/modules/visualization/visual/visual.h
+++ b/modules/visualization/visual/visual.h
@@ -63,10 +63,6 @@ int spectrum_Run
         (visual_effect_t * , aout_instance_t *, aout_buffer_t *, picture_t *);
 int spectrometer_Run
         (visual_effect_t * , aout_instance_t *, aout_buffer_t *, picture_t *);
-#if 0
-int blur_Run
-        (visual_effect_t * , aout_instance_t *, aout_buffer_t *, picture_t *);
-#endif
 
 /* Default vout size */
 #define VOUT_WIDTH 533

diff --git a/modules/visualization/xosd.c b/modules/visualization/xosd.c
index 21daa92c2e2e8f1efffb7a1e55924cb7a94737b9..0d805e54330b1a273f6d34ce8cafe982f5cdf95f 100644 (file)
--- a/modules/visualization/xosd.c
+++ b/modules/visualization/xosd.c
@@ -61,20 +61,22 @@ static int PlaylistNext( vlc_object_t *p_this, const char *psz_variable,
  * Module descriptor
  *****************************************************************************/
 #define POSITION_TEXT N_("Flip vertical position")
-#define POSITION_LONGTEXT N_("Display xosd output on the bottom of the " \
+#define POSITION_LONGTEXT N_("Display XOSD output at the bottom of the " \
                              "screen instead of the top.")
 
 #define TXT_OFS_TEXT N_("Vertical offset")
-#define TXT_OFS_LONGTEXT N_("Vertical offset in pixels of the displayed " \
-                            "text (default 30 px).")
+#define TXT_OFS_LONGTEXT N_("Vertical offset between the border of the screen "\
+                            "and the displayed text (in pixels, defaults to "\
+                            "30 pixels)." )
 
 #define SHD_OFS_TEXT N_("Shadow offset")
-#define SHD_OFS_LONGTEXT N_("Offset in pixels of the shadow (default 2 px).")
+#define SHD_OFS_LONGTEXT N_("Offset between the text and the shadow (in " \
+                            "pixels, defaults to 2 pixels)." )
 
 #define FONT_TEXT N_("Font")
-#define FONT_LONGTEXT N_("Font used to display text in the xosd output.")
+#define FONT_LONGTEXT N_("Font used to display text in the XOSD output.")
 #define COLOUR_TEXT N_("Color")
-#define COLOUR_LONGTEXT N_("Color used to display text in the xosd output.")
+#define COLOUR_LONGTEXT N_("Color used to display text in the XOSD output.")
 
 vlc_module_begin();
     set_category( CAT_INTERFACE );