/*****************************************************************************
* visual.c : Visualisation system
*****************************************************************************
- * Copyright (C) 2002 VideoLAN (Centrale Réseaux) and its contributors
+ * Copyright (C) 2002-2006 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
*
* 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.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
+#define _GNU_SOURCE
#include <stdlib.h> /* malloc(), free() */
#include <vlc/vlc.h>
#include <vlc/vout.h>
#define ELIST_TEXT N_( "Effects list" )
#define ELIST_LONGTEXT N_( \
"A list of visual effect, separated by commas.\n" \
- "Current effects include: dummy, random, scope, spectrum" )
+ "Current effects include: dummy, scope, spectrum." )
#define WIDTH_TEXT N_( "Video width" )
#define WIDTH_LONGTEXT N_( \
#define NBBANDS_TEXT N_( "Number of bands" )
#define NBBANDS_LONGTEXT N_( \
"Number of bands used by spectrum analyzer, should be 20 or 80." )
+#define SPNBBANDS_LONGTEXT N_( \
+ "Number of bands used by the spectrometer, from 20 to 80." )
#define SEPAR_TEXT N_( "Band separator" )
#define SEPAR_LONGTEXT N_( \
#define PEAKS_TEXT N_( "Enable peaks" )
#define PEAKS_LONGTEXT N_( \
- "Defines whether to draw peaks." )
+ "Draw \"peaks\" in the spectrum analyzer." )
+
+#define ORIG_TEXT N_( "Enable original graphic spectrum" )
+#define ORIG_LONGTEXT N_( \
+ "Enable the \"flat\" spectrum analyzer in the spectrometer." )
+
+#define BANDS_TEXT N_( "Enable bands" )
+#define BANDS_LONGTEXT N_( \
+ "Draw bands in the spectrometer." )
+
+#define BASE_TEXT N_( "Enable base" )
+#define BASE_LONGTEXT N_( \
+ "Defines whether to draw the base of the bands." )
+
+#define RADIUS_TEXT N_( "Base pixel radius" )
+#define RADIUS_LONGTEXT N_( \
+ "Defines radius size in pixels, of base of bands(beginning)." )
+
+#define SSECT_TEXT N_( "Spectral sections" )
+#define SSECT_LONGTEXT N_( \
+ "Determines how many sections of spectrum will exist." )
+
+#define PEAK_HEIGHT_TEXT N_( "Peak height" )
+#define PEAK_HEIGHT_LONGTEXT N_( \
+ "Total pixel height of the peak items." )
+
+#define PEAK_WIDTH_TEXT N_( "Peak extra width" )
+#define PEAK_WIDTH_LONGTEXT N_( \
+ "Additions or subtractions of pixels on the peak width." )
+
+#define COLOR1_TEXT N_( "V-plane color" )
+#define COLOR1_LONGTEXT N_( \
+ "YUV-Color cube shifting across the V-plane ( 0 - 127 )." )
#define STARS_TEXT N_( "Number of stars" )
#define STARS_LONGTEXT N_( \
- "Defines the number of stars to draw with random effect." )
+ "Number of stars to draw with random effect." )
static int Open ( vlc_object_t * );
static void Close ( vlc_object_t * );
AMP_TEXT, AMP_LONGTEXT, VLC_TRUE );
add_bool("visual-peaks", VLC_TRUE, NULL,
PEAKS_TEXT, PEAKS_LONGTEXT, VLC_TRUE );
- set_section( N_( "Random effect") , NULL );
- add_integer("visual-stars", 200, NULL,
- STARS_TEXT, STARS_LONGTEXT, VLC_TRUE );
+ set_section( N_("Spectrometer") , NULL );
+ add_bool("spect-show-original", VLC_FALSE, NULL,
+ ORIG_TEXT, ORIG_LONGTEXT, VLC_TRUE );
+ add_bool("spect-show-base", VLC_TRUE, NULL,
+ BASE_TEXT, BASE_LONGTEXT, VLC_TRUE );
+ add_integer("spect-radius", 42, NULL,
+ RADIUS_TEXT, RADIUS_LONGTEXT, VLC_TRUE );
+ add_integer("spect-sections", 3, NULL,
+ SSECT_TEXT, SSECT_LONGTEXT, VLC_TRUE );
+ add_integer("spect-color", 80, NULL,
+ COLOR1_TEXT, COLOR1_LONGTEXT, VLC_TRUE );
+ add_bool("spect-show-bands", VLC_TRUE, NULL,
+ BANDS_TEXT, BANDS_LONGTEXT, VLC_TRUE );
+ add_integer("spect-nbbands", 32, NULL,
+ NBBANDS_TEXT, SPNBBANDS_LONGTEXT, VLC_TRUE );
+ add_integer("spect-separ", 1, NULL,
+ SEPAR_TEXT, SEPAR_LONGTEXT, VLC_TRUE );
+ add_integer("spect-amp", 8, NULL,
+ AMP_TEXT, AMP_LONGTEXT, VLC_TRUE );
+ add_bool("spect-show-peaks", VLC_TRUE, NULL,
+ PEAKS_TEXT, PEAKS_LONGTEXT, VLC_TRUE );
+ add_integer("spect-peak-width", 61, NULL,
+ PEAK_WIDTH_TEXT, PEAK_WIDTH_LONGTEXT, VLC_TRUE );
+ add_integer("spect-peak-height", 1, NULL,
+ PEAK_HEIGHT_TEXT, PEAK_HEIGHT_LONGTEXT, VLC_TRUE );
set_capability( "visualization", 0 );
set_callbacks( Open, Close );
add_shortcut( "visualizer");
{
{ "scope", scope_Run },
{ "spectrum", spectrum_Run },
- { "random", random_Run},
+ { "spectrometer", spectrometer_Run },
{ "dummy", dummy_Run},
{ NULL, dummy_Run}
};
var_Get( p_filter, "effect-list", &val);
psz_parser = psz_effects = strdup( val.psz_string );
free( val.psz_string );
- msg_Dbg( p_filter , "Building list of effects" );
-
+
var_AddCallback( p_filter, "effect-list", FilterCallback, NULL );
while( psz_parser && *psz_parser != '\0' )
if( ( psz_eoa = strchr( psz_parser, '}') ) == NULL )
{
- msg_Err( p_filter, "Unable to parse effect list. Aborting");
+ msg_Err( p_filter, "unable to parse effect list. Aborting");
break;
}
p_effect->psz_args =
p_filter->pf_do_work = DoWork;
p_filter->b_in_place= 1;
- msg_Dbg( p_filter,"Visualizer initialized");
return VLC_SUCCESS;
}
{
aout_filter_t *p_filter = (aout_filter_t *)p_this;
/* restart this baby */
- msg_Dbg( p_filter, "We should restart the visual filter" );
+ msg_Dbg( p_filter, "we should restart the visual filter" );
return VLC_SUCCESS;
}
projects / vlc / blobdiff