A bit of headers cleanup

[vlc] / modules / visualization / goom.c

diff --git a/modules/visualization/goom.c b/modules/visualization/goom.c
index 5d558eff234289a9382891239ed6d923164c88a1..3d7070c906cf5f8fb2931b726b8a9f704e2326d3 100644 (file)
--- a/modules/visualization/goom.c
+++ b/modules/visualization/goom.c
@@ -30,10 +30,10 @@
 #include <errno.h>
 
 #include <vlc/vlc.h>
-#include <vlc/input.h>
-#include <vlc/aout.h>
-#include <vlc/vout.h>
-#include "aout_internal.h"
+#include <vlc_aout.h>
+#include <vlc_vout.h>
+#include <vlc_block.h>
+#include <vlc_input.h>
 
 #ifdef USE_GOOM_TREE
 #   ifdef OLD_GOOM
@@ -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
 
@@ -136,7 +136,7 @@ static int Open( vlc_object_t *p_this )
     if ( p_filter->input.i_format != VLC_FOURCC('f','l','3','2' )
          || p_filter->output.i_format != VLC_FOURCC('f','l','3','2') )
     {
-        msg_Warn( p_filter, "Bad input or output format" );
+        msg_Warn( p_filter, "bad input or output format" );
         return VLC_EGENERIC;
     }
     if ( !AOUT_FMTS_SIMILAR( &p_filter->input, &p_filter->output ) )
@@ -413,19 +413,27 @@ static char *TitleGet( vlc_object_t *p_this )
 
     if( p_input )
     {
-        char *psz = strrchr( p_input->input.p_item->psz_uri, '/' );
-
-        if( psz )
+        if( input_GetItem(p_input)->p_meta->psz_title &&
+                *input_GetItem(p_input)->p_meta->psz_title )
         {
-            psz++;
+            psz_title = strdup( input_GetItem(p_input)->p_meta->psz_title );
         }
         else
         {
-            psz = p_input->input.p_item->psz_uri;
-        }
-        if( psz && *psz )
-        {
-            psz_title = strdup( psz );
+            char *psz = strrchr( input_GetItem(p_input)->psz_uri, '/' );
+
+            if( psz )
+            {
+                psz++;
+            }
+            else
+            {
+                psz = input_GetItem(p_input)->psz_uri;
+            }
+            if( psz && *psz )
+            {
+                psz_title = strdup( psz );
+            }
         }
         vlc_object_release( p_input );
     }