diff options
| author | Guenter Bartsch <guenter@users.sourceforge.net> | 2001-11-15 23:18:04 +0000 |
|---|---|---|
| committer | Guenter Bartsch <guenter@users.sourceforge.net> | 2001-11-15 23:18:04 +0000 |
| commit | 9635738cc349e37e76f23a4d99eda696197cb715 (patch) | |
| tree | c77eaa18c0a85983252dd7f5ef5bbba04e18a015 /src/xine-engine/xine_internal.h | |
| parent | 230d3c07ef6fca8fb08ae8f14235c56b535d7e64 (diff) | |
| download | xine-lib-9635738cc349e37e76f23a4d99eda696197cb715.tar.gz xine-lib-9635738cc349e37e76f23a4d99eda696197cb715.tar.bz2 | |
improved audio/spu channel selection, let the user take control over both if he/she wants to
CVS patchset: 1047
CVS date: 2001/11/15 23:18:04
Diffstat (limited to 'src/xine-engine/xine_internal.h')
| -rw-r--r-- | src/xine-engine/xine_internal.h | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/src/xine-engine/xine_internal.h b/src/xine-engine/xine_internal.h index 99628c7e5..99e37b546 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.54 2001/11/13 21:47:59 heikos Exp $ + * $Id: xine_internal.h,v 1.55 2001/11/15 23:18:04 guenter Exp $ * */ @@ -164,8 +164,15 @@ struct xine_s { spu_decoder_t *cur_spu_decoder_plugin; int spu_finished; - int audio_channel; - int audio_channel_suggested; + /* *_user: -2 => off + -1 => auto (use *_auto value) + >=0 => respect the user's choice + */ + + int audio_channel_user; + int audio_channel_auto; + int spu_channel_user; + int spu_channel_auto; int spu_channel; vo_instance_t *video_out; @@ -198,6 +205,9 @@ struct xine_s { xine_event_listener_t event_listeners[XINE_MAX_EVENT_LISTENERS]; void *event_listener_user_data[XINE_MAX_EVENT_LISTENERS]; uint16_t num_event_listeners; + + /* scratch string buffer */ + char str[1024]; }; /* |