make use of the freshly introduced information about different spu types

and stream scale permissions from libdvdnav

CVS patchset: 2210
CVS date: 2002/07/05 15:08:58

4 files changed, 18 insertions, 8 deletions

diff --git a/src/xine-engine/events.h b/src/xine-engine/events.h
index af76d4716..c0abeb20b 100644
--- a/src/xine-engine/events.h
+++ b/src/xine-engine/events.h
@@ -161,6 +161,7 @@ typedef struct {
 typedef struct {
   xine_event_t     event;
   int              ratio_code;
+  int              scale_permission;
 } xine_aspect_ratio_event_t;
 
 #ifdef __cplusplus
diff --git a/src/xine-engine/video_decoder.c b/src/xine-engine/video_decoder.c
index f516ec02e..d570b1af0 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.90 2002/06/19 23:42:50 tmattern Exp $
+ * $Id: video_decoder.c,v 1.91 2002/07/05 15:08:58 mroi Exp $
  *
  */
 
@@ -133,7 +133,12 @@ void *video_decoder_loop (void *this_gen) {
       {
 	xine_ui_event_t  ui_event;
 	
+	/* We use widescreen spu as the auto selection, because widescreen
+	 * display is common. SPU decoders can choose differently if it suits
+	 * them. */
 	this->spu_channel_auto = buf->decoder_info[0];
+	this->spu_channel_letterbox = buf->decoder_info[1];
+	this->spu_channel_pan_scan = buf->decoder_info[2];
 	if (this->spu_channel_user == -1)
 	  this->spu_channel = this->spu_channel_auto;
 	
diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c
index c292202f4..31ea5ea46 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.141 2002/06/17 07:47:50 f1rmb Exp $
+ * $Id: xine.c,v 1.142 2002/07/05 15:08:58 mroi Exp $
  *
  * top-level xine functions
  *
@@ -657,11 +657,13 @@ xine_t *xine_init (vo_driver_t *vo,
 
   load_demux_plugins(this, config);
 
-  this->spu_channel_auto   = -1;
-  this->spu_channel_user   = -1;
-  this->cur_input_pos      = 0;
-  this->cur_input_length   = 0;
-  this->last_input_plugin  = NULL;
+  this->spu_channel_auto      = -1;
+  this->spu_channel_letterbox = -1;
+  this->spu_channel_pan_scan  = -1;
+  this->spu_channel_user      = -1;
+  this->cur_input_pos         = 0;
+  this->cur_input_length      = 0;
+  this->last_input_plugin     = NULL;
 
   /*
    * init and start decoder threads
diff --git a/src/xine-engine/xine_internal.h b/src/xine-engine/xine_internal.h
index ba907df0a..62cf5f803 100644
--- a/src/xine-engine/xine_internal.h
+++ b/src/xine-engine/xine_internal.h
@@ -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_internal.h,v 1.88 2002/06/10 13:41:55 miguelfreitas Exp $
+ * $Id: xine_internal.h,v 1.89 2002/07/05 15:08:58 mroi Exp $
  *
  */
 
@@ -205,6 +205,8 @@ struct xine_s {
   int                        audio_channel_auto;
   int                        spu_channel_user;
   int                        spu_channel_auto;
+  int                        spu_channel_letterbox;
+  int                        spu_channel_pan_scan;
   int                        spu_channel;
 
   vo_driver_t               *video_driver;