diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h | 473 |
1 files changed, 226 insertions, 247 deletions
diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h index 0de8277fc7e..c4f7103d87f 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h @@ -76,7 +76,7 @@ public: /** * @class TAO_Basic_StreamCtrl - * @brief Base class for StreamCtrl, implements basic stream start + * @brief Base class for StreamCtrl, implements basic stream start * and stop functionality. */ class TAO_AV_Export TAO_Basic_StreamCtrl @@ -94,15 +94,15 @@ public: /// Stop the transfer of data of the stream /// Empty the_spec means apply operation to all flows - virtual void stop (const AVStreams::flowSpec &the_spec, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual void stop (const AVStreams::flowSpec &the_spec + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow)); /// Start the transfer of data in the stream. /// Empty the_spec means apply operation to all flows - virtual void start (const AVStreams::flowSpec &the_spec, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual void start (const AVStreams::flowSpec &the_spec + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow)); @@ -111,39 +111,39 @@ public: * the streamendpoint and vdev associated with this stream * Empty the_spec means apply operation to all flows */ - virtual void destroy (const AVStreams::flowSpec &the_spec, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual void destroy (const AVStreams::flowSpec &the_spec + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow)); /// Changes the QoS associated with the stream /// Empty the_spec means apply operation to all flows virtual CORBA::Boolean modify_QoS (AVStreams::streamQoS &new_qos, - const AVStreams::flowSpec &the_spec, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + const AVStreams::flowSpec &the_spec + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::QoSRequestFailed)); /// Used by StreamEndPoint and VDev to inform StreamCtrl of events. /// E.g., loss of flow, reestablishment of flow, etc.. - virtual void push_event (const struct CosPropertyService::Property & the_event, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual void push_event (const struct CosPropertyService::Property & the_event + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Used to control the flow protocol parameters. virtual void set_FPStatus (const AVStreams::flowSpec &the_spec, const char *fp_name, - const CORBA::Any &fp_settings, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + const CORBA::Any &fp_settings + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::FPError)); /// Not implemented in the light profile, will raise the notsupported /// exception - virtual CORBA::Object_ptr get_flow_connection (const char *flow_name, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual CORBA::Object_ptr get_flow_connection (const char *flow_name + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::notSupported)); @@ -151,8 +151,8 @@ public: /// Not implemented in the light profile, will raise the notsupported /// exception virtual void set_flow_connection (const char *flow_name, - CORBA::Object_ptr flow_connection, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + CORBA::Object_ptr flow_connection + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::notSupported)); @@ -185,8 +185,8 @@ class TAO_AV_Export TAO_Negotiator { public: virtual CORBA::Boolean negotiate (AVStreams::Negotiator_ptr remote_negotiator, - const AVStreams::streamQoS &qos_spec, - CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ()) + const AVStreams::streamQoS &qos_spec + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); }; @@ -250,15 +250,15 @@ public: /// Stop the transfer of data of the stream /// Empty the_spec means apply operation to all flows - virtual void stop (const AVStreams::flowSpec &the_spec, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual void stop (const AVStreams::flowSpec &the_spec + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow)); /// Start the transfer of data in the stream. /// Empty the_spec means apply operation to all flows - virtual void start (const AVStreams::flowSpec &the_spec, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual void start (const AVStreams::flowSpec &the_spec + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow)); @@ -267,8 +267,8 @@ public: * the streamendpoint and vdev associated with this stream * Empty the_spec means apply operation to all flows */ - virtual void destroy (const AVStreams::flowSpec &the_spec, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual void destroy (const AVStreams::flowSpec &the_spec + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow)); @@ -282,8 +282,8 @@ public: virtual CORBA::Boolean bind_devs (AVStreams::MMDevice_ptr a_party, AVStreams::MMDevice_ptr b_party, AVStreams::streamQoS& the_qos, - const AVStreams::flowSpec& the_flows, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + const AVStreams::flowSpec& the_flows + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::noSuchFlow, @@ -297,44 +297,44 @@ public: virtual CORBA::Boolean bind (AVStreams::StreamEndPoint_A_ptr a_party, AVStreams::StreamEndPoint_B_ptr b_party, AVStreams::streamQoS &the_qos, - const AVStreams::flowSpec &the_flows, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + const AVStreams::flowSpec &the_flows + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::noSuchFlow, AVStreams::QoSRequestFailed)); virtual void unbind_dev (AVStreams::MMDevice_ptr dev, - const AVStreams::flowSpec & the_spec, - CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ()) + const AVStreams::flowSpec & the_spec + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::noSuchFlow)); /// Unbind the_ep from the stream. Empty the_spec means apply to all flows. virtual void unbind_party (AVStreams::StreamEndPoint_ptr the_ep, - const AVStreams::flowSpec &the_spec, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + const AVStreams::flowSpec &the_spec + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::noSuchFlow)); /// unbind the stream. Same effect as Basic_StreamCtrl::destroy () - virtual void unbind (CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual void unbind (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed)); virtual AVStreams::VDev_ptr get_related_vdev (AVStreams::MMDevice_ptr adev, - AVStreams::StreamEndPoint_out sep, - CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ()) + AVStreams::StreamEndPoint_out sep + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed)); /// Changes the QoS associated with the stream /// Empty the_spec means apply operation to all flows virtual CORBA::Boolean modify_QoS (AVStreams::streamQoS &new_qos, - const AVStreams::flowSpec &the_spec, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + const AVStreams::flowSpec &the_spec + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::QoSRequestFailed)); @@ -385,30 +385,29 @@ public: virtual CORBA::Boolean set_peer (CORBA::Object_ptr peer, AVStreams::streamQoS & the_qos, - const AVStreams::flowSpec & the_spec, - CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ()) + const AVStreams::flowSpec & the_spec + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::QoSRequestFailed, AVStreams::streamOpFailed)); - virtual void configure (const CosPropertyService::Property & a_configuration, - CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ()) + virtual void configure (const CosPropertyService::Property & a_configuration + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void set_initial_configuration (const CosPropertyService::Properties & initial, - CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ()) + virtual void set_initial_configuration (const CosPropertyService::Properties & initial + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void set_format (const char * flowName, - const char * format_name, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment ()) + const char * format_name + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported)); virtual void set_dev_params (const char * flowName, - const CosPropertyService::Properties & new_params, - CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ()) + const CosPropertyService::Properties & new_params + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::PropertyException, @@ -494,16 +493,16 @@ public: virtual int handle_close (void); /// Application needs to define this - virtual int handle_stop (const AVStreams::flowSpec &the_spec, - CORBA::Environment &env = CORBA::Environment::default_environment ()); + virtual int handle_stop (const AVStreams::flowSpec &the_spec + TAO_ENV_ARG_DECL_WITH_DEFAULTS); /// Application needs to define this - virtual int handle_start (const AVStreams::flowSpec &the_spec, - CORBA::Environment &env = CORBA::Environment::default_environment ()); + virtual int handle_start (const AVStreams::flowSpec &the_spec + TAO_ENV_ARG_DECL_WITH_DEFAULTS); /// Application needs to define this - virtual int handle_destroy (const AVStreams::flowSpec &the_spec, - CORBA::Environment &env = CORBA::Environment::default_environment ()); + virtual int handle_destroy (const AVStreams::flowSpec &the_spec + TAO_ENV_ARG_DECL_WITH_DEFAULTS); /// Application needs to define this virtual CORBA::Boolean handle_preconnect (AVStreams::flowSpec &the_spec); @@ -512,8 +511,8 @@ public: virtual CORBA::Boolean handle_postconnect (AVStreams::flowSpec &the_spec); /// Application needs to define this - virtual CORBA::Boolean handle_connection_requested (AVStreams::flowSpec &the_spec, - CORBA::Environment &env = CORBA::Environment::default_environment ()); + virtual CORBA::Boolean handle_connection_requested (AVStreams::flowSpec &the_spec + TAO_ENV_ARG_DECL_WITH_DEFAULTS); virtual int get_callback (const char *flowname, TAO_AV_Callback *&callback); @@ -525,7 +524,7 @@ public: TAO_AV_Protocol_Object *object); virtual void set_flow_handler (const char *flowname, - TAO_AV_Flow_Handler *handler); + TAO_AV_Flow_Handler *handler); virtual void set_control_flow_handler (const char *flowname, TAO_AV_Flow_Handler *handler); @@ -546,7 +545,7 @@ class TAO_AV_Connector; class TAO_Forward_FlowSpec_Entry; class TAO_Reverse_FlowSpec_Entry; -/** +/** * @class TAO_StreamEndPoint * @brief The Stream EndPoint. Used to implement one endpoint of a stream * that implements the transport layer. @@ -563,28 +562,28 @@ public: TAO_StreamEndPoint (void); /// Stop the stream. Empty the_spec means, for all the flows - virtual void stop (const AVStreams::flowSpec &the_spec, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual void stop (const AVStreams::flowSpec &the_spec + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow)); /// Start the stream, Empty the_spec means, for all the flows - virtual void start (const AVStreams::flowSpec &the_spec, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual void start (const AVStreams::flowSpec &the_spec + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow)); /// Destroy the stream, Empty the_spec means, for all the flows - virtual void destroy (const AVStreams::flowSpec &the_spec, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual void destroy (const AVStreams::flowSpec &the_spec + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow)); /// Called by StreamCtrl. responder is the peer to connect to virtual CORBA::Boolean connect (AVStreams::StreamEndPoint_ptr responder, AVStreams::streamQoS& qos_spec, - const AVStreams::flowSpec& the_spec, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + const AVStreams::flowSpec& the_spec + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::QoSRequestFailed, @@ -595,8 +594,8 @@ public: virtual CORBA::Boolean request_connection (AVStreams::StreamEndPoint_ptr initiator, CORBA::Boolean is_mcast, AVStreams::streamQoS &qos, - AVStreams::flowSpec &the_spec, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + AVStreams::flowSpec &the_spec + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpDenied, AVStreams::noSuchFlow, @@ -605,24 +604,24 @@ public: /// Change the transport qos on a stream virtual CORBA::Boolean modify_QoS (AVStreams::streamQoS &new_qos, - const AVStreams::flowSpec &the_flows, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + const AVStreams::flowSpec &the_flows + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::QoSRequestFailed)); - + virtual int change_qos (AVStreams::streamQoS &new_qos, - const AVStreams::flowSpec &the_flows, - CORBA::Environment &env = CORBA::Environment::default_environment ()); - + const AVStreams::flowSpec &the_flows + TAO_ENV_ARG_DECL_WITH_DEFAULTS); + /// Used to restrict the set of protocols - virtual CORBA::Boolean set_protocol_restriction (const AVStreams::protocolSpec &the_pspec, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual CORBA::Boolean set_protocol_restriction (const AVStreams::protocolSpec &the_pspec + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// disconnect the flows - virtual void disconnect (const AVStreams::flowSpec &the_spec, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual void disconnect (const AVStreams::flowSpec &the_spec + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::streamOpFailed)); @@ -630,65 +629,65 @@ public: /// Used to control the flow virtual void set_FPStatus (const AVStreams::flowSpec &the_spec, const char *fp_name, - const CORBA::Any &fp_settings, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + const CORBA::Any &fp_settings + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::FPError)); /// Not implemented in the light profile, throws notsupported - virtual CORBA::Object_ptr get_fep (const char *flow_name, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual CORBA::Object_ptr get_fep (const char *flow_name + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported, AVStreams::noSuchFlow)); /// Not implemented in the light profile, throws notsupported - virtual char * add_fep (CORBA::Object_ptr the_fep, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual char * add_fep (CORBA::Object_ptr the_fep + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported, AVStreams::streamOpFailed)); /// Not implemented in the light profile, throws notsupported - virtual void remove_fep (const char *fep_name, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual void remove_fep (const char *fep_name + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported, AVStreams::streamOpFailed)); /// Used to "attach" a negotiator to the endpoint - virtual void set_negotiator (AVStreams::Negotiator_ptr new_negotiator, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual void set_negotiator (AVStreams::Negotiator_ptr new_negotiator + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Used for public key encryption. virtual void set_key (const char *flow_name, - const AVStreams::key & the_key, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + const AVStreams::key & the_key + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Used to set a unique id for packets sent by this streamendpoint - virtual void set_source_id (CORBA::Long source_id, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual void set_source_id (CORBA::Long source_id + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Destructor virtual ~TAO_StreamEndPoint (void); CORBA::Boolean multiconnect (AVStreams::streamQoS &the_qos, - AVStreams::flowSpec &the_spec, - CORBA::Environment &ACE_TRY_ENV); + AVStreams::flowSpec &the_spec + TAO_ENV_ARG_DECL); protected: /// Helper methods to implement add_fep() - char* add_fep_i (AVStreams::FlowEndPoint_ptr fep, - CORBA::Environment &ACE_TRY_ENV) + char* add_fep_i (AVStreams::FlowEndPoint_ptr fep + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported, AVStreams::streamOpFailed)); - char* add_fep_i_add_property (AVStreams::FlowEndPoint_ptr fep, - CORBA::Environment &ACE_TRY_ENV) + char* add_fep_i_add_property (AVStreams::FlowEndPoint_ptr fep + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported, AVStreams::streamOpFailed)); @@ -753,8 +752,8 @@ public: /// Used for ATM-style multicast virtual CORBA::Boolean multiconnect (AVStreams::streamQoS &the_qos, - AVStreams::flowSpec &the_spec, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + AVStreams::flowSpec &the_spec + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::QoSRequestFailed, @@ -763,8 +762,8 @@ public: /// Used for ATM-style multicast virtual CORBA::Boolean connect_leaf (AVStreams::StreamEndPoint_B_ptr the_ep, AVStreams::streamQoS &the_qos, - const AVStreams::flowSpec &the_flows, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + const AVStreams::flowSpec &the_flows + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::noSuchFlow, @@ -773,8 +772,8 @@ public: /// Used to remove a multicast leaf virtual void disconnect_leaf (AVStreams::StreamEndPoint_B_ptr the_ep, - const AVStreams::flowSpec &theSpec, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + const AVStreams::flowSpec &theSpec + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::noSuchFlow, @@ -806,8 +805,8 @@ public: /// Used for internet-style multicast virtual CORBA::Boolean multiconnect (AVStreams::streamQoS &the_qos, - AVStreams::flowSpec &the_spec, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + AVStreams::flowSpec &the_spec + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::noSuchFlow, @@ -837,8 +836,8 @@ public: virtual CORBA::Boolean set_peer (AVStreams::StreamCtrl_ptr the_ctrl, AVStreams::VDev_ptr the_peer_dev, AVStreams::streamQoS &the_qos, - const AVStreams::flowSpec &the_spec, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + const AVStreams::flowSpec &the_spec + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::QoSRequestFailed, @@ -848,39 +847,39 @@ public: virtual CORBA::Boolean set_Mcast_peer (AVStreams::StreamCtrl_ptr the_ctrl, AVStreams::MCastConfigIf_ptr a_mcastconfigif, AVStreams::streamQoS &the_qos, - const AVStreams::flowSpec &the_spec, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + const AVStreams::flowSpec &the_spec + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::QoSRequestFailed, AVStreams::streamOpFailed)); /// Called by the peer VDev to configure the device (catch all) - virtual void configure (const CosPropertyService::Property &the_config_mesg, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual void configure (const CosPropertyService::Property &the_config_mesg + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::PropertyException, AVStreams::streamOpFailed)); /// Used to set a format on a flowname virtual void set_format (const char *flowName, - const char *format_name, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + const char *format_name + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported)); /// Used to set device parameters virtual void set_dev_params (const char *flowName, - const CosPropertyService::Properties &new_params, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + const CosPropertyService::Properties &new_params + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::PropertyException, AVStreams::streamOpFailed)); /// Called to change QoS of the device virtual CORBA::Boolean modify_QoS (AVStreams::streamQoS &the_qos, - const AVStreams::flowSpec &the_spec, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + const AVStreams::flowSpec &the_spec + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::QoSRequestFailed)); @@ -890,8 +889,8 @@ public: protected: /// hook called after set_peer is done to set the media ctrl of the peer vdev. - virtual CORBA::Boolean set_media_ctrl (CORBA::Object_ptr media_ctrl, - CORBA::Environment &env = CORBA::Environment::default_environment ()); + virtual CORBA::Boolean set_media_ctrl (CORBA::Object_ptr media_ctrl + TAO_ENV_ARG_DECL_WITH_DEFAULTS); /// My stream controller AVStreams::StreamCtrl_var streamctrl_; @@ -930,16 +929,16 @@ public: AVStreams::streamQoS &the_qos, CORBA::Boolean_out met_qos, char *&named_vdev, - const AVStreams::flowSpec &the_spec, - CORBA::Environment &env = CORBA::Environment::default_environment ()); + const AVStreams::flowSpec &the_spec + TAO_ENV_ARG_DECL_WITH_DEFAULTS); /// Can be used to request the MMDevice to create a new StreamCtrl, /// and call bind_devs on it virtual AVStreams::StreamCtrl_ptr bind (AVStreams::MMDevice_ptr peer_device, AVStreams::streamQoS &the_qos, CORBA::Boolean_out is_met, - const AVStreams::flowSpec &the_spec, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + const AVStreams::flowSpec &the_spec + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::noSuchFlow, @@ -949,8 +948,8 @@ public: virtual AVStreams::StreamCtrl_ptr bind_mcast (AVStreams::MMDevice_ptr first_peer, AVStreams::streamQoS &the_qos, CORBA::Boolean_out is_met, - const AVStreams::flowSpec &the_spec, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + const AVStreams::flowSpec &the_spec + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::noSuchFlow, @@ -962,8 +961,8 @@ public: AVStreams::streamQoS &the_qos, CORBA::Boolean_out met_qos, char *&named_vdev, - const AVStreams::flowSpec &the_spec, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + const AVStreams::flowSpec &the_spec + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::streamOpDenied, @@ -977,8 +976,8 @@ public: AVStreams::streamQoS &the_qos, CORBA::Boolean_out met_qos, char *&named_vdev, - const AVStreams::flowSpec &the_spec, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + const AVStreams::flowSpec &the_spec + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::streamOpDenied, @@ -988,28 +987,28 @@ public: /// Remove the StreamEndPoint and the related vdev virtual void destroy (AVStreams::StreamEndPoint_ptr the_ep, - const char *vdev_name, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + const char *vdev_name + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported)); /// Not supported in the light profile, raises notsupported - virtual char * add_fdev (CORBA::Object_ptr the_fdev, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual char * add_fdev (CORBA::Object_ptr the_fdev + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported, AVStreams::streamOpFailed)); /// Not supported in the light profile, raises notsupported - virtual CORBA::Object_ptr get_fdev (const char *flow_name, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual CORBA::Object_ptr get_fdev (const char *flow_name + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported, AVStreams::noSuchFlow)); /// Not supported in the light profile, raises notsupported - virtual void remove_fdev (const char *flow_name, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual void remove_fdev (const char *flow_name + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported, AVStreams::noSuchFlow, @@ -1020,8 +1019,8 @@ public: protected: /// Helper method to implement add_fdev() - char* add_fdev_i (AVStreams::FDev_ptr fdev, - CORBA::Environment &ACE_TRY_ENV) + char* add_fdev_i (AVStreams::FDev_ptr fdev + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported, AVStreams::streamOpFailed)); @@ -1070,42 +1069,42 @@ public: TAO_FlowConnection (void); /// stop this flow. - virtual void stop (CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual void stop (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// start this flow. - virtual void start (CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual void start (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// destroy this flow. - virtual void destroy (CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// modify the QoS for this flow. - virtual CORBA::Boolean modify_QoS (AVStreams::QoS & new_qos, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual CORBA::Boolean modify_QoS (AVStreams::QoS & new_qos + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::QoSRequestFailed)); /// use the specified flow protocol for this flow. virtual CORBA::Boolean use_flow_protocol (const char * fp_name, - const CORBA::Any & fp_settings, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + const CORBA::Any & fp_settings + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::FPError, AVStreams::notSupported)); /// pushes an event , to be handled by the application. - virtual void push_event (const AVStreams::streamEvent & the_event, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual void push_event (const AVStreams::streamEvent & the_event + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// connect 2 Flow Devices. virtual CORBA::Boolean connect_devs (AVStreams::FDev_ptr a_party, AVStreams::FDev_ptr b_party, - AVStreams::QoS & the_qos, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + AVStreams::QoS & the_qos + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::streamOpDenied, @@ -1114,35 +1113,35 @@ public: /// Connect a flow producer and consumer under this flow connection. virtual CORBA::Boolean connect (AVStreams::FlowProducer_ptr flow_producer, AVStreams::FlowConsumer_ptr flow_consumer, - AVStreams::QoS & the_qos, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + AVStreams::QoS & the_qos + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::formatMismatch, AVStreams::FEPMismatch, AVStreams::alreadyConnected)); /// disconnect this flow connection. - virtual CORBA::Boolean disconnect (CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual CORBA::Boolean disconnect (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// adds the producer to this flow connection. virtual CORBA::Boolean add_producer (AVStreams::FlowProducer_ptr flow_producer, - AVStreams::QoS & the_qos, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + AVStreams::QoS & the_qos + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::alreadyConnected, AVStreams::notSupported)); /// adds a consumer to this flow connection. virtual CORBA::Boolean add_consumer (AVStreams::FlowConsumer_ptr flow_consumer, - AVStreams::QoS & the_qos, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + AVStreams::QoS & the_qos + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::alreadyConnected)); /// drops a flow endpoint from the flow. - virtual CORBA::Boolean drop (AVStreams::FlowEndPoint_ptr target, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual CORBA::Boolean drop (AVStreams::FlowEndPoint_ptr target + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notConnected)); @@ -1172,7 +1171,7 @@ protected: /** * @class TAO_FlowEndPoint - * @brief This class is used per flow e.g video flow and an audio flow + * @brief This class is used per flow e.g video flow and an audio flow * to encapsulate the transport details. */ class TAO_AV_Export TAO_FlowEndPoint : @@ -1204,82 +1203,75 @@ public: TAO_AV_Protocol_Object *object); /// lock the flow endpoint for a particular flow. - virtual CORBA::Boolean lock (CORBA::Environment &env = - CORBA::Environment::default_environment ()) + virtual CORBA::Boolean lock (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// unlock the flow endpoint for subsequent use. - virtual void unlock (CORBA::Environment &env = - CORBA::Environment::default_environment ()) + virtual void unlock (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// destroy this flow. - virtual void destroy (CORBA::Environment &env = - CORBA::Environment::default_environment ()) + virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// get method for the related streamendpoint under which this /// flowendpoint is. - virtual AVStreams::StreamEndPoint_ptr related_sep(CORBA::Environment &env = - CORBA::Environment::default_environment ()) + virtual AVStreams::StreamEndPoint_ptr related_sep(TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// set method for the related streamendpoint under which this /// flowendpoint is. - virtual void related_sep (AVStreams::StreamEndPoint_ptr related_sep, - CORBA::Environment &env = - CORBA::Environment::default_environment ()) + virtual void related_sep (AVStreams::StreamEndPoint_ptr related_sep + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual AVStreams::FlowConnection_ptr related_flow_connection(CORBA::Environment &env = - CORBA::Environment::default_environment ()) + virtual AVStreams::FlowConnection_ptr related_flow_connection(TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // accessor for the related flow connection attribute. /// set method for the related flow connection attribute. - virtual void related_flow_connection (AVStreams::FlowConnection_ptr related_flow_connection, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual void related_flow_connection (AVStreams::FlowConnection_ptr related_flow_connection + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// returns the other flowendpoint to which this is connected. - virtual AVStreams::FlowEndPoint_ptr get_connected_fep (CORBA::Environment &env = - CORBA::Environment::default_environment ()) + virtual AVStreams::FlowEndPoint_ptr get_connected_fep (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notConnected, AVStreams::notSupported)); //// use the specified flow protocol. virtual CORBA::Boolean use_flow_protocol (const char * fp_name, - const CORBA::Any & fp_settings, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + const CORBA::Any & fp_settings + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::FPError, AVStreams::notSupported)); /// sets the data format. - virtual void set_format (const char * format, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual void set_format (const char * format + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported)); /// sets the device parameters. - virtual void set_dev_params (const CosPropertyService::Properties & new_settings, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual void set_dev_params (const CosPropertyService::Properties & new_settings + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::PropertyException, AVStreams::streamOpFailed)); /// sets the list of protocols to be used. - virtual void set_protocol_restriction (const AVStreams::protocolSpec & the_spec, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual void set_protocol_restriction (const AVStreams::protocolSpec & the_spec + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported)); /// checks whether the passed flowendpoint is compatible with this. - virtual CORBA::Boolean is_fep_compatible (AVStreams::FlowEndPoint_ptr fep, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual CORBA::Boolean is_fep_compatible (AVStreams::FlowEndPoint_ptr fep + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::formatMismatch, AVStreams::deviceQosMismatch)); @@ -1287,8 +1279,8 @@ public: /// sets the peer flowendpoint. virtual CORBA::Boolean set_peer (AVStreams::FlowConnection_ptr the_fc, AVStreams::FlowEndPoint_ptr the_peer_fep, - AVStreams::QoS & the_qos, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + AVStreams::QoS & the_qos + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::QoSRequestFailed, AVStreams::streamOpFailed)); @@ -1296,9 +1288,8 @@ public: /// sets the multicast peer flowendpoint, not implemented. virtual CORBA::Boolean set_Mcast_peer (AVStreams::FlowConnection_ptr the_fc, AVStreams::MCastConfigIf_ptr a_mcastconfigif, - AVStreams::QoS & the_qos, - CORBA::Environment &env = - CORBA::Environment::default_environment ()) + AVStreams::QoS & the_qos + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::QoSRequestFailed)); @@ -1310,9 +1301,8 @@ public: */ virtual CORBA::Boolean connect_to_peer (AVStreams::QoS & the_qos, const char * address, - const char * use_flow_protocol, - CORBA::Environment &env = - CORBA::Environment::default_environment ()) + const char * use_flow_protocol + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::failedToConnect, AVStreams::FPError, @@ -1322,9 +1312,8 @@ public: virtual CORBA::Boolean connect_to_peer_i (TAO_FlowSpec_Entry::Role role, AVStreams::QoS & the_qos, const char * address, - const char * use_flow_protocol, - CORBA::Environment &env = - CORBA::Environment::default_environment ()) + const char * use_flow_protocol + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::failedToConnect, AVStreams::FPError, @@ -1338,9 +1327,8 @@ public: virtual char * go_to_listen (AVStreams::QoS & the_qos, CORBA::Boolean is_mcast, AVStreams::FlowEndPoint_ptr peer, - char *& flowProtocol, - CORBA::Environment &env = - CORBA::Environment::default_environment ()) + char *& flowProtocol + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::failedToListen, AVStreams::FPError, @@ -1351,9 +1339,8 @@ public: AVStreams::QoS & the_qos, CORBA::Boolean is_mcast, AVStreams::FlowEndPoint_ptr peer, - char *& flowProtocol, - CORBA::Environment &env = - CORBA::Environment::default_environment ()) + char *& flowProtocol + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::failedToListen, AVStreams::FPError, @@ -1409,26 +1396,23 @@ public: * UDP if the producer is listening and the consumer connects (logically) then the producer needs to * know the reverse channel on its peer fep to send data to. */ - virtual char * get_rev_channel (const char * pcol_name, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual char * get_rev_channel (const char * pcol_name + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// stop this flow, to be overridden by the application. - virtual void stop (CORBA::Environment &env = - CORBA::Environment::default_environment ()) + virtual void stop (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// start this flow, to be overridden by the application. - virtual void start (CORBA::Environment &env = - CORBA::Environment::default_environment ()) + virtual void start (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * go_to_listen (AVStreams::QoS & the_qos, CORBA::Boolean is_mcast, AVStreams::FlowEndPoint_ptr peer, - char *& flowProtocol, - CORBA::Environment &env = - CORBA::Environment::default_environment ()) + char *& flowProtocol + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::failedToListen, AVStreams::FPError, @@ -1436,9 +1420,8 @@ public: virtual CORBA::Boolean connect_to_peer (AVStreams::QoS & the_qos, const char * address, - const char * use_flow_protocol, - CORBA::Environment &env = - CORBA::Environment::default_environment ()) + const char * use_flow_protocol + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::failedToConnect, AVStreams::FPError, @@ -1448,8 +1431,8 @@ public: virtual char * connect_mcast (AVStreams::QoS & the_qos, CORBA::Boolean_out is_met, const char * address, - const char * use_flow_protocol, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + const char * use_flow_protocol + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::failedToConnect, AVStreams::notSupported, @@ -1459,14 +1442,14 @@ public: /// sets the public key to be used for encryption of the data. - virtual void set_key (const AVStreams::key & the_key, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual void set_key (const AVStreams::key & the_key + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// sets the source id of this flow producer so that it can be used /// to distinguish this producer from others in the multicast case. - virtual void set_source_id (CORBA::Long source_id, - CORBA::Environment &env =CORBA::Environment::default_environment()) + virtual void set_source_id (CORBA::Long source_id + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); protected: @@ -1489,21 +1472,18 @@ public: const char *format); /// stop this flow, to be overridden by the application. - virtual void stop (CORBA::Environment &env = - CORBA::Environment::default_environment ()) + virtual void stop (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// start this flow, to be overridden by the application. - virtual void start (CORBA::Environment &env = - CORBA::Environment::default_environment ()) + virtual void start (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * go_to_listen (AVStreams::QoS & the_qos, CORBA::Boolean is_mcast, AVStreams::FlowEndPoint_ptr peer, - char *& flowProtocol, - CORBA::Environment &env = - CORBA::Environment::default_environment ()) + char *& flowProtocol + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::failedToListen, AVStreams::FPError, @@ -1511,16 +1491,15 @@ public: virtual CORBA::Boolean connect_to_peer (AVStreams::QoS & the_qos, const char * address, - const char * use_flow_protocol, - CORBA::Environment &env = - CORBA::Environment::default_environment ()) + const char * use_flow_protocol + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::failedToConnect, AVStreams::FPError, AVStreams::QoSRequestFailed)); }; -/** +/** * @class TAO_MediaControl * @brief Abstract Mediacontrol class. * The following are to be handled by the specialized media control @@ -1536,34 +1515,34 @@ public: TAO_MediaControl (void); virtual AVStreams::Position get_media_position (AVStreams::PositionOrigin an_origin, - AVStreams::PositionKey a_key, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + AVStreams::PositionKey a_key + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::MediaControl::PostionKeyNotSupported)) =0; - virtual void set_media_position (const AVStreams::Position & a_position, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual void set_media_position (const AVStreams::Position & a_position + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::MediaControl::PostionKeyNotSupported, AVStreams::InvalidPosition)) =0; - virtual void start (const AVStreams::Position & a_position, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual void start (const AVStreams::Position & a_position + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::InvalidPosition)) =0; - virtual void pause (const AVStreams::Position & a_position, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual void pause (const AVStreams::Position & a_position + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::InvalidPosition)) =0; - virtual void resume (const AVStreams::Position & a_position, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual void resume (const AVStreams::Position & a_position + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::InvalidPosition)) =0; - virtual void stop (const AVStreams::Position & a_position, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual void stop (const AVStreams::Position & a_position + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::InvalidPosition)) =0; |