Goom: remove unnecessary includes and delete GOOM_TREE mode

modules/visualization/goom.c

 /*****************************************************************************
  * goom.c: based on libgoom (see http://ios.free.fr/?page=projet&quoi=1)
  *****************************************************************************
- * Copyright (C) 2003 the VideoLAN team
- * $Id$
+ * Copyright (C) 2003-2011 the VideoLAN team
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *          Gildas Bazin <gbazin@videolan.org>
@@ -25,32 +24,18 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
 #include <vlc_common.h>
 #include <vlc_plugin.h>
-#include <vlc_aout.h>
-#include <vlc_vout.h>
-#include <vlc_block.h>
-#include <vlc_input.h>
-#include <vlc_filter.h>
-#include <vlc_playlist.h>
-
-#ifdef USE_GOOM_TREE
-#   ifdef OLD_GOOM
-#       include "goom_core.h"
-#       define PluginInfo void
-#       define goom_update(a,b,c,d,e,f) goom_update(b,c,d,e,f)
-#       define goom_close(a) goom_close()
-#       define goom_init(a,b) NULL; goom_init(a,b,0); goom_set_font(0,0,0)
-#   else
-#       include "goom.h"
-#   endif
-#else
-#   include <goom/goom.h>
-#endif
+#include <vlc_aout.h>            /* aout_FormatNbChannels, AOUT_FMTS_SIMILAR */
+#include <vlc_vout.h>              /* vout_*Picture, aout_filter_RequestVout */
+#include <vlc_playlist.h>              /* playlist_CurrentInput, input*Title */
+
+#include <goom/goom.h>
 
 /*****************************************************************************
  * Module descriptor