Merge from 1.2 main.

11 files changed, 12 insertions, 9 deletions

diff --git a/include/xine/audio_decoder.h b/include/xine/audio_decoder.h
index 49194e290..05d29823d 100644
--- a/include/xine/audio_decoder.h
+++ b/include/xine/audio_decoder.h
@@ -61,7 +61,7 @@ struct audio_decoder_class_s {
   /**
    * @brief Optional non-standard catalog to use with dgettext() for description.
    */
-  const char *textdomain;
+  const char *text_domain;
   
   /*
    * free all class-related resources
diff --git a/include/xine/audio_out.h b/include/xine/audio_out.h
index b720110bf..25e5deb68 100644
--- a/include/xine/audio_out.h
+++ b/include/xine/audio_out.h
@@ -258,7 +258,7 @@ struct audio_driver_class_s {
   /**
    * @brief Optional non-standard catalog to use with dgettext() for description.
    */
-  const char *textdomain;
+  const char *text_domain;
   
   /*
    * free all class-related resources
diff --git a/include/xine/buffer.h b/include/xine/buffer.h
index 9401f8852..a53b99db3 100644
--- a/include/xine/buffer.h
+++ b/include/xine/buffer.h
@@ -264,6 +264,7 @@ extern "C" {
 #define BUF_AUDIO_SMACKER	0x033B0000
 #define BUF_AUDIO_FLVADPCM	0x033C0000
 #define BUF_AUDIO_WAVPACK	0x033D0000
+#define BUF_AUDIO_MP3ADU	0x033E0000
 /*@}*/
 
 /**
diff --git a/include/xine/demux.h b/include/xine/demux.h
index 35a5c9a82..72808f76d 100644
--- a/include/xine/demux.h
+++ b/include/xine/demux.h
@@ -66,7 +66,7 @@ struct demux_class_s {
   /**
    * @brief Optional non-standard catalog to use with dgettext() for description.
    */
-  const char *textdomain;
+  const char *text_domain;
   
   /**
    * @brief MIME types supported for this plugin
diff --git a/include/xine/input_plugin.h b/include/xine/input_plugin.h
index e434dc5a8..95fc65c4e 100644
--- a/include/xine/input_plugin.h
+++ b/include/xine/input_plugin.h
@@ -60,7 +60,7 @@ struct input_class_s {
   /**
    * @brief Optional non-standard catalog to use with dgettext() for description.
    */
-  const char *textdomain;
+  const char *text_domain;
   
   /*
    * ls function, optional: may be NULL
diff --git a/include/xine/post.h b/include/xine/post.h
index 10844d03a..a8f721a9a 100644
--- a/include/xine/post.h
+++ b/include/xine/post.h
@@ -65,7 +65,7 @@ struct post_class_s {
   /**
    * @brief Optional non-standard catalog to use with dgettext() for description.
    */
-  const char *textdomain;
+  const char *text_domain;
   
   /*
    * free all class-related resources
diff --git a/include/xine/spu_decoder.h b/include/xine/spu_decoder.h
index d36b5b691..1833a22b4 100644
--- a/include/xine/spu_decoder.h
+++ b/include/xine/spu_decoder.h
@@ -62,7 +62,7 @@ struct spu_decoder_class_s {
   /**
    * @brief Optional non-standard catalog to use with dgettext() for description.
    */
-  const char *textdomain;
+  const char *text_domain;
   
   /*
    * free all class-related resources
diff --git a/include/xine/vdr.h b/include/xine/vdr.h
index 5102d7f77..a2a3e800f 100644
--- a/include/xine/vdr.h
+++ b/include/xine/vdr.h
@@ -22,7 +22,7 @@
 #define __VDR_H
 
 
-#define XINE_VDR_VERSION 801
+#define XINE_VDR_VERSION 802
 
 
 enum funcs
@@ -270,6 +270,7 @@ typedef struct __attribute__((packed)) data_clear_s
 
   int32_t n;
   int8_t s;
+  uint8_t i;
 }
 data_clear_t;
 
diff --git a/include/xine/video_decoder.h b/include/xine/video_decoder.h
index 916cfe68b..022c2af33 100644
--- a/include/xine/video_decoder.h
+++ b/include/xine/video_decoder.h
@@ -62,7 +62,7 @@ struct video_decoder_class_s {
   /**
    * @brief Optional non-standard catalog to use with dgettext() for description.
    */
-  const char *textdomain;
+  const char *text_domain;
   
   /*
    * free all class-related resources
diff --git a/include/xine/video_out.h b/include/xine/video_out.h
index 02eff3cac..0bdd0f557 100644
--- a/include/xine/video_out.h
+++ b/include/xine/video_out.h
@@ -403,7 +403,7 @@ struct video_driver_class_s {
   /**
    * @brief Optional non-standard catalog to use with dgettext() for description.
    */
-  const char *textdomain;
+  const char *text_domain;
   
   /*
    * free all class-related resources
diff --git a/include/xine/xine_internal.h b/include/xine/xine_internal.h
index 20bf6a9c8..805c569a3 100644
--- a/include/xine/xine_internal.h
+++ b/include/xine/xine_internal.h
@@ -325,6 +325,7 @@ struct xine_stream_s {
   /* demux thread stuff */
   pthread_t                  demux_thread;
   pthread_mutex_t            demux_lock;
+  pthread_cond_t             demux_resume;
   pthread_mutex_t            demux_mutex; /* used in _x_demux_... functions to synchronize order of pairwise A/V buffer operations */
 
   extra_info_t              *current_extra_info;