Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
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-1.1
Commits
40f43d32
Commit
40f43d32
authored
May 04, 2008
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use libvlc_priv_t for httpd
parent
e0a120ef
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
9 deletions
+5
-9
src/libvlc-common.c
src/libvlc-common.c
+1
-1
src/network/httpd.c
src/network/httpd.c
+4
-8
No files found.
src/libvlc-common.c
View file @
40f43d32
...
...
@@ -178,11 +178,11 @@ libvlc_int_t * libvlc_InternalCreate( void )
if
(
p_libvlc
==
NULL
)
return
NULL
;
priv
=
libvlc_priv
(
p_libvlc
);
p_libvlc
->
p_playlist
=
NULL
;
p_libvlc
->
p_interaction
=
NULL
;
priv
->
p_vlm
=
NULL
;
p_libvlc
->
psz_object_name
=
strdup
(
"libvlc"
);
priv
=
libvlc_priv
(
p_libvlc
);
/* Initialize message queue */
msg_Create
(
p_libvlc
);
...
...
src/network/httpd.c
View file @
40f43d32
...
...
@@ -996,14 +996,11 @@ httpd_host_t *httpd_TLSHostNew( vlc_object_t *p_this, const char *psz_hostname,
/* to be sure to avoid multiple creation */
var_Create
(
p_this
->
p_libvlc
,
"httpd_mutex"
,
VLC_VAR_MUTEX
);
var_Create
(
p_this
->
p_libvlc
,
"httpd_object"
,
VLC_VAR_ADDRESS
);
var_Get
(
p_this
->
p_libvlc
,
"httpd_mutex"
,
&
lockval
);
vlc_mutex_lock
(
lockval
.
p_address
);
var_Get
(
p_this
->
p_libvlc
,
"httpd_object"
,
&
ptrval
)
;
httpd
=
libvlc_priv
(
p_this
->
p_libvlc
)
->
p_httpd
;
if
(
ptrval
.
p_address
!=
NULL
)
httpd
=
ptrval
.
p_address
;
else
if
(
httpd
==
NULL
)
{
msg_Info
(
p_this
,
"creating httpd"
);
httpd
=
(
httpd_t
*
)
vlc_custom_create
(
p_this
,
sizeof
(
*
httpd
),
...
...
@@ -1020,7 +1017,7 @@ httpd_host_t *httpd_TLSHostNew( vlc_object_t *p_this, const char *psz_hostname,
httpd
->
host
=
NULL
;
ptrval
.
p_address
=
httpd
;
var_Set
(
p_this
->
p_libvlc
,
"httpd_object"
,
ptrval
)
;
libvlc_priv
(
p_this
->
p_libvlc
)
->
p_httpd
=
httpd
;
vlc_object_yield
(
httpd
);
vlc_object_attach
(
httpd
,
p_this
->
p_libvlc
);
}
...
...
@@ -1201,8 +1198,7 @@ void httpd_HostDelete( httpd_host_t *host )
msg_Dbg
(
httpd
,
"no host left, stopping httpd"
);
ptrval
.
p_address
=
NULL
;
var_Set
(
httpd
->
p_libvlc
,
"httpd_object"
,
ptrval
);
libvlc_priv
(
httpd
->
p_libvlc
)
->
p_httpd
=
NULL
;
vlc_object_detach
(
httpd
);
vlc_object_release
(
httpd
);
...
...
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