videolan
/
vlc
mirror of https://code.videolan.org/videolan/vlc
1
Fork 0
Code Releases Activity

Merge branch 'visualisations_ranges' into 'master' 

plugins/visualisations: add some missing option ranges

See merge request videolan/vlc!1236
This commit is contained in:
Lyndon Brown 2024-04-28 07:11:03 +00:00
parent 7d6abadd24 09da3fbea7
commit 2139d674ef
6 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/visualization/glspectrum.c
View File

@ -36,6 +36,7 @@
#include <vlc_rand.h>
#include <math.h>
#include <limits.h>
#include "visual/fft.h"
#include "visual/window.h"
@ -62,7 +63,9 @@ vlc_module_begin()
set_subcategory(SUBCAT_AUDIO_VISUAL)
add_integer("glspectrum-width", 400, WIDTH_TEXT, WIDTH_LONGTEXT)
change_integer_range( 0, INT_MAX )
add_integer("glspectrum-height", 300, HEIGHT_TEXT, HEIGHT_LONGTEXT)
change_integer_range( 0, INT_MAX )
add_shortcut("glspectrum")
set_callback(Open)

3
modules/visualization/goom.c
View File

@ -38,6 +38,7 @@
#include <vlc_picture_pool.h>
#include <goom/goom.h>
#include <limits.h>
/*****************************************************************************
* Module descriptor
@ -63,8 +64,10 @@ vlc_module_begin ()
set_capability( "visualization", 0 )
add_integer( "goom-width", 800,
WIDTH_TEXT, RES_LONGTEXT )
change_integer_range( 0, INT_MAX )
add_integer( "goom-height", 500,
HEIGHT_TEXT, RES_LONGTEXT )
change_integer_range( 0, INT_MAX )
add_integer_with_range( "goom-speed", 6, 1, 10,
SPEED_TEXT, SPEED_LONGTEXT )
set_callback( Open )

6
modules/visualization/projectm.cpp
View File

@ -42,6 +42,7 @@
#ifdef HAVE_XLOCALE_H
# include <xlocale.h>
#endif
#include <limits.h>
/*****************************************************************************
* Module descriptor
@ -114,10 +115,15 @@ vlc_module_begin ()
MENU_FONT_TXT, MENU_FONT_LONGTXT)
#endif
add_integer( "projectm-width", 800, WIDTH_TEXT, WIDTH_LONGTEXT )
change_integer_range( 0, INT_MAX )
add_integer( "projectm-height", 500, HEIGHT_TEXT, HEIGHT_LONGTEXT )
change_integer_range( 0, INT_MAX )
add_integer( "projectm-meshx", 32, MESHX_TEXT, MESHX_LONGTEXT )
change_integer_range( 0, INT_MAX )
add_integer( "projectm-meshy", 24, MESHY_TEXT, MESHY_LONGTEXT )
change_integer_range( 0, INT_MAX )
add_integer( "projectm-texture-size", 1024, TEXTURE_TEXT, TEXTURE_LONGTEXT )
change_integer_range( 0, INT_MAX )
add_shortcut( "projectm" )
set_callback( Open )
vlc_module_end ()

2
modules/visualization/visual/effects.c
View File

@ -705,8 +705,6 @@ static int spectrometer_Run(visual_effect_t * p_effect, vlc_object_t *p_aout,
band_sep_angle = 360.0 / i_nb_bands;
section_sep_angle = 360.0 / i_sections;
if( i_peak_height < 1 )
i_peak_height = 1;
max_band_length = p_effect->i_height / 2 - ( i_rad + i_peak_height + 1 );
i_band_width = floor( 360 / i_nb_bands - i_separ );

18
modules/visualization/visual/visual.c
View File

@ -107,12 +107,16 @@
#define COLOR1_TEXT N_( "V-plane color" )
#define COLOR1_LONGTEXT N_( \
"YUV-Color cube shifting across the V-plane ( 0 - 127 )." )
"YUV-Color cube shifting across the V-plane." )
/* Default vout size */
#define VOUT_WIDTH 800
#define VOUT_HEIGHT 500
/* Min vout size - no resolution under 400x532 */
#define VOUT_MIN_WIDTH 532
#define VOUT_MIN_HEIGHT 400
static int Open ( vlc_object_t * );
static void Close ( filter_t * );
@ -125,8 +129,10 @@ vlc_module_begin ()
ELIST_TEXT, ELIST_LONGTEXT )
add_integer("effect-width",VOUT_WIDTH,
WIDTH_TEXT, WIDTH_LONGTEXT )
change_integer_range( VOUT_MIN_WIDTH, INT_MAX )
add_integer("effect-height" , VOUT_HEIGHT ,
HEIGHT_TEXT, HEIGHT_LONGTEXT )
change_integer_range( VOUT_MIN_HEIGHT, INT_MAX )
add_string("effect-fft-window", "none",
FFT_WINDOW_TEXT, FFT_WINDOW_LONGTEXT )
change_string_list( window_list, window_list_text )
@ -146,7 +152,7 @@ vlc_module_begin ()
RADIUS_TEXT, RADIUS_LONGTEXT )
add_integer_with_range("spect-sections", 3, 1, INT_MAX,
SSECT_TEXT, SSECT_LONGTEXT )
add_integer("spect-color", 80,
add_integer_with_range("spect-color", 80, 0, 127,
COLOR1_TEXT, COLOR1_LONGTEXT )
add_bool("spect-show-bands", true,
BANDS_TEXT, NULL )
@ -160,7 +166,7 @@ vlc_module_begin ()
PEAKS_TEXT, NULL )
add_integer("spect-peak-width", 61,
PEAK_WIDTH_TEXT, PEAK_WIDTH_LONGTEXT )
add_integer("spect-peak-height", 1,
add_integer_with_range("spect-peak-height", 1, 1, INT_MAX,
PEAK_HEIGHT_TEXT, PEAK_HEIGHT_LONGTEXT )
set_capability( "visualization", 0 )
set_callback( Open )
@ -209,12 +215,8 @@ static int Open( vlc_object_t *p_this )
int width = var_InheritInteger( p_filter , "effect-width");
int height = var_InheritInteger( p_filter , "effect-height");
/* No resolution under 400x532 and no odd dimension */
if( width < 532 )
width = 532;
/* No odd dimension */
width &= ~1;
if( height < 400 )
height = 400;
height &= ~1;
p_sys->i_effect = 0;

4
modules/visualization/vsxu.cpp
View File

@ -35,6 +35,8 @@
#include <vlc_opengl.h>
#include <vlc_filter.h>
#include <limits.h>
// vsxu manager include
#include <vsx_manager.h>
#include <logo_intro.h>
@ -60,7 +62,9 @@ vlc_module_begin ()
set_capability( "visualization", 0 )
set_subcategory( SUBCAT_AUDIO_VISUAL )
add_integer( "vsxu-width", 1280, WIDTH_TEXT, WIDTH_LONGTEXT )
change_integer_range( 0, INT_MAX )
add_integer( "vsxu-height", 800, HEIGHT_TEXT, HEIGHT_LONGTEXT )
change_integer_range( 0, INT_MAX )
add_shortcut( "vsxu" )
set_callback( Open )
vlc_module_end ()