From 74641d0374d17b28fb4636f890bd62e43c9a603c Mon Sep 17 00:00:00 2001
From: Miguel Freitas <miguelfreitas@users.sourceforge.net>
Date: Tue, 14 Jan 2003 00:10:28 +0000
Subject: move default handled flag to xine.c. this fixes false alarm with -A
 null.

CVS patchset: 3909
CVS date: 2003/01/14 00:10:28
---
 src/xine-engine/audio_decoder.c | 4 +---
 src/xine-engine/video_decoder.c | 4 +---
 src/xine-engine/xine.c          | 8 +++++++-
 3 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/xine-engine/audio_decoder.c b/src/xine-engine/audio_decoder.c
index 68ab6e0ea..930654ef0 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.101 2003/01/13 23:02:41 miguelfreitas Exp $
+ * $Id: audio_decoder.c,v 1.102 2003/01/14 00:10:28 miguelfreitas Exp $
  *
  *
  * functions that implement audio decoding
@@ -97,8 +97,6 @@ void *audio_decoder_loop (void *stream_gen) {
       
       stream->metronom->handle_audio_discontinuity (stream->metronom, DISC_STREAMSTART, 0);
       
-      /* assume handled, we will known after trying to init decoder */
-      stream->stream_info[XINE_STREAM_INFO_AUDIO_HANDLED] = 1;
       buftype_unknown = 0;
       break;
       
diff --git a/src/xine-engine/video_decoder.c b/src/xine-engine/video_decoder.c
index 678775c28..f51363bc7 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.123 2003/01/09 02:44:39 miguelfreitas Exp $
+ * $Id: video_decoder.c,v 1.124 2003/01/14 00:10:29 miguelfreitas Exp $
  *
  */
 
@@ -107,8 +107,6 @@ void *video_decoder_loop (void *stream_gen) {
       stream->metronom->handle_video_discontinuity (stream->metronom, 
 						    DISC_STREAMSTART, 0);
       
-      /* assume handled, we will known after trying to init decoder */
-      stream->stream_info[XINE_STREAM_INFO_VIDEO_HANDLED] = 1;
       buftype_unknown = 0;
       break;
 
diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c
index dfabc315b..1b77f7361 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.220 2003/01/13 23:03:13 miguelfreitas Exp $
+ * $Id: xine.c,v 1.221 2003/01/14 00:10:31 miguelfreitas Exp $
  *
  * top-level xine functions
  *
@@ -721,6 +721,12 @@ static int xine_open_internal (xine_stream_t *stream, const char *mrl) {
   extra_info_reset( stream->video_decoder_extra_info );
   extra_info_reset( stream->audio_decoder_extra_info );
 
+  /* assume handled for now. we will only know for sure after trying
+   * to init decoders (which should happen when headers are sent)
+   */
+  stream->stream_info[XINE_STREAM_INFO_VIDEO_HANDLED] = 1;
+  stream->stream_info[XINE_STREAM_INFO_AUDIO_HANDLED] = 1;
+  
   /*
    * send and decode headers
    */
-- 
cgit v1.2.3