Navigation

← Previous Changeset
Next Changeset →

Changeset 5f151d5106880ffccb0641f3eabdeee93ad34de0

Timestamp:

02/11/03 13:22:45 (5 years ago)

Author:

Gildas Bazin <gbazin@videolan.org>

git-committer:

Gildas Bazin <gbazin@videolan.org> 1067775765 +0000

git-parent:

[faf9b659a939847862216ea3d80dd7e3c7b6f47e]

git-author:

Gildas Bazin <gbazin@videolan.org> 1067775765 +0000

Message:

* src/audio_output/input.c: on-the-fly visualization changes.
* modules/gui/wxwindows/menus.cpp: added a visualization entry.

Files:

modules/gui/wxwindows/menus.cpp (modified) (4 diffs)
src/audio_output/input.c (modified) (7 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

modules/gui/wxwindows/menus.cpp

r6fc5b53	r5f151d5
3	3	*****************************************************************************
4	4	* Copyright (C) 2000-2001 VideoLAN
5		* $Id: menus.cpp,v 1.2~~3 2003/10/19 23:38:09~~ gbazin Exp $
	5	* $Id: menus.cpp,v 1.24 2003/11/02 12:22:45 gbazin Exp $
6	6	*
7	7	* Authors: Gildas Bazin <gbazin@netcourrier.com>
…	…
123	123	ppsz_varnames[i] = "audio-channels";
124	124	pi_objects[i++] = p_object->i_object_id;
	125	ppsz_varnames[i] = "visual";
	126	pi_objects[i++] = p_object->i_object_id;
125	127	vlc_object_release( p_object );
126	128	}
…	…
220	222	#define MAX_AUDIO_ITEMS 10
221	223
222		vlc_object_t *p_object;
	224	vlc_object_t p_object1, p_object2;
223	225	char *ppsz_varnames[MAX_AUDIO_ITEMS];
224	226	int pi_objects[MAX_AUDIO_ITEMS];
…	…
228	230	memset( pi_objects, 0, MAX_AUDIO_ITEMS * sizeof(int) );
229	231
230		p_object = (vlc_object_t *)vlc_object_find( _p_intf, VLC_OBJECT_AOUT,
231		FIND_ANYWHERE );
232		if( p_object != NULL )
	232	p_object1 = (vlc_object_t *)vlc_object_find( _p_intf, VLC_OBJECT_AOUT,
	233	FIND_ANYWHERE );
	234	if( p_object1 != NULL )
233	235	{
234	236	ppsz_varnames[i] = "audio-device";
235		pi_objects[i++] = p_object->i_object_id;
	237	pi_objects[i++] = p_object1->i_object_id;
236	238	ppsz_varnames[i] = "audio-channels";
237		pi_objects[i++] = p_object->i_object_id;
238		vlc_object_release( p_object );
239		}
240
241		p_object = (vlc_object_t *)vlc_object_find( _p_intf, VLC_OBJECT_INPUT,
242		FIND_ANYWHERE );
243		if( p_object != NULL )
	239	pi_objects[i++] = p_object1->i_object_id;
	240	}
	241
	242	p_object2 = (vlc_object_t *)vlc_object_find( _p_intf, VLC_OBJECT_INPUT,
	243	FIND_ANYWHERE );
	244	if( p_object2 != NULL )
244	245	{
245	246	ppsz_varnames[i] = "audio-es";
246		pi_objects[i++] = p_object->i_object_id;
247		vlc_object_release( p_object );
	247	pi_objects[i++] = p_object2->i_object_id;
	248	vlc_object_release( p_object2 );
	249	}
	250
	251	if( p_object1 != NULL )
	252	{
	253	ppsz_varnames[i] = "visual";
	254	pi_objects[i++] = p_object1->i_object_id;
	255	vlc_object_release( p_object1 );
248	256	}
249	257

src/audio_output/input.c

rfaf9b65	r5f151d5
3	3	*****************************************************************************
4	4	* Copyright (C) 2002 VideoLAN
5		* $Id: input.c,v 1.~~39 2003/11/02 06:33:49 hartma~~n Exp $
	5	* $Id: input.c,v 1.40 2003/11/02 12:22:45 gbazin Exp $
6	6	*
7	7	* Authors: Christophe Massiot <massiot@via.ecp.fr>
…	…
76	76
77	77	/* Now add user filters */
78		if( ( psz_filters = config_GetPsz( p_aout , "audio-filter" ) ) )
	78	if( var_Type( p_aout, "visual" ) == 0 )
	79	{
	80	var_Create( p_aout, "visual", VLC_VAR_STRING \| VLC_VAR_HASCHOICE );
	81	text.psz_string = _("Visualizations");
	82	var_Change( p_aout, "visual", VLC_VAR_SETTEXT, &text, NULL );
	83	val.psz_string = ""; text.psz_string = _("Disable");
	84	var_Change( p_aout, "visual", VLC_VAR_ADDCHOICE, &val, &text );
	85	val.psz_string = "random"; text.psz_string = _("Random");
	86	var_Change( p_aout, "visual", VLC_VAR_ADDCHOICE, &val, &text );
	87	val.psz_string = "scope"; text.psz_string = _("Scope");
	88	var_Change( p_aout, "visual", VLC_VAR_ADDCHOICE, &val, &text );
	89	val.psz_string = "spectrum"; text.psz_string = _("Spectrum");
	90	var_Change( p_aout, "visual", VLC_VAR_ADDCHOICE, &val, &text );
	91	val.psz_string = "goom"; text.psz_string = _("Goom");
	92	var_Change( p_aout, "visual", VLC_VAR_ADDCHOICE, &val, &text );
	93	if( var_Get( p_aout, "effect-list", &val ) == VLC_SUCCESS )
	94	{
	95	var_Set( p_aout, "visual", val );
	96	if( val.psz_string ) free( val.psz_string );
	97	}
	98	var_AddCallback( p_aout, "visual", VisualizationCallback, NULL );
	99	}
	100
	101	if( var_Type( p_aout, "audio-filter" ) == 0 )
	102	{
	103	var_Create( p_aout, "audio-filter",
	104	VLC_VAR_STRING \| VLC_VAR_DOINHERIT );
	105	text.psz_string = _("Audio filters");
	106	var_Change( p_aout, "audio-filter", VLC_VAR_SETTEXT, &text, NULL );
	107	}
	108
	109	var_Get( p_aout, "audio-filter", &val );
	110	psz_filters = val.psz_string;
	111	if( psz_filters && *psz_filters )
79	112	{
80	113	char *psz_parser = psz_filters;
…	…
152	185	psz_parser = psz_next;
153	186	}
154		free( psz_filters );
155		}
156
157		var_Create( p_aout, "visual", VLC_VAR_STRING \| VLC_VAR_HASCHOICE );
158		text.psz_string = _("Visualizations");
159		var_Change( p_aout, "visual", VLC_VAR_SETTEXT, &text, NULL );
160		val.psz_string = ""; text.psz_string = _("Disable");
161		var_Change( p_aout, "visual", VLC_VAR_ADDCHOICE, &val, &text );
162		val.psz_string = "random"; text.psz_string = _("Random");
163		var_Change( p_aout, "visual", VLC_VAR_ADDCHOICE, &val, &text );
164		val.psz_string = "scope"; text.psz_string = _("Scope");
165		var_Change( p_aout, "visual", VLC_VAR_ADDCHOICE, &val, &text );
166		val.psz_string = "spectrum"; text.psz_string = _("Spectrum");
167		var_Change( p_aout, "visual", VLC_VAR_ADDCHOICE, &val, &text );
168		val.psz_string = "goom"; text.psz_string = _("Goom");
169		var_Change( p_aout, "visual", VLC_VAR_ADDCHOICE, &val, &text );
170		if( var_Get( p_aout, "effect-list", &val ) == VLC_SUCCESS )
171		{
172		var_Set( p_aout, "visual", val );
173		}
174		var_AddCallback( p_aout, "visual", VisualizationCallback, NULL );
175
176
177		var_Create( p_aout, "audio-filter", VLC_VAR_STRING );
178		text.psz_string = _("Audio filters");
179		var_Change( p_aout, "audio-filter", VLC_VAR_SETTEXT, &text, NULL );
180		var_Change( p_aout, "audio-filter", VLC_VAR_INHERITVALUE, &val, NULL );
181		if( var_Get( p_aout, "audio-filter", &val ) == VLC_SUCCESS )
182		{
183		var_Set( p_aout, "audio-filter", val );
184		}
185		//var_AddCallback( p_aout, "audio-filter", AudioFilterCallback, NULL );
	187	}
	188	if( psz_filters ) free( psz_filters );
186	189
187	190	/* Prepare hints for the buffer allocator. */
…	…
214	217	p_input->i_nb_filters );
215	218	aout_FifoDestroy( p_aout, &p_input->fifo );
	219	var_Destroy( p_aout, "visual" );
216	220	p_input->b_error = 1;
217	221
…	…
424	428	}
425	429
426
427	430	static int VisualizationCallback( vlc_object_t p_this, char const psz_cmd,
428	431	vlc_value_t oldval, vlc_value_t newval, void *p_data )
429	432	{
430	433	aout_instance_t p_aout = (aout_instance_t )p_this;
431		~~input_thread_t *p_input;~~
432	434	vlc_value_t val;
433
434	435	char *psz_mode = newval.psz_string;
435	436	char *psz_filter;
436		unsigned int i;
437
438		psz_filter = ~~config_GetPsz( p_aout, "audio-filter" )~~;
	437
	438	var_Get( p_aout, "audio-filter", &val );
	439	psz_filter = val.psz_string;
439	440
440	441	if( !psz_mode \|\| !*psz_mode )
441	442	{
442		config_PutPsz( p_aout, "audio-filter", "" );
	443	val.psz_string = "";
	444	var_Set( p_aout, "audio-filter", val );
443	445	}
444	446	else
…	…
446	448	if( !psz_filter \|\| !*psz_filter )
447	449	{
448		config_PutPsz( p_aout, "audio-filter", "visual" );
	450	val.psz_string = "visual";
	451	var_Set( p_aout, "audio-filter", val );
449	452	}
450	453	else
…	…
455	458	strcat( psz_filter, ",visual" );
456	459	}
457		config_PutPsz( p_aout, "audio-filter", psz_filter );
458		}
459		}
460
	460	val.psz_string = psz_filter;
	461	var_Set( p_aout, "audio-filter", val );
	462	}
	463	}
	464
461	465	if( psz_mode && *psz_mode )
462	466	{
463		config_PutPsz( p_aout, "effect-list", psz_mode );
	467	vlc_value_t val;
	468	val.psz_string = psz_mode;
	469	var_Create( p_aout, "effect-list", VLC_VAR_STRING );
	470	var_Set( p_aout, "effect-list", val);
464	471	}
465	472
466	473	if( psz_filter ) free( psz_filter );
	474
	475	aout_Restart( p_aout );
467	476
468	477	return VLC_SUCCESS;

Navigation

Changeset 5f151d5106880ffccb0641f3eabdeee93ad34de0

Legend:

modules/gui/wxwindows/menus.cpp

src/audio_output/input.c

Download in other formats: