Changeset 2663

Show
Ignore:
Timestamp:
07/31/99 20:37:05 (15 years ago)
Author:
ucacoxh
Message:

- some name consistency fixes:

init_session -> session_init
end_session -> session_exit

Location:
rat/trunk
Files:
5 modified

Legend:

Unmodified
Added
Removed
  • rat/trunk/main.c

    r2662 r2663  
    9191        for (i = 0; i < 2; i++) { 
    9292                sp[i] = (session_struct *) xmalloc(sizeof(session_struct)); 
    93                 init_session(sp[i]); 
     93                session_init(sp[i]); 
    9494        } 
    95         parse_early_options(argc, argv, sp); 
     95        session_parse_early_options(argc, argv, sp); 
    9696        network_init(sp[0]); 
    9797        cname = get_cname(sp[0]->rtp_socket[0]); 
     
    128128        ui_initial_settings(sp[0]); 
    129129 
    130         parse_late_options(argc, argv, sp);     /* Things which can override the settings we just loaded... */ 
     130        session_parse_late_options(argc, argv, sp);     /* Things which can override the settings we just loaded... */ 
    131131        ui_update(sp[0]);                       /* ...and push those to the UI */ 
    132132        network_process_mbus(sp[0]); 
     
    296296 
    297297        for(i = 0; i < 2; i++) { 
    298                 end_session(sp[i]); 
     298                session_exit(sp[i]); 
    299299                xfree(sp[i]); 
    300300        } 
  • rat/trunk/main_engine.c

    r2584 r2663  
    9898        for (i = 0; i < 2;i++) { 
    9999                sp[i] = (session_struct *) xmalloc(sizeof(session_struct)); 
    100                 init_session(sp[i]); 
     100                session_init(sp[i]); 
    101101        } 
    102102        num_sessions = 1; 
     
    187187        for (i = 0; i < 2;i++) { 
    188188                sp[i] = (session_struct *) xmalloc(sizeof(session_struct)); 
    189                 init_session(sp[i]); 
    190         } 
    191         num_sessions = parse_early_options(argc, argv, sp); 
     189                session_init(sp[i]); 
     190        } 
     191        num_sessions = session_parse_early_options(argc, argv, sp); 
    192192        for (i = 0; i < num_sessions; i++) { 
    193193                network_init(sp[i]); 
     
    224224        network_process_mbus(sp[0]); 
    225225 
    226         parse_late_options(argc, argv, sp); 
     226        session_parse_late_options(argc, argv, sp); 
    227227        for (i = 0; i < num_sessions; i++) { 
    228228                ui_update(sp[i]); 
     
    382382         
    383383        for(i = 0; i < 2; i++) { 
    384                 end_session(sp[i]); 
     384                session_exit(sp[i]); 
    385385                xfree(sp[i]); 
    386386        } 
  • rat/trunk/rtcp_db.c

    r2644 r2663  
    409409 * want to remove them Added more stats counters 
    410410 * 
    411  * Most of this work is done in init_session() now, we just have to set up the 
     411 * Most of this work is done in session_init() now, we just have to set up the 
    412412 * dynamic stuff here. [csp] 
    413413 */ 
  • rat/trunk/session.c

    r2659 r2663  
    102102 
    103103void 
    104 init_session(session_struct *sp) 
     104session_init(session_struct *sp) 
    105105{ 
    106106        codec_id_t            cid; 
     
    170170 
    171171void 
    172 end_session(session_struct *sp) 
     172session_exit(session_struct *sp) 
    173173{ 
    174174        codec_exit(); 
     
    185185 
    186186static int  
    187 parse_early_options_common(int argc, char *argv[], session_struct *sp[], int num_sessions) 
     187session_parse_early_options_common(int argc, char *argv[], session_struct *sp[], int num_sessions) 
    188188{ 
    189189        /* Parse command-line options common to all the modes of 
     
    286286 
    287287static void  
    288 parse_early_options_audio_tool(int argc, char *argv[], session_struct *sp) 
     288session_parse_early_options_audio_tool(int argc, char *argv[], session_struct *sp) 
    289289{ 
    290290        /* Parse command-line options specific to the audio tool */ 
     
    351351 
    352352static void  
    353 parse_early_options_transcoder(int argc, char *argv[], session_struct *sp[]) 
     353session_parse_early_options_transcoder(int argc, char *argv[], session_struct *sp[]) 
    354354{ 
    355355        /* Parse command-line options specific to the transcoder */ 
     
    400400 
    401401int 
    402 parse_early_options(int argc, char *argv[], session_struct *sp[]) 
     402session_parse_early_options(int argc, char *argv[], session_struct *sp[]) 
    403403{ 
    404404        int     i, j, num_sessions = 0; 
     
    420420        } 
    421421 
    422         if (parse_early_options_common(argc, argv, sp, num_sessions) > argc - 2) { 
    423                 /* parse_early_options commmon returns number of args processed. 
     422        if (session_parse_early_options_common(argc, argv, sp, num_sessions) > argc - 2) { 
     423                /* session_parse_early_options commmon returns number of args processed. 
    424424                 * At least two argv[0] (the appname) and argv[argc - 1] (address) 
    425425                 * should not be processed.  Other args may not be processed, but 
     
    431431 
    432432        switch (sp[0]->mode) { 
    433                 case AUDIO_TOOL: parse_early_options_audio_tool(argc, argv, sp[0]); 
     433                case AUDIO_TOOL: session_parse_early_options_audio_tool(argc, argv, sp[0]); 
    434434                                 break; 
    435                 case TRANSCODER: parse_early_options_transcoder(argc, argv, sp); 
     435                case TRANSCODER: session_parse_early_options_transcoder(argc, argv, sp); 
    436436                                 break; 
    437437                default        : abort(); 
     
    483483 
    484484static void  
    485 parse_late_options_common(int argc, char *argv[], session_struct *sp[], int sp_size) 
     485session_parse_late_options_common(int argc, char *argv[], session_struct *sp[], int sp_size) 
    486486{ 
    487487        /* Parse command-line options common to all the modes of operation.     */ 
     
    627627} 
    628628 
    629 static void parse_late_options_audio_tool(int argc, char *argv[], session_struct *sp) 
     629static void session_parse_late_options_audio_tool(int argc, char *argv[], session_struct *sp) 
    630630{ 
    631631        /* Audio tool specific late setup... */ 
     
    635635} 
    636636 
    637 static void parse_late_options_transcoder(int argc, char *argv[], session_struct *sp[]) 
     637static void session_parse_late_options_transcoder(int argc, char *argv[], session_struct *sp[]) 
    638638{ 
    639639        /* Transcoder specific late setup... */ 
     
    649649} 
    650650 
    651 void parse_late_options(int argc, char *argv[], session_struct *sp[]) 
     651void session_parse_late_options(int argc, char *argv[], session_struct *sp[]) 
    652652{ 
    653653        int     i, j, num_sessions = 0; 
     
    665665                num_sessions= 1; 
    666666        } 
    667         parse_late_options_common(argc, argv, sp, num_sessions); 
     667        session_parse_late_options_common(argc, argv, sp, num_sessions); 
    668668        switch (sp[0]->mode) { 
    669                 case AUDIO_TOOL: parse_late_options_audio_tool(argc, argv, sp[0]); 
     669                case AUDIO_TOOL: session_parse_late_options_audio_tool(argc, argv, sp[0]); 
    670670                                 break; 
    671                 case TRANSCODER: parse_late_options_transcoder(argc, argv, sp); 
     671                case TRANSCODER: session_parse_late_options_transcoder(argc, argv, sp); 
    672672                                 break; 
    673673                default        : abort(); 
  • rat/trunk/session.h

    r2659 r2663  
    105105} session_struct; 
    106106 
    107 void init_session(session_struct *sp); 
    108 void end_session(session_struct *sp); 
    109 int  parse_early_options(int argc, char *argv[], session_struct *sp[]); 
    110 void parse_late_options(int argc, char *argv[], session_struct *sp[]); 
     107void session_init(session_struct *sp); 
     108void session_exit(session_struct *sp); 
     109int  session_parse_early_options(int argc, char *argv[], session_struct *sp[]); 
     110void session_parse_late_options(int argc, char *argv[], session_struct *sp[]); 
    111111 
    112112#endif /* _session_h_ */