Navigation

Changeset 4933bf4034f6e0a62c6892da0eea507f74d367ae

Timestamp:

10/12/05 12:34:20 (3 years ago)

Author:

Olivier Aubert <olivier.aubert@liris.cnrs.fr>

git-committer:

Olivier Aubert <olivier.aubert@liris.cnrs.fr> 1134214460 +0000

git-parent:

[0591a1d3fec932940bd7d1bf46b792acf7eea702]

git-author:

Olivier Aubert <olivier.aubert@liris.cnrs.fr> 1134214460 +0000

Message:

src/control/core.c, include/vlc/control.h: Applied patch from Filippo Carone,

using vlc_object_id instead of a direct p_object pointer as parameter
for mediacontrol_new_from_object

Files:

re96ffed	r4933bf4
3	3	*****************************************************************************
4	4	* Copyright (C) 2005 the VideoLAN team
5		* $Id~~: vlc.h 10101 2005-03-02 16:47:31Z robux4~~ $
	5	* $Id$
6	6	*
7	7	* Authors: Olivier Aubert <olivier.aubert@liris.univ-lyon1.fr>
…	…
143	143
144	144	mediacontrol_Instance *
145		mediacontrol_new_from_object( ~~vlc_object_t *p_object~~,
	145	mediacontrol_new_from_object( int vlc_object_id,
146	146	mediacontrol_Exception *exception );
147	147

r4208865	r4933bf4
3	3	*****************************************************************************
4	4	* Copyright (C) 2005 the VideoLAN team
5		* $Id~~: vlc.c 10786 2005-04-23 23:19:17Z zorglub~~ $
	5	* $Id$
6	6	*
7	7	* Authors: Olivier Aubert <olivier.aubert@liris.univ-lyon1.fr>
…	…
58	58
59	59
60		mediacontrol_Instance* mediacontrol_new_from_object( ~~vlc_object_t* p_object~~,
	60	mediacontrol_Instance* mediacontrol_new_from_object( int vlc_object_id,
61	61	mediacontrol_Exception *exception )
62	62	{
63	63	mediacontrol_Instance* retval;
64	64	vlc_object_t *p_vlc;
	65	vlc_object_t *p_object;
	66
	67	p_object = ( vlc_object_t* )vlc_current_object( vlc_object_id );
	68	if( ! p_object )
	69	{
	70	RAISE( mediacontrol_InternalException, "Unable to find vlc object" );
	71	return NULL;
	72	}
65	73
66	74	p_vlc = vlc_object_find( p_object, VLC_OBJECT_ROOT, FIND_PARENT );