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
9a867d73
Commit
9a867d73
authored
Mar 29, 2008
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove VOD object type - not actually needed
parent
5541a98c
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
8 deletions
+4
-8
include/vlc_objects.h
include/vlc_objects.h
+1
-1
modules/misc/lua/objects.c
modules/misc/lua/objects.c
+0
-1
src/input/vlm.c
src/input/vlm.c
+3
-1
src/misc/objects.c
src/misc/objects.c
+0
-5
No files found.
include/vlc_objects.h
View file @
9a867d73
...
...
@@ -58,7 +58,7 @@
#define VLC_OBJECT_STREAM (-20)
#define VLC_OBJECT_OPENGL (-21)
#define VLC_OBJECT_FILTER (-22)
#define VLC_OBJECT_VOD (-23)
#define VLC_OBJECT_SPU (-24)
#define VLC_OBJECT_SD (-26)
...
...
modules/misc/lua/objects.c
View file @
9a867d73
...
...
@@ -128,7 +128,6 @@ static int vlc_object_type_from_string( const char *psz_name )
{
VLC_OBJECT_STREAM
,
"stream"
},
{
VLC_OBJECT_OPENGL
,
"opengl"
},
{
VLC_OBJECT_FILTER
,
"filter"
},
{
VLC_OBJECT_VOD
,
"vod"
},
{
VLC_OBJECT_SPU
,
"spu"
},
{
VLC_OBJECT_SD
,
"sd"
},
{
VLC_OBJECT_XML
,
"xml"
},
...
...
src/input/vlm.c
View file @
9a867d73
...
...
@@ -2331,7 +2331,9 @@ static int vlm_ControlMediaAdd( vlm_t *p_vlm, vlm_media_t *p_cfg, int64_t *p_id
/* Check if we need to load the VOD server */
if
(
p_cfg
->
b_vod
&&
!
p_vlm
->
i_vod
)
{
p_vlm
->
p_vod
=
vlc_object_create
(
p_vlm
,
VLC_OBJECT_VOD
);
p_vlm
->
p_vod
=
vlc_custom_create
(
VLC_OBJECT
(
p_vlm
),
sizeof
(
p_vlm
->
p_vod
),
VLC_OBJECT_GENERIC
,
"vod server"
);
vlc_object_attach
(
p_vlm
->
p_vod
,
p_vlm
);
p_vlm
->
p_vod
->
p_module
=
module_Need
(
p_vlm
->
p_vod
,
"vod server"
,
0
,
0
);
if
(
!
p_vlm
->
p_vod
->
p_module
)
...
...
src/misc/objects.c
View file @
9a867d73
...
...
@@ -56,7 +56,6 @@
#include "vlc_httpd.h"
#include "vlc_vlm.h"
#include "input/vlm_internal.h"
#include "vlc_vod.h"
#include "vlc_tls.h"
#include "vlc_xml.h"
#include "vlc_osd.h"
...
...
@@ -320,10 +319,6 @@ void * __vlc_object_create( vlc_object_t *p_this, int i_type )
i_size
=
sizeof
(
vlm_t
);
psz_type
=
"vlm dameon"
;
break
;
case
VLC_OBJECT_VOD
:
i_size
=
sizeof
(
vod_t
);
psz_type
=
"vod server"
;
break
;
case
VLC_OBJECT_XML
:
i_size
=
sizeof
(
xml_t
);
psz_type
=
"xml"
;
...
...
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