Merge from 1.1.

--HG--
rename : include/xine.h.in => include/xine.h
rename : src/xine-engine/video_out.h => include/xine/video_out.h

9 files changed, 32 insertions, 5 deletions

diff --git a/src/demuxers/demux_mpeg_pes.c b/src/demuxers/demux_mpeg_pes.c
index 3b2489a43..5ad959d51 100644
--- a/src/demuxers/demux_mpeg_pes.c
+++ b/src/demuxers/demux_mpeg_pes.c
@@ -1756,7 +1756,7 @@ static void *init_plugin (xine_t *xine, void *data) {
   this->demux_class.open_plugin     = open_plugin;
   this->demux_class.description     = N_("mpeg pes demux plugin");
   this->demux_class.identifier      = "MPEG_PES";
-  this->demux_class.mimetypes       = NULL;
+  this->demux_class.mimetypes       = "video/mp2p: m2p: MPEG2 program stream;";
   this->demux_class.extensions      = "pes vdr:/ netvdr:/";
   this->demux_class.dispose         = default_demux_class_dispose;
 
diff --git a/src/demuxers/demux_ts.c b/src/demuxers/demux_ts.c
index 8c8250cf4..39b273abf 100644
--- a/src/demuxers/demux_ts.c
+++ b/src/demuxers/demux_ts.c
@@ -2441,7 +2441,7 @@ static void *init_class (xine_t *xine, void *data) {
   this->demux_class.open_plugin     = open_plugin;
   this->demux_class.description     = N_("MPEG Transport Stream demuxer");
   this->demux_class.identifier      = "MPEG_TS";
-  this->demux_class.mimetypes       = NULL;
+  this->demux_class.mimetypes       = "video/mp2t: m2t: MPEG2 transport stream;";
 
   /* accept dvb streams; also handle the special dvbs,dvbt and dvbc
    * mrl formats: the content is exactly the same but the input plugin
diff --git a/src/demuxers/demux_tta.c b/src/demuxers/demux_tta.c
index d7c2a65cd..3df30daef 100644
--- a/src/demuxers/demux_tta.c
+++ b/src/demuxers/demux_tta.c
@@ -128,7 +128,7 @@ static int demux_tta_send_chunk(demux_plugin_t *this_gen) {
     /* Get a buffer */
     buf = this->audio_fifo->buffer_pool_alloc(this->audio_fifo);
     buf->type = BUF_AUDIO_TTA;
-    buf->pts = (int64_t)(FRAME_TIME * this->currentframe) * 90000;
+    buf->pts = (int64_t)(FRAME_TIME * this->currentframe * 90000);
     buf->extra_info->total_time = (int)(le2me_32(this->header.tta.data_length) * 1000.0 / le2me_32(this->header.tta.samplerate)); /* milliseconds */ 
     buf->decoder_flags = 0;
 
@@ -137,7 +137,7 @@ static int demux_tta_send_chunk(demux_plugin_t *this_gen) {
       (int) ((double) this->currentframe * 65535 / this->totalframes);
 
     /* Set time */
-    buf->extra_info->input_time = (int)(FRAME_TIME * this->currentframe)*1000;
+    buf->extra_info->input_time = (int)(FRAME_TIME * this->currentframe * 1000);
 
     bytes_read = this->input->read(this->input, buf->content, ( bytes_to_read > buf->max_size ) ? buf->max_size : bytes_to_read);
     if (bytes_read < 0) {
diff --git a/src/video_out/video_out_xcbxv.c b/src/video_out/video_out_xcbxv.c
index 15b14c791..81a799dca 100644
--- a/src/video_out/video_out_xcbxv.c
+++ b/src/video_out/video_out_xcbxv.c
@@ -1340,6 +1340,11 @@ static vo_driver_t *open_plugin(video_driver_class_t *class_gen, const void *vis
 	  xv_check_capability (this, VO_PROP_CONTRAST, attribute_it.data,
 			       adaptor_it.data->base_id,
 			       NULL, NULL, NULL);
+	} else if(!strcmp(name, "XV_GAMMA")) {
+	  this->capabilities |= VO_CAP_GAMMA;
+	  xv_check_capability (this, VO_PROP_GAMMA, attribute_it.data,
+			       adaptor_it.data->base_id,
+			       NULL, NULL, NULL);
 	} else if(!strcmp(name, "XV_COLORKEY")) {
 	  this->capabilities |= VO_CAP_COLORKEY;
 	  xv_check_capability (this, VO_PROP_COLORKEY, attribute_it.data,
diff --git a/src/video_out/video_out_xv.c b/src/video_out/video_out_xv.c
index bca1b97f7..5c994c351 100644
--- a/src/video_out/video_out_xv.c
+++ b/src/video_out/video_out_xv.c
@@ -1390,6 +1390,11 @@ static vo_driver_t *open_plugin_2 (video_driver_class_t *class_gen, const void *
 	  xv_check_capability (this, VO_PROP_CONTRAST, attr[k],
 			       adaptor_info[adaptor_num].base_id,
 			       NULL, NULL, NULL);
+	} else if(!strcmp(name, "XV_GAMMA")) {
+	  this->capabilities |= VO_CAP_GAMMA;
+	  xv_check_capability (this, VO_PROP_GAMMA, attr[k],
+			       adaptor_info[adaptor_num].base_id,
+			       NULL, NULL, NULL);
 	} else if(!strcmp(name, "XV_COLORKEY")) {
 	  this->capabilities |= VO_CAP_COLORKEY;
 	  xv_check_capability (this, VO_PROP_COLORKEY, attr[k],
diff --git a/src/video_out/video_out_xvmc.c b/src/video_out/video_out_xvmc.c
index 79fea9ce5..7a0535818 100644
--- a/src/video_out/video_out_xvmc.c
+++ b/src/video_out/video_out_xvmc.c
@@ -1424,6 +1424,11 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi
 	  xvmc_check_capability (this, VO_PROP_CONTRAST, attr[k],
 				 adaptor_info[adaptor_num].base_id,
 				 NULL, NULL, NULL);
+	} else if(!strcmp(name, "XV_GAMMA")) {
+	  this->capabilities |= VO_CAP_GAMMA;
+	  xvmc_check_capability (this, VO_PROP_GAMMA, attr[k],
+				 adaptor_info[adaptor_num].base_id,
+				 NULL, NULL, NULL);
 	} else if(!strcmp(name, "XV_COLORKEY")) {
 	  this->capabilities |= VO_CAP_COLORKEY;
 	  xvmc_check_capability (this, VO_PROP_COLORKEY, attr[k],
diff --git a/src/video_out/video_out_xxmc.c b/src/video_out/video_out_xxmc.c
index 5f131855f..aa47eb2ae 100644
--- a/src/video_out/video_out_xxmc.c
+++ b/src/video_out/video_out_xxmc.c
@@ -2619,6 +2619,13 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi
 	  xxmc_check_capability (this, VO_PROP_CONTRAST, attr[k],
 				 adaptor_info[adaptor_num].base_id,
 				 NULL, NULL, NULL);
+
+	} else if(!strcmp(name, "XV_GAMMA")) {
+	  this->capabilities |= VO_CAP_GAMMA;
+	  xxmc_check_capability (this, VO_PROP_GAMMA, attr[k],
+				 adaptor_info[adaptor_num].base_id,
+				 NULL, NULL, NULL);
+
 	} else if(!strcmp(name, "XV_COLORKEY")) {
 	  this->capabilities |= VO_CAP_COLORKEY;
 	  xxmc_check_capability (this, VO_PROP_COLORKEY, attr[k],
diff --git a/src/xine-engine/video_out.c b/src/xine-engine/video_out.c
index e4af36e3c..4372226ad 100644
--- a/src/xine-engine/video_out.c
+++ b/src/xine-engine/video_out.c
@@ -1471,7 +1471,9 @@ static int vo_get_property (xine_video_port_t *this_gen, int property) {
   case XINE_PARAM_VO_HUE:
   case XINE_PARAM_VO_SATURATION:
   case XINE_PARAM_VO_CONTRAST:
-  case XINE_PARAM_VO_BRIGHTNESS: {
+  case XINE_PARAM_VO_BRIGHTNESS:
+  case XINE_PARAM_VO_GAMMA:
+   {
     int v, min_v, max_v, range_v;
 
     pthread_mutex_lock( &this->driver_lock );
@@ -1566,6 +1568,7 @@ static int vo_set_property (xine_video_port_t *this_gen, int property, int value
   case XINE_PARAM_VO_SATURATION:
   case XINE_PARAM_VO_CONTRAST:
   case XINE_PARAM_VO_BRIGHTNESS:
+  case XINE_PARAM_VO_GAMMA:
     if (!this->grab_only) {
       int v, min_v, max_v, range_v;
 
diff --git a/src/xine-engine/xine_interface.c b/src/xine-engine/xine_interface.c
index 87775c470..ab1bafa1e 100644
--- a/src/xine-engine/xine_interface.c
+++ b/src/xine-engine/xine_interface.c
@@ -471,6 +471,7 @@ void xine_set_param (xine_stream_t *stream, int param, int value) {
   case XINE_PARAM_VO_SATURATION:
   case XINE_PARAM_VO_CONTRAST:
   case XINE_PARAM_VO_BRIGHTNESS:
+  case XINE_PARAM_VO_GAMMA:
   case XINE_PARAM_VO_DEINTERLACE:
   case XINE_PARAM_VO_ASPECT_RATIO:
   case XINE_PARAM_VO_ZOOM_X:
@@ -637,6 +638,7 @@ int xine_get_param (xine_stream_t *stream, int param) {
   case XINE_PARAM_VO_SATURATION:
   case XINE_PARAM_VO_CONTRAST:
   case XINE_PARAM_VO_BRIGHTNESS:
+  case XINE_PARAM_VO_GAMMA:
   case XINE_PARAM_VO_DEINTERLACE:
   case XINE_PARAM_VO_ASPECT_RATIO:
   case XINE_PARAM_VO_ZOOM_X: