[xine-cvs] CVS: xine-lib/src/demuxers demux_4xm.c,1.5,1.6 demux_ac3.c,1.10,1.11 demux_aiff.c,1.32,1.33 demux_asf.c,1.136,1.137

[Thibaut M. <tma...@us...>]

Update of /cvsroot/xine/xine-lib/src/demuxers
In directory sc8-pr-cvs1:/tmp/cvs-serv23651

Modified Files:
	demux_4xm.c demux_ac3.c demux_aiff.c demux_asf.c 
Log Message:
Use info_helper functions.



Index: demux_4xm.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/demuxers/demux_4xm.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- demux_4xm.c	25 Aug 2003 21:51:38 -0000	1.5
+++ demux_4xm.c	28 Oct 2003 00:10:18 -0000	1.6
@@ -353,18 +353,20 @@
   this->status = DEMUX_OK;
 
   /* load stream information */
-  this->stream->stream_info[XINE_STREAM_INFO_HAS_VIDEO] = 1;
-  this->stream->stream_info[XINE_STREAM_INFO_HAS_AUDIO] =
-    (this->track_count > 0) ? 1 : 0;
-  this->stream->stream_info[XINE_STREAM_INFO_VIDEO_WIDTH]  = this->bih.biWidth;
-  this->stream->stream_info[XINE_STREAM_INFO_VIDEO_HEIGHT] = this->bih.biHeight;
+  xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 1);
+  xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_AUDIO,
+                       (this->track_count > 0) ? 1 : 0);
+  xine_set_stream_info(this->stream, XINE_STREAM_INFO_VIDEO_WIDTH,
+                       this->bih.biWidth);
+  xine_set_stream_info(this->stream, XINE_STREAM_INFO_VIDEO_HEIGHT,
+                       this->bih.biHeight);
   if (this->track_count > 0) {
-    this->stream->stream_info[XINE_STREAM_INFO_AUDIO_CHANNELS] =
-      this->tracks[0].channels;
-    this->stream->stream_info[XINE_STREAM_INFO_AUDIO_SAMPLERATE] =
-      this->tracks[0].sample_rate;
-    this->stream->stream_info[XINE_STREAM_INFO_AUDIO_BITS] =
-      this->tracks[0].bits;
+    xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_CHANNELS,
+                         this->tracks[0].channels);
+    xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_SAMPLERATE,
+                         this->tracks[0].sample_rate);
+    xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_BITS,
+                         this->tracks[0].bits);
   }
 
   /* send start buffers */

Index: demux_ac3.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/demuxers/demux_ac3.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- demux_ac3.c	25 Aug 2003 21:51:38 -0000	1.10
+++ demux_ac3.c	28 Oct 2003 00:10:18 -0000	1.11
@@ -230,8 +230,8 @@
   this->status = DEMUX_OK;
 
   /* load stream information */
-  this->stream->stream_info[XINE_STREAM_INFO_HAS_VIDEO] = 0;
-  this->stream->stream_info[XINE_STREAM_INFO_HAS_AUDIO] = 1;
+  xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 0);
+  xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 1);
 
   /* send start buffers */
   xine_demux_control_start(this->stream);

Index: demux_aiff.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/demuxers/demux_aiff.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- demux_aiff.c	25 Aug 2003 21:51:38 -0000	1.32
+++ demux_aiff.c	28 Oct 2003 00:10:18 -0000	1.33
@@ -242,14 +242,14 @@
   this->status = DEMUX_OK;
 
   /* load stream information */
-  this->stream->stream_info[XINE_STREAM_INFO_HAS_VIDEO] = 0;
-  this->stream->stream_info[XINE_STREAM_INFO_HAS_AUDIO] = 1;
-  this->stream->stream_info[XINE_STREAM_INFO_AUDIO_CHANNELS] =
-    this->audio_channels;
-  this->stream->stream_info[XINE_STREAM_INFO_AUDIO_SAMPLERATE] =
-    this->audio_sample_rate;
-  this->stream->stream_info[XINE_STREAM_INFO_AUDIO_BITS] =
-    this->audio_bits;
+  xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 0);
+  xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 1);
+  xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_CHANNELS,
+                       this->audio_channels);
+  xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_SAMPLERATE,
+                       this->audio_sample_rate);
+  xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_BITS,
+                       this->audio_bits);
 
   /* send start buffers */
   xine_demux_control_start(this->stream);

