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
cec206c3
Commit
cec206c3
authored
Jan 04, 2010
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
libvlc_add_intf: remove dummy exception parameter
parent
d91fcec7
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
22 deletions
+8
-22
bin/vlc.c
bin/vlc.c
+3
-8
bin/winvlc.c
bin/winvlc.c
+2
-2
include/vlc/libvlc.h
include/vlc/libvlc.h
+1
-3
src/control/core.c
src/control/core.c
+2
-9
No files found.
bin/vlc.c
View file @
cec206c3
...
...
@@ -159,17 +159,12 @@ int main( int i_argc, const char *ppsz_argv[] )
if
(
vlc
!=
NULL
)
{
libvlc_add_intf
(
vlc
,
"signals"
,
&
ex
);
if
(
libvlc_exception_raised
(
&
ex
))
{
libvlc_exception_clear
(
&
ex
);
if
(
libvlc_add_intf
(
vlc
,
"signals"
))
pthread_sigmask
(
SIG_UNBLOCK
,
&
set
,
NULL
);
}
#if !defined (HAVE_MAEMO)
libvlc_add_intf
(
vlc
,
"globalhotkeys,none"
,
&
ex
);
libvlc_add_intf
(
vlc
,
"globalhotkeys,none"
);
#endif
libvlc_exception_clear
(
&
ex
);
libvlc_add_intf
(
vlc
,
NULL
,
&
ex
);
libvlc_add_intf
(
vlc
,
NULL
);
libvlc_playlist_play
(
vlc
,
-
1
,
0
,
NULL
,
&
dummy
);
libvlc_wait
(
vlc
);
...
...
bin/winvlc.c
View file @
cec206c3
...
...
@@ -171,8 +171,8 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
vlc
=
libvlc_new
(
argc
,
(
const
char
**
)
argv
,
&
ex
);
if
(
vlc
!=
NULL
)
{
libvlc_add_intf
(
vlc
,
"globalhotkeys,none"
,
&
ex
);
libvlc_add_intf
(
vlc
,
NULL
,
&
ex
);
libvlc_add_intf
(
vlc
,
"globalhotkeys,none"
);
libvlc_add_intf
(
vlc
,
NULL
);
libvlc_playlist_play
(
vlc
,
-
1
,
0
,
NULL
,
&
dummy
);
libvlc_wait
(
vlc
);
libvlc_release
(
vlc
);
...
...
include/vlc/libvlc.h
View file @
cec206c3
...
...
@@ -191,12 +191,10 @@ VLC_PUBLIC_API void libvlc_retain( libvlc_instance_t * );
*
* \param p_instance the instance
* \param name interface name, or NULL for default
* \param p_exception an initialized exception pointer
* \return 0 on success, -1 on error.
*/
VLC_PUBLIC_API
int
libvlc_add_intf
(
libvlc_instance_t
*
p_instance
,
const
char
*
name
,
libvlc_exception_t
*
p_exception
);
int
libvlc_add_intf
(
libvlc_instance_t
*
p_instance
,
const
char
*
name
);
/**
* Waits until an interface causes the instance to exit.
...
...
src/control/core.c
View file @
cec206c3
...
...
@@ -167,16 +167,9 @@ void libvlc_release( libvlc_instance_t *p_instance )
}
}
int
libvlc_add_intf
(
libvlc_instance_t
*
p_i
,
const
char
*
name
,
libvlc_exception_t
*
p_e
)
int
libvlc_add_intf
(
libvlc_instance_t
*
p_i
,
const
char
*
name
)
{
if
(
libvlc_InternalAddIntf
(
p_i
->
p_libvlc_int
,
name
)
)
{
libvlc_printerr
(
"Interface initialization failed"
);
libvlc_exception_raise
(
p_e
);
return
-
1
;
}
return
0
;
return
libvlc_InternalAddIntf
(
p_i
->
p_libvlc_int
,
name
)
?
-
1
:
0
;
}
void
libvlc_wait
(
libvlc_instance_t
*
p_i
)
...
...
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