Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

added null-checks around calls in close()

Browse source 
see http://bugs.campware.org/view.php?id=1444
This commit is contained in:
maroy 2005-09-05 10:36:39 +00:00
parent ae6fb6216d
commit 0a92d1d5ea
1 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

18
livesupport/modules/playlistExecutor/src/GstreamerPlayer.cxx
View file

@ -22,7 +22,7 @@
Author : $Author: maroy $ Author : $Author: maroy $
Version : $Revision: 1.12 $ Version : $Revision: 1.13 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/playlistExecutor/src/GstreamerPlayer.cxx,v $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/playlistExecutor/src/GstreamerPlayer.cxx,v $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -444,10 +444,18 @@ GstreamerPlayer :: close(void) throw ()
} }
gst_element_set_state(pipeline, GST_STATE_NULL); gst_element_set_state(pipeline, GST_STATE_NULL);
gst_element_unlink(filesrc, decoder); if (filesrc && decoder) {
gst_element_unlink(decoder, audiosink); gst_element_unlink(filesrc, decoder);
gst_bin_remove(GST_BIN(pipeline), decoder); }
gst_bin_remove(GST_BIN(pipeline), filesrc); if (decoder && audiosink) {
gst_element_unlink(decoder, audiosink);
}
if (decoder) {
gst_bin_remove(GST_BIN(pipeline), decoder);
}
if (filesrc) {
gst_bin_remove(GST_BIN(pipeline), filesrc);
}
filesrc = 0; filesrc = 0;
decoder = 0; decoder = 0;
} }