Ignore:
Timestamp:
Jun 12, 2019 6:00:35 AM (3 years ago)
Author:
nanang
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjsip/src/pjsua2/media.cpp

    r5992 r6026  
    129129} 
    130130 
    131 void AudioMedia::registerMediaPort(MediaPort port) throw(Error) 
     131void AudioMedia::registerMediaPort(MediaPort port) PJSUA2_THROW(Error) 
    132132{ 
    133133    /* Check if media already added to Conf bridge. */ 
     
    157157 
    158158void AudioMedia::registerMediaPort2(MediaPort port, pj_pool_t *pool) 
    159      throw(Error) 
     159     PJSUA2_THROW(Error) 
    160160{ 
    161161    /* Check if media already added to Conf bridge. */ 
     
    194194} 
    195195 
    196 ConfPortInfo AudioMedia::getPortInfo() const throw(Error) 
     196ConfPortInfo AudioMedia::getPortInfo() const PJSUA2_THROW(Error) 
    197197{ 
    198198    return AudioMedia::getPortInfoFromId(id); 
     
    204204} 
    205205 
    206 ConfPortInfo AudioMedia::getPortInfoFromId(int port_id) throw(Error) 
     206ConfPortInfo AudioMedia::getPortInfoFromId(int port_id) PJSUA2_THROW(Error) 
    207207{ 
    208208    pjsua_conf_port_info pj_info; 
     
    214214} 
    215215 
    216 void AudioMedia::startTransmit(const AudioMedia &sink) const throw(Error) 
     216void AudioMedia::startTransmit(const AudioMedia &sink) const PJSUA2_THROW(Error) 
    217217{ 
    218218    PJSUA2_CHECK_EXPR( pjsua_conf_connect(id, sink.id) ); 
     
    221221void AudioMedia::startTransmit2(const AudioMedia &sink, 
    222222                                const AudioMediaTransmitParam &param) const 
    223      throw(Error) 
     223     PJSUA2_THROW(Error) 
    224224{ 
    225225    pjsua_conf_connect_param pj_param; 
     
    230230} 
    231231 
    232 void AudioMedia::stopTransmit(const AudioMedia &sink) const throw(Error) 
     232void AudioMedia::stopTransmit(const AudioMedia &sink) const PJSUA2_THROW(Error) 
    233233{ 
    234234    PJSUA2_CHECK_EXPR( pjsua_conf_disconnect(id, sink.id) ); 
    235235} 
    236236 
    237 void AudioMedia::adjustRxLevel(float level) throw(Error) 
     237void AudioMedia::adjustRxLevel(float level) PJSUA2_THROW(Error) 
    238238{ 
    239239    PJSUA2_CHECK_EXPR( pjsua_conf_adjust_tx_level(id, level) ); 
    240240} 
    241241 
    242 void AudioMedia::adjustTxLevel(float level) throw(Error) 
     242void AudioMedia::adjustTxLevel(float level) PJSUA2_THROW(Error) 
    243243{ 
    244244    PJSUA2_CHECK_EXPR( pjsua_conf_adjust_rx_level(id, level) ); 
    245245} 
    246246 
    247 unsigned AudioMedia::getRxLevel() const throw(Error) 
     247unsigned AudioMedia::getRxLevel() const PJSUA2_THROW(Error) 
    248248{ 
    249249    unsigned level; 
     
    252252} 
    253253 
    254 unsigned AudioMedia::getTxLevel() const throw(Error) 
     254unsigned AudioMedia::getTxLevel() const PJSUA2_THROW(Error) 
    255255{ 
    256256    unsigned level; 
     
    282282void AudioMediaPlayer::createPlayer(const string &file_name, 
    283283                                    unsigned options) 
    284                                     throw(Error) 
     284                                    PJSUA2_THROW(Error) 
    285285{ 
    286286    if (playerId != PJSUA_INVALID_ID) { 
     
    318318                                      const string &label, 
    319319                                      unsigned options) 
    320                                       throw(Error) 
     320                                      PJSUA2_THROW(Error) 
    321321{ 
    322322    if (playerId != PJSUA_INVALID_ID) { 
     
    363363} 
    364364 
    365 AudioMediaPlayerInfo AudioMediaPlayer::getInfo() const throw(Error) 
     365AudioMediaPlayerInfo AudioMediaPlayer::getInfo() const PJSUA2_THROW(Error) 
    366366{ 
    367367    AudioMediaPlayerInfo info; 
     
    379379} 
    380380 
    381 pj_uint32_t AudioMediaPlayer::getPos() const throw(Error) 
     381pj_uint32_t AudioMediaPlayer::getPos() const PJSUA2_THROW(Error) 
    382382{ 
    383383    pj_ssize_t pos = pjsua_player_get_pos(playerId); 
     
    388388} 
    389389 
    390 void AudioMediaPlayer::setPos(pj_uint32_t samples) throw(Error) 
     390void AudioMediaPlayer::setPos(pj_uint32_t samples) PJSUA2_THROW(Error) 
    391391{ 
    392392    PJSUA2_CHECK_EXPR( pjsua_player_set_pos(playerId, samples) ); 
     
    426426                                        long max_size, 
    427427                                        unsigned options) 
    428                                         throw(Error) 
     428                                        PJSUA2_THROW(Error) 
    429429{ 
    430430    PJ_UNUSED_ARG(max_size); 
     
    476476 
    477477void ToneGenerator::createToneGenerator(unsigned clock_rate, 
    478                                         unsigned channel_count) throw(Error) 
     478                                        unsigned channel_count) 
     479                                        PJSUA2_THROW(Error) 
    479480{ 
    480481    pj_status_t status; 
     
    504505} 
    505506 
    506 void ToneGenerator::stop() throw(Error) 
     507void ToneGenerator::stop() PJSUA2_THROW(Error) 
    507508{ 
    508509    pj_status_t status; 
     
    516517} 
    517518 
    518 void ToneGenerator::rewind() throw(Error) 
     519void ToneGenerator::rewind() PJSUA2_THROW(Error) 
    519520{ 
    520521    pj_status_t status; 
     
    529530 
    530531void ToneGenerator::play(const ToneDescVector &tones, 
    531                          bool loop) throw(Error) 
     532                         bool loop) PJSUA2_THROW(Error) 
    532533{ 
    533534    pj_status_t status; 
     
    546547 
    547548void ToneGenerator::playDigits(const ToneDigitVector &digits, 
    548                                bool loop) throw(Error) 
     549                               bool loop) PJSUA2_THROW(Error) 
    549550{ 
    550551    pj_status_t status; 
     
    557558    } 
    558559 
    559     status = pjmedia_tonegen_play_digits(tonegen, (unsigned)digits.size(), &digits[0], 
     560    status = pjmedia_tonegen_play_digits(tonegen, 
     561                                         (unsigned)digits.size(), 
     562                                         &digits[0], 
    560563                                         loop? PJMEDIA_TONEGEN_LOOP : 0); 
    561564    PJSUA2_CHECK_RAISE_ERROR2(status, "ToneGenerator::playDigits()"); 
    562565} 
    563566 
    564 ToneDigitMapVector ToneGenerator::getDigitMap() const throw(Error) 
     567ToneDigitMapVector ToneGenerator::getDigitMap() const PJSUA2_THROW(Error) 
    565568{ 
    566569    const pjmedia_tone_digit_map *pdm; 
     
    594597 
    595598void ToneGenerator::setDigitMap(const ToneDigitMapVector &digit_map) 
    596                                 throw(Error) 
     599                                PJSUA2_THROW(Error) 
    597600{ 
    598601    unsigned i; 
     
    682685} 
    683686 
    684 int AudDevManager::getCaptureDev() const throw(Error) 
     687int AudDevManager::getCaptureDev() const PJSUA2_THROW(Error) 
    685688{ 
    686689    return getActiveDev(true); 
    687690} 
    688691 
    689 AudioMedia &AudDevManager::getCaptureDevMedia() throw(Error) 
     692AudioMedia &AudDevManager::getCaptureDevMedia() PJSUA2_THROW(Error) 
    690693{ 
    691694    if (!devMedia) 
     
    694697} 
    695698 
    696 int AudDevManager::getPlaybackDev() const throw(Error) 
     699int AudDevManager::getPlaybackDev() const PJSUA2_THROW(Error) 
    697700{ 
    698701    return getActiveDev(false); 
    699702} 
    700703 
    701 AudioMedia &AudDevManager::getPlaybackDevMedia() throw(Error) 
     704AudioMedia &AudDevManager::getPlaybackDevMedia() PJSUA2_THROW(Error) 
    702705{ 
    703706    if (!devMedia) 
     
    706709} 
    707710 
    708 void AudDevManager::setCaptureDev(int capture_dev) const throw(Error) 
     711void AudDevManager::setCaptureDev(int capture_dev) const PJSUA2_THROW(Error) 
    709712{     
    710713    pjsua_snd_dev_param param; 
     
    726729} 
    727730 
    728 void AudDevManager::setPlaybackDev(int playback_dev) const throw(Error) 
     731void AudDevManager::setPlaybackDev(int playback_dev) const PJSUA2_THROW(Error) 
    729732{ 
    730733    pjsua_snd_dev_param param; 
     
    746749} 
    747750 
    748 const AudioDevInfoVector &AudDevManager::enumDev() throw(Error) 
     751const AudioDevInfoVector &AudDevManager::enumDev() PJSUA2_THROW(Error) 
    749752{ 
    750753    pjmedia_aud_dev_info pj_info[MAX_DEV_COUNT]; 
     
    764767} 
    765768 
    766 AudioDevInfoVector2 AudDevManager::enumDev2() const throw(Error) 
     769AudioDevInfoVector2 AudDevManager::enumDev2() const PJSUA2_THROW(Error) 
    767770{ 
    768771    pjmedia_aud_dev_info pj_info[MAX_DEV_COUNT]; 
     
    781784} 
    782785 
    783 void AudDevManager::setNullDev() throw(Error) 
     786void AudDevManager::setNullDev() PJSUA2_THROW(Error) 
    784787{ 
    785788    PJSUA2_CHECK_EXPR( pjsua_set_null_snd_dev() ); 
     
    791794} 
    792795 
    793 void AudDevManager::setSndDevMode(unsigned mode) const throw(Error) 
     796void AudDevManager::setSndDevMode(unsigned mode) const PJSUA2_THROW(Error) 
    794797{     
    795798    int capture_dev = 0, playback_dev = 0; 
     
    807810 
    808811void AudDevManager::setEcOptions(unsigned tail_msec, 
    809                                  unsigned options) throw(Error) 
     812                                 unsigned options) PJSUA2_THROW(Error) 
    810813{ 
    811814    PJSUA2_CHECK_EXPR( pjsua_set_ec(tail_msec, options) ); 
    812815} 
    813816 
    814 unsigned AudDevManager::getEcTail() const throw(Error) 
     817unsigned AudDevManager::getEcTail() const PJSUA2_THROW(Error) 
    815818{ 
    816819    unsigned tail_msec = 0; 
     
    826829} 
    827830 
    828 void AudDevManager::refreshDevs() throw(Error) 
     831void AudDevManager::refreshDevs() PJSUA2_THROW(Error) 
    829832{ 
    830833    PJSUA2_CHECK_EXPR( pjmedia_aud_dev_refresh() ); 
     
    837840 
    838841AudioDevInfo 
    839 AudDevManager::getDevInfo(int id) const throw(Error) 
     842AudDevManager::getDevInfo(int id) const PJSUA2_THROW(Error) 
    840843{ 
    841844    AudioDevInfo dev_info; 
     
    849852 
    850853int AudDevManager::lookupDev(const string &drv_name, 
    851                              const string &dev_name) const throw(Error) 
     854                             const string &dev_name) const PJSUA2_THROW(Error) 
    852855{ 
    853856    pjmedia_aud_dev_index pj_idx = 0; 
     
    868871void 
    869872AudDevManager::setExtFormat(const MediaFormatAudio &format, 
    870                             bool keep) throw(Error) 
     873                            bool keep) PJSUA2_THROW(Error) 
    871874{ 
    872875    pjmedia_format pj_format = format.toPj(); 
     
    877880} 
    878881 
    879 MediaFormatAudio AudDevManager::getExtFormat() const throw(Error) 
     882MediaFormatAudio AudDevManager::getExtFormat() const PJSUA2_THROW(Error) 
    880883{ 
    881884    pjmedia_format pj_format; 
     
    891894 
    892895void AudDevManager::setInputLatency(unsigned latency_msec, 
    893                                     bool keep) throw(Error) 
     896                                    bool keep) PJSUA2_THROW(Error) 
    894897{ 
    895898    PJSUA2_CHECK_EXPR( pjsua_snd_set_setting(PJMEDIA_AUD_DEV_CAP_INPUT_LATENCY, 
     
    898901} 
    899902 
    900 unsigned AudDevManager::getInputLatency() const throw(Error) 
     903unsigned AudDevManager::getInputLatency() const PJSUA2_THROW(Error) 
    901904{ 
    902905    unsigned latency_msec = 0; 
     
    910913void 
    911914AudDevManager::setOutputLatency(unsigned latency_msec, 
    912                                 bool keep) throw(Error) 
     915                                bool keep) PJSUA2_THROW(Error) 
    913916{ 
    914917    PJSUA2_CHECK_EXPR( pjsua_snd_set_setting(PJMEDIA_AUD_DEV_CAP_OUTPUT_LATENCY, 
     
    917920} 
    918921 
    919 unsigned AudDevManager::getOutputLatency() const throw(Error) 
     922unsigned AudDevManager::getOutputLatency() const PJSUA2_THROW(Error) 
    920923{ 
    921924    unsigned latency_msec = 0; 
     
    927930} 
    928931 
    929 void AudDevManager::setInputVolume(unsigned volume, bool keep) throw(Error) 
     932void AudDevManager::setInputVolume(unsigned volume, bool keep) 
     933                                   PJSUA2_THROW(Error) 
    930934{ 
    931935    PJSUA2_CHECK_EXPR( 
     
    935939} 
    936940 
    937 unsigned AudDevManager::getInputVolume() const throw(Error) 
     941unsigned AudDevManager::getInputVolume() const PJSUA2_THROW(Error) 
    938942{ 
    939943    unsigned volume = 0; 
     
    946950} 
    947951 
    948 void AudDevManager::setOutputVolume(unsigned volume, bool keep) throw(Error) 
     952void AudDevManager::setOutputVolume(unsigned volume, bool keep) 
     953                                    PJSUA2_THROW(Error) 
    949954{ 
    950955    PJSUA2_CHECK_EXPR( 
     
    954959} 
    955960 
    956 unsigned AudDevManager::getOutputVolume() const throw(Error) 
     961unsigned AudDevManager::getOutputVolume() const PJSUA2_THROW(Error) 
    957962{ 
    958963    unsigned volume = 0; 
     
    965970} 
    966971 
    967 unsigned AudDevManager::getInputSignal() const throw(Error) 
     972unsigned AudDevManager::getInputSignal() const PJSUA2_THROW(Error) 
    968973{ 
    969974    unsigned signal = 0; 
     
    976981} 
    977982 
    978 unsigned AudDevManager::getOutputSignal() const throw(Error) 
     983unsigned AudDevManager::getOutputSignal() const PJSUA2_THROW(Error) 
    979984{ 
    980985    unsigned signal = 0; 
     
    989994void 
    990995AudDevManager::setInputRoute(pjmedia_aud_dev_route route, 
    991                              bool keep) throw(Error) 
     996                             bool keep) PJSUA2_THROW(Error) 
    992997{ 
    993998    PJSUA2_CHECK_EXPR( pjsua_snd_set_setting(PJMEDIA_AUD_DEV_CAP_INPUT_ROUTE, 
     
    9961001} 
    9971002 
    998 pjmedia_aud_dev_route AudDevManager::getInputRoute() const throw(Error) 
     1003pjmedia_aud_dev_route AudDevManager::getInputRoute() const PJSUA2_THROW(Error) 
    9991004{ 
    10001005    pjmedia_aud_dev_route route = PJMEDIA_AUD_DEV_ROUTE_DEFAULT; 
     
    10081013void 
    10091014AudDevManager::setOutputRoute(pjmedia_aud_dev_route route, 
    1010                               bool keep) throw(Error) 
     1015                              bool keep) PJSUA2_THROW(Error) 
    10111016{ 
    10121017    PJSUA2_CHECK_EXPR( pjsua_snd_set_setting(PJMEDIA_AUD_DEV_CAP_OUTPUT_ROUTE, 
     
    10151020} 
    10161021 
    1017 pjmedia_aud_dev_route AudDevManager::getOutputRoute() const throw(Error) 
     1022pjmedia_aud_dev_route AudDevManager::getOutputRoute() const 
     1023                                                    PJSUA2_THROW(Error) 
    10181024{ 
    10191025    pjmedia_aud_dev_route route = PJMEDIA_AUD_DEV_ROUTE_DEFAULT; 
     
    10251031} 
    10261032 
    1027 void AudDevManager::setVad(bool enable, bool keep) throw(Error) 
     1033void AudDevManager::setVad(bool enable, bool keep) PJSUA2_THROW(Error) 
    10281034{ 
    10291035    PJSUA2_CHECK_EXPR( pjsua_snd_set_setting(PJMEDIA_AUD_DEV_CAP_VAD, 
     
    10321038} 
    10331039 
    1034 bool AudDevManager::getVad() const throw(Error) 
     1040bool AudDevManager::getVad() const PJSUA2_THROW(Error) 
    10351041{ 
    10361042    bool enable = false; 
     
    10421048} 
    10431049 
    1044 void AudDevManager::setCng(bool enable, bool keep) throw(Error) 
     1050void AudDevManager::setCng(bool enable, bool keep) PJSUA2_THROW(Error) 
    10451051{ 
    10461052    PJSUA2_CHECK_EXPR( pjsua_snd_set_setting(PJMEDIA_AUD_DEV_CAP_CNG, 
     
    10491055} 
    10501056 
    1051 bool AudDevManager::getCng() const throw(Error) 
     1057bool AudDevManager::getCng() const PJSUA2_THROW(Error) 
    10521058{ 
    10531059    bool enable = false; 
     
    10591065} 
    10601066 
    1061 void AudDevManager::setPlc(bool enable, bool keep) throw(Error) 
     1067void AudDevManager::setPlc(bool enable, bool keep) PJSUA2_THROW(Error) 
    10621068{ 
    10631069    PJSUA2_CHECK_EXPR( pjsua_snd_set_setting(PJMEDIA_AUD_DEV_CAP_PLC, 
     
    10661072} 
    10671073 
    1068 bool AudDevManager::getPlc() const throw(Error) 
     1074bool AudDevManager::getPlc() const PJSUA2_THROW(Error) 
    10691075{ 
    10701076    bool enable = false; 
     
    10841090} 
    10851091 
    1086 int AudDevManager::getActiveDev(bool is_capture) const throw(Error) 
     1092int AudDevManager::getActiveDev(bool is_capture) const PJSUA2_THROW(Error) 
    10871093{ 
    10881094    int capture_dev = 0, playback_dev = 0; 
     
    11731179} 
    11741180 
    1175 VideoWindowInfo VideoWindow::getInfo() const throw(Error) 
     1181VideoWindowInfo VideoWindow::getInfo() const PJSUA2_THROW(Error) 
    11761182{ 
    11771183    VideoWindowInfo vwi; 
     
    11951201} 
    11961202 
    1197 VideoMedia VideoWindow::getVideoMedia() throw(Error) 
     1203VideoMedia VideoWindow::getVideoMedia() PJSUA2_THROW(Error) 
    11981204{ 
    11991205#if PJSUA_HAS_VIDEO 
     
    12141220} 
    12151221 
    1216 void VideoWindow::Show(bool show) throw(Error) 
     1222void VideoWindow::Show(bool show) PJSUA2_THROW(Error) 
    12171223{ 
    12181224#if PJSUA_HAS_VIDEO 
     
    12231229} 
    12241230 
    1225 void VideoWindow::setPos(const MediaCoordinate &pos) throw(Error) 
     1231void VideoWindow::setPos(const MediaCoordinate &pos) PJSUA2_THROW(Error) 
    12261232{ 
    12271233#if PJSUA_HAS_VIDEO 
     
    12361242} 
    12371243 
    1238 void VideoWindow::setSize(const MediaSize &size) throw(Error) 
     1244void VideoWindow::setSize(const MediaSize &size) PJSUA2_THROW(Error) 
    12391245{ 
    12401246#if PJSUA_HAS_VIDEO 
     
    12491255} 
    12501256 
    1251 void VideoWindow::rotate(int angle) throw(Error) 
     1257void VideoWindow::rotate(int angle) PJSUA2_THROW(Error) 
    12521258{ 
    12531259#if PJSUA_HAS_VIDEO 
     
    12581264} 
    12591265 
    1260 void VideoWindow::setWindow(const VideoWindowHandle &win) throw(Error) 
     1266void VideoWindow::setWindow(const VideoWindowHandle &win) PJSUA2_THROW(Error) 
    12611267{ 
    12621268#if PJSUA_HAS_VIDEO 
     
    13271333} 
    13281334 
    1329 void VideoPreview::start(const VideoPreviewOpParam &param) throw(Error) 
     1335void VideoPreview::start(const VideoPreviewOpParam &param) PJSUA2_THROW(Error) 
    13301336{ 
    13311337#if PJSUA_HAS_VIDEO 
     
    13381344} 
    13391345 
    1340 void VideoPreview::stop() throw(Error) 
     1346void VideoPreview::stop() PJSUA2_THROW(Error) 
    13411347{ 
    13421348#if PJSUA_HAS_VIDEO 
     
    13541360} 
    13551361 
    1356 VideoMedia VideoPreview::getVideoMedia() throw(Error) 
     1362VideoMedia VideoPreview::getVideoMedia() PJSUA2_THROW(Error) 
    13571363{ 
    13581364#if PJSUA_HAS_VIDEO 
     
    14441450 
    14451451/////////////////////////////////////////////////////////////////////////////// 
    1446 void VidDevManager::refreshDevs() throw(Error) 
     1452void VidDevManager::refreshDevs() PJSUA2_THROW(Error) 
    14471453{ 
    14481454#if PJSUA_HAS_VIDEO 
     
    14601466} 
    14611467 
    1462 VideoDevInfo VidDevManager::getDevInfo(int dev_id) const throw(Error) 
     1468VideoDevInfo VidDevManager::getDevInfo(int dev_id) const PJSUA2_THROW(Error) 
    14631469{ 
    14641470    VideoDevInfo dev_info; 
     
    14751481} 
    14761482 
    1477 const VideoDevInfoVector &VidDevManager::enumDev() throw(Error) 
     1483const VideoDevInfoVector &VidDevManager::enumDev() PJSUA2_THROW(Error) 
    14781484{ 
    14791485#if PJSUA_HAS_VIDEO 
     
    14951501} 
    14961502 
    1497 VideoDevInfoVector2 VidDevManager::enumDev2() const throw(Error) 
     1503VideoDevInfoVector2 VidDevManager::enumDev2() const PJSUA2_THROW(Error) 
    14981504{ 
    14991505    VideoDevInfoVector2 vdiv2; 
     
    15141520 
    15151521int VidDevManager::lookupDev(const string &drv_name, 
    1516                              const string &dev_name) const throw(Error) 
     1522                             const string &dev_name) const PJSUA2_THROW(Error) 
    15171523{ 
    15181524    pjmedia_vid_dev_index pj_idx = 0; 
     
    15411547void VidDevManager::setFormat(int dev_id, 
    15421548                              const MediaFormatVideo &format, 
    1543                               bool keep) throw(Error) 
     1549                              bool keep) PJSUA2_THROW(Error) 
    15441550{ 
    15451551#if PJSUA_HAS_VIDEO 
     
    15571563} 
    15581564 
    1559 MediaFormatVideo VidDevManager::getFormat(int dev_id) const throw(Error) 
     1565MediaFormatVideo VidDevManager::getFormat(int dev_id) const 
     1566                                          PJSUA2_THROW(Error) 
    15601567{ 
    15611568    MediaFormatVideo vid_format; 
     
    15751582void VidDevManager::setInputScale(int dev_id, 
    15761583                                  const MediaSize &scale, 
    1577                                   bool keep) throw(Error) 
     1584                                  bool keep) PJSUA2_THROW(Error) 
    15781585{ 
    15791586#if PJSUA_HAS_VIDEO 
     
    15921599} 
    15931600 
    1594 MediaSize VidDevManager::getInputScale(int dev_id) const throw(Error) 
     1601MediaSize VidDevManager::getInputScale(int dev_id) const PJSUA2_THROW(Error) 
    15951602{ 
    15961603    MediaSize scale; 
     
    16121619void VidDevManager::setOutputWindowFlags(int dev_id,  
    16131620                                         int flags,  
    1614                                          bool keep) throw(Error) 
     1621                                         bool keep) PJSUA2_THROW(Error) 
    16151622{     
    16161623#if PJSUA_HAS_VIDEO     
     
    16261633} 
    16271634 
    1628 int VidDevManager::getOutputWindowFlags(int dev_id) throw(Error) 
     1635int VidDevManager::getOutputWindowFlags(int dev_id) PJSUA2_THROW(Error) 
    16291636{ 
    16301637    int flags = 0; 
     
    16411648 
    16421649void VidDevManager::switchDev(int dev_id, 
    1643                               const VideoSwitchParam &param) throw(Error) 
     1650                              const VideoSwitchParam &param) 
     1651                              PJSUA2_THROW(Error) 
    16441652{ 
    16451653#if PJSUA_HAS_VIDEO 
     
    16791687void VidDevManager::setCaptureOrient(pjmedia_vid_dev_index dev_id, 
    16801688                                     pjmedia_orient orient, 
    1681                                      bool keep) throw(Error) 
     1689                                     bool keep) PJSUA2_THROW(Error) 
    16821690{ 
    16831691#if PJSUA_HAS_VIDEO 
     
    18671875 
    18681876void VideoMedia::registerMediaPort(MediaPort port, pj_pool_t *pool) 
    1869      throw(Error) 
     1877     PJSUA2_THROW(Error) 
    18701878{ 
    18711879#if PJSUA_HAS_VIDEO 
     
    19071915} 
    19081916 
    1909 VidConfPortInfo VideoMedia::getPortInfo() const throw(Error) 
     1917VidConfPortInfo VideoMedia::getPortInfo() const PJSUA2_THROW(Error) 
    19101918{ 
    19111919    return VideoMedia::getPortInfoFromId(id); 
     
    19171925} 
    19181926 
    1919 VidConfPortInfo VideoMedia::getPortInfoFromId(int port_id) throw(Error) 
     1927VidConfPortInfo VideoMedia::getPortInfoFromId(int port_id) PJSUA2_THROW(Error) 
    19201928{ 
    19211929#if PJSUA_HAS_VIDEO 
     
    19341942void VideoMedia::startTransmit(const VideoMedia &sink, 
    19351943                               const VideoMediaTransmitParam &param) const 
    1936      throw(Error) 
     1944     PJSUA2_THROW(Error) 
    19371945{ 
    19381946    PJ_UNUSED_ARG(param); 
     
    19451953} 
    19461954 
    1947 void VideoMedia::stopTransmit(const VideoMedia &sink) const throw(Error) 
     1955void VideoMedia::stopTransmit(const VideoMedia &sink) const 
     1956                              PJSUA2_THROW(Error) 
    19481957{ 
    19491958#if PJSUA_HAS_VIDEO 
Note: See TracChangeset for help on using the changeset viewer.