mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-05 06:58:56 +00:00
Code Issues 1 Projects Releases Wiki Activity

Rename osselement to ossmixer and only open audio device if we have at least one pad. This makes ossmixer *only* open...

Browse source 
Original commit message from CVS:
Rename osselement to ossmixer and only open audio device if we have at least one pad. This makes ossmixer *only* open the mixer, which means we can open multiple mixer sessions.
This commit is contained in:
Ronald S. Bultje 2003-10-26 12:16:43 +00:00
parent 5de12607be
commit 5d540ce924
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sys/oss/gstosselement.c
View file

@ -412,6 +412,8 @@ gst_osselement_open_audio (GstOssElement *oss)
if (GST_PAD_IS_SINK (firstpad)) { if (GST_PAD_IS_SINK (firstpad)) {
mode = GST_OSSELEMENT_WRITE; mode = GST_OSSELEMENT_WRITE;
} }
} else {
goto do_mixer;
} }
/* first try to open the sound card */ /* first try to open the sound card */
@ -515,6 +517,7 @@ gst_osselement_open_audio (GstOssElement *oss)
oss->caps = caps; oss->caps = caps;
do_mixer:
gst_ossmixer_build_list (oss); gst_ossmixer_build_list (oss);
return TRUE; return TRUE;
@ -523,10 +526,11 @@ gst_osselement_open_audio (GstOssElement *oss)
static void static void
gst_osselement_close_audio (GstOssElement *oss) gst_osselement_close_audio (GstOssElement *oss)
{ {
gst_ossmixer_free_list (oss);
if (oss->fd < 0) if (oss->fd < 0)
return; return;
gst_ossmixer_free_list (oss);
close(oss->fd); close(oss->fd);
oss->fd = -1; oss->fd = -1;
} }
@ -678,7 +682,7 @@ gst_osselement_factory_init (GstPlugin *plugin)
{ {
GstElementFactory *factory; GstElementFactory *factory;
factory = gst_element_factory_new ("osselement", factory = gst_element_factory_new ("ossmixer",
GST_TYPE_OSSELEMENT, GST_TYPE_OSSELEMENT,
&gst_osselement_details); &gst_osselement_details);
g_return_val_if_fail (factory != NULL, FALSE); g_return_val_if_fail (factory != NULL, FALSE);