diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/xine-engine/audio_out.c | 6 | ||||
| -rw-r--r-- | src/xine-engine/audio_out.h | 6 | ||||
| -rw-r--r-- | src/xine-engine/video_out.c | 6 | ||||
| -rw-r--r-- | src/xine-engine/video_out.h | 5 |
4 files changed, 16 insertions, 7 deletions
diff --git a/src/xine-engine/audio_out.c b/src/xine-engine/audio_out.c index 4e88d9eee..9f20efe00 100644 --- a/src/xine-engine/audio_out.c +++ b/src/xine-engine/audio_out.c @@ -17,7 +17,7 @@ * along with self program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: audio_out.c,v 1.179 2004/06/13 21:28:57 miguelfreitas Exp $ + * $Id: audio_out.c,v 1.180 2004/06/19 20:07:15 mroi Exp $ * * 22-8-2001 James imported some useful AC3 sections from the previous alsa driver. * (c) 2001 Andy Lo A Foe <andy@alsaplayer.org> @@ -1587,6 +1587,10 @@ static int ao_get_property (xine_audio_port_t *this_gen, int property) { ret = this->compression_factor_max*100; break; + case AO_PROP_BUFS_IN_FIFO: + ret = this->audio_loop_running ? this->out_fifo->num_buffers : -1; + break; + case AO_PROP_AMP: ret = this->amp_factor*100; break; diff --git a/src/xine-engine/audio_out.h b/src/xine-engine/audio_out.h index fe51d4475..55a8dfe3d 100644 --- a/src/xine-engine/audio_out.h +++ b/src/xine-engine/audio_out.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: audio_out.h,v 1.70 2004/05/29 14:45:25 mroi Exp $ + * $Id: audio_out.h,v 1.71 2004/06/19 20:07:15 mroi Exp $ */ #ifndef HAVE_AUDIO_OUT_H #define HAVE_AUDIO_OUT_H @@ -309,7 +309,7 @@ int _x_ao_mode2channels( int mode ); #define AO_PROP_MUTE_VOL 2 #define AO_PROP_COMPRESSOR 3 #define AO_PROP_DISCARD_BUFFERS 4 -#define AO_PROP_REUSE_ME 5 +#define AO_PROP_BUFS_IN_FIFO 5 /* read-only */ #define AO_PROP_AMP 6 /* amplifier */ #define AO_PROP_EQ_30HZ 7 /* equalizer */ #define AO_PROP_EQ_60HZ 8 /* equalizer */ @@ -323,7 +323,7 @@ int _x_ao_mode2channels( int mode ); #define AO_PROP_EQ_16000HZ 16 /* equalizer */ #define AO_PROP_CLOSE_DEVICE 17 /* force closing audio device */ #define AO_PROP_AMP_MUTE 18 /* amplifier mute */ -/* if you need to add another one: number 5 is unused */ +#define AO_NUM_PROPERTIES 19 /* audio device control ops */ #define AO_CTRL_PLAY_PAUSE 0 diff --git a/src/xine-engine/video_out.c b/src/xine-engine/video_out.c index 8a9873f53..894d0200a 100644 --- a/src/xine-engine/video_out.c +++ b/src/xine-engine/video_out.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_out.c,v 1.198 2004/06/13 21:28:57 miguelfreitas Exp $ + * $Id: video_out.c,v 1.199 2004/06/19 20:07:15 mroi Exp $ * * frame allocation / queuing / scheduling / output functions */ @@ -1243,6 +1243,10 @@ static int vo_get_property (xine_video_port_t *this_gen, int property) { ret = this->discard_frames; break; + case VO_PROP_BUFS_IN_FIFO: + ret = this->video_loop_running ? this->display_img_buf_queue->num_buffers : -1; + break; + /* * handle XINE_PARAM_xxx properties (convert from driver's range) */ diff --git a/src/xine-engine/video_out.h b/src/xine-engine/video_out.h index 8ad3773fa..fa64344c0 100644 --- a/src/xine-engine/video_out.h +++ b/src/xine-engine/video_out.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: video_out.h,v 1.106 2004/05/29 14:45:25 mroi Exp $ + * $Id: video_out.h,v 1.107 2004/06/19 20:07:15 mroi Exp $ * * * xine version of video_out.h @@ -260,7 +260,8 @@ struct xine_video_port_s { #define VO_PROP_DISCARD_FRAMES 14 /* not used by drivers */ #define VO_PROP_WINDOW_WIDTH 15 /* read-only */ #define VO_PROP_WINDOW_HEIGHT 16 /* read-only */ -#define VO_NUM_PROPERTIES 17 +#define VO_PROP_BUFS_IN_FIFO 17 /* read-only */ +#define VO_NUM_PROPERTIES 18 /* number of colors in the overlay palette. Currently limited to 256 at most, because some alphablend functions use an 8-bit index into |