summaryrefslogtreecommitdiff
path: root/src/xine-engine/xine_internal.h
diff options
context:
space:
mode:
authorMiguel Freitas <miguelfreitas@users.sourceforge.net>2003-01-11 03:47:01 +0000
committerMiguel Freitas <miguelfreitas@users.sourceforge.net>2003-01-11 03:47:01 +0000
commit9d4ebc4801effe30c2af538d00864993299e06fe (patch)
tree63ab498c0e5b5e8d7664c3b6fdebff5691e4fdb8 /src/xine-engine/xine_internal.h
parent263770caece699a5677a9017fa668c2ff30f4f76 (diff)
downloadxine-lib-9d4ebc4801effe30c2af538d00864993299e06fe.tar.gz
xine-lib-9d4ebc4801effe30c2af538d00864993299e06fe.tar.bz2
brand-new external subtitles support. (yes, it works!)
tested with asf, avi and mpeg but any media should work. todo: - clean up the master/slave stuff and public api. - implement seeking on demux_sputext.c (it must seek to closest subtitle) - general cleaning up and bugfixing CVS patchset: 3860 CVS date: 2003/01/11 03:47:01
Diffstat (limited to 'src/xine-engine/xine_internal.h')
-rw-r--r--src/xine-engine/xine_internal.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/xine-engine/xine_internal.h b/src/xine-engine/xine_internal.h
index c046b92d8..cc10e167d 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.123 2003/01/10 19:15:17 miguelfreitas Exp $
+ * $Id: xine_internal.h,v 1.124 2003/01/11 03:47:01 miguelfreitas Exp $
*
*/
@@ -210,6 +210,11 @@ struct xine_stream_s {
int stream_info[XINE_STREAM_INFO_MAX];
char *meta_info [XINE_STREAM_INFO_MAX];
+
+ /* master/slave streams */
+ xine_stream_t *master_stream;
+ xine_stream_t *slave_stream;
+
/* seeking slowdown */
int first_frame_flag;
pthread_mutex_t first_frame_lock;
@@ -269,6 +274,8 @@ void audio_decoder_shutdown (xine_stream_t *stream);
void extra_info_reset( extra_info_t *extra_info );
void extra_info_merge( extra_info_t *dst, extra_info_t *src );
+
+void xine_get_current_info (xine_stream_t *stream, extra_info_t *extra_info, int size);
/* demuxer helper functions from demux.c */