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
84331305
Commit
84331305
authored
Dec 03, 2011
by
Pierre Ynard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Remove unused intf_thread_t.psz_intf"
This reverts commit
e9cff78d
. This is needed to fix `vlc -I lua`
parent
62d3ead9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
8 deletions
+10
-8
include/vlc_interface.h
include/vlc_interface.h
+1
-0
src/interface/interface.c
src/interface/interface.c
+9
-8
No files found.
include/vlc_interface.h
View file @
84331305
...
@@ -60,6 +60,7 @@ typedef struct intf_thread_t
...
@@ -60,6 +60,7 @@ typedef struct intf_thread_t
/* Specific interfaces */
/* Specific interfaces */
intf_sys_t
*
p_sys
;
/** system interface */
intf_sys_t
*
p_sys
;
/** system interface */
char
*
psz_intf
;
/** intf name specified */
/** Interface module */
/** Interface module */
module_t
*
p_module
;
module_t
*
p_module
;
...
...
src/interface/interface.c
View file @
84331305
...
@@ -64,10 +64,10 @@ static vlc_mutex_t lock = VLC_STATIC_MUTEX;
...
@@ -64,10 +64,10 @@ static vlc_mutex_t lock = VLC_STATIC_MUTEX;
* Create and start an interface.
* Create and start an interface.
*
*
* @param p_this the calling vlc_object_t
* @param p_this the calling vlc_object_t
* @param
chain configuration chain string
* @param
psz_module a preferred interface module
* @return VLC_SUCCESS or an error code
* @return VLC_SUCCESS or an error code
*/
*/
int
intf_Create
(
vlc_object_t
*
p_this
,
const
char
*
chain
)
int
intf_Create
(
vlc_object_t
*
p_this
,
const
char
*
psz_module
)
{
{
libvlc_int_t
*
p_libvlc
=
p_this
->
p_libvlc
;
libvlc_int_t
*
p_libvlc
=
p_this
->
p_libvlc
;
intf_thread_t
*
p_intf
;
intf_thread_t
*
p_intf
;
...
@@ -113,15 +113,14 @@ int intf_Create( vlc_object_t *p_this, const char *chain )
...
@@ -113,15 +113,14 @@ int intf_Create( vlc_object_t *p_this, const char *chain )
/* Choose the best module */
/* Choose the best module */
p_intf
->
p_cfg
=
NULL
;
p_intf
->
p_cfg
=
NULL
;
char
*
psz_parser
=
*
chain
==
'$'
char
*
psz_parser
=
*
psz_module
==
'$'
?
var_CreateGetString
(
p_intf
,
chain
+
1
)
?
var_CreateGetString
(
p_intf
,
psz_module
+
1
)
:
strdup
(
chain
);
:
strdup
(
psz_module
);
char
*
module
;
char
*
psz_tmp
=
config_ChainCreate
(
&
p_intf
->
psz_intf
,
&
p_intf
->
p_cfg
,
char
*
psz_tmp
=
config_ChainCreate
(
&
module
,
&
p_intf
->
p_cfg
,
psz_parser
);
psz_parser
);
free
(
psz_tmp
);
free
(
psz_tmp
);
free
(
psz_parser
);
free
(
psz_parser
);
p_intf
->
p_module
=
module_need
(
p_intf
,
"interface"
,
module
,
true
);
p_intf
->
p_module
=
module_need
(
p_intf
,
"interface"
,
p_intf
->
psz_intf
,
true
);
if
(
p_intf
->
p_module
==
NULL
)
if
(
p_intf
->
p_module
==
NULL
)
{
{
msg_Err
(
p_intf
,
"no suitable interface module"
);
msg_Err
(
p_intf
,
"no suitable interface module"
);
...
@@ -169,6 +168,7 @@ error:
...
@@ -169,6 +168,7 @@ error:
if
(
p_intf
->
p_module
)
if
(
p_intf
->
p_module
)
module_unneed
(
p_intf
,
p_intf
->
p_module
);
module_unneed
(
p_intf
,
p_intf
->
p_module
);
config_ChainDestroy
(
p_intf
->
p_cfg
);
config_ChainDestroy
(
p_intf
->
p_cfg
);
free
(
p_intf
->
psz_intf
);
vlc_object_release
(
p_intf
);
vlc_object_release
(
p_intf
);
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
}
}
...
@@ -204,6 +204,7 @@ void intf_DestroyAll( libvlc_int_t *p_libvlc )
...
@@ -204,6 +204,7 @@ void intf_DestroyAll( libvlc_int_t *p_libvlc )
vlc_join
(
p_intf
->
thread
,
NULL
);
vlc_join
(
p_intf
->
thread
,
NULL
);
}
}
module_unneed
(
p_intf
,
p_intf
->
p_module
);
module_unneed
(
p_intf
,
p_intf
->
p_module
);
free
(
p_intf
->
psz_intf
);
config_ChainDestroy
(
p_intf
->
p_cfg
);
config_ChainDestroy
(
p_intf
->
p_cfg
);
vlc_object_release
(
p_intf
);
vlc_object_release
(
p_intf
);
...
...
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