← Back to branch summary

~ubuntu-branches/ubuntu/natty/linphone/natty

« back to all changes in this revision

Viewing changes to coreapi/linphonecore.c

  • Committer: Bazaar Package Importer
  • Author(s): Samuel Mimram, Kilian Krause, Samuel Mimram
  • Date: 2007-12-05 11:24:25 UTC
  • mfrom: (1.1.10 upstream)
  • Revision ID: james.westby@ubuntu.com-20071205112425-odfikcvg5j313rnl
Tags: 2.0.1-1
http://bugs.debian.org/454281
[ Kilian Krause ]
* New upstream release.
* Conflict with libortp5-dev to fix conflicting file
  (/usr/include/ortp/event.h). (Closes: #454281)

[ Samuel Mimram ]
* liblinphone2-dev conflicts with liblinphone1-dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
coreapi/linphonecore.c
312
312
        const char **devices;
313
313
        int ndev;
314
314
        int i;
 
315
 
 
316
        /*alsadev let the user use custom alsa device within linphone*/
 
317
        devid=lp_config_get_string(lc->config,"sound","alsadev",NULL);
 
318
        if (devid){
 
319
                MSSndCard *card=ms_alsa_card_new_custom(devid,devid);
 
320
                ms_snd_card_manager_add_card(ms_snd_card_manager_get(),card);
 
321
        }
315
322
        /* retrieve all sound devices */
316
323
        elem=ms_snd_card_manager_get_list(ms_snd_card_manager_get());
317
324
        ndev=ms_list_size(elem);
1048
1055
                        /*if the prompted uri was auto-suffixed with proxy domain,
1049
1056
                        then automatically set a route so that the request goes
1050
1057
                        through the proxy*/
1051
 
                        if (tmproute==NULL) 
1052
 
                                *route=ms_strdup(linphone_proxy_config_get_addr(proxy));
 
1058
                        if (tmproute==NULL){
 
1059
                                osip_route_t *rt=NULL;
 
1060
                                char *rtstr=NULL;
 
1061
                                osip_route_init(&rt);
 
1062
                                if (osip_route_parse(rt,linphone_proxy_config_get_addr(proxy))==0){
 
1063
                                        osip_uri_uparam_add(rt->url,osip_strdup("lr"),NULL);
 
1064
                                        osip_route_to_str(rt,&rtstr);
 
1065
                                        *route=ms_strdup(rtstr);
 
1066
                                        osip_free(rtstr);
 
1067
                                }
 
1068
                                ms_message("setting automatically a route to %s",*route);
 
1069
                        }
1053
1070
                        else *route=ms_strdup(tmproute);
1054
1071
                        return TRUE;
1055
1072
                }