diff options
| author | Luis de Bethencourt <luis.bg@samsung.com> | 2015-01-13 16:49:07 +0000 |
|---|---|---|
| committer | Luis de Bethencourt <luis.bg@samsung.com> | 2015-01-13 16:55:14 +0000 |
| commit | ad6b8d0a3dd12ed54c4107071d255c32f31892ea (patch) | |
| tree | 838a413d7a677a2dbf7aa2f9cae4981a38316992 /gst/audiovisualizers | |
| parent | fc56b0742cf0d1f4ead57c5bc0c7033dfd0825dc (diff) | |
| download | gstreamer-plugins-bad-ad6b8d0a3dd12ed54c4107071d255c32f31892ea.tar.gz | |
audiovisualizer: handle the return of the setup function
Make the class future proof by handling the gboolean return of the setup
function. So if/when a child class uses this the base class is ready.
Diffstat (limited to 'gst/audiovisualizers')
| -rw-r--r-- | gst/audiovisualizers/gstaudiovisualizer.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/gst/audiovisualizers/gstaudiovisualizer.c b/gst/audiovisualizers/gstaudiovisualizer.c index 954db141a..ef4974773 100644 --- a/gst/audiovisualizers/gstaudiovisualizer.c +++ b/gst/audiovisualizers/gstaudiovisualizer.c @@ -758,8 +758,8 @@ gst_audio_visualizer_src_setcaps (GstAudioVisualizer * scope, GstCaps * caps) gst_video_frame_map (&scope->tempframe, &scope->vinfo, scope->tempbuf, GST_MAP_READWRITE); - if (klass->setup) - res = klass->setup (scope); + if (klass->setup && !klass->setup (scope)) + goto setup_failed; GST_DEBUG_OBJECT (scope, "video: dimension %dx%d, framerate %d/%d", GST_VIDEO_INFO_WIDTH (&info), GST_VIDEO_INFO_HEIGHT (&info), @@ -782,6 +782,12 @@ wrong_caps: GST_DEBUG_OBJECT (scope, "error parsing caps"); return FALSE; } + +setup_failed: + { + GST_WARNING_OBJECT (scope, "failed to set up"); + return FALSE; + } } static gboolean |