mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 04:01:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

ext/mikmod/gstmikmod.*: make mikmod's loop function not loop infinitely and call gst_element_yield anymore

Browse source 
Original commit message from CVS:
* ext/mikmod/gstmikmod.c: (gst_mikmod_init), (gst_mikmod_loop),
(gst_mikmod_change_state):
* ext/mikmod/gstmikmod.h:
make mikmod's loop function not loop infinitely and call
gst_element_yield anymore
* gst/modplug/gstmodplug.cc:
fix pad negotiation
This commit is contained in:
Benjamin Otte 2004-03-09 21:09:11 +00:00
parent 1e292a5bd3
commit 3faf623b27
3 changed files with 58 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
2004-03-09 Benjamin Otte <otte@gnome.org>
* ext/mikmod/gstmikmod.c: (gst_mikmod_init), (gst_mikmod_loop),
(gst_mikmod_change_state):
* ext/mikmod/gstmikmod.h:
make mikmod's loop function not loop infinitely and call
gst_element_yield anymore
* gst/modplug/gstmodplug.cc:
fix pad negotiation
2004-03-09 David Schleef <ds@schleef.org>
* ext/lcs/Makefile.am: Fix so that the lcs colorspace plugin

95
ext/mikmod/gstmikmod.c
View file

@ -230,6 +230,8 @@ gst_mikmod_init (GstMikMod *filter)
filter->sndfxvolume = 128;
filter->songname = NULL;
filter->modtype = NULL;
filter->initialized = FALSE;
}
static GstCaps *
@ -288,60 +290,55 @@ gst_mikmod_loop (GstElement *element)
srcpad = mikmod->srcpad;
mikmod->Buffer = NULL;
while ((buffer_in = GST_BUFFER (gst_pad_pull( mikmod->sinkpad )))) {
if ( GST_IS_EVENT (buffer_in) ) {
GstEvent *event = GST_EVENT (buffer_in);
if (!mikmod->initialized) {
while ((buffer_in = GST_BUFFER (gst_pad_pull( mikmod->sinkpad )))) {
if ( GST_IS_EVENT (buffer_in) ) {
GstEvent *event = GST_EVENT (buffer_in);
if (GST_EVENT_TYPE (event) == GST_EVENT_EOS)
break;
}
else
{
if ( mikmod->Buffer ) {
GstBuffer *merge;
merge = gst_buffer_merge( mikmod->Buffer, buffer_in );
gst_buffer_unref( buffer_in );
gst_buffer_unref( mikmod->Buffer );
mikmod->Buffer = merge;
if (GST_EVENT_TYPE (event) == GST_EVENT_EOS)
break;
} else {
if ( mikmod->Buffer ) {
GstBuffer *merge;
merge = gst_buffer_merge( mikmod->Buffer, buffer_in );
gst_buffer_unref( buffer_in );
gst_buffer_unref( mikmod->Buffer );
mikmod->Buffer = merge;
} else {
mikmod->Buffer = buffer_in;
}
}
else
mikmod->Buffer = buffer_in;
}
}
}
if (!GST_PAD_CAPS (mikmod->srcpad)) {
if (GST_PAD_LINK_SUCCESSFUL (gst_pad_renegotiate (mikmod->srcpad))) {
GST_ELEMENT_ERROR (mikmod, CORE, NEGOTIATION, (NULL), (NULL));
return;
if (!GST_PAD_CAPS (mikmod->srcpad)) {
if (GST_PAD_LINK_SUCCESSFUL (gst_pad_renegotiate (mikmod->srcpad))) {
GST_ELEMENT_ERROR (mikmod, CORE, NEGOTIATION, (NULL), (NULL));
return;
}
}
MikMod_RegisterDriver(&drv_gst);
MikMod_RegisterAllLoaders();
MikMod_Init("");
reader = GST_READER_new( mikmod );
module = Player_LoadGeneric ( reader, 64, 0 );
gst_buffer_unref (mikmod->Buffer);
if ( ! Player_Active() )
Player_Start(module);
mikmod->initialized = TRUE;
}
MikMod_RegisterDriver(&drv_gst);
MikMod_RegisterAllLoaders();
MikMod_Init("");
reader = GST_READER_new( mikmod );
module = Player_LoadGeneric ( reader, 64, 0 );
gst_buffer_unref (mikmod->Buffer);
if ( ! Player_Active() )
Player_Start(module);
do {
if ( Player_Active() ) {
timestamp = ( module->sngtime / 1024.0 ) * GST_SECOND;
drv_gst.Update();
gst_element_yield (element);
}
else {
gst_element_set_eos (GST_ELEMENT (mikmod));
gst_pad_push (mikmod->srcpad, GST_DATA (gst_event_new (GST_EVENT_EOS)));
}
}
while ( 1 );
if ( Player_Active() ) {
timestamp = ( module->sngtime / 1024.0 ) * GST_SECOND;
drv_gst.Update();
} else {
gst_element_set_eos (GST_ELEMENT (mikmod));
gst_pad_push (mikmod->srcpad, GST_DATA (gst_event_new (GST_EVENT_EOS)));
}
}
@ -405,7 +402,7 @@ GstMikMod *mikmod;
Player_TogglePause();
Player_SetPosition( 0 );
}
mikmod->initialized = FALSE;
}
if (GST_STATE_PENDING (element) == GST_STATE_PLAYING)

2
ext/mikmod/gstmikmod.h
View file

@ -63,6 +63,8 @@ struct _GstMikMod {
gboolean soft_music;
gboolean soft_sndfx;
gboolean stereo;
gboolean initialized;
};
struct _GstMikModClass {