[Toxine-cvs] CVS: toxine/src commands.c,1.77,1.78 errors.c,1.3,1.4 loader.c,1.20,1.21 playlist.c,1.1
Brought to you by:
f1rmb
Menu
▾
▴
[Toxine-cvs] CVS: toxine/src commands.c,1.77,1.78 errors.c,1.3,1.4 loader.c,1.20,1.21 playlist.c,1.14,1.15 xine_commands.c,1.49,1.50 xine_commands.h,1.28,1.29
|
From: Daniel Caujolle-B. <f1...@us...> - 2004-06-01 21:50:00
|
Update of /cvsroot/toxine/toxine/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31593 Modified Files: commands.c errors.c loader.c playlist.c xine_commands.c xine_commands.h Log Message: @@update xine's constants. Preliminary error codes descriptions. Index: commands.c =================================================================== RCS file: /cvsroot/toxine/toxine/src/commands.c,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- commands.c 31 May 2004 20:37:05 -0000 1.77 +++ commands.c 1 Jun 2004 21:49:51 -0000 1.78 @@ -2039,7 +2039,7 @@ if(toxine_is_arg_contain(tox, 1, "current")) { if(toxine_is_arg_contain(tox, 2, "position")) { int ret, pos; -#warning Set last result + return_if_no_init(tox); start_watchdog(tox, "xine_get_pos_length"); @@ -2048,8 +2048,10 @@ if(!ret) error_code_set(tox, TOX_ERR_XINE_GET_POS_LENGTH); - else + else { toxine_draw_bar(tox, "Current position", 0, 65535, pos); + toxine_set_last_int_result(tox, pos); + } } else if(toxine_is_arg_contain(tox, 2, "time")) { int err, seconds; @@ -2065,6 +2067,7 @@ else { seconds /= 1000; pinfo("Current time: %02d:%02d:%02d\n", seconds / (60 * 60), (seconds / 60) % 60, seconds % 60); + toxine_set_last_int_result(tox, seconds); } } Index: errors.c =================================================================== RCS file: /cvsroot/toxine/toxine/src/errors.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- errors.c 27 May 2004 21:23:43 -0000 1.3 +++ errors.c 1 Jun 2004 21:49:51 -0000 1.4 @@ -26,47 +26,111 @@ #include "common.h" static struct error_codes_s { + char *l_descr; char *descr; toxine_error_code_t code; } error_codes[] = { -#warning Write real description - { "TOX_ERR_SUCCESS", TOX_ERR_SUCCESS }, - { "TOX_ERR_DEADLOCK", TOX_ERR_DEADLOCK }, - { "TOX_ERR_SIGSEGV", TOX_ERR_SIGSEGV }, - { "TOX_ERR_SIGINT", TOX_ERR_SIGINT }, - { "TOX_ERR_SIGTERM", TOX_ERR_SIGTERM }, - { "TOX_ERR_SIGQUIT", TOX_ERR_SIGQUIT }, - { "TOX_ERR_INTERNAL", TOX_ERR_INTERNAL }, - { "TOX_ERR_BAD_CMDLINE", TOX_ERR_BAD_CMDLINE }, - { "TOX_ERR_UNKNOWN_CMD", TOX_ERR_UNKNOWN_CMD }, - { "TOX_ERR_WRONG_SYNTAX", TOX_ERR_WRONG_SYNTAX }, - { "TOX_ERR_MISSING_STEP", TOX_ERR_MISSING_STEP }, - { "TOX_ERR_SURNUM_STEP", TOX_ERR_SURNUM_STEP }, - - { "TOX_ERR_NO_VOP", TOX_ERR_NO_VOP }, - { "TOX_ERR_VOP_FAILURE", TOX_ERR_VOP_FAILURE }, - { "TOX_ERR_AOP_FAILURE", TOX_ERR_AOP_FAILURE }, - { "TOX_ERR_WRONG_VERSION", TOX_ERR_WRONG_VERSION }, + { "Success.", + "TOX_ERR_SUCCESS", TOX_ERR_SUCCESS + }, + { "Deadlock occured. Generally this returned value is set when watchdog was triggered.", + "TOX_ERR_DEADLOCK", TOX_ERR_DEADLOCK + }, + { "SIGSEGV received.", + "TOX_ERR_SIGSEGV", TOX_ERR_SIGSEGV + }, + { "SIGINT received.", + "TOX_ERR_SIGINT", TOX_ERR_SIGINT + }, + { "SIGTERM received.", + "TOX_ERR_SIGTERM", TOX_ERR_SIGTERM + }, + { "SIGQUIT received.", + "TOX_ERR_SIGQUIT", TOX_ERR_SIGQUIT + }, + { "Returned when toxine stumble on an internal error.", + "TOX_ERR_INTERNAL", TOX_ERR_INTERNAL + }, + { "Bad command line option syntax. Toxine was called with wrong parameters.", + "TOX_ERR_BAD_CMDLINE", TOX_ERR_BAD_CMDLINE + }, + { "An unknown command was typed.", + "TOX_ERR_UNKNOWN_CMD", TOX_ERR_UNKNOWN_CMD + }, + { "Wrong command syntax was typed.", + "TOX_ERR_WRONG_SYNTAX", TOX_ERR_WRONG_SYNTAX + }, + { "A step is missing, eg: you forgot to call xine_new before xine_init.", + "TOX_ERR_MISSING_STEP", TOX_ERR_MISSING_STEP + }, + { "A step happened twice or more, eg: you called xine_new twice without a xine_dispose.", + "TOX_ERR_SURNUM_STEP", TOX_ERR_SURNUM_STEP + }, + { "No video output plugin found. Toxine's plugin is missing.", + "TOX_ERR_NO_VOP", TOX_ERR_NO_VOP + }, + { "Video output plugin initialisation failure. Toxine's or xine's plugin failed to initialize.", + "TOX_ERR_VOP_FAILURE", TOX_ERR_VOP_FAILURE + }, + { "Audio output plugin initialization failure. xine's plugin failed to initialize, check you audio driver configuration.", + "TOX_ERR_AOP_FAILURE", TOX_ERR_AOP_FAILURE + }, + { "Wrong xine library version found. Check you installation, maybe an older xine-lib is installed somewhere.", + "TOX_ERR_WRONG_VERSION", TOX_ERR_WRONG_VERSION + }, /* xine API */ - { "TOX_ERR_XINE_OPEN_VIDEO_DRIVER", TOX_ERR_XINE_OPEN_VIDEO_DRIVER }, - { "TOX_ERR_XINE_OPEN_AUDIO_DRIVER", TOX_ERR_XINE_OPEN_AUDIO_DRIVER }, - { "TOX_ERR_XINE_STREAM_NEW", TOX_ERR_XINE_STREAM_NEW }, - { "TOX_ERR_XINE_OPEN", TOX_ERR_XINE_OPEN }, - { "TOX_ERR_XINE_PLAY", TOX_ERR_XINE_PLAY }, - { "TOX_ERR_XINE_TRICK_MODE", TOX_ERR_XINE_TRICK_MODE }, - { "TOX_ERR_XINE_GET_AUDIO_LANG", TOX_ERR_XINE_GET_AUDIO_LANG }, - { "TOX_ERR_XINE_GET_SPU_LANG", TOX_ERR_XINE_GET_SPU_LANG }, - { "TOX_ERR_XINE_GET_POS_LENGTH", TOX_ERR_XINE_GET_POS_LENGTH }, - { "TOX_ERR_XINE_GET_LOG_NAMES", TOX_ERR_XINE_GET_LOG_NAMES }, - { "TOX_ERR_XINE_CONFIG_GET_FIRST_ENTRY", TOX_ERR_XINE_CONFIG_GET_FIRST_ENTRY }, - { "TOX_ERR_XINE_CONFIG_GET_NEXT_ENTRY", TOX_ERR_XINE_CONFIG_GET_NEXT_ENTRY }, - { "TOX_ERR_XINE_CONFIG_LOOKUP_ENTRY", TOX_ERR_XINE_CONFIG_LOOKUP_ENTRY }, - { "TOX_ERR_XINE_GET_VERSION_STRING", TOX_ERR_XINE_GET_VERSION_STRING }, - { "TOX_ERR_XINE_CHECK_VERSION", TOX_ERR_XINE_CHECK_VERSION }, - { "TOX_ERR_XINE_GET_CURRENT_FRAME", TOX_ERR_XINE_GET_CURRENT_FRAME }, - - - { NULL, 0 } + { "xine_open_video_driver() failed.", + "TOX_ERR_XINE_OPEN_VIDEO_DRIVER", TOX_ERR_XINE_OPEN_VIDEO_DRIVER + }, + { "xine_open_audio_driver() failed.", + "TOX_ERR_XINE_OPEN_AUDIO_DRIVER", TOX_ERR_XINE_OPEN_AUDIO_DRIVER + }, + { "xine_stream_new() failed.", + "TOX_ERR_XINE_STREAM_NEW", TOX_ERR_XINE_STREAM_NEW + }, + { "xine_open() failed.", + "TOX_ERR_XINE_OPEN", TOX_ERR_XINE_OPEN + }, + { "xine_play() failed.", + "TOX_ERR_XINE_PLAY", TOX_ERR_XINE_PLAY + }, + { "xine_trick_mode() failed.", + "TOX_ERR_XINE_TRICK_MODE", TOX_ERR_XINE_TRICK_MODE + }, + { "xine_get_audio_lang() failed.", + "TOX_ERR_XINE_GET_AUDIO_LANG", TOX_ERR_XINE_GET_AUDIO_LANG + }, + { "xine_get_spu_lang() failed.", + "TOX_ERR_XINE_GET_SPU_LANG", TOX_ERR_XINE_GET_SPU_LANG + }, + { "xine_get_pos_length() failed.", + "TOX_ERR_XINE_GET_POS_LENGTH", TOX_ERR_XINE_GET_POS_LENGTH + }, + { "xine_get_log_names() failed.", + "TOX_ERR_XINE_GET_LOG_NAMES", TOX_ERR_XINE_GET_LOG_NAMES + }, + { "xine_config_get_first_entry() failed.", + "TOX_ERR_XINE_CONFIG_GET_FIRST_ENTRY", TOX_ERR_XINE_CONFIG_GET_FIRST_ENTRY + }, + { "xine_config_get_next_entry() failed.", + "TOX_ERR_XINE_CONFIG_GET_NEXT_ENTRY", TOX_ERR_XINE_CONFIG_GET_NEXT_ENTRY + }, + { "xine_config_lookup_entry() failed.", + "TOX_ERR_XINE_CONFIG_LOOKUP_ENTRY", TOX_ERR_XINE_CONFIG_LOOKUP_ENTRY + }, + { "xine_get_version_string() failed.", + "TOX_ERR_XINE_GET_VERSION_STRING", TOX_ERR_XINE_GET_VERSION_STRING + }, + { "xine_check_version() failed.", + "TOX_ERR_XINE_CHECK_VERSION", TOX_ERR_XINE_CHECK_VERSION + }, + { "xine_get_current_frame() failed.", + "TOX_ERR_XINE_GET_CURRENT_FRAME", TOX_ERR_XINE_GET_CURRENT_FRAME + }, + + { NULL, + NULL, 0 + } }; void toxine_print_error_codes(toxine_t *tox) { @@ -74,7 +138,7 @@ pout("Return codes are:\n"); for(i = 0; error_codes[i].descr; i++) - pout("%3d => \t%s\n", error_codes[i].code, error_codes[i].descr); + pout("- %s [%3d]:\n\t* %s\n\n", error_codes[i].descr, error_codes[i].code, error_codes[i].l_descr); pout("--\n"); } Index: loader.c =================================================================== RCS file: /cvsroot/toxine/toxine/src/loader.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- loader.c 27 May 2004 00:27:39 -0000 1.20 +++ loader.c 1 Jun 2004 21:49:51 -0000 1.21 @@ -34,7 +34,6 @@ #include "common.h" #ifdef LOCAL_BUILD -#warning "Load plugins from plugins/.libs" #undef TOXINE_PLUGINDIR #define TOXINE_PLUGINDIR "plugins/.libs" #endif Index: playlist.c =================================================================== RCS file: /cvsroot/toxine/toxine/src/playlist.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- playlist.c 27 May 2004 00:27:39 -0000 1.14 +++ playlist.c 1 Jun 2004 21:49:51 -0000 1.15 @@ -596,19 +596,9 @@ } void playlist_add_entry(toxine_t *tox, const char *mrl, const char *ident, int start, int end) { -#warning FIXME - /* - if(!tox->playlist.num) - tox->playlist.mmk = (mediamark_t **) xine_xmalloc(sizeof(mediamark_t *) * 2); - else { - if(tox->playlist.num > 1) { - */ tox->playlist.mmk = (mediamark_t **) realloc(tox->playlist.mmk, sizeof(mediamark_t *) * (tox->playlist.num + 1)); - /* - } - } - */ + if(_playlist_store_mmk(&tox->playlist.mmk[tox->playlist.num], mrl, ident, start, end)) tox->playlist.num++; } Index: xine_commands.c =================================================================== RCS file: /cvsroot/toxine/toxine/src/xine_commands.c,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- xine_commands.c 31 May 2004 20:37:05 -0000 1.49 +++ xine_commands.c 1 Jun 2004 21:49:51 -0000 1.50 @@ -54,43 +54,20 @@ }; #if 0 -static struct video_props_s { - char *name; - int prop; -} video_props[] = { - /* Property name Property value Require capability */ - { "XINE_PARAM_VO_DEINTERLACE", XINE_PARAM_VO_DEINTERLACE }, - { "XINE_PARAM_VO_ASPECT_RATIO", XINE_PARAM_VO_ASPECT_RATIO }, - { "XINE_PARAM_VO_HUE", XINE_PARAM_VO_HUE }, - { "XINE_PARAM_VO_SATURATION", XINE_PARAM_VO_SATURATION }, - { "XINE_PARAM_VO_CONTRAST", XINE_PARAM_VO_CONTRAST }, - { "XINE_PARAM_VO_BRIGHTNESS", XINE_PARAM_VO_BRIGHTNESS }, - { "XINE_PARAM_VO_ZOOM_X", XINE_PARAM_VO_ZOOM_X }, - { "XINE_PARAM_VO_ZOOM_Y", XINE_PARAM_VO_ZOOM_Y }, - { "XINE_PARAM_VO_PAN_SCAN", XINE_PARAM_VO_PAN_SCAN }, - { "XINE_PARAM_VO_TVMODE", XINE_PARAM_VO_TVMODE }, - { NULL, 0 } - /* What is do it for ? - XINE_VO_ZOOM_STEP - XINE_VO_ZOOM_MAX - XINE_VO_ZOOM_MIN - */ -}; -#endif - -#if 0 static struct visual_types_s { char *name; int type; } visual_types[] = { - { "XINE_VISUAL_TYPE_NONE", XINE_VISUAL_TYPE_NONE }, - { "XINE_VISUAL_TYPE_X11" , XINE_VISUAL_TYPE_X11 }, - { "XINE_VISUAL_TYPE_AA" , XINE_VISUAL_TYPE_AA }, - { "XINE_VISUAL_TYPE_FB" , XINE_VISUAL_TYPE_FB }, - { "XINE_VISUAL_TYPE_GTK" , XINE_VISUAL_TYPE_GTK }, - { "XINE_VISUAL_TYPE_DFB" , XINE_VISUAL_TYPE_DFB }, - { "XINE_VISUAL_TYPE_PM" , XINE_VISUAL_TYPE_PM }, - { NULL , 0 } + { "XINE_VISUAL_TYPE_NONE" , XINE_VISUAL_TYPE_NONE }, + { "XINE_VISUAL_TYPE_X11" , XINE_VISUAL_TYPE_X11 }, + { "XINE_VISUAL_TYPE_AA" , XINE_VISUAL_TYPE_AA }, + { "XINE_VISUAL_TYPE_FB" , XINE_VISUAL_TYPE_FB }, + { "XINE_VISUAL_TYPE_GTK" , XINE_VISUAL_TYPE_GTK }, + { "XINE_VISUAL_TYPE_DFB" , XINE_VISUAL_TYPE_DFB }, + { "XINE_VISUAL_TYPE_PM" , XINE_VISUAL_TYPE_PM }, + { "XINE_VISUAL_TYPE_DIRECTX", XINE_VISUAL_TYPE_DIRECTX }, + { "XINE_VISUAL_TYPE_CACA" , XINE_VISUAL_TYPE_CACA }, + { NULL , 0 } }; #endif @@ -149,6 +126,28 @@ { NULL , 0 } }; +#warning HANDLE +static struct ui_messages_s { + char *name; + int type; +} ui_messages[] = { + { "XINE_MSG_NO_ERROR" , XINE_MSG_NO_ERROR }, + { "XINE_MSG_GENERAL_WARNING" , XINE_MSG_GENERAL_WARNING }, + { "XINE_MSG_UNKNOWN_HOST" , XINE_MSG_UNKNOWN_HOST }, + { "XINE_MSG_UNKNOWN_DEVICE" , XINE_MSG_UNKNOWN_DEVICE }, + { "XINE_MSG_NETWORK_UNREACHABLE" , XINE_MSG_NETWORK_UNREACHABLE }, + { "XINE_MSG_CONNECTION_REFUSED" , XINE_MSG_CONNECTION_REFUSED }, + { "XINE_MSG_FILE_NOT_FOUND" , XINE_MSG_FILE_NOT_FOUND }, + { "XINE_MSG_READ_ERROR" , XINE_MSG_READ_ERROR }, + { "XINE_MSG_LIBRARY_LOAD_ERROR" , XINE_MSG_LIBRARY_LOAD_ERROR }, + { "XINE_MSG_ENCRYPTED_SOURCE" , XINE_MSG_ENCRYPTED_SOURCE }, + { "XINE_MSG_SECURITY" , XINE_MSG_SECURITY }, + { "XINE_MSG_AUDIO_OUT_UNAVAILABLE", XINE_MSG_AUDIO_OUT_UNAVAILABLE }, + { "XINE_MSG_PERMISSION_ERROR" , XINE_MSG_PERMISSION_ERROR }, + { NULL , 0 }, + +}; + static struct stream_infos_s { char *name; int type; @@ -179,6 +178,9 @@ { "XINE_STREAM_INFO_VIDEO_HAS_STILL" , XINE_STREAM_INFO_VIDEO_HAS_STILL }, { "XINE_STREAM_INFO_MAX_AUDIO_CHANNEL", XINE_STREAM_INFO_MAX_AUDIO_CHANNEL }, { "XINE_STREAM_INFO_MAX_SPU_CHANNEL" , XINE_STREAM_INFO_MAX_SPU_CHANNEL }, + { "XINE_STREAM_INFO_AUDIO_MODE" , XINE_STREAM_INFO_AUDIO_MODE }, + { "XINE_STREAM_INFO_SKIPPED_FRAMES" , XINE_STREAM_INFO_SKIPPED_FRAMES }, + { "XINE_STREAM_INFO_DISCARDED_FRAMES" , XINE_STREAM_INFO_DISCARDED_FRAMES }, { NULL , 0 } }; @@ -186,17 +188,18 @@ char *name; int type; } meta_infos[] = { - { "XINE_META_INFO_TITLE" , XINE_META_INFO_TITLE }, - { "XINE_META_INFO_COMMENT" , XINE_META_INFO_COMMENT }, - { "XINE_META_INFO_ARTIST" , XINE_META_INFO_ARTIST }, - { "XINE_META_INFO_GENRE" , XINE_META_INFO_GENRE }, - { "XINE_META_INFO_ALBUM" , XINE_META_INFO_ALBUM }, - { "XINE_META_INFO_YEAR" , XINE_META_INFO_YEAR }, - { "XINE_META_INFO_VIDEOCODEC" , XINE_META_INFO_VIDEOCODEC }, - { "XINE_META_INFO_AUDIOCODEC" , XINE_META_INFO_AUDIOCODEC }, - { "XINE_META_INFO_SYSTEMLAYER" , XINE_META_INFO_SYSTEMLAYER }, - { "XINE_META_INFO_INPUT_PLUGIN" , XINE_META_INFO_INPUT_PLUGIN }, - { NULL , 0 } + { "XINE_META_INFO_TITLE" , XINE_META_INFO_TITLE }, + { "XINE_META_INFO_COMMENT" , XINE_META_INFO_COMMENT }, + { "XINE_META_INFO_ARTIST" , XINE_META_INFO_ARTIST }, + { "XINE_META_INFO_GENRE" , XINE_META_INFO_GENRE }, + { "XINE_META_INFO_ALBUM" , XINE_META_INFO_ALBUM }, + { "XINE_META_INFO_YEAR" , XINE_META_INFO_YEAR }, + { "XINE_META_INFO_VIDEOCODEC" , XINE_META_INFO_VIDEOCODEC }, + { "XINE_META_INFO_AUDIOCODEC" , XINE_META_INFO_AUDIOCODEC }, + { "XINE_META_INFO_SYSTEMLAYER" , XINE_META_INFO_SYSTEMLAYER }, + { "XINE_META_INFO_INPUT_PLUGIN" , XINE_META_INFO_INPUT_PLUGIN }, + { "XINE_META_INFO_CDINDEX_DISCID", XINE_META_INFO_CDINDEX_DISCID }, + { NULL , 0 } }; static struct xine_params_s { @@ -215,6 +218,23 @@ { "XINE_PARAM_AUDIO_REPORT_LEVEL" , XINE_PARAM_AUDIO_REPORT_LEVEL }, { "XINE_PARAM_VERBOSITY" , XINE_PARAM_VERBOSITY }, { "XINE_PARAM_SPU_OFFSET" , XINE_PARAM_SPU_OFFSET }, + { "XINE_PARAM_IGNORE_VIDEO" , XINE_PARAM_IGNORE_VIDEO }, + { "XINE_PARAM_IGNORE_AUDIO" , XINE_PARAM_IGNORE_AUDIO }, + { "XINE_PARAM_IGNORE_SPU" , XINE_PARAM_IGNORE_SPU }, + { "XINE_PARAM_BROADCASTER_PORT" , XINE_PARAM_BROADCASTER_PORT }, + { "XINE_PARAM_METRONOM_PREBUFFER" , XINE_PARAM_METRONOM_PREBUFFER }, + { "XINE_PARAM_EQ_30HZ" , XINE_PARAM_EQ_30HZ }, + { "XINE_PARAM_EQ_60HZ" , XINE_PARAM_EQ_60HZ }, + { "XINE_PARAM_EQ_125HZ" , XINE_PARAM_EQ_125HZ }, + { "XINE_PARAM_EQ_250HZ" , XINE_PARAM_EQ_250HZ }, + { "XINE_PARAM_EQ_500HZ" , XINE_PARAM_EQ_500HZ }, + { "XINE_PARAM_EQ_1000HZ" , XINE_PARAM_EQ_1000HZ }, + { "XINE_PARAM_EQ_2000HZ" , XINE_PARAM_EQ_2000HZ }, + { "XINE_PARAM_EQ_4000HZ" , XINE_PARAM_EQ_4000HZ }, + { "XINE_PARAM_EQ_8000HZ" , XINE_PARAM_EQ_8000HZ }, + { "XINE_PARAM_EQ_16000HZ" , XINE_PARAM_EQ_16000HZ }, + { "XINE_PARAM_AUDIO_CLOSE_DEVICE" , XINE_PARAM_AUDIO_CLOSE_DEVICE }, + { "XINE_PARAM_AUDIO_AMP_MUTE" , XINE_PARAM_AUDIO_AMP_MUTE }, { "XINE_PARAM_VO_DEINTERLACE" , XINE_PARAM_VO_DEINTERLACE }, { "XINE_PARAM_VO_ASPECT_RATIO" , XINE_PARAM_VO_ASPECT_RATIO }, { "XINE_PARAM_VO_HUE" , XINE_PARAM_VO_HUE }, @@ -253,38 +273,6 @@ { NULL , 0 } }; -#if 0 -static struct xine_vo_params_s { - char *name; - int param; -} xine_vo_params[] = { - /* XINE_PARAM_VIDEO VALUE */ - { "XINE_PARAM_VO_DEINTERLACE" , XINE_PARAM_VO_DEINTERLACE }, - { "XINE_PARAM_VO_ASPECT_RATIO" , XINE_PARAM_VO_ASPECT_RATIO }, - { "XINE_PARAM_VO_HUE" , XINE_PARAM_VO_HUE }, - { "XINE_PARAM_VO_SATURATION" , XINE_PARAM_VO_SATURATION }, - { "XINE_PARAM_VO_CONTRAST" , XINE_PARAM_VO_CONTRAST }, - { "XINE_PARAM_VO_BRIGHTNESS" , XINE_PARAM_VO_BRIGHTNESS }, - { "XINE_PARAM_VO_ZOOM_X" , XINE_PARAM_VO_ZOOM_X }, - { "XINE_PARAM_VO_ZOOM_Y" , XINE_PARAM_VO_ZOOM_Y }, - { "XINE_PARAM_VO_PAN_SCAN" , XINE_PARAM_VO_PAN_SCAN }, - { "XINE_PARAM_VO_TVMODE" , XINE_PARAM_VO_TVMODE }, - { NULL , 0 } -}; -#endif - -#if 0 -static struct xine_vo_zooms_s { - char *name; - int factor; -} xine_vo_zooms[] = { - { "XINE_VO_ZOOM_STEP", XINE_VO_ZOOM_STEP }, - { "XINE_VO_ZOOM_MAX" , XINE_VO_ZOOM_MAX }, - { "XINE_VO_ZOOM_MIN" , XINE_VO_ZOOM_MIN }, - { NULL , 0 } -}; -#endif - static struct xine_vo_aspects_s { char *name; int aspect; @@ -1126,6 +1114,23 @@ case XINE_PARAM_AUDIO_REPORT_LEVEL: case XINE_PARAM_VERBOSITY: case XINE_PARAM_SPU_OFFSET: + case XINE_PARAM_IGNORE_VIDEO: + case XINE_PARAM_IGNORE_AUDIO: + case XINE_PARAM_IGNORE_SPU: + case XINE_PARAM_BROADCASTER_PORT: + case XINE_PARAM_METRONOM_PREBUFFER: + case XINE_PARAM_EQ_30HZ: + case XINE_PARAM_EQ_60HZ: + case XINE_PARAM_EQ_125HZ: + case XINE_PARAM_EQ_250HZ: + case XINE_PARAM_EQ_500HZ: + case XINE_PARAM_EQ_1000HZ: + case XINE_PARAM_EQ_2000HZ: + case XINE_PARAM_EQ_4000HZ: + case XINE_PARAM_EQ_8000HZ: + case XINE_PARAM_EQ_16000HZ: + case XINE_PARAM_AUDIO_CLOSE_DEVICE: + case XINE_PARAM_AUDIO_AMP_MUTE: case XINE_PARAM_VO_DEINTERLACE: case XINE_PARAM_VO_HUE: case XINE_PARAM_VO_SATURATION: @@ -1243,10 +1248,78 @@ case XINE_PARAM_VERBOSITY: pinfo("verbosity: %d", result); break; - + case XINE_PARAM_SPU_OFFSET: pinfo("spu offset: %d (u: 1/90000 sec)", result); break; + + case XINE_PARAM_IGNORE_VIDEO: + pinfo("ignore video: %s", (result) ? "yes" : "no"); + break; + + case XINE_PARAM_IGNORE_AUDIO: + pinfo("ignore audio: %s", (result) ? "yes" : "no"); + break; + + case XINE_PARAM_IGNORE_SPU: + pinfo("ignore spu: %s", (result) ? "yes" : "no"); + break; + + case XINE_PARAM_BROADCASTER_PORT: + pinfo("broadcast port: %d", result); + break; + + case XINE_PARAM_METRONOM_PREBUFFER: + pinfo("metronom prebuffer: %d * (1/90000 sec)", result); + break; + + case XINE_PARAM_EQ_30HZ: + toxine_draw_bar(tox, "equalizer 30Hz gains", -100, 100, result); + break; + + case XINE_PARAM_EQ_60HZ: + toxine_draw_bar(tox, "equalizer 60Hz gains", -100, 100, result); + break; + + case XINE_PARAM_EQ_125HZ: + toxine_draw_bar(tox, "equalizer 125Hz gains", -100, 100, result); + break; + + case XINE_PARAM_EQ_250HZ: + toxine_draw_bar(tox, "equalizer 250Hz gains", -100, 100, result); + break; + + case XINE_PARAM_EQ_500HZ: + toxine_draw_bar(tox, "equalizer 500Hz gains", -100, 100, result); + break; + + case XINE_PARAM_EQ_1000HZ: + toxine_draw_bar(tox, "equalizer 1000Hz gains", -100, 100, result); + break; + + case XINE_PARAM_EQ_2000HZ: + toxine_draw_bar(tox, "equalizer 2000Hz gains", -100, 100, result); + break; + + case XINE_PARAM_EQ_4000HZ: + toxine_draw_bar(tox, "equalizer 4000Hz gains", -100, 100, result); + break; + + case XINE_PARAM_EQ_8000HZ: + toxine_draw_bar(tox, "equalizer 8000Hz gains", -100, 100, result); + break; + + case XINE_PARAM_EQ_16000HZ: + toxine_draw_bar(tox, "equalizer 16000Hz gains", -100, 100, result); + break; + + case XINE_PARAM_AUDIO_CLOSE_DEVICE: + pinfo("force audio device: %s", (result) ? "yes" : "no"); + break; + + case XINE_PARAM_AUDIO_AMP_MUTE: + pinfo("audio amp mute: %s", (result) ? "yes" : "no"); + break; case XINE_PARAM_VO_DEINTERLACE: pinfo("video out deinterlace: %s", (result) ? "yes" : "no"); Index: xine_commands.h =================================================================== RCS file: /cvsroot/toxine/toxine/src/xine_commands.h,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- xine_commands.h 17 May 2004 19:53:25 -0000 1.28 +++ xine_commands.h 1 Jun 2004 21:49:51 -0000 1.29 @@ -171,6 +171,7 @@ void _NAPI_config(commands_t *, toxine_t *, void *); */ +#warning update contants list in syntax #define xine_commands \ { "xine_new", NO_ARGS, _xine_new, \ "Create a new xine instance.", \ |
