Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-gpu
Commits
2709abbb
Commit
2709abbb
authored
Jun 04, 2008
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove VLC_OBJECT_SOUT
parent
a0329834
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
5 additions
and
24 deletions
+5
-24
include/vlc_objects.h
include/vlc_objects.h
+2
-13
modules/control/http/rpn.c
modules/control/http/rpn.c
+0
-2
modules/misc/lua/objects.c
modules/misc/lua/objects.c
+0
-1
src/misc/objects.c
src/misc/objects.c
+0
-4
src/stream_output/stream_output.c
src/stream_output/stream_output.c
+3
-4
No files found.
include/vlc_objects.h
View file @
2709abbb
...
...
@@ -36,39 +36,28 @@
*/
/* Object types */
#define VLC_OBJECT_LIBVLC (-2)
#define VLC_OBJECT_MODULE (-3)
#define VLC_OBJECT_INTF (-4)
#define VLC_OBJECT_PLAYLIST (-5)
#define VLC_OBJECT_INPUT (-7)
#define VLC_OBJECT_DECODER (-8)
#define VLC_OBJECT_VOUT (-9)
#define VLC_OBJECT_AOUT (-10)
#define VLC_OBJECT_SOUT (-11)
#define VLC_OBJECT_PACKETIZER (-13)
#define VLC_OBJECT_ENCODER (-14)
#define VLC_OBJECT_DIALOGS (-15)
#define VLC_OBJECT_ANNOUNCE (-17)
#define VLC_OBJECT_DEMUX (-18)
#define VLC_OBJECT_ACCESS (-19)
#define VLC_OBJECT_STREAM (-20)
#define VLC_OBJECT_OPENGL (-21)
#define VLC_OBJECT_FILTER (-22)
#define VLC_OBJECT_OSDMENU (-28)
#define VLC_OBJECT_HTTPD_HOST (-30)
#define VLC_OBJECT_INTERACTION (-32)
/* Please add new object types below -34 */
/* Please do not add new object types anyway */
#define VLC_OBJECT_GENERIC (-666)
/* Object search mode */
...
...
modules/control/http/rpn.c
View file @
2709abbb
...
...
@@ -52,8 +52,6 @@ static vlc_object_t *GetVLCObject( intf_thread_t *p_intf,
i_object_type
=
VLC_OBJECT_VOUT
;
else
if
(
!
strcmp
(
psz_object
,
"VLC_OBJECT_AOUT"
)
)
i_object_type
=
VLC_OBJECT_AOUT
;
else
if
(
!
strcmp
(
psz_object
,
"VLC_OBJECT_SOUT"
)
)
i_object_type
=
VLC_OBJECT_SOUT
;
else
msg_Warn
(
p_intf
,
"unknown object type (%s)"
,
psz_object
);
...
...
modules/misc/lua/objects.c
View file @
2709abbb
...
...
@@ -115,7 +115,6 @@ static int vlc_object_type_from_string( const char *psz_name )
{
VLC_OBJECT_DECODER
,
"decoder"
},
{
VLC_OBJECT_VOUT
,
"vout"
},
{
VLC_OBJECT_AOUT
,
"aout"
},
{
VLC_OBJECT_SOUT
,
"sout"
},
{
VLC_OBJECT_PACKETIZER
,
"packetizer"
},
{
VLC_OBJECT_ENCODER
,
"encoder"
},
{
VLC_OBJECT_DIALOGS
,
"dialogs"
},
...
...
src/misc/objects.c
View file @
2709abbb
...
...
@@ -270,10 +270,6 @@ void * __vlc_object_create( vlc_object_t *p_this, int i_type )
i_size
=
sizeof
(
aout_instance_t
);
psz_type
=
"audio output"
;
break
;
case
VLC_OBJECT_SOUT
:
i_size
=
sizeof
(
sout_instance_t
);
psz_type
=
"stream output"
;
break
;
case
VLC_OBJECT_OPENGL
:
i_size
=
sizeof
(
vout_thread_t
);
psz_type
=
"opengl"
;
...
...
src/stream_output/stream_output.c
View file @
2709abbb
...
...
@@ -76,15 +76,14 @@ static void mrl_Clean( mrl_t *p_mrl );
*****************************************************************************/
sout_instance_t
*
__sout_NewInstance
(
vlc_object_t
*
p_parent
,
char
*
psz_dest
)
{
static
const
char
typename
[]
=
"stream output"
;
sout_instance_t
*
p_sout
;
/* *** Allocate descriptor *** */
p_sout
=
vlc_object_create
(
p_parent
,
VLC_OBJECT_SOUT
);
p_sout
=
vlc_custom_create
(
p_parent
,
sizeof
(
*
p_sout
),
VLC_OBJECT_GENERIC
,
typename
);
if
(
p_sout
==
NULL
)
{
msg_Err
(
p_parent
,
"out of memory"
);
return
NULL
;
}
/* *** init descriptor *** */
p_sout
->
psz_sout
=
strdup
(
psz_dest
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment