diff options
| author | Thibaut Mattern <tmattern@users.sourceforge.net> | 2003-11-20 00:42:14 +0000 |
|---|---|---|
| committer | Thibaut Mattern <tmattern@users.sourceforge.net> | 2003-11-20 00:42:14 +0000 |
| commit | 86d39c4ef501d1f975a2e6bc1a71472102d6f167 (patch) | |
| tree | 9d5c51f283a45fba1dc55b0d36c93fb1ccf37916 /src/xine-engine/metronom.h | |
| parent | c0c8ad9dfc5f4bf261c20ddc93d60f87666290da (diff) | |
| download | xine-lib-86d39c4ef501d1f975a2e6bc1a71472102d6f167.tar.gz xine-lib-86d39c4ef501d1f975a2e6bc1a71472102d6f167.tar.bz2 | |
"Anti audio fifo null" patch ;)
Makes things a bit more symetric:
- the audio fifo (demuxer->decoder) can't be NULL
- the video driver can be NULL
A dummy fifo (5 buffers) is used if the audio driver or video driver is NULL.
Audio frontends (rhythmbox, seedeexeen, quark) do not need to instanciate a video driver anymore.
CVS patchset: 5767
CVS date: 2003/11/20 00:42:14
Diffstat (limited to 'src/xine-engine/metronom.h')
| -rw-r--r-- | src/xine-engine/metronom.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/xine-engine/metronom.h b/src/xine-engine/metronom.h index 325aed6e4..2f14f0388 100644 --- a/src/xine-engine/metronom.h +++ b/src/xine-engine/metronom.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000-2002 the xine project + * Copyright (C) 2000-2003 the xine project * * This file is part of xine, a free video player. * @@ -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: metronom.h,v 1.55 2003/11/16 15:44:03 mroi Exp $ + * $Id: metronom.h,v 1.56 2003/11/20 00:42:14 tmattern Exp $ * * metronom: general pts => virtual calculation/assoc * @@ -204,6 +204,7 @@ struct metronom_s { pthread_mutex_t lock; + int have_video; int have_audio; int video_discontinuity_count; int audio_discontinuity_count; @@ -234,7 +235,7 @@ struct metronom_s { #define METRONOM_VPTS_OFFSET 6 #define METRONOM_PREBUFFER 7 -metronom_t *_x_metronom_init (int have_audio, xine_t *xine); +metronom_t *_x_metronom_init (int have_video, int have_audio, xine_t *xine); struct metronom_clock_s { |
