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
7c912f1e
Commit
7c912f1e
authored
Jan 24, 2010
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
libvlc_playlist_play: remove unused exception
parent
7db94f4d
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
12 deletions
+6
-12
bin/vlc.c
bin/vlc.c
+2
-3
bin/winvlc.c
bin/winvlc.c
+2
-4
include/vlc/deprecated.h
include/vlc/deprecated.h
+1
-2
src/control/playlist.c
src/control/playlist.c
+1
-3
No files found.
bin/vlc.c
View file @
7c912f1e
...
@@ -150,9 +150,8 @@ int main( int i_argc, const char *ppsz_argv[] )
...
@@ -150,9 +150,8 @@ int main( int i_argc, const char *ppsz_argv[] )
return
1
;
// BOOM!
return
1
;
// BOOM!
argv
[
argc
]
=
NULL
;
argv
[
argc
]
=
NULL
;
libvlc_exception_t
ex
,
dummy
;
libvlc_exception_t
ex
;
libvlc_exception_init
(
&
ex
);
libvlc_exception_init
(
&
ex
);
libvlc_exception_init
(
&
dummy
);
/* Initialize libvlc */
/* Initialize libvlc */
libvlc_instance_t
*
vlc
=
libvlc_new
(
argc
,
argv
,
&
ex
);
libvlc_instance_t
*
vlc
=
libvlc_new
(
argc
,
argv
,
&
ex
);
...
@@ -166,7 +165,7 @@ int main( int i_argc, const char *ppsz_argv[] )
...
@@ -166,7 +165,7 @@ int main( int i_argc, const char *ppsz_argv[] )
#endif
#endif
if
(
libvlc_add_intf
(
vlc
,
NULL
)
==
0
)
if
(
libvlc_add_intf
(
vlc
,
NULL
)
==
0
)
{
{
libvlc_playlist_play
(
vlc
,
-
1
,
0
,
NULL
,
&
dummy
);
libvlc_playlist_play
(
vlc
,
-
1
,
0
,
NULL
);
libvlc_wait
(
vlc
);
libvlc_wait
(
vlc
);
}
}
libvlc_release
(
vlc
);
libvlc_release
(
vlc
);
...
...
bin/winvlc.c
View file @
7c912f1e
...
@@ -162,9 +162,8 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
...
@@ -162,9 +162,8 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
argc
=
parse_cmdline
(
psz_cmdline
,
&
argv
);
argc
=
parse_cmdline
(
psz_cmdline
,
&
argv
);
#endif
#endif
libvlc_exception_t
ex
,
dummy
;
libvlc_exception_t
ex
;
libvlc_exception_init
(
&
ex
);
libvlc_exception_init
(
&
ex
);
libvlc_exception_init
(
&
dummy
);
/* Initialize libvlc */
/* Initialize libvlc */
libvlc_instance_t
*
vlc
;
libvlc_instance_t
*
vlc
;
...
@@ -173,14 +172,13 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
...
@@ -173,14 +172,13 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
{
{
libvlc_add_intf
(
vlc
,
"globalhotkeys,none"
);
libvlc_add_intf
(
vlc
,
"globalhotkeys,none"
);
libvlc_add_intf
(
vlc
,
NULL
);
libvlc_add_intf
(
vlc
,
NULL
);
libvlc_playlist_play
(
vlc
,
-
1
,
0
,
NULL
,
&
dummy
);
libvlc_playlist_play
(
vlc
,
-
1
,
0
,
NULL
);
libvlc_wait
(
vlc
);
libvlc_wait
(
vlc
);
libvlc_release
(
vlc
);
libvlc_release
(
vlc
);
}
}
ret
=
libvlc_exception_raised
(
&
ex
);
ret
=
libvlc_exception_raised
(
&
ex
);
libvlc_exception_clear
(
&
ex
);
libvlc_exception_clear
(
&
ex
);
libvlc_exception_clear
(
&
dummy
);
for
(
int
i
=
0
;
i
<
argc
;
i
++
)
for
(
int
i
=
0
;
i
<
argc
;
i
++
)
free
(
argv
[
i
]);
free
(
argv
[
i
]);
...
...
include/vlc/deprecated.h
View file @
7c912f1e
...
@@ -63,10 +63,9 @@ extern "C" {
...
@@ -63,10 +63,9 @@ extern "C" {
* played
* played
* \param i_options the number of options to add to the item
* \param i_options the number of options to add to the item
* \param ppsz_options the options to add to the item
* \param ppsz_options the options to add to the item
* \param p_e an initialized exception pointer
*/
*/
VLC_DEPRECATED_API
void
libvlc_playlist_play
(
libvlc_instance_t
*
,
int
,
int
,
VLC_DEPRECATED_API
void
libvlc_playlist_play
(
libvlc_instance_t
*
,
int
,
int
,
char
**
,
libvlc_exception_t
*
);
char
**
);
/** @}*/
/** @}*/
...
...
src/control/playlist.c
View file @
7c912f1e
...
@@ -39,12 +39,10 @@
...
@@ -39,12 +39,10 @@
#include <assert.h>
#include <assert.h>
void
libvlc_playlist_play
(
libvlc_instance_t
*
p_instance
,
int
i_id
,
void
libvlc_playlist_play
(
libvlc_instance_t
*
p_instance
,
int
i_id
,
int
i_options
,
char
**
ppsz_options
,
int
i_options
,
char
**
ppsz_options
)
libvlc_exception_t
*
p_e
)
{
{
playlist_t
*
pl
=
libvlc_priv
(
p_instance
->
p_libvlc_int
)
->
p_playlist
;
playlist_t
*
pl
=
libvlc_priv
(
p_instance
->
p_libvlc_int
)
->
p_playlist
;
VLC_UNUSED
(
i_id
);
VLC_UNUSED
(
i_options
);
VLC_UNUSED
(
ppsz_options
);
VLC_UNUSED
(
i_id
);
VLC_UNUSED
(
i_options
);
VLC_UNUSED
(
ppsz_options
);
VLC_UNUSED
(
p_e
);
assert
(
pl
);
assert
(
pl
);
if
(
pl
->
items
.
i_size
==
0
)
if
(
pl
->
items
.
i_size
==
0
)
...
...
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