diff options
Diffstat (limited to 'src/xine-engine')
| -rw-r--r-- | src/xine-engine/audio_decoder.c | 10 | ||||
| -rw-r--r-- | src/xine-engine/load_plugins.c | 14 | ||||
| -rw-r--r-- | src/xine-engine/video_decoder.c | 7 |
3 files changed, 16 insertions, 15 deletions
diff --git a/src/xine-engine/audio_decoder.c b/src/xine-engine/audio_decoder.c index 764683574..b4b4fdae2 100644 --- a/src/xine-engine/audio_decoder.c +++ b/src/xine-engine/audio_decoder.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: audio_decoder.c,v 1.14 2001/06/04 17:01:47 f1rmb Exp $ + * $Id: audio_decoder.c,v 1.15 2001/06/09 17:07:22 guenter Exp $ * * * functions that implement audio decoding @@ -103,7 +103,7 @@ void *audio_decoder_loop (void *this_gen) { default: if ( (buf->type & 0xFF000000) == BUF_AUDIO_BASE ) { - /* printf ("audio_decoder: got an audio buffer, type %08x\n", buf->type); */ + /* printf ("audio_decoder: got an audio buffer, type %08x\n", buf->type); */ /* update track map */ @@ -127,8 +127,7 @@ void *audio_decoder_loop (void *this_gen) { this->audio_track_map_entries++; if (i<=this->audio_channel) { - /* printf ("audio_decoder: resetting audio decoder because of new channel\n"); */ - + /* close old audio decoder */ if (this->cur_audio_decoder_plugin) { this->cur_audio_decoder_plugin->close (this->cur_audio_decoder_plugin); this->cur_audio_decoder_plugin = NULL; @@ -143,9 +142,6 @@ void *audio_decoder_loop (void *this_gen) { int streamtype = (buf->type>>16) & 0xFF; - /* printf ("audio_decoder_c: buffer is from the right track => decode it\n"); */ - - decoder = this->audio_decoder_plugins [streamtype]; if (decoder) { diff --git a/src/xine-engine/load_plugins.c b/src/xine-engine/load_plugins.c index 67ab4a2bc..028e19860 100644 --- a/src/xine-engine/load_plugins.c +++ b/src/xine-engine/load_plugins.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: load_plugins.c,v 1.20 2001/06/07 20:23:54 guenter Exp $ + * $Id: load_plugins.c,v 1.21 2001/06/09 17:07:22 guenter Exp $ * * * Load input/demux/audio_out/video_out/codec plugins @@ -406,11 +406,11 @@ void load_decoder_plugins (xine_t *this, sprintf (str, "%s/%s", XINE_PLUGINDIR, pEntry->d_name); if(!(plugin = dlopen (str, RTLD_LAZY))) { - fprintf(stderr, "%s(%d): %s doesn't seem to be installed (%s)\n", - __FILE__, __LINE__, str, dlerror()); - exit(1); - } - else { + + printf ("load_plugins: failed to load plugin %s:\n%s\n", + str, dlerror()); + + } else { void *(*initplug) (int, config_values_t *); /* @@ -459,7 +459,7 @@ void load_decoder_plugins (xine_t *this, } } } - + this->cur_video_decoder_plugin = NULL; this->cur_audio_decoder_plugin = NULL; } diff --git a/src/xine-engine/video_decoder.c b/src/xine-engine/video_decoder.c index bbe5214b6..270d2717b 100644 --- a/src/xine-engine/video_decoder.c +++ b/src/xine-engine/video_decoder.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: video_decoder.c,v 1.19 2001/06/04 17:13:36 guenter Exp $ + * $Id: video_decoder.c,v 1.20 2001/06/09 17:07:22 guenter Exp $ * */ @@ -68,6 +68,11 @@ void *video_decoder_loop (void *this_gen) { case BUF_VIDEO_MPEG: case BUF_VIDEO_AVI: + /* + printf ("video_decoder: got package %d, decoder_info[0]:%d\n", + buf, buf->decoder_info[0]); + */ + streamtype = (buf->type>>16) & 0xFF; decoder = this->video_decoder_plugins [streamtype]; |