mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-04 17:52:29 +00:00
Code Issues 1 Projects Releases Wiki Activity

applied dolphy's patch

Browse source 
Original commit message from CVS:
applied dolphy's patch
This commit is contained in:
Thomas Vander Stichele 2002-11-05 10:12:01 +00:00
parent d6657bcb91
commit 9bcaf77637
1 changed files with 53 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
gst-libs/gst/play/playpipelines.c
View file

@ -53,7 +53,7 @@ gst_play_audio_setup (GstPlay *play, GError **error)
return FALSE; return FALSE;
} }
/* creating audio_sink from osssink (?) */ /* creating fake audio_sink */
play->audio_sink = gst_element_factory_make ("fakesink", "fake_audio"); play->audio_sink = gst_element_factory_make ("fakesink", "fake_audio");
if (play->audio_sink == NULL) if (play->audio_sink == NULL)
{ {
@ -61,10 +61,6 @@ gst_play_audio_setup (GstPlay *play, GError **error)
return FALSE; return FALSE;
} }
g_signal_connect (
G_OBJECT (play->audio_sink), "eos",
G_CALLBACK (callback_audio_sink_eos), play);
gst_bin_add_many ( gst_bin_add_many (
GST_BIN (play->pipeline), play->volume, GST_BIN (play->pipeline), play->volume,
play->audio_sink, NULL); play->audio_sink, NULL);
@ -126,10 +122,6 @@ gst_play_audiot_setup (GstPlay *play, GError **error)
return FALSE; return FALSE;
} }
g_signal_connect (
G_OBJECT (play->audio_sink), "eos",
G_CALLBACK (callback_audio_sink_eos), play);
gst_bin_add_many ( gst_bin_add_many (
GST_BIN (play->pipeline), play->volume, GST_BIN (play->pipeline), play->volume,
play->audio_sink, NULL); play->audio_sink, NULL);
@ -166,6 +158,13 @@ gst_play_audiot_set_audio (GstPlay *play, GstElement *audio_sink)
gst_bin_add (GST_BIN (play->pipeline), play->audio_sink); gst_bin_add (GST_BIN (play->pipeline), play->audio_sink);
gst_element_connect (play->volume, play->audio_sink); gst_element_connect (play->volume, play->audio_sink);
play->audio_sink_element = gst_play_get_sink_element (play, audio_sink);
if (play->audio_sink_element != NULL) {
g_signal_connect (G_OBJECT (play->audio_sink_element), "eos",
G_CALLBACK (callback_audio_sink_eos), play);
}
return TRUE; return TRUE;
} }
@ -251,11 +250,11 @@ gst_play_audioht_setup (GstPlay *play, GError **error)
/* create audiosink. */ /* create audiosink. */
play->audio_sink = gst_element_factory_make ("fakesink", "play_audio"); play->audio_sink = gst_element_factory_make ("fakesink", "play_audio");
if (!play->audio_sink) if (play->audio_sink == NULL)
g_warning ("You need the fakesink element to use this program.\n"); {
gst_play_error_plugin (GST_PLAY_ERROR_FAKESINK, error);
g_signal_connect (G_OBJECT (play->audio_sink), "eos", return FALSE;
G_CALLBACK (callback_audio_sink_eos), play); }
gst_bin_add_many ( gst_bin_add_many (
GST_BIN (audio_thread), audio_queue, play->volume, GST_BIN (audio_thread), audio_queue, play->volume,
@ -303,6 +302,13 @@ gst_play_audioht_set_audio (GstPlay *play, GstElement *audio_sink)
gst_bin_add (GST_BIN (audio_thread), play->audio_sink); gst_bin_add (GST_BIN (audio_thread), play->audio_sink);
gst_element_connect (play->volume, play->audio_sink); gst_element_connect (play->volume, play->audio_sink);
play->audio_sink_element = gst_play_get_sink_element (play, audio_sink);
if (play->audio_sink_element != NULL) {
g_signal_connect (G_OBJECT (play->audio_sink_element), "eos",
G_CALLBACK (callback_audio_sink_eos), play);
}
return TRUE; return TRUE;
} }
@ -488,7 +494,8 @@ gst_play_video_setup (GstPlay *play, GError **error)
static gboolean static gboolean
gst_play_video_set_auto (GstPlay *play, GstElement *autoplugger){ gst_play_video_set_auto (GstPlay *play, GstElement *autoplugger)
{
GstElement *audio_bin, *video_bin, *work_thread; GstElement *audio_bin, *video_bin, *work_thread;
@ -575,7 +582,7 @@ gst_play_video_set_audio (GstPlay *play, GstElement *audio_sink)
play->audio_sink_element = gst_play_get_sink_element (play, audio_sink); play->audio_sink_element = gst_play_get_sink_element (play, audio_sink);
if (play->audio_sink_element != NULL) { if (play->audio_sink_element != NULL) {
g_signal_connect (G_OBJECT (play->audio_sink), "eos", g_signal_connect (G_OBJECT (play->audio_sink_element), "eos",
G_CALLBACK (callback_audio_sink_eos), play); G_CALLBACK (callback_audio_sink_eos), play);
} }
@ -633,16 +640,14 @@ gst_play_videots_setup (GstPlay *play, GError **error)
return FALSE; return FALSE;
} }
/* create audiosink. /* creating audio_sink element */
FIXME : Should use gconf to choose the right one */ play->audio_sink = gst_element_factory_make ("fakesink", "fake_audio");
play->audio_sink = gst_element_factory_make ("osssink", "play_audio");
if (!play->audio_sink) if (!play->audio_sink)
g_warning ("You need the osssink element to use this program.\n"); {
gst_play_error_plugin (GST_PLAY_ERROR_FAKESINK, error);
g_object_set (G_OBJECT (play->audio_sink), "fragment", 0x00180008, NULL); return FALSE;
g_signal_connect ( }
G_OBJECT (play->audio_sink), "eos", play->audio_sink_element = NULL;
G_CALLBACK (callback_audio_sink_eos), play);
audio_queue = gst_element_factory_make ("queue", "audio_queue"); audio_queue = gst_element_factory_make ("queue", "audio_queue");
if (!audio_queue) if (!audio_queue)
@ -728,7 +733,8 @@ gst_play_videots_setup (GstPlay *play, GError **error)
static gboolean static gboolean
gst_play_videots_set_auto (GstPlay *play, GstElement *autoplugger){ gst_play_videots_set_auto (GstPlay *play, GstElement *autoplugger)
{
GstElement *audio_bin, *auto_identity, *work_thread; GstElement *audio_bin, *auto_identity, *work_thread;
@ -740,7 +746,8 @@ gst_play_videots_set_auto (GstPlay *play, GstElement *autoplugger){
work_thread = g_hash_table_lookup(play->other_elements, "work_thread"); work_thread = g_hash_table_lookup(play->other_elements, "work_thread");
if (play->autoplugger) { if (play->autoplugger) {
/* we need to remove the existing autoplugger before creating a new one */ /* we need to remove the existing autoplugger
* before creating a new one */
gst_element_disconnect (play->autoplugger, audio_bin); gst_element_disconnect (play->autoplugger, audio_bin);
gst_element_disconnect (play->autoplugger, play->source); gst_element_disconnect (play->autoplugger, play->source);
gst_element_disconnect (play->autoplugger, auto_identity); gst_element_disconnect (play->autoplugger, auto_identity);
@ -802,6 +809,12 @@ gst_play_videots_set_audio (GstPlay *play, GstElement *audio_sink)
gst_bin_add (GST_BIN (audio_bin), play->audio_sink); gst_bin_add (GST_BIN (audio_bin), play->audio_sink);
gst_element_connect (play->volume, play->audio_sink); gst_element_connect (play->volume, play->audio_sink);
play->audio_sink_element = gst_play_get_sink_element (play, audio_sink);
if (play->audio_sink_element != NULL) {
g_signal_connect (G_OBJECT (play->audio_sink_element), "eos",
G_CALLBACK (callback_audio_sink_eos), play);
}
return TRUE; return TRUE;
} }