Commit 104c1905 authored by Pekka Pessi's avatar Pekka Pessi

Removed mss-related tags.

darcs-hash:20050929181934-65a35-19bff2a00638a3d5474d4b9ffb15db9319fb1066.gz
parent 31e8d18d
......@@ -236,269 +236,6 @@ tag_typedef_t soatag_af = INTTAG_TYPEDEF(af);
*/
tag_typedef_t soatag_address = STRTAG_TYPEDEF(address);
/**@def SOATAG_MEDIA_PROFILE(x)
* Name of the media template for the NUA stack.
*
* @par Used with
* nua_invite() \n
* nua_update() \n
* nua_set_params() \n
* nua_get_params()
*
* @par Parameter type
* char const *
*
* @par Values
* NULL terminated character string
*
* Corresponding tag taking reference parameter is SOATAG_MEDIA_PROFILE_REF()
*/
tag_typedef_t soatag_media_profile = STRTAG_TYPEDEF(media_profile);
/**@def SOATAG_MEDIA_SUBSYSTEM(x)
* Pointer to a media subsystem.
*
* Pointer to MSS media subsystem object. The mss object can be used to
* customize the media with mss_config_add(), for example.
*
* @par Used with
* nua_get_param()
*
* @par Parameter type
* void * (actually mss_t*)
*
* @par Values
* Pointer to MSS media subsystem.
*
* Corresponding tag taking reference parameter is SOATAG_MEDIA_SUBSYSTEM_REF.
*/
tag_typedef_t soatag_media_subsystem = PTRTAG_TYPEDEF(media_subsystem);
/**@def SOATAG_MEDIA_SESSION(x)
* Pointer to a media session.
*
* Pointer to MSS media session. Used with SOATAG_MEDIA_CLONE()
* when multiple SIP calls share common media session.
*
* @par Used with
*
* @par Parameter type
* void * (actually ms_t*)
*
* @par Values
* Pointer to MSS media session.
*
* Corresponding tag taking reference parameter is SOATAG_MEDIA_SESSION_REF.
*/
tag_typedef_t soatag_media_session = PTRTAG_TYPEDEF(media_session);
/**@def SOATAG_MEDIA_CLONE(x)
* Clone media session.
*
* @par Used with
* nua_set_params() \n
* nua_get_params() \n
* nua_invite() \n
* nua_respond()
*
* @par Parameter type
* int
*
* @par Values
* @c 0 False \n
* @c !=0 True
*
* Corresponding tag taking reference parameter is SOATAG_MEDIA_CLONE_REF()
*/
tag_typedef_t soatag_media_clone = BOOLTAG_TYPEDEF(media_clone);
/**@def SOATAG_MSS_SDP(x)
* Pass media description file name to the NUA stack.
*
* Pass name of media description file that contains media templates
* (normally mss.sdp) to the NUA stack.
*
* @par Used with
* nua_set_params() \n
* nua_get_params() \n
* nua_create()
*
* @par Parameter type
* char const *
*
* @par Values
* NULL terminated character string
*
* Corresponding tag taking reference parameter is SOATAG_MSS_SDP_REF()
*/
tag_typedef_t soatag_mss_sdp = STRTAG_TYPEDEF(mss_sdp);
/**@def SOATAG_MSS_CFG(x)
* Media parameter file name to the NUA stack.
*
* Media parameter file name to the NUA stack (mss.cfg).
* Used for debugging RTP and RTCP.
*
* @par Used with
* nua_set_params() \n
* nua_get_params() \n
* nua_invite() \n
* nua_update()
*
* @par Parameter type
* char const *
*
* @par Values
* NULL terminated character string
*
* Corresponding tag taking reference parameter is SOATAG_MSS_CFG_REF()
*/
tag_typedef_t soatag_mss_cfg = STRTAG_TYPEDEF(mss_cfg);
/**@def SOATAG_MEDIA_EVENT_PATH(x)
* Media event path name
*
* @par Used with
* nua_invite() \n
* nua_update() \n
* nua_set_params() \n
* nua_get_params()
*
* @par Parameter type
* char const *
*
* @par Values
* NULL terminated character string
*
* Corresponding tag taking reference parameter is
* SOATAG_MEDIA_EVENT_PATH_REF()
*/
tag_typedef_t soatag_media_event_path = STRTAG_TYPEDEF(media_event_path);
/**@def SOATAG_MEDIA_EVENT_DATA(x)
* Media event data
*
* @par Used with
* nua_media_event() \n
* #nua_i_media_event \n
* nua_invite() \n
* nua_update() \n
* nua_handle()
*
* @par Parameter type
* void *
*
* @par Values
* Free format data
*
* Corresponding tag taking reference parameter is
* SOATAG_MEDIA_EVENT_DATA_REF()
*/
tag_typedef_t soatag_media_event_data = PTRTAG_TYPEDEF(media_event_data);
/**@def SOATAG_MEDIA_EVENT_DLEN(x)
* Media event data length
*
* @par Used with
* nua_media_event() \n
* #nua_i_media_event \n
* nua_invite() \n
* nua_update() \n
* nua_handle()
*
* @par Parameter type
* unsigned int
*
* @par Values
* Length of media event data in octets
*
* Corresponding tag taking reference parameter is SOATAG_MEDIA_EVENT_DLEN_REF()
*/
tag_typedef_t soatag_media_event_dlen = INTTAG_TYPEDEF(media_event_dlen);
/**@def SOATAG_VIDEO_LOCAL(x)
* Local video window passed to mss_setup().
*
* The content of this tag is passed to media session
* in parameters to mss_setup().
*
* @par Used with
* nua_invite() \n
* nua_respond()
*
* @par Parameter type
* char const *
*
* @par Values
* NULL terminated character string X window handle of
* drawing window. Pointer printed with printf \%p format string.
*
* Corresponding tag taking reference parameter is SOATAG_VIDEO_LOCAL_REF()
*/
tag_typedef_t soatag_video_local = STRTAG_TYPEDEF(video_local);
/**@def SOATAG_VIDEO_REMOTE(x)
* Remote video window passed to mss_setup().
*
* The content of this tag is passed to media session
* in parameters to mss_setup().
*
* @par Used with
* nua_invite() \n
* nua_respond()
*
* @par Parameter type
* char const *
*
* @par Values
* NULL terminated character string
* X window handle of drawing window. Pointer printed with \%p
* format string of printf().
*
* Corresponding tag taking reference parameter is SOATAG_VIDEO_REMOTE_REF()
*/
tag_typedef_t soatag_video_remote = STRTAG_TYPEDEF(video_remote);
// Addition for JPIP - START
/**@def SOATAG_IMAGE_LOCAL(x)
* Local image window passed to mss_setup().
*
* The contents of tag item SOATAG_IMAGE_LOCAL() is passed to media session
* as parameters to mss_setup().
*/
tag_typedef_t soatag_image_local = STRTAG_TYPEDEF(image_local);
/**@def SOATAG_IMAGE_REMOTE(x)
* Remote image window passed to mss_setup().
*
* The contents of tag item SOATAG_IMAGE_REMOTE() is passed to media session
* as parameters to mss_setup().
*/
tag_typedef_t soatag_image_remote = STRTAG_TYPEDEF(image_remote);
/**@def SOATAG_TARGET_IMAGE_NAME(x)
* Target image name used in JPIP session passed to mss_setup()
*
* The content of tag item SOATAG_TARGET_IMAGE_NAME() is passed to media
* session as parameter to mss_setup().
*
*/
tag_typedef_t soatag_target_image_name = STRTAG_TYPEDEF(target_image_name);
tag_typedef_t soatag_active_image = INTTAG_TYPEDEF(active_image);
// Addition for JPIP - END
/**@def SOATAG_SRTP_ENABLE(x)
*
* Enable SRTP
......
......@@ -141,61 +141,6 @@ extern tag_typedef_t soatag_address;
#define SOATAG_ADDRESS_REF(x) soatag_address_ref, tag_str_vr(&(x))
extern tag_typedef_t soatag_address_ref;
#define SOATAG_MEDIA_PROFILE(x) soatag_media_profile, tag_str_v(x)
extern tag_typedef_t soatag_media_profile;
#define SOATAG_MEDIA_PROFILE_REF(x) soatag_media_profile_ref, tag_str_vr(&(x))
extern tag_typedef_t soatag_media_profile_ref;
#define SOATAG_MEDIA_CLONE(x) soatag_media_clone, tag_bool_v(x)
extern tag_typedef_t soatag_media_clone;
#define SOATAG_MEDIA_CLONE_REF(x) soatag_media_clone_ref, tag_bool_vr(&(x))
extern tag_typedef_t soatag_media_clone_ref;
#define SOATAG_MSS_SDP(x) soatag_mss_sdp, tag_str_v(x)
extern tag_typedef_t soatag_mss_sdp;
#define SOATAG_MSS_SDP_REF(x) soatag_mss_sdp_ref, tag_str_vr(&(x))
extern tag_typedef_t soatag_mss_sdp_ref;
#define SOATAG_MSS_CFG(x) soatag_mss_cfg, tag_str_v(x)
extern tag_typedef_t soatag_mss_cfg;
#define SOATAG_MSS_CFG_REF(x) soatag_mss_cfg_ref, tag_str_vr(&(x))
extern tag_typedef_t soatag_mss_cfg_ref;
extern tag_typedef_t soatag_image_local;
#define SOATAG_IMAGE_LOCAL(x) soatag_image_local, tag_str_v(x)
extern tag_typedef_t soatag_image_local_ref;
#define SOATAG_IMAGE_LOCAL_REF(x) soatag_image_local_ref, tag_str_vr(&(x))
extern tag_typedef_t soatag_image_remote;
#define SOATAG_IMAGE_REMOTE(x) soatag_image_remote, tag_str_v(x)
extern tag_typedef_t soatag_image_remote_ref;
#define SOATAG_IMAGE_REMOTE_REF(x) soatag_image_remote_ref, tag_str_vr(&(x))
extern tag_typedef_t soatag_target_image_name;
#define SOATAG_TARGET_IMAGE_NAME(x) soatag_target_image_name, tag_str_v(x)
extern tag_typedef_t soatag_target_image_name_ref;
#define SOATAG_TARGET_IMAGE_NAME_REF(x) soatag_target_image_name_ref, tag_str_vr(&(x))
/* XXX - Active image call */
#define SOATAG_ACTIVE_IMAGE(x) soatag_active_image, tag_int_v(x)
extern tag_typedef_t soatag_active_image;
#define SOATAG_ACTIVE_IMAGE_REF(x) soatag_active_image_ref, tag_int_vr(&(x))
extern tag_typedef_t soatag_active_image_ref;
#define SOATAG_VIDEO_LOCAL(x) soatag_video_local, tag_str_v(x)
extern tag_typedef_t soatag_video_local;
#define SOATAG_VIDEO_LOCAL_REF(x) soatag_video_local_ref, tag_str_vr(&(x))
extern tag_typedef_t soatag_video_local_ref;
#define SOATAG_VIDEO_REMOTE(x) soatag_video_remote, tag_str_v(x)
extern tag_typedef_t soatag_video_remote;
#define SOATAG_VIDEO_REMOTE_REF(x) soatag_video_remote_ref, tag_str_vr(&(x))
extern tag_typedef_t soatag_video_remote_ref;
/** Enable SRTP */
#define SOATAG_SRTP_ENABLE(x) soatag_srtp_enable, tag_bool_v(x)
extern tag_typedef_t soatag_srtp_enable;
......@@ -221,38 +166,4 @@ extern tag_typedef_t soatag_hold;
#define SOATAG_HOLD_REF(x) soatag_hold_ref, tag_str_vr(&(x))
extern tag_typedef_t soatag_hold_ref;
#define SOATAG_MEDIA_EVENT_PATH(x) soatag_media_event_path, tag_str_v(x)
extern tag_typedef_t soatag_media_event_path;
#define SOATAG_MEDIA_EVENT_PATH_REF(x) \
soatag_media_event_path_ref, tag_str_vr(&(x))
extern tag_typedef_t soatag_media_event_path_ref;
#define SOATAG_MEDIA_EVENT_DATA(x) \
soatag_media_event_data, tag_ptr_v(x)
extern tag_typedef_t soatag_media_event_data;
#define SOATAG_MEDIA_EVENT_DATA_REF(x) \
soatag_media_event_data_ref, tag_ptr_vr(&(x),(x))
extern tag_typedef_t soatag_media_event_data_ref;
#define SOATAG_MEDIA_EVENT_DLEN(x) soatag_media_event_dlen, tag_uint_v(x)
extern tag_typedef_t soatag_media_event_dlen;
#define SOATAG_MEDIA_EVENT_DLEN_REF(x) \
soatag_media_event_dlen_ref, tag_uint_vr(&(x))
extern tag_typedef_t soatag_media_event_dlen_ref;
#define SOATAG_MEDIA_SUBSYSTEM(x) soatag_media_subsystem, tag_ptr_v(x)
extern tag_typedef_t soatag_media_subsystem;
#define SOATAG_MEDIA_SUBSYSTEM_REF(x) \
soatag_media_subsystem_ref, tag_ptr_vr(&(x),(x))
extern tag_typedef_t soatag_media_subsystem_ref;
#define SOATAG_MEDIA_SESSION(x) soatag_media_session, tag_ptr_v(x)
extern tag_typedef_t soatag_media_session;
#define SOATAG_MEDIA_SESSION_REF(x) \
soatag_media_session_ref, tag_ptr_vr(&(x),(x))
extern tag_typedef_t soatag_media_session_ref;
#endif /* SOA_TAG_H */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment