diff options
| -rw-r--r-- | src/demuxers/demux_mpeg_block.c | 16 | ||||
| -rw-r--r-- | src/xine-engine/xine.c | 6 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/demuxers/demux_mpeg_block.c b/src/demuxers/demux_mpeg_block.c index 61787fb8c..8a78fbb10 100644 --- a/src/demuxers/demux_mpeg_block.c +++ b/src/demuxers/demux_mpeg_block.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: demux_mpeg_block.c,v 1.32 2001/08/28 19:16:19 guenter Exp $ + * $Id: demux_mpeg_block.c,v 1.33 2001/08/29 11:14:12 guenter Exp $ * * demultiplexer for mpeg 1/2 program streams * @@ -32,6 +32,7 @@ #include <unistd.h> #include <pthread.h> #include <string.h> +#include <stdlib.h> #include "xine_internal.h" #include "monitor.h" @@ -413,7 +414,14 @@ static void *demux_mpeg_block_loop (void *this_gen) { } static void demux_mpeg_block_close (demux_plugin_t *this_gen) { + + demux_mpeg_block_t *this = (demux_mpeg_block_t *) this_gen; + free (this); +} + +static void demux_mpeg_block_stop (demux_plugin_t *this_gen) { + demux_mpeg_block_t *this = (demux_mpeg_block_t *) this_gen; buf_element_t *buf; @@ -443,12 +451,6 @@ static void demux_mpeg_block_close (demux_plugin_t *this_gen) { buf->decoder_info[0] = 1; /* forced */ this->audio_fifo->put (this->audio_fifo, buf); } - -} - -static void demux_mpeg_block_stop (demux_plugin_t *this) { - - demux_mpeg_block_close(this); } static int demux_mpeg_block_get_status (demux_plugin_t *this_gen) { diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c index 9bdf6bd1c..a4878d7b9 100644 --- a/src/xine-engine/xine.c +++ b/src/xine-engine/xine.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xine.c,v 1.51 2001/08/28 22:52:57 f1rmb Exp $ + * $Id: xine.c,v 1.52 2001/08/29 11:14:12 guenter Exp $ * * top-level xine functions * @@ -86,7 +86,6 @@ void xine_stop (xine_t *this) { if(this->cur_demuxer_plugin) { this->cur_demuxer_plugin->stop (this->cur_demuxer_plugin); - this->cur_demuxer_plugin->close (this->cur_demuxer_plugin); this->cur_demuxer_plugin = NULL; } @@ -126,6 +125,7 @@ static int try_demux_with_stages(xine_t *this, const char *MRL, while(stages[s] != -1) { for(i = 0; i < this->num_demuxer_plugins; i++) { + printf ("trying demuxer %s\n", this->demuxer_plugins[i]->get_identifier()); if(this->demuxer_plugins[i]->open(this->demuxer_plugins[i], this->cur_input_plugin, stages[s]) == DEMUX_CAN_HANDLE) { @@ -266,7 +266,6 @@ void xine_play (xine_t *this, char *MRL, int spos) { if(this->cur_demuxer_plugin) { this->cur_demuxer_plugin->stop (this->cur_demuxer_plugin); - this->cur_demuxer_plugin->close (this->cur_demuxer_plugin); this->cur_demuxer_plugin = NULL; } @@ -362,7 +361,6 @@ void xine_exit (xine_t *this) { printf ("xine_exit: closing demuxer\n"); this->cur_demuxer_plugin->stop (this->cur_demuxer_plugin); - this->cur_demuxer_plugin->close (this->cur_demuxer_plugin); this->cur_demuxer_plugin = NULL; } |