Changeset 3359

Show
Ignore:
Timestamp:
04/10/00 22:09:19 (14 years ago)
Author:
ucacoxh
Message:

- Partial fix for -f . The order of channels and freq in

tool.rat.codec were the wrong way around). Still have a problem
(at least on my PC) since tool.rat.codec is processed during rendez
vous and over ridden by loaded settings.

Location:
rat/trunk
Files:
3 modified

Legend:

Unmodified
Added
Removed
  • rat/trunk/MODS

    r3358 r3359  
    12481248        - Add -N,-E,-P,-L for sdes item setting from command-line (name, email, 
    12491249          phone, location). 
     1250        - Fix -f codec communication from controller to engine. 
    12501251 
    12511252TODO -- They're features not bugs dammit! 
     
    13031304- Rework media engine initialization, so we can query it before sending 
    13041305  rtp.addr() 
    1305 - The -f command line option is broken. 
    1306  
     1306- The -f command line option is broken (message arrives during rendez_vous). 
     1307 
  • rat/trunk/main_control.c

    r3357 r3359  
    399399        chan     = (char*)strtok(NULL, ""); 
    400400        if (freq != NULL && chan != NULL) { 
    401                 debug_msg("codec: %s %s %s\n", name, freq, chan); 
     401                debug_msg("codec: %s %s %s\n", name, chan, freq); 
    402402                name    = mbus_encode_str(name); 
    403403                freq    = mbus_encode_str(freq); 
    404404                chan    = mbus_encode_str(chan); 
    405                 mbus_qmsgf(m, addr, TRUE, "tool.rat.codec", "%s %s %s", name, freq, chan); 
     405                mbus_qmsgf(m, addr, TRUE, "tool.rat.codec", "%s %s %s", name, chan, freq); 
    406406                xfree(name); 
    407407                xfree(freq); 
  • rat/trunk/mbus_engine.c

    r3325 r3359  
    10351035 
    10361036        freq = atoi(sfreq) * 1000; 
     1037        assert(channels != 0); 
     1038        assert(freq     != 0); 
    10371039        next_cid = codec_get_matching(short_name, (uint16_t)freq, (uint16_t)channels); 
    10381040