More read/write lock fixes in various modules

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2574 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_rpt.c b/apps/app_rpt.c
index c99a06ae61e78041e129774b3cc1dce3afef3a29..9e9d26f721af7f52fb65582ebc67d87898e8dbc2 100755 (executable)
--- a/apps/app_rpt.c
+++ b/apps/app_rpt.c
@@ -378,8 +378,8 @@ pthread_attr_t attr;
        myrpt->rxchannel = ast_request(myrpt->rxchanname,AST_FORMAT_SLINEAR,tele);
        if (myrpt->rxchannel)
        {
-               ast_set_read_format(myrpt->rxchannel,AST_FORMAT_SLINEAR);
-               ast_set_write_format(myrpt->rxchannel,AST_FORMAT_SLINEAR);
+               ast_set_read_format(myrpt->rxchannel,AST_FORMAT_SLINEAR, 0);
+               ast_set_write_format(myrpt->rxchannel,AST_FORMAT_SLINEAR, 0);
                myrpt->rxchannel->whentohangup = 0;
                myrpt->rxchannel->appl = "Apprpt";
                myrpt->rxchannel->data = "(Repeater Rx)";
@@ -405,8 +405,8 @@ pthread_attr_t attr;
                myrpt->txchannel = ast_request(myrpt->txchanname,AST_FORMAT_SLINEAR,tele);
                if (myrpt->txchannel)
                {
-                       ast_set_read_format(myrpt->txchannel,AST_FORMAT_SLINEAR);
-                       ast_set_write_format(myrpt->txchannel,AST_FORMAT_SLINEAR);
+                       ast_set_read_format(myrpt->txchannel,AST_FORMAT_SLINEAR, 0);
+                       ast_set_write_format(myrpt->txchannel,AST_FORMAT_SLINEAR, 0);
                        myrpt->txchannel->whentohangup = 0;
                        myrpt->txchannel->appl = "Apprpt";
                        myrpt->txchannel->data = "(Repeater Rx)";

diff --git a/channels/chan_h323.c b/channels/chan_h323.c
index afecf0f3db9052e1bf489c0caadd9e74e4dfe596..68a1837c5264e1ab404c883e2aa52535ddb79a5b 100755 (executable)
--- a/channels/chan_h323.c
+++ b/channels/chan_h323.c
@@ -527,8 +527,8 @@ static struct ast_frame *oh323_rtp_read(struct oh323_pvt *p)
                        if (f->subclass != p->owner->nativeformats) {
                                ast_log(LOG_DEBUG, "Oooh, format changed to %d\n", f->subclass);
                                p->owner->nativeformats = f->subclass;
-                               ast_set_read_format(p->owner, p->owner->readformat);
-                               ast_set_write_format(p->owner, p->owner->writeformat);
+                               ast_set_read_format(p->owner, p->owner->readformat, 0);
+                               ast_set_write_format(p->owner, p->owner->writeformat, 0);
                        }
                
                        /* Do in-band DTMF detection */

diff --git a/channels/chan_iax.c b/channels/chan_iax.c
index 2829c2912e3a9e491a72f75536cd36cc5f2eea7d..e85d34876d5155bf2b584228f8e0458fcca29107 100755 (executable)
--- a/channels/chan_iax.c
+++ b/channels/chan_iax.c
@@ -3798,7 +3798,7 @@ retryowner:
                                                orignative = iaxs[fr.callno]->owner->nativeformats;
                                                iaxs[fr.callno]->owner->nativeformats = f.subclass;
                                                if (iaxs[fr.callno]->owner->readformat)
-                                                       ast_set_read_format(iaxs[fr.callno]->owner, iaxs[fr.callno]->owner->readformat);
+                                                       ast_set_read_format(iaxs[fr.callno]->owner, iaxs[fr.callno]->owner->readformat, 0);
                                                iaxs[fr.callno]->owner->nativeformats = orignative;
                                                ast_mutex_unlock(&iaxs[fr.callno]->owner->lock);
                                        }
@@ -3981,9 +3981,9 @@ retryowner:
                                                        ast_verbose(VERBOSE_PREFIX_3 "Format for call is %s\n", ast_getformatname(iaxs[fr.callno]->owner->nativeformats));
                                                /* Setup read/write formats properly. */
                                                if (iaxs[fr.callno]->owner->writeformat)
-                                                       ast_set_write_format(iaxs[fr.callno]->owner, iaxs[fr.callno]->owner->writeformat);      
+                                                       ast_set_write_format(iaxs[fr.callno]->owner, iaxs[fr.callno]->owner->writeformat, 0);   
                                                if (iaxs[fr.callno]->owner->readformat)
-                                                       ast_set_read_format(iaxs[fr.callno]->owner, iaxs[fr.callno]->owner->readformat);        
+                                                       ast_set_read_format(iaxs[fr.callno]->owner, iaxs[fr.callno]->owner->readformat, 0);     
                                        }
                                }
                                ast_mutex_lock(&dpcache_lock);

diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c
index 375515914e245aa296d5a1ad5fcc21416cb17853..b06f020d6ac9bfc9a07e80430490e568ed716f51 100755 (executable)
--- a/channels/chan_mgcp.c
+++ b/channels/chan_mgcp.c
@@ -1307,8 +1307,8 @@ static int rtpready(struct ast_rtp *rtp, struct ast_frame *f, void *data)
                                if (f->subclass != p->owner->nativeformats) {
                                        ast_log(LOG_DEBUG, "Oooh, format changed to %d\n", f->subclass);
                                        p->owner->nativeformats = f->subclass;
-                                       ast_set_read_format(p->owner, p->owner->readformat);
-                                       ast_set_write_format(p->owner, p->owner->writeformat);
+                                       ast_set_read_format(p->owner, p->owner->readformat, 0);
+                                       ast_set_write_format(p->owner, p->owner->writeformat, 0);
                                }
                                if (p->dtmfinband) {
                                    f = ast_dsp_process(p->owner,p->dsp,f,0);