diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2009-02-10 18:25:09 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2009-02-10 18:25:09 +0000 |
| commit | 1c19b8e8e3cfb32e341332b751686e86d7389569 (patch) | |
| tree | 64d9edcf312915b3d9ae524d55b6508b61bf361f /include | |
| parent | c62b455944c8c91bd4d9ae5e8000ec33190174c5 (diff) | |
| parent | 6002a9a87b3f591832c2b91ca1b2b1b67be008f5 (diff) | |
| download | xine-lib-1c19b8e8e3cfb32e341332b751686e86d7389569.tar.gz xine-lib-1c19b8e8e3cfb32e341332b751686e86d7389569.tar.bz2 | |
Merge from 1.1.
--HG--
rename : doc/faq/faq.sgml => doc/faq/faq.docbook
rename : src/xine-engine/buffer.h => include/xine/buffer.h
rename : src/xine-engine/xine_internal.h => include/xine/xine_internal.h
Diffstat (limited to 'include')
| -rw-r--r-- | include/xine/buffer.h | 3 | ||||
| -rw-r--r-- | include/xine/xine_internal.h | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/xine/buffer.h b/include/xine/buffer.h index 76302dd93..6959b1de0 100644 --- a/include/xine/buffer.h +++ b/include/xine/buffer.h @@ -391,6 +391,9 @@ struct buf_element_s { * decoder_info[2] carries denominator for display aspect ratio */ #define BUF_FLAG_ASPECT 0x0800 +/* represent the state of gapless_switch at the time buf was enqueued */ +#define BUF_FLAG_GAPLESS_SW 0x1000 + /** * \defgroup buffer_special Special buffer types: diff --git a/include/xine/xine_internal.h b/include/xine/xine_internal.h index b876030ee..c6e2b50b2 100644 --- a/include/xine/xine_internal.h +++ b/include/xine/xine_internal.h @@ -260,6 +260,7 @@ struct xine_stream_s { * layers as they cannot call xine_stop. */ uint32_t early_finish_event:1; /*< do not wait fifos get empty before sending event */ uint32_t gapless_switch:1; /*< next stream switch will be gapless */ + uint32_t keep_ao_driver_open:1; input_class_t *eject_class; demux_plugin_t *demux_plugin; |