diff options
| author | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2003-01-10 11:57:15 +0000 |
|---|---|---|
| committer | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2003-01-10 11:57:15 +0000 |
| commit | 4b7cfbfb7aa9d3af0f483b15b32882aa453f87a7 (patch) | |
| tree | 36073c846d54ce98a71d255651e78abe69dc2035 /src/xine-engine | |
| parent | a4318a6700f307c76487a66a196860986bd1b781 (diff) | |
| download | xine-lib-4b7cfbfb7aa9d3af0f483b15b32882aa453f87a7.tar.gz xine-lib-4b7cfbfb7aa9d3af0f483b15b32882aa453f87a7.tar.bz2 | |
internal input_time is miliseconds now
CVS patchset: 3851
CVS date: 2003/01/10 11:57:15
Diffstat (limited to 'src/xine-engine')
| -rw-r--r-- | src/xine-engine/xine.c | 4 | ||||
| -rw-r--r-- | src/xine-engine/xine_internal.h | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c index d9b8caf86..bccde1f51 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.208 2003/01/09 13:26:03 miguelfreitas Exp $ + * $Id: xine.c,v 1.209 2003/01/10 11:57:19 miguelfreitas Exp $ * * top-level xine functions * @@ -1084,7 +1084,7 @@ int xine_get_pos_length (xine_stream_t *stream, int *pos_stream, if (pos_stream) *pos_stream = pos; if (pos_time) - *pos_time = stream->current_extra_info->input_time * 1000; + *pos_time = stream->current_extra_info->input_time; if (length_time) *length_time = xine_get_stream_length (stream) * 1000; diff --git a/src/xine-engine/xine_internal.h b/src/xine-engine/xine_internal.h index 88f0bbff8..c615c5601 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.121 2003/01/08 01:02:33 miguelfreitas Exp $ + * $Id: xine_internal.h,v 1.122 2003/01/10 11:57:19 miguelfreitas Exp $ * */ @@ -124,9 +124,12 @@ struct extra_info_s { off_t input_pos; /* remember where this buf came from in the input source */ off_t input_length; /* remember the length of the input source */ - int input_time;/* time offset in seconds from beginning of stream */ + int input_time;/* time offset in miliseconds from beginning of stream */ uint32_t frame_number; /* number of current frame if known */ + int seek_count; /* internal engine use */ + pthread_mutex_t lock; /* keep consistency */ + int64_t vpts; /* set on output layers only */ }; /* |