New stream/meta info (safe) stuff.

BIG NOTE: use helpers to access to these informations (get/set/reset):
    _x_{stream,meta}_info_{get,set,reset}()
  are for internal use, don't use *_public() ones from inside the beast ;-)
Some wrongly names "xine_" fonction renaming.

CVS patchset: 5757
CVS date: 2003/11/16 23:33:42

17 files changed, 38 insertions, 38 deletions

diff --git a/src/libxinevdec/cinepak.c b/src/libxinevdec/cinepak.c
index b1de77eff..a814dc757 100644
--- a/src/libxinevdec/cinepak.c
+++ b/src/libxinevdec/cinepak.c
@@ -22,7 +22,7 @@
  * based on overview of Cinepak algorithm and example decoder
  * by Tim Ferguson: http://www.csse.monash.edu.au/~timf/
  *
- * $Id: cinepak.c,v 1.32 2003/11/15 13:01:22 miguelfreitas Exp $
+ * $Id: cinepak.c,v 1.33 2003/11/16 23:33:47 f1rmb Exp $
  */
 
 #include <stdlib.h>
@@ -421,7 +421,7 @@ static void cvid_decode_data (video_decoder_t *this_gen, buf_element_t *buf) {
     this->decoder_ok = 1;
 
     /* stream/meta info */
-    xine_set_meta_info(this->stream, XINE_META_INFO_VIDEOCODEC, "Cinepak");
+    _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, "Cinepak");
 
   } else if (this->decoder_ok) {
     
diff --git a/src/libxinevdec/cyuv.c b/src/libxinevdec/cyuv.c
index d4603ae53..3e43ca579 100644
--- a/src/libxinevdec/cyuv.c
+++ b/src/libxinevdec/cyuv.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: cyuv.c,v 1.20 2003/11/15 13:01:22 miguelfreitas Exp $
+ * $Id: cyuv.c,v 1.21 2003/11/16 23:33:48 f1rmb Exp $
  */
 
 /* And this is the header that came with the CYUV decoder: */
@@ -163,7 +163,7 @@ static void cyuv_decode_data (video_decoder_t *this_gen,
     this->skipframes = 0;
     this->video_step = buf->decoder_info[1];
 
-    xine_set_meta_info(this->stream, XINE_META_INFO_VIDEOCODEC, "Creative YUV");
+    _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, "Creative YUV");
 
     return;
   }
diff --git a/src/libxinevdec/fli.c b/src/libxinevdec/fli.c
index a40a2786b..98e03190d 100644
--- a/src/libxinevdec/fli.c
+++ b/src/libxinevdec/fli.c
@@ -23,7 +23,7 @@
  * avoid when implementing a FLI decoder, visit:
  *   http://www.pcisys.net/~melanson/codecs/
  * 
- * $Id: fli.c,v 1.22 2003/11/15 13:01:22 miguelfreitas Exp $
+ * $Id: fli.c,v 1.23 2003/11/16 23:33:48 f1rmb Exp $
  */
 
 #include <stdio.h>
@@ -454,7 +454,7 @@ static void fli_decode_data (video_decoder_t *this_gen,
     this->decoder_ok = 1;
 
     /* load the stream/meta info */
-    xine_set_meta_info(this->stream, XINE_META_INFO_VIDEOCODEC, "FLI/FLC Video");
+    _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, "FLI/FLC Video");
 
     return;
   } else if (this->decoder_ok) {
diff --git a/src/libxinevdec/foovideo.c b/src/libxinevdec/foovideo.c
index 9ab2a5651..5b3b25fd9 100644
--- a/src/libxinevdec/foovideo.c
+++ b/src/libxinevdec/foovideo.c
@@ -23,7 +23,7 @@
  * value from the last frame. This creates a slowly rotating solid color
  * frame when the frames are played in succession.
  *
- * $Id: foovideo.c,v 1.17 2003/11/15 13:01:23 miguelfreitas Exp $
+ * $Id: foovideo.c,v 1.18 2003/11/16 23:33:48 f1rmb Exp $
  */
 
 #include <stdio.h>
@@ -111,7 +111,7 @@ static void foovideo_decode_data (video_decoder_t *this_gen,
     this->size = 0;
 
     /* take this opportunity to load the stream/meta info */
-    xine_set_meta_info(this->stream, XINE_META_INFO_VIDEOCODEC, "foovideo");
+    _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, "foovideo");
 
     /* do anything else relating to initializing this decoder */
     this->current_yuv_byte = 0;
diff --git a/src/libxinevdec/idcinvideo.c b/src/libxinevdec/idcinvideo.c
index 605986e12..7f01b73d8 100644
--- a/src/libxinevdec/idcinvideo.c
+++ b/src/libxinevdec/idcinvideo.c
@@ -21,7 +21,7 @@
  * the Id CIN format, visit:
  *   http://www.csse.monash.edu.au/~timf/
  * 
- * $Id: idcinvideo.c,v 1.17 2003/11/15 13:01:23 miguelfreitas Exp $
+ * $Id: idcinvideo.c,v 1.18 2003/11/16 23:33:48 f1rmb Exp $
  */
 
 #include <stdio.h>
@@ -267,7 +267,7 @@ static void idcinvideo_decode_data (video_decoder_t *this_gen,
     this->decoder_ok = 1;
 
     /* load the stream/meta info */
-    xine_set_meta_info(this->stream, XINE_META_INFO_VIDEOCODEC, "Id CIN Video");
+    _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, "Id CIN Video");
 
     return;
   } else if (this->decoder_ok) {
diff --git a/src/libxinevdec/image.c b/src/libxinevdec/image.c
index 23712f793..f2b054b1f 100644
--- a/src/libxinevdec/image.c
+++ b/src/libxinevdec/image.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: image.c,v 1.8 2003/11/15 13:01:23 miguelfreitas Exp $
+ * $Id: image.c,v 1.9 2003/11/16 23:33:48 f1rmb Exp $
  *
  * a image video decoder
  */
@@ -266,7 +266,7 @@ static void end_callback(png_structp png_ptr, png_infop info) {
 	*out = le2me_16(*out);
       }
     }
