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
8261a227
Commit
8261a227
authored
Sep 25, 2006
by
Olivier Aubert
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
src/control/mediacontrol_audio_video.c: use RAISE_NULL, RAISE_VOID macros
parent
24a43144
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
20 deletions
+12
-20
src/control/mediacontrol_audio_video.c
src/control/mediacontrol_audio_video.c
+12
-20
No files found.
src/control/mediacontrol_audio_video.c
View file @
8261a227
...
...
@@ -52,9 +52,6 @@
# include <sys/types.h>
#endif
#define RAISE( c, m ) exception->code = c; \
exception->message = strdup(m);
mediacontrol_RGBPicture
*
mediacontrol_snapshot
(
mediacontrol_Instance
*
self
,
const
mediacontrol_Position
*
a_position
,
...
...
@@ -71,16 +68,13 @@ mediacontrol_snapshot( mediacontrol_Instance *self,
p_vout
=
vlc_object_find
(
self
->
p_playlist
,
VLC_OBJECT_VOUT
,
FIND_CHILD
);
if
(
!
p_vout
)
{
RAISE
(
mediacontrol_InternalException
,
"No video output"
);
return
NULL
;
RAISE_NULL
(
mediacontrol_InternalException
,
"No video output"
);
}
p_cache
=
vlc_object_create
(
self
->
p_playlist
,
VLC_OBJECT_GENERIC
);
if
(
p_cache
==
NULL
)
{
vlc_object_release
(
p_vout
);
msg_Err
(
self
->
p_playlist
,
"out of memory"
);
RAISE
(
mediacontrol_InternalException
,
"Out of memory"
);
return
NULL
;
RAISE_NULL
(
mediacontrol_InternalException
,
"Out of memory"
);
}
snprintf
(
path
,
255
,
"object:%d"
,
p_cache
->
i_object_id
);
var_SetString
(
p_vout
,
"snapshot-path"
,
path
);
...
...
@@ -103,13 +97,15 @@ mediacontrol_snapshot( mediacontrol_Instance *self,
p_snapshot
->
p_data
,
p_snapshot
->
i_datasize
);
if
(
!
p_pic
)
RAISE
(
mediacontrol_InternalException
,
"out of memory"
);
free
(
p_snapshot
->
p_data
);
free
(
p_snapshot
);
{
free
(
p_snapshot
->
p_data
);
free
(
p_snapshot
);
RAISE_NULL
(
mediacontrol_InternalException
,
"Out of memory"
);
}
}
else
{
RAISE
(
mediacontrol_InternalException
,
"Snapshot exception"
);
RAISE
_NULL
(
mediacontrol_InternalException
,
"Snapshot exception"
);
}
return
p_pic
;
}
...
...
@@ -120,8 +116,7 @@ mediacontrol_all_snapshots( mediacontrol_Instance *self,
{
exception
=
mediacontrol_exception_init
(
exception
);
RAISE
(
mediacontrol_InternalException
,
"unsupported method"
);
return
NULL
;
RAISE_NULL
(
mediacontrol_InternalException
,
"unsupported method"
);
}
int
mediacontrol_showtext
(
vout_thread_t
*
p_vout
,
int
i_channel
,
...
...
@@ -182,15 +177,13 @@ mediacontrol_display_text( mediacontrol_Instance *self,
psz_message
=
strdup
(
message
);
if
(
!
psz_message
)
{
RAISE
(
mediacontrol_InternalException
,
"no more memory"
);
return
;
RAISE_VOID
(
mediacontrol_InternalException
,
"no more memory"
);
}
p_vout
=
vlc_object_find
(
self
->
p_playlist
,
VLC_OBJECT_VOUT
,
FIND_CHILD
);
if
(
!
p_vout
)
{
RAISE
(
mediacontrol_InternalException
,
"no video output"
);
return
;
RAISE_VOID
(
mediacontrol_InternalException
,
"no video output"
);
}
if
(
begin
->
origin
==
mediacontrol_RelativePosition
&&
...
...
@@ -217,9 +210,8 @@ mediacontrol_display_text( mediacontrol_Instance *self,
p_input
=
self
->
p_playlist
->
p_input
;
if
(
!
p_input
)
{
RAISE
(
mediacontrol_InternalException
,
"No input"
);
vlc_object_release
(
p_vout
);
return
;
RAISE_VOID
(
mediacontrol_InternalException
,
"No input"
)
;
}
/* FIXME */
...
...
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