Index: demux_asf.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/demuxers/demux_asf.c,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- demux_asf.c	27 Oct 2003 23:23:29 -0000	1.136
+++ demux_asf.c	28 Oct 2003 00:10:18 -0000	1.137
@@ -297,7 +297,8 @@
   buf = this->audio_fifo->buffer_pool_alloc (this->audio_fifo);
   memcpy (buf->content, this->wavex, this->wavex_size);
 
-  this->stream->stream_info[XINE_STREAM_INFO_AUDIO_FOURCC] = wavex->wFormatTag;
+  xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_FOURCC,
+                       wavex->wFormatTag);
 
 #ifdef LOG
   printf ("demux_asf: wavex header is %d bytes long\n", this->wavex_size);
@@ -324,7 +325,8 @@
   buf_element_t    *buf;
   xine_bmiheader   *bih = (xine_bmiheader *) this->bih;
 
-  this->stream->stream_info[XINE_STREAM_INFO_VIDEO_FOURCC] = bih->biCompression;
+  xine_set_stream_info(this->stream, XINE_STREAM_INFO_VIDEO_FOURCC,
+                       bih->biCompression);
 
   buf = this->video_fifo->buffer_pool_alloc (this->video_fifo);
   buf->decoder_flags   = BUF_FLAG_HEADER;
@@ -376,7 +378,8 @@
           else
             this->rate = 0;
 
-          this->stream->stream_info[XINE_STREAM_INFO_BITRATE] = this->rate*8;
+          xine_set_stream_info(this->stream, XINE_STREAM_INFO_BITRATE,
+                               this->rate*8);
 
           get_le64(this); /* preroll in 1/1000 s*/
           flags = get_le32(this); /* flags */
@@ -596,8 +599,8 @@
   uint32_t     bitrate = 0;
 
   /* will get overridden later */
-  this->stream->stream_info[XINE_STREAM_INFO_HAS_VIDEO] = 0;
-  this->stream->stream_info[XINE_STREAM_INFO_HAS_AUDIO] = 0;
+  xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 0);
+  xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 0);
 
   /*
    * initialize asf engine
@@ -648,8 +651,9 @@
       if ((buf_type == BUF_VIDEO_BASE) &&
           (bitrate > max_vrate || this->video_stream_id == -1)) {
 
-        this->stream->stream_info[XINE_STREAM_INFO_HAS_VIDEO]  = 1;
-        this->stream->stream_info[XINE_STREAM_INFO_VIDEO_BITRATE] = bitrate;
+        xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 1);
+        xine_set_stream_info(this->stream, XINE_STREAM_INFO_VIDEO_BITRATE,
+                             bitrate);
 
         max_vrate = bitrate;
         this->video_stream    = i;
@@ -657,8 +661,9 @@
       } else if ((buf_type == BUF_AUDIO_BASE) &&
                  (bitrate > max_arate || this->audio_stream_id == -1)) {
 
-        this->stream->stream_info[XINE_STREAM_INFO_HAS_AUDIO]  = 1;
-        this->stream->stream_info[XINE_STREAM_INFO_AUDIO_BITRATE] = bitrate;
+        xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 1);
+        xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_BITRATE,
+                             bitrate);
 
         max_arate = bitrate;
         this->audio_stream    = i;
@@ -666,15 +671,15 @@
       }
     }
 
-    this->stream->stream_info[XINE_STREAM_INFO_BITRATE] = bitrate;
+    xine_set_stream_info(this->stream, XINE_STREAM_INFO_BITRATE, bitrate);
 
     if (this->stream->xine->verbosity >= XINE_VERBOSITY_DEBUG) 
       printf("demux_asf: video stream_id: %d, audio stream_id: %d\n",
              this->video_stream_id, this->audio_stream_id);
 
-    if(this->stream->stream_info[XINE_STREAM_INFO_HAS_AUDIO])
+    if(xine_get_stream_info(this->stream, XINE_STREAM_INFO_HAS_AUDIO))
       asf_send_audio_header(this, this->audio_stream);
-    if(this->stream->stream_info[XINE_STREAM_INFO_HAS_VIDEO])
+    if(xine_get_stream_info(this->stream, XINE_STREAM_INFO_HAS_VIDEO))
       asf_send_video_header(this, this->video_stream);
   }
   return 0;