dbus: adds some playlist locking, finish [22423]

[vlc] / modules / visualization / visual / visual.h

diff --git a/modules/visualization/visual/visual.h b/modules/visualization/visual/visual.h
index 807e84a6e424b2af39df2f688eee36277139cbbd..dbd4a9de83d293bcc721671ff9e0736139d4bfae 100644 (file)
--- a/modules/visualization/visual/visual.h
+++ b/modules/visualization/visual/visual.h
@@ -1,16 +1,16 @@
 /*****************************************************************************
  * visual.h : Header for the visualisation system
  *****************************************************************************
- * Copyright (C) 2002 VideoLAN
- * $Id: visual.h,v 1.2 2003/08/29 16:56:43 zorglub Exp $
+ * Copyright (C) 2002 the VideoLAN team
+ * $Id$
  *
- * Authors: Clément Stenac <zorglub@via.ecp.fr>
+ * Authors: Clément Stenac <zorglub@via.ecp.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -18,50 +18,39 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
- *****************************************************************************/
-
-/*****************************************************************************
- * Preamble
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
-#include <stdlib.h>                                      /* malloc(), free() */
-#include <string.h>                                              /* strdup() */
-#include <errno.h>
-
-#include <vlc/vlc.h>
-#include <vlc/vout.h>
-
-#include "audio_output.h"
 
-#include "aout_internal.h"
-
-/*****************************************************************************
- * aout_filter_sys_t: visualizer audio filter method descriptor
- *****************************************************************************
- * This structure is part of the audio filter descriptor.
- * It describes some visualizer specific variables.
- *****************************************************************************/
 typedef struct visual_effect_t
 {
-    int         (*pf_run) 
-                   (struct visual_effect_t * , aout_instance_t *,
-                   aout_buffer_t *, picture_t *);
+    char *     psz_name;    /* Filter name*/
+
+    int         (*pf_run)( struct visual_effect_t * , aout_instance_t *,
+                           aout_buffer_t *, picture_t *);
     void *     p_data; /* The effect stores whatever it wants here */
-    struct     visual_effect_t * p_next;
     int        i_width;
     int        i_height;
-    char *     psz_args; 
+    char *     psz_args;
     int        i_nb_chans;
 } visual_effect_t ;
 
 
-struct aout_filter_sys_t
+/*****************************************************************************
+ * aout_filter_sys_t: visualizer audio filter method descriptor
+ *****************************************************************************
+ * This structure is part of the audio filter descriptor.
+ * It describes some visualizer specific variables.
+ *****************************************************************************/
+typedef struct aout_filter_sys_t
 {
     vout_thread_t   *p_vout;
-    visual_effect_t *p_first_effect;
+
     int             i_width;
     int             i_height;
-};
+
+    int             i_effect;
+    visual_effect_t **effect;
+} aout_filter_sys_t;
 
 /* Prototypes */
 int scope_Run
@@ -72,11 +61,9 @@ int random_Run
         (visual_effect_t * , aout_instance_t *, aout_buffer_t *, picture_t *);
 int spectrum_Run
         (visual_effect_t * , aout_instance_t *, aout_buffer_t *, picture_t *);
-#if 0
-int blur_Run
+int spectrometer_Run
         (visual_effect_t * , aout_instance_t *, aout_buffer_t *, picture_t *);
-#endif
 
-/* Default vout size */       
-#define VOUT_WIDTH 320
-#define VOUT_HEIGHT 240
+/* Default vout size */
+#define VOUT_WIDTH 533
+#define VOUT_HEIGHT 400