-    xine_set_stream_info(this->stream, XINE_STREAM_INFO_FRAME_DURATION, img->duration);
+    _x_stream_info_set(this->stream, XINE_STREAM_INFO_FRAME_DURATION, img->duration);
     img->draw(img, this->stream);
     img->free(img);
   }
diff --git a/src/libxinevdec/interplayvideo.c b/src/libxinevdec/interplayvideo.c
index 570877414..261a69192 100644
--- a/src/libxinevdec/interplayvideo.c
+++ b/src/libxinevdec/interplayvideo.c
@@ -21,7 +21,7 @@
  * For more information regarding the Interplay MVE format, visit:
  *   http://www.pcisys.net/~melanson/codecs/
  *
- * $Id: interplayvideo.c,v 1.6 2003/11/15 13:01:23 miguelfreitas Exp $
+ * $Id: interplayvideo.c,v 1.7 2003/11/16 23:33:48 f1rmb Exp $
  */
 
 #include <stdio.h>
@@ -1177,7 +1177,7 @@ static void interplay_decode_data (video_decoder_t *this_gen,
     this->current_planes = 1;
 
     /* take this opportunity to load the stream/meta info */
-    xine_set_meta_info(this->stream, XINE_META_INFO_VIDEOCODEC,
+    _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC,
       "Interplay MVE Video");
 
     this->decoder_ok = 1;
diff --git a/src/libxinevdec/msrle.c b/src/libxinevdec/msrle.c
index 3f6e7eed4..a9398c85b 100644
--- a/src/libxinevdec/msrle.c
+++ b/src/libxinevdec/msrle.c
@@ -21,7 +21,7 @@
  * For more information on the MS RLE format, visit:
  *   http://www.pcisys.net/~melanson/codecs/
  * 
- * $Id: msrle.c,v 1.20 2003/11/15 13:01:24 miguelfreitas Exp $
+ * $Id: msrle.c,v 1.21 2003/11/16 23:33:48 f1rmb Exp $
  */
 
 #include <stdio.h>
@@ -227,7 +227,7 @@ static void msrle_decode_data (video_decoder_t *this_gen,
     this->decoder_ok = 1;
 
     /* load the stream/meta info */
-    xine_set_meta_info(this->stream, XINE_META_INFO_VIDEOCODEC, "Microsoft RLE");
+    _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, "Microsoft RLE");
 
     return;
   } else if (this->decoder_ok) {
diff --git a/src/libxinevdec/msvc.c b/src/libxinevdec/msvc.c
index 4beee4021..d0b05b1e1 100644
--- a/src/libxinevdec/msvc.c
+++ b/src/libxinevdec/msvc.c
@@ -22,7 +22,7 @@
  * based on overview of Microsoft Video-1 algorithm
  * by Mike Melanson: http://www.pcisys.net/~melanson/codecs/video1.txt
  *
- * $Id: msvc.c,v 1.25 2003/11/15 13:01:24 miguelfreitas Exp $
+ * $Id: msvc.c,v 1.26 2003/11/16 23:33:48 f1rmb Exp $
  */
 
 #include <stdlib.h>
@@ -256,7 +256,7 @@ static void msvc_decode_data (video_decoder_t *this_gen, buf_element_t *buf) {
     this->decoder_ok = 1;
 
     /* load the stream/meta info */
-    xine_set_meta_info(this->stream, XINE_META_INFO_VIDEOCODEC, "Microsoft Video-1");
+    _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, "Microsoft Video-1");
 
   } else if (this->decoder_ok && !(buf->decoder_flags & BUF_FLAG_SPECIAL)) {
     
diff --git a/src/libxinevdec/qtrle.c b/src/libxinevdec/qtrle.c
index b227184a9..056056dc7 100644
--- a/src/libxinevdec/qtrle.c
+++ b/src/libxinevdec/qtrle.c
@@ -21,7 +21,7 @@
  * For more information on the QT RLE format, visit:
  *   http://www.pcisys.net/~melanson/codecs/
  * 
- * $Id: qtrle.c,v 1.15 2003/11/15 13:01:25 miguelfreitas Exp $
+ * $Id: qtrle.c,v 1.16 2003/11/16 23:33:48 f1rmb Exp $
  */
 
 #include <stdio.h>
@@ -862,7 +862,7 @@ static void qtrle_decode_data (video_decoder_t *this_gen,
 
     /* load the stream/meta info */
     sprintf(codec_name, "%d bpp Quicktime Animation (RLE)", this->depth & 0x1F);
-    xine_set_meta_info(this->stream, XINE_META_INFO_VIDEOCODEC, codec_name);
+    _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, codec_name);
 
     return;
   } else if (this->decoder_ok) {
diff --git a/src/libxinevdec/qtrpza.c b/src/libxinevdec/qtrpza.c
index d2249bec5..3299d1e36 100644
--- a/src/libxinevdec/qtrpza.c
+++ b/src/libxinevdec/qtrpza.c
@@ -21,7 +21,7 @@
  * For more information about the RPZA format, visit:
  *   http://www.pcisys.net/~melanson/codecs/
  *
- * $Id: qtrpza.c,v 1.18 2003/11/15 13:01:25 miguelfreitas Exp $
+ * $Id: qtrpza.c,v 1.19 2003/11/16 23:33:48 f1rmb Exp $
  */
 
 #include <stdio.h>
@@ -321,7 +321,7 @@ static void qtrpza_decode_data (video_decoder_t *this_gen,
     this->decoder_ok = 1;
 
     /* load the stream/meta info */
-    xine_set_meta_info(this->stream, XINE_META_INFO_VIDEOCODEC, "Quicktime Video (RPZA)");
+    _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, "Quicktime Video (RPZA)");
 
     return;
   } else if (this->decoder_ok) {
diff --git a/src/libxinevdec/qtsmc.c b/src/libxinevdec/qtsmc.c
index b33ebaa01..8bdf7b7bf 100644
--- a/src/libxinevdec/qtsmc.c
+++ b/src/libxinevdec/qtsmc.c
@@ -23,7 +23,7 @@
  * For more information on the SMC format, visit:
  *   http://www.pcisys.net/~melanson/codecs/
  * 
- * $Id: qtsmc.c,v 1.18 2003/11/15 13:01:25 miguelfreitas Exp $
+ * $Id: qtsmc.c,v 1.19 2003/11/16 23:33:48 f1rmb Exp $
  */
 
 #include <stdio.h>
@@ -553,7 +553,7 @@ static void qtsmc_decode_data (video_decoder_t *this_gen,
     this->decoder_ok = 1;
 
     /* load the stream/meta info */
-    xine_set_meta_info(this->stream, XINE_META_INFO_VIDEOCODEC, "Quicktime Graphics (SMC)");
+    _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, "Quicktime Graphics (SMC)");
 
     return;
   } else if (this->decoder_ok) {
diff --git a/src/libxinevdec/rgb.c b/src/libxinevdec/rgb.c
index 7e53860ce..d1f224816 100644
--- a/src/libxinevdec/rgb.c
+++ b/src/libxinevdec/rgb.c
@@ -21,7 +21,7 @@
  * Actually, this decoder just converts a raw RGB image to a YUY2 map
  * suitable for display under xine.
  * 
- * $Id: rgb.c,v 1.21 2003/11/15 13:01:26 miguelfreitas Exp $
+ * $Id: rgb.c,v 1.22 2003/11/16 23:33:48 f1rmb Exp $
  */
 
 #include <stdio.h>
@@ -125,7 +125,7 @@ static void rgb_decode_data (video_decoder_t *this_gen,
     this->decoder_ok = 1;
 
     /* load the stream/meta info */
-    xine_set_meta_info(this->stream, XINE_META_INFO_VIDEOCODEC, "Raw RGB");
+    _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, "Raw RGB");
 
     return;
   } else if (this->decoder_ok) {
diff --git a/src/libxinevdec/roqvideo.c b/src/libxinevdec/roqvideo.c
index 111d3503b..88f895df5 100644
--- a/src/libxinevdec/roqvideo.c
+++ b/src/libxinevdec/roqvideo.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: roqvideo.c,v 1.22 2003/11/15 13:01:26 miguelfreitas Exp $
+ * $Id: roqvideo.c,v 1.23 2003/11/16 23:33:48 f1rmb Exp $
  */
 
 /* And this is the header that came with the RoQ video decoder: */
@@ -427,7 +427,7 @@ static void roqvideo_decode_data (video_decoder_t *this_gen,
     memset(this->v[1], 0x80, this->c_size);
 
     /* load the stream/meta info */
-    xine_set_meta_info(this->stream, XINE_META_INFO_VIDEOCODEC, "RoQ VQ Video");
+    _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, "RoQ VQ Video");
 
     return;
   }
diff --git a/src/libxinevdec/svq1.c b/src/libxinevdec/svq1.c
index f032b590c..48ecd4da6 100644
--- a/src/libxinevdec/svq1.c
+++ b/src/libxinevdec/svq1.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: svq1.c,v 1.27 2003/11/15 13:01:26 miguelfreitas Exp $
+ * $Id: svq1.c,v 1.28 2003/11/16 23:33:48 f1rmb Exp $
  */
 
 #include <stdio.h>
@@ -1340,7 +1340,7 @@ static void svq1dec_decode_data (video_decoder_t *this_gen, buf_element_t *buf)
     this->decoder_ok = 1;
 
     /* load the stream/meta info */
-    xine_set_meta_info(this->stream, XINE_META_INFO_VIDEOCODEC, "Sorenson Video 1");
+    _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, "Sorenson Video 1");
 
   } else if (this->decoder_ok) {
     
diff --git a/src/libxinevdec/wc3video.c b/src/libxinevdec/wc3video.c
index 93290cf02..66b7eda77 100644
--- a/src/libxinevdec/wc3video.c
+++ b/src/libxinevdec/wc3video.c
@@ -22,7 +22,7 @@
  * For more information on the WC3 Movie format, visit:
  *   http://www.pcisys.net/~melanson/codecs/
  *
- * $Id: wc3video.c,v 1.16 2003/11/15 13:01:27 miguelfreitas Exp $
+ * $Id: wc3video.c,v 1.17 2003/11/16 23:33:48 f1rmb Exp $
  */
 
 #include <stdio.h>
@@ -387,7 +387,7 @@ static void wc3video_decode_data (video_decoder_t *this_gen,
     this->decoder_ok = 1;
 
     /* load the stream/meta info */
-    xine_set_meta_info(this->stream, XINE_META_INFO_VIDEOCODEC, "Wing Commander III Video");
+    _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, "Wing Commander III Video");
 
     return;
   } else if (this->decoder_ok) {
diff --git a/src/libxinevdec/yuv.c b/src/libxinevdec/yuv.c
index 9d52cfdcb..b2dc7ee01 100644
--- a/src/libxinevdec/yuv.c
+++ b/src/libxinevdec/yuv.c
@@ -21,7 +21,7 @@
  * Actually, this decoder just reorganizes chunks of raw YUV data in such
  * a way that xine can display them.
  * 
- * $Id: yuv.c,v 1.24 2003/11/15 13:01:27 miguelfreitas Exp $
+ * $Id: yuv.c,v 1.25 2003/11/16 23:33:48 f1rmb Exp $
  */
 
 #include <stdio.h>
@@ -118,24 +118,24 @@ static void yuv_decode_data (video_decoder_t *this_gen,
     switch (buf->type) {
 
       case BUF_VIDEO_YV12:
-        xine_set_meta_info(this->stream, XINE_META_INFO_VIDEOCODEC, "Raw YV12");
+        _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, "Raw YV12");
         break;
 
       case BUF_VIDEO_YVU9:
-        xine_set_meta_info(this->stream, XINE_META_INFO_VIDEOCODEC, "Raw YVU9");
+        _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, "Raw YVU9");
         break;
 
       case BUF_VIDEO_GREY:
-        xine_set_meta_info(this->stream, XINE_META_INFO_VIDEOCODEC, "Greyscale YUV");
+        _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, "Greyscale YUV");
         break;
         
       case BUF_VIDEO_I420:
-        xine_set_meta_info(this->stream, XINE_META_INFO_VIDEOCODEC, "Raw I420");
+        _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, "Raw I420");
         break;
 
     }
     
-    xine_set_stream_info(this->stream, XINE_STREAM_INFO_FRAME_DURATION, this->video_step);
+    _x_stream_info_set(this->stream, XINE_STREAM_INFO_FRAME_DURATION, this->video_step);
     
     return;
   } else if (this->decoder_ok && !(buf->decoder_flags & BUF_FLAG_SPECIAL)) {