[vlc-commits] commit: Goom: remove unnecessary includes and delete GOOM_TREE mode ( Jean-Baptiste Kempf )

[git at videolan.org]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat Jan 15 16:01:41 2011 +0100| [8fc72635bff955369b3969a0a41f2f05a855154b] | committer: Jean-Baptiste Kempf 

Goom: remove unnecessary includes and delete GOOM_TREE mode

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8fc72635bff955369b3969a0a41f2f05a855154b
---

 modules/visualization/goom.c |   27 ++++++---------------------
 1 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/modules/visualization/goom.c b/modules/visualization/goom.c
index 13df457..e68e148 100644
--- a/modules/visualization/goom.c
+++ b/modules/visualization/goom.c
@@ -1,8 +1,7 @@
 /*****************************************************************************
  * 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 at via.ecp.fr>
  *          Gildas Bazin <gbazin at 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