Changeset 6026 for pjproject/trunk/pjsip/src/pjsua2/media.cpp

Timestamp:

Jun 12, 2019 6:00:35 AM (5 years ago)

Author:

nanang

Message:

Misc (re #2147): Fixed compile warnings "dynamic exception specifications are deprecated in C++11".

File:

• pjproject/trunk/pjsip/src/pjsua2/media.cpp (modified) (84 diffs)

pjproject/trunk/pjsip/src/pjsua2/media.cpp

@@ -129 +129 @@
 }
 
-void AudioMedia::registerMediaPort(MediaPort port) throw(Error)
+void AudioMedia::registerMediaPort(MediaPort port) PJSUA2_THROW(Error)
 {
     /* Check if media already added to Conf bridge. */
@@ -157 +157 @@
 
 void AudioMedia::registerMediaPort2(MediaPort port, pj_pool_t *pool)
-     throw(Error)
+     PJSUA2_THROW(Error)
 {
     /* Check if media already added to Conf bridge. */
@@ -194 +194 @@
 }
 
-ConfPortInfo AudioMedia::getPortInfo() const throw(Error)
+ConfPortInfo AudioMedia::getPortInfo() const PJSUA2_THROW(Error)
 {
     return AudioMedia::getPortInfoFromId(id);
@@ -204 +204 @@
 }
 
-ConfPortInfo AudioMedia::getPortInfoFromId(int port_id) throw(Error)
+ConfPortInfo AudioMedia::getPortInfoFromId(int port_id) PJSUA2_THROW(Error)
 {
     pjsua_conf_port_info pj_info;
@@ -214 +214 @@
 }
 
-void AudioMedia::startTransmit(const AudioMedia &sink) const throw(Error)
+void AudioMedia::startTransmit(const AudioMedia &sink) const PJSUA2_THROW(Error)
 {
     PJSUA2_CHECK_EXPR( pjsua_conf_connect(id, sink.id) );
@@ -221 +221 @@
 void AudioMedia::startTransmit2(const AudioMedia &sink,
                                 const AudioMediaTransmitParam &param) const
-     throw(Error)
+     PJSUA2_THROW(Error)
 {
     pjsua_conf_connect_param pj_param;
@@ -230 +230 @@
 }
 
-void AudioMedia::stopTransmit(const AudioMedia &sink) const throw(Error)
+void AudioMedia::stopTransmit(const AudioMedia &sink) const PJSUA2_THROW(Error)
 {
     PJSUA2_CHECK_EXPR( pjsua_conf_disconnect(id, sink.id) );
 }
 
-void AudioMedia::adjustRxLevel(float level) throw(Error)
+void AudioMedia::adjustRxLevel(float level) PJSUA2_THROW(Error)
 {
     PJSUA2_CHECK_EXPR( pjsua_conf_adjust_tx_level(id, level) );
 }
 
-void AudioMedia::adjustTxLevel(float level) throw(Error)
+void AudioMedia::adjustTxLevel(float level) PJSUA2_THROW(Error)
 {
     PJSUA2_CHECK_EXPR( pjsua_conf_adjust_rx_level(id, level) );
 }
 
-unsigned AudioMedia::getRxLevel() const throw(Error)
+unsigned AudioMedia::getRxLevel() const PJSUA2_THROW(Error)
 {
     unsigned level;
@@ -252 +252 @@
 }
 
-unsigned AudioMedia::getTxLevel() const throw(Error)
+unsigned AudioMedia::getTxLevel() const PJSUA2_THROW(Error)
 {
     unsigned level;
@@ -282 +282 @@
 void AudioMediaPlayer::createPlayer(const string &file_name,
                                     unsigned options)
-                                    throw(Error)
+                                    PJSUA2_THROW(Error)
 {
     if (playerId != PJSUA_INVALID_ID) {
@@ -318 +318 @@
                                       const string &label,
                                       unsigned options)
-                                      throw(Error)
+                                      PJSUA2_THROW(Error)
 {
     if (playerId != PJSUA_INVALID_ID) {
@@ -363 +363 @@
 }
 
-AudioMediaPlayerInfo AudioMediaPlayer::getInfo() const throw(Error)
+AudioMediaPlayerInfo AudioMediaPlayer::getInfo() const PJSUA2_THROW(Error)
 {
     AudioMediaPlayerInfo info;
@@ -379 +379 @@
 }
 
-pj_uint32_t AudioMediaPlayer::getPos() const throw(Error)
+pj_uint32_t AudioMediaPlayer::getPos() const PJSUA2_THROW(Error)
 {
     pj_ssize_t pos = pjsua_player_get_pos(playerId);
@@ -388 +388 @@
 }
 
-void AudioMediaPlayer::setPos(pj_uint32_t samples) throw(Error)
+void AudioMediaPlayer::setPos(pj_uint32_t samples) PJSUA2_THROW(Error)
 {
     PJSUA2_CHECK_EXPR( pjsua_player_set_pos(playerId, samples) );
@@ -426 +426 @@
                                         long max_size,
                                         unsigned options)
-                                        throw(Error)
+                                        PJSUA2_THROW(Error)
 {
     PJ_UNUSED_ARG(max_size);
@@ -476 +476 @@
 
 void ToneGenerator::createToneGenerator(unsigned clock_rate,
-                                        unsigned channel_count) throw(Error)
+                                        unsigned channel_count)
+                                        PJSUA2_THROW(Error)
 {
     pj_status_t status;
@@ -504 +505 @@
 }
 
-void ToneGenerator::stop() throw(Error)
+void ToneGenerator::stop() PJSUA2_THROW(Error)
 {
     pj_status_t status;
@@ -516 +517 @@
 }
 
-void ToneGenerator::rewind() throw(Error)
+void ToneGenerator::rewind() PJSUA2_THROW(Error)
 {
     pj_status_t status;
@@ -529 +530 @@
 
 void ToneGenerator::play(const ToneDescVector &tones,
-                         bool loop) throw(Error)
+                         bool loop) PJSUA2_THROW(Error)
 {
     pj_status_t status;
@@ -546 +547 @@
 
 void ToneGenerator::playDigits(const ToneDigitVector &digits,
-                               bool loop) throw(Error)
+                               bool loop) PJSUA2_THROW(Error)
 {
     pj_status_t status;
@@ -557 +558 @@
     }
 
-    status = pjmedia_tonegen_play_digits(tonegen, (unsigned)digits.size(), &digits[0],
+    status = pjmedia_tonegen_play_digits(tonegen,
+                                         (unsigned)digits.size(),
+                                         &digits[0],
                                          loop? PJMEDIA_TONEGEN_LOOP : 0);
     PJSUA2_CHECK_RAISE_ERROR2(status, "ToneGenerator::playDigits()");
 }
 
-ToneDigitMapVector ToneGenerator::getDigitMap() const throw(Error)
+ToneDigitMapVector ToneGenerator::getDigitMap() const PJSUA2_THROW(Error)
 {
     const pjmedia_tone_digit_map *pdm;
@@ -594 +597 @@
 
 void ToneGenerator::setDigitMap(const ToneDigitMapVector &digit_map)
-                                throw(Error)
+                                PJSUA2_THROW(Error)
 {
     unsigned i;
@@ -682 +685 @@
 }
 
-int AudDevManager::getCaptureDev() const throw(Error)
+int AudDevManager::getCaptureDev() const PJSUA2_THROW(Error)
 {
     return getActiveDev(true);
 }
 
-AudioMedia &AudDevManager::getCaptureDevMedia() throw(Error)
+AudioMedia &AudDevManager::getCaptureDevMedia() PJSUA2_THROW(Error)
 {
     if (!devMedia)
@@ -694 +697 @@
 }
 
-int AudDevManager::getPlaybackDev() const throw(Error)
+int AudDevManager::getPlaybackDev() const PJSUA2_THROW(Error)
 {
     return getActiveDev(false);
 }
 
-AudioMedia &AudDevManager::getPlaybackDevMedia() throw(Error)
+AudioMedia &AudDevManager::getPlaybackDevMedia() PJSUA2_THROW(Error)
 {
     if (!devMedia)
@@ -706 +709 @@
 }
 
-void AudDevManager::setCaptureDev(int capture_dev) const throw(Error)
+void AudDevManager::setCaptureDev(int capture_dev) const PJSUA2_THROW(Error)
 {    
     pjsua_snd_dev_param param;
@@ -726 +729 @@
 }
 
-void AudDevManager::setPlaybackDev(int playback_dev) const throw(Error)
+void AudDevManager::setPlaybackDev(int playback_dev) const PJSUA2_THROW(Error)
 {
     pjsua_snd_dev_param param;
@@ -746 +749 @@
 }
 
-const AudioDevInfoVector &AudDevManager::enumDev() throw(Error)
+const AudioDevInfoVector &AudDevManager::enumDev() PJSUA2_THROW(Error)
 {
     pjmedia_aud_dev_info pj_info[MAX_DEV_COUNT];
@@ -764 +767 @@
 }
 
-AudioDevInfoVector2 AudDevManager::enumDev2() const throw(Error)
+AudioDevInfoVector2 AudDevManager::enumDev2() const PJSUA2_THROW(Error)
 {
     pjmedia_aud_dev_info pj_info[MAX_DEV_COUNT];
@@ -781 +784 @@
 }
 
-void AudDevManager::setNullDev() throw(Error)
+void AudDevManager::setNullDev() PJSUA2_THROW(Error)
 {
     PJSUA2_CHECK_EXPR( pjsua_set_null_snd_dev() );
@@ -791 +794 @@
 }
 
-void AudDevManager::setSndDevMode(unsigned mode) const throw(Error)
+void AudDevManager::setSndDevMode(unsigned mode) const PJSUA2_THROW(Error)
 {    
     int capture_dev = 0, playback_dev = 0;
@@ -807 +810 @@
 
 void AudDevManager::setEcOptions(unsigned tail_msec,
-                                 unsigned options) throw(Error)
+                                 unsigned options) PJSUA2_THROW(Error)
 {
     PJSUA2_CHECK_EXPR( pjsua_set_ec(tail_msec, options) );
 }
 
-unsigned AudDevManager::getEcTail() const throw(Error)
+unsigned AudDevManager::getEcTail() const PJSUA2_THROW(Error)
 {
     unsigned tail_msec = 0;
@@ -826 +829 @@
 }
 
-void AudDevManager::refreshDevs() throw(Error)
+void AudDevManager::refreshDevs() PJSUA2_THROW(Error)
 {
     PJSUA2_CHECK_EXPR( pjmedia_aud_dev_refresh() );
@@ -837 +840 @@
 
 AudioDevInfo
-AudDevManager::getDevInfo(int id) const throw(Error)
+AudDevManager::getDevInfo(int id) const PJSUA2_THROW(Error)
 {
     AudioDevInfo dev_info;
@@ -849 +852 @@
 
 int AudDevManager::lookupDev(const string &drv_name,
-                             const string &dev_name) const throw(Error)
+                             const string &dev_name) const PJSUA2_THROW(Error)
 {
     pjmedia_aud_dev_index pj_idx = 0;
@@ -868 +871 @@
 void
 AudDevManager::setExtFormat(const MediaFormatAudio &format,
-                            bool keep) throw(Error)
+                            bool keep) PJSUA2_THROW(Error)
 {
     pjmedia_format pj_format = format.toPj();
@@ -877 +880 @@
 }
 
-MediaFormatAudio AudDevManager::getExtFormat() const throw(Error)
+MediaFormatAudio AudDevManager::getExtFormat() const PJSUA2_THROW(Error)
 {
     pjmedia_format pj_format;
@@ -891 +894 @@
 
 void AudDevManager::setInputLatency(unsigned latency_msec,
-                                    bool keep) throw(Error)
+                                    bool keep) PJSUA2_THROW(Error)
 {
     PJSUA2_CHECK_EXPR( pjsua_snd_set_setting(PJMEDIA_AUD_DEV_CAP_INPUT_LATENCY,
@@ -898 +901 @@
 }
 
-unsigned AudDevManager::getInputLatency() const throw(Error)
+unsigned AudDevManager::getInputLatency() const PJSUA2_THROW(Error)
 {
     unsigned latency_msec = 0;
@@ -910 +913 @@
 void
 AudDevManager::setOutputLatency(unsigned latency_msec,
-                                bool keep) throw(Error)
+                                bool keep) PJSUA2_THROW(Error)
 {
     PJSUA2_CHECK_EXPR( pjsua_snd_set_setting(PJMEDIA_AUD_DEV_CAP_OUTPUT_LATENCY,
@@ -917 +920 @@
 }
 
-unsigned AudDevManager::getOutputLatency() const throw(Error)
+unsigned AudDevManager::getOutputLatency() const PJSUA2_THROW(Error)
 {
     unsigned latency_msec = 0;
@@ -927 +930 @@
 }
 
-void AudDevManager::setInputVolume(unsigned volume, bool keep) throw(Error)
+void AudDevManager::setInputVolume(unsigned volume, bool keep)
+                                   PJSUA2_THROW(Error)
 {
     PJSUA2_CHECK_EXPR(
@@ -935 +939 @@
 }
 
-unsigned AudDevManager::getInputVolume() const throw(Error)
+unsigned AudDevManager::getInputVolume() const PJSUA2_THROW(Error)
 {
     unsigned volume = 0;
@@ -946 +950 @@
 }
 
-void AudDevManager::setOutputVolume(unsigned volume, bool keep) throw(Error)
+void AudDevManager::setOutputVolume(unsigned volume, bool keep)
+                                    PJSUA2_THROW(Error)
 {
     PJSUA2_CHECK_EXPR(
@@ -954 +959 @@
 }
 
-unsigned AudDevManager::getOutputVolume() const throw(Error)
+unsigned AudDevManager::getOutputVolume() const PJSUA2_THROW(Error)
 {
     unsigned volume = 0;
@@ -965 +970 @@
 }
 
-unsigned AudDevManager::getInputSignal() const throw(Error)
+unsigned AudDevManager::getInputSignal() const PJSUA2_THROW(Error)
 {
     unsigned signal = 0;
@@ -976 +981 @@
 }
 
-unsigned AudDevManager::getOutputSignal() const throw(Error)
+unsigned AudDevManager::getOutputSignal() const PJSUA2_THROW(Error)
 {
     unsigned signal = 0;
@@ -989 +994 @@
 void
 AudDevManager::setInputRoute(pjmedia_aud_dev_route route,
-                             bool keep) throw(Error)
+                             bool keep) PJSUA2_THROW(Error)
 {
     PJSUA2_CHECK_EXPR( pjsua_snd_set_setting(PJMEDIA_AUD_DEV_CAP_INPUT_ROUTE,
@@ -996 +1001 @@
 }
 
-pjmedia_aud_dev_route AudDevManager::getInputRoute() const throw(Error)
+pjmedia_aud_dev_route AudDevManager::getInputRoute() const PJSUA2_THROW(Error)
 {
     pjmedia_aud_dev_route route = PJMEDIA_AUD_DEV_ROUTE_DEFAULT;
@@ -1008 +1013 @@
 void
 AudDevManager::setOutputRoute(pjmedia_aud_dev_route route,
-                              bool keep) throw(Error)
+                              bool keep) PJSUA2_THROW(Error)
 {
     PJSUA2_CHECK_EXPR( pjsua_snd_set_setting(PJMEDIA_AUD_DEV_CAP_OUTPUT_ROUTE,
@@ -1015 +1020 @@
 }
 
-pjmedia_aud_dev_route AudDevManager::getOutputRoute() const throw(Error)
+pjmedia_aud_dev_route AudDevManager::getOutputRoute() const
+                                                    PJSUA2_THROW(Error)
 {
     pjmedia_aud_dev_route route = PJMEDIA_AUD_DEV_ROUTE_DEFAULT;
@@ -1025 +1031 @@
 }
 
-void AudDevManager::setVad(bool enable, bool keep) throw(Error)
+void AudDevManager::setVad(bool enable, bool keep) PJSUA2_THROW(Error)
 {
     PJSUA2_CHECK_EXPR( pjsua_snd_set_setting(PJMEDIA_AUD_DEV_CAP_VAD,
@@ -1032 +1038 @@
 }
 
-bool AudDevManager::getVad() const throw(Error)
+bool AudDevManager::getVad() const PJSUA2_THROW(Error)
 {
     bool enable = false;
@@ -1042 +1048 @@
 }
 
-void AudDevManager::setCng(bool enable, bool keep) throw(Error)
+void AudDevManager::setCng(bool enable, bool keep) PJSUA2_THROW(Error)
 {
     PJSUA2_CHECK_EXPR( pjsua_snd_set_setting(PJMEDIA_AUD_DEV_CAP_CNG,
@@ -1049 +1055 @@
 }
 
-bool AudDevManager::getCng() const throw(Error)
+bool AudDevManager::getCng() const PJSUA2_THROW(Error)
 {
     bool enable = false;
@@ -1059 +1065 @@
 }
 
-void AudDevManager::setPlc(bool enable, bool keep) throw(Error)
+void AudDevManager::setPlc(bool enable, bool keep) PJSUA2_THROW(Error)
 {
     PJSUA2_CHECK_EXPR( pjsua_snd_set_setting(PJMEDIA_AUD_DEV_CAP_PLC,
@@ -1066 +1072 @@
 }
 
-bool AudDevManager::getPlc() const throw(Error)
+bool AudDevManager::getPlc() const PJSUA2_THROW(Error)
 {
     bool enable = false;
@@ -1084 +1090 @@
 }
 
-int AudDevManager::getActiveDev(bool is_capture) const throw(Error)
+int AudDevManager::getActiveDev(bool is_capture) const PJSUA2_THROW(Error)
 {
     int capture_dev = 0, playback_dev = 0;
@@ -1173 +1179 @@
 }
 
-VideoWindowInfo VideoWindow::getInfo() const throw(Error)
+VideoWindowInfo VideoWindow::getInfo() const PJSUA2_THROW(Error)
 {
     VideoWindowInfo vwi;
@@ -1195 +1201 @@
 }
 
-VideoMedia VideoWindow::getVideoMedia() throw(Error)
+VideoMedia VideoWindow::getVideoMedia() PJSUA2_THROW(Error)
 {
 #if PJSUA_HAS_VIDEO
@@ -1214 +1220 @@
 }
 
-void VideoWindow::Show(bool show) throw(Error)
+void VideoWindow::Show(bool show) PJSUA2_THROW(Error)
 {
 #if PJSUA_HAS_VIDEO
@@ -1223 +1229 @@
 }
 
-void VideoWindow::setPos(const MediaCoordinate &pos) throw(Error)
+void VideoWindow::setPos(const MediaCoordinate &pos) PJSUA2_THROW(Error)
 {
 #if PJSUA_HAS_VIDEO
@@ -1236 +1242 @@
 }
 
-void VideoWindow::setSize(const MediaSize &size) throw(Error)
+void VideoWindow::setSize(const MediaSize &size) PJSUA2_THROW(Error)
 {
 #if PJSUA_HAS_VIDEO
@@ -1249 +1255 @@
 }
 
-void VideoWindow::rotate(int angle) throw(Error)
+void VideoWindow::rotate(int angle) PJSUA2_THROW(Error)
 {
 #if PJSUA_HAS_VIDEO
@@ -1258 +1264 @@
 }
 
-void VideoWindow::setWindow(const VideoWindowHandle &win) throw(Error)
+void VideoWindow::setWindow(const VideoWindowHandle &win) PJSUA2_THROW(Error)
 {
 #if PJSUA_HAS_VIDEO
@@ -1327 +1333 @@
 }
 
-void VideoPreview::start(const VideoPreviewOpParam &param) throw(Error)
+void VideoPreview::start(const VideoPreviewOpParam &param) PJSUA2_THROW(Error)
 {
 #if PJSUA_HAS_VIDEO
@@ -1338 +1344 @@
 }
 
-void VideoPreview::stop() throw(Error)
+void VideoPreview::stop() PJSUA2_THROW(Error)
 {
 #if PJSUA_HAS_VIDEO
@@ -1354 +1360 @@
 }
 
-VideoMedia VideoPreview::getVideoMedia() throw(Error)
+VideoMedia VideoPreview::getVideoMedia() PJSUA2_THROW(Error)
 {
 #if PJSUA_HAS_VIDEO
@@ -1444 +1450 @@
 
 ///////////////////////////////////////////////////////////////////////////////
-void VidDevManager::refreshDevs() throw(Error)
+void VidDevManager::refreshDevs() PJSUA2_THROW(Error)
 {
 #if PJSUA_HAS_VIDEO
@@ -1460 +1466 @@
 }
 
-VideoDevInfo VidDevManager::getDevInfo(int dev_id) const throw(Error)
+VideoDevInfo VidDevManager::getDevInfo(int dev_id) const PJSUA2_THROW(Error)
 {
     VideoDevInfo dev_info;
@@ -1475 +1481 @@
 }
 
-const VideoDevInfoVector &VidDevManager::enumDev() throw(Error)
+const VideoDevInfoVector &VidDevManager::enumDev() PJSUA2_THROW(Error)
 {
 #if PJSUA_HAS_VIDEO
@@ -1495 +1501 @@
 }
 
-VideoDevInfoVector2 VidDevManager::enumDev2() const throw(Error)
+VideoDevInfoVector2 VidDevManager::enumDev2() const PJSUA2_THROW(Error)
 {
     VideoDevInfoVector2 vdiv2;
@@ -1514 +1520 @@
 
 int VidDevManager::lookupDev(const string &drv_name,
-                             const string &dev_name) const throw(Error)
+                             const string &dev_name) const PJSUA2_THROW(Error)
 {
     pjmedia_vid_dev_index pj_idx = 0;
@@ -1541 +1547 @@
 void VidDevManager::setFormat(int dev_id,
                               const MediaFormatVideo &format,
-                              bool keep) throw(Error)
+                              bool keep) PJSUA2_THROW(Error)
 {
 #if PJSUA_HAS_VIDEO
@@ -1557 +1563 @@
 }
 
-MediaFormatVideo VidDevManager::getFormat(int dev_id) const throw(Error)
+MediaFormatVideo VidDevManager::getFormat(int dev_id) const
+                                          PJSUA2_THROW(Error)
 {
     MediaFormatVideo vid_format;
@@ -1575 +1582 @@
 void VidDevManager::setInputScale(int dev_id,
                                   const MediaSize &scale,
-                                  bool keep) throw(Error)
+                                  bool keep) PJSUA2_THROW(Error)
 {
 #if PJSUA_HAS_VIDEO
@@ -1592 +1599 @@
 }
 
-MediaSize VidDevManager::getInputScale(int dev_id) const throw(Error)
+MediaSize VidDevManager::getInputScale(int dev_id) const PJSUA2_THROW(Error)
 {
     MediaSize scale;
@@ -1612 +1619 @@
 void VidDevManager::setOutputWindowFlags(int dev_id, 
                                          int flags, 
-                                         bool keep) throw(Error)
+                                         bool keep) PJSUA2_THROW(Error)
 {    
 #if PJSUA_HAS_VIDEO    
@@ -1626 +1633 @@
 }
 
-int VidDevManager::getOutputWindowFlags(int dev_id) throw(Error)
+int VidDevManager::getOutputWindowFlags(int dev_id) PJSUA2_THROW(Error)
 {
     int flags = 0;
@@ -1641 +1648 @@
 
 void VidDevManager::switchDev(int dev_id,
-                              const VideoSwitchParam &param) throw(Error)
+                              const VideoSwitchParam &param)
+                              PJSUA2_THROW(Error)
 {
 #if PJSUA_HAS_VIDEO
@@ -1679 +1687 @@
 void VidDevManager::setCaptureOrient(pjmedia_vid_dev_index dev_id,
                                      pjmedia_orient orient,
-                                     bool keep) throw(Error)
+                                     bool keep) PJSUA2_THROW(Error)
 {
 #if PJSUA_HAS_VIDEO
@@ -1867 +1875 @@
 
 void VideoMedia::registerMediaPort(MediaPort port, pj_pool_t *pool)
-     throw(Error)
+     PJSUA2_THROW(Error)
 {
 #if PJSUA_HAS_VIDEO
@@ -1907 +1915 @@
 }
 
-VidConfPortInfo VideoMedia::getPortInfo() const throw(Error)
+VidConfPortInfo VideoMedia::getPortInfo() const PJSUA2_THROW(Error)
 {
     return VideoMedia::getPortInfoFromId(id);
@@ -1917 +1925 @@
 }
 
-VidConfPortInfo VideoMedia::getPortInfoFromId(int port_id) throw(Error)
+VidConfPortInfo VideoMedia::getPortInfoFromId(int port_id) PJSUA2_THROW(Error)
 {
 #if PJSUA_HAS_VIDEO
@@ -1934 +1942 @@
 void VideoMedia::startTransmit(const VideoMedia &sink,
                                const VideoMediaTransmitParam &param) const
-     throw(Error)
+     PJSUA2_THROW(Error)
 {
     PJ_UNUSED_ARG(param);
@@ -1945 +1953 @@
 }
 
-void VideoMedia::stopTransmit(const VideoMedia &sink) const throw(Error)
+void VideoMedia::stopTransmit(const VideoMedia &sink) const
+                              PJSUA2_THROW(Error)
 {
 #if PJSUA_HAS_VIDEO