Merge from 1.1 (except po/*; translators needed for this).

--HG--
rename : src/video_out/vidix/drivers/mga_vid.c => contrib/vidix/drivers/mga_vid.c
rename : src/video_out/vidix/drivers/nvidia_vid.c => contrib/vidix/drivers/nvidia_vid.c
rename : src/video_out/vidix/drivers/savage_vid.c => contrib/vidix/drivers/savage_vid.c
rename : src/xine-engine/video_out.h => include/xine/video_out.h
rename : src/xine-utils/xmllexer.h => include/xine/xmllexer.h
rename : po/libxine1.pot => po/libxine2.pot
rename : src/libsputext/xine_sputext_decoder.c => src/spu_dec/sputext_decoder.c
rename : src/libsputext/demux_sputext.c => src/spu_dec/sputext_demuxer.c

11 files changed, 122 insertions, 2 deletions

diff --git a/src/video_out/video_out_directfb.c b/src/video_out/video_out_directfb.c
index 943eec681..0781384c1 100644
--- a/src/video_out/video_out_directfb.c
+++ b/src/video_out/video_out_directfb.c
@@ -922,7 +922,19 @@ static int directfb_get_property (vo_driver_t *this_gen, int property) {
     
     case VO_PROP_WINDOW_HEIGHT:
       return this->sc.gui_height;
-   
+
+    case VO_PROP_OUTPUT_WIDTH:
+      return this->cur_frame->sc.output_width;
+
+    case VO_PROP_OUTPUT_HEIGHT:
+      return this->cur_frame->sc.output_height;
+
+    case VO_PROP_OUTPUT_XOFFSET:
+      return this->cur_frame->sc.output_xoffset;
+
+    case VO_PROP_OUTPUT_YOFFSET:
+      return this->cur_frame->sc.output_yoffset;
+
     case VO_PROP_MAX_NUM_FRAMES:
       return (this->type & DLTF_VIDEO) ? 8 : 15;
 
diff --git a/src/video_out/video_out_fb.c b/src/video_out/video_out_fb.c
index 1e95e5a71..d45989e14 100644
--- a/src/video_out/video_out_fb.c
+++ b/src/video_out/video_out_fb.c
@@ -600,7 +600,19 @@ static int fb_get_property(vo_driver_t *this_gen, int property)
     
     case VO_PROP_WINDOW_HEIGHT:
       return this->sc.gui_height;
-    
+
+    case VO_PROP_OUTPUT_WIDTH:
+      return this->cur_frame->sc.output_width;
+
+    case VO_PROP_OUTPUT_HEIGHT:
+      return this->cur_frame->sc.output_height;
+
+    case VO_PROP_OUTPUT_XOFFSET:
+      return this->cur_frame->sc.output_xoffset;
+
+    case VO_PROP_OUTPUT_YOFFSET:
+      return this->cur_frame->sc.output_yoffset;
+
     default:
       xprintf(this->xine, XINE_VERBOSITY_DEBUG, 
 	      "video_out_fb: tried to get unsupported property %d\n", property);
diff --git a/src/video_out/video_out_sdl.c b/src/video_out/video_out_sdl.c
index 5866f822f..de9736845 100644
--- a/src/video_out/video_out_sdl.c
+++ b/src/video_out/video_out_sdl.c
@@ -360,6 +360,14 @@ static int sdl_get_property (vo_driver_t *this_gen, int property) {
       return this->sc.gui_width;
     case VO_PROP_WINDOW_HEIGHT:
       return this->sc.gui_height;
+    case VO_PROP_OUTPUT_WIDTH:
+      return this->sc.output_width;
+    case VO_PROP_OUTPUT_HEIGHT:
+      return this->sc.output_height;
+    case VO_PROP_OUTPUT_XOFFSET:
+      return this->sc.output_xoffset;
+    case VO_PROP_OUTPUT_YOFFSET:
+      return this->sc.output_yoffset;
     case VO_PROP_ASPECT_RATIO:
     return this->sc.user_ratio;
   }
diff --git a/src/video_out/video_out_syncfb.c b/src/video_out/video_out_syncfb.c
index e6c3ffdf6..49c0d371a 100644
--- a/src/video_out/video_out_syncfb.c
+++ b/src/video_out/video_out_syncfb.c
@@ -670,6 +670,18 @@ static int syncfb_get_property(vo_driver_t* this_gen, int property)
     case VO_PROP_WINDOW_HEIGHT:
       this->props[property].value = this->sc.gui_height;
       break;
+    case VO_PROP_OUTPUT_WIDTH:
+      this->props[property].value = this->sc.output_width;
+      break;
+    case VO_PROP_OUTPUT_HEIGHT:
+      this->props[property].value = this->sc.output_height;
+      break;
+    case VO_PROP_OUTPUT_XOFFSET:
+      this->props[property].value = this->sc.output_xoffset;
+      break;
+    case VO_PROP_OUTPUT_YOFFSET:
+      this->props[property].value = this->sc.output_yoffset;
+      break;
   }
   
   return this->props[property].value;
diff --git a/src/video_out/video_out_vidix.c b/src/video_out/video_out_vidix.c
index 251dac87e..d0a45a58c 100644
--- a/src/video_out/video_out_vidix.c
+++ b/src/video_out/video_out_vidix.c
@@ -700,6 +700,18 @@ static int vidix_get_property (vo_driver_t *this_gen, int property) {
     case VO_PROP_WINDOW_HEIGHT:
       this->props[property].value = this->sc.gui_height;
       break;
+    case VO_PROP_OUTPUT_WIDTH:
+      this->props[property].value = this->sc.output_width;
+      break;
+    case VO_PROP_OUTPUT_HEIGHT:
+      this->props[property].value = this->sc.output_height;
+      break;
+    case VO_PROP_OUTPUT_XOFFSET:
+      this->props[property].value = this->sc.output_xoffset;
+      break;
+    case VO_PROP_OUTPUT_YOFFSET:
+      this->props[property].value = this->sc.output_yoffset;
+      break;
   }
   
   lprintf ("video_out_vidix: property #%d = %d\n", property,
diff --git a/src/video_out/video_out_xcbshm.c b/src/video_out/video_out_xcbshm.c
index 9e9df7a71..376099e8f 100644
--- a/src/video_out/video_out_xcbshm.c
+++ b/src/video_out/video_out_xcbshm.c
@@ -730,6 +730,14 @@ static int xshm_get_property (vo_driver_t *this_gen, int property) {
     return this->sc.gui_width;
   case VO_PROP_WINDOW_HEIGHT:
     return this->sc.gui_height;
+  case VO_PROP_OUTPUT_WIDTH:
+    return this->cur_frame->sc.output_width;
+  case VO_PROP_OUTPUT_HEIGHT:
+    return this->cur_frame->sc.output_height;
+  case VO_PROP_OUTPUT_XOFFSET:
+    return this->cur_frame->sc.output_xoffset;
+  case VO_PROP_OUTPUT_YOFFSET:
+    return this->cur_frame->sc.output_yoffset;
   default:
     xprintf(this->xine, XINE_VERBOSITY_DEBUG, 
 	    LOG_MODULE ": tried to get unsupported property %d\n", property);
diff --git a/src/video_out/video_out_xcbxv.c b/src/video_out/video_out_xcbxv.c
index f3650a6dd..19a387732 100644
--- a/src/video_out/video_out_xcbxv.c
+++ b/src/video_out/video_out_xcbxv.c
@@ -636,6 +636,18 @@ static int xv_get_property (vo_driver_t *this_gen, int property) {
     case VO_PROP_WINDOW_HEIGHT:
       this->props[property].value = this->sc.gui_height;
       break;
+    case VO_PROP_OUTPUT_WIDTH:
+      this->props[property].value = this->sc.output_width;
+      break;
+    case VO_PROP_OUTPUT_HEIGHT:
+      this->props[property].value = this->sc.output_height;
+      break;
+    case VO_PROP_OUTPUT_XOFFSET:
+      this->props[property].value = this->sc.output_xoffset;
+      break;
+    case VO_PROP_OUTPUT_YOFFSET:
+      this->props[property].value = this->sc.output_yoffset;
+      break;
   }
 
   lprintf(LOG_MODULE ": property #%d = %d\n", property, this->props[property].value);
diff --git a/src/video_out/video_out_xshm.c b/src/video_out/video_out_xshm.c
index 52468781a..cce57f27a 100644
--- a/src/video_out/video_out_xshm.c
+++ b/src/video_out/video_out_xshm.c
@@ -819,6 +819,14 @@ static int xshm_get_property (vo_driver_t *this_gen, int property) {
     return this->sc.gui_width;
   case VO_PROP_WINDOW_HEIGHT:
     return this->sc.gui_height;
+  case VO_PROP_OUTPUT_WIDTH:
+    return this->cur_frame->sc.output_width;
+  case VO_PROP_OUTPUT_HEIGHT:
+    return this->cur_frame->sc.output_height;
+  case VO_PROP_OUTPUT_XOFFSET:
+    return this->cur_frame->sc.output_xoffset;
+  case VO_PROP_OUTPUT_YOFFSET:
+    return this->cur_frame->sc.output_yoffset;
   default:
     xprintf(this->xine, XINE_VERBOSITY_DEBUG, 
 	    LOG_MODULE ": tried to get unsupported property %d\n", property);
diff --git a/src/video_out/video_out_xv.c b/src/video_out/video_out_xv.c
index b99f8eae2..208e8600f 100644
--- a/src/video_out/video_out_xv.c
+++ b/src/video_out/video_out_xv.c
@@ -737,6 +737,18 @@ static int xv_get_property (vo_driver_t *this_gen, int property) {
     case VO_PROP_WINDOW_HEIGHT:
       this->props[property].value = this->sc.gui_height;
       break;
+    case VO_PROP_OUTPUT_WIDTH:
+      this->props[property].value = this->sc.output_width;
+      break;
+    case VO_PROP_OUTPUT_HEIGHT:
+      this->props[property].value = this->sc.output_height;
+      break;
+    case VO_PROP_OUTPUT_XOFFSET:
+      this->props[property].value = this->sc.output_xoffset;
+      break;
+    case VO_PROP_OUTPUT_YOFFSET:
+      this->props[property].value = this->sc.output_yoffset;
+      break;
   }
 
   lprintf(LOG_MODULE ": property #%d = %d\n", property, this->props[property].value);
diff --git a/src/video_out/video_out_xvmc.c b/src/video_out/video_out_xvmc.c
index 8d7b5737d..6aa8f430d 100644
--- a/src/video_out/video_out_xvmc.c
+++ b/src/video_out/video_out_xvmc.c
@@ -991,6 +991,18 @@ static int xvmc_get_property (vo_driver_t *this_gen, int property) {
     case VO_PROP_WINDOW_HEIGHT:
       this->props[property].value = this->sc.gui_height;
       break;
+    case VO_PROP_OUTPUT_WIDTH:
+      this->props[property].value = this->sc.output_width;
+      break;
+    case VO_PROP_OUTPUT_HEIGHT:
+      this->props[property].value = this->sc.output_height;
+      break;
+    case VO_PROP_OUTPUT_XOFFSET:
+      this->props[property].value = this->sc.output_xoffset;
+      break;
+    case VO_PROP_OUTPUT_YOFFSET:
+      this->props[property].value = this->sc.output_yoffset;
+      break;
   }
   
   return this->props[property].value;
diff --git a/src/video_out/video_out_xxmc.c b/src/video_out/video_out_xxmc.c
index 6e99d765c..98ce99f1f 100644
--- a/src/video_out/video_out_xxmc.c
+++ b/src/video_out/video_out_xxmc.c
@@ -1796,6 +1796,18 @@ static int xxmc_get_property (vo_driver_t *this_gen, int property) {
   case VO_PROP_WINDOW_HEIGHT:
     this->props[property].value = this->sc.gui_height;
     break;
+  case VO_PROP_OUTPUT_WIDTH:
+    this->props[property].value = this->sc.output_width;
+    break;
+  case VO_PROP_OUTPUT_HEIGHT:
+    this->props[property].value = this->sc.output_height;
+    break;
+  case VO_PROP_OUTPUT_XOFFSET:
+    this->props[property].value = this->sc.output_xoffset;
+    break;
+  case VO_PROP_OUTPUT_YOFFSET:
+    this->props[property].value = this->sc.output_yoffset;
+    break;
   }
 
   lprintf("%s: property #%d = %d\n", LOG_MODULE, property, this->props[property].value);