Changeset 1911

Show
Ignore:
Timestamp:
03/07/08 05:37:15 (2 years ago)
Author:
sletz
Message:

Define an internal jack_client_open_aux needed for wrapper feature.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • jack2/trunk/jackmp/ChangeLog

    r1910 r1911  
    1919--------------------------- 
    2020 
     212008-03-07 Stephane Letz  <letz@grame.fr> 
     22                 
     23        * Define an internal jack_client_open_aux needed for library wrapper feature. 
     24 
    21252008-03-06 Stephane Letz  <letz@grame.fr> 
    2226                 

  • jack2/trunk/jackmp/common/JackAPI.cpp

    r1909 r1911  
    4949#endif 
    5050 
    51     EXPORT jack_client_t * jack_client_open (const char *client_name, 
     51        EXPORT jack_client_t * jack_client_open_aux (const char *client_name, 
     52            jack_options_t options, 
     53            jack_status_t *status, ...); 
     54        EXPORT jack_client_t * jack_client_open (const char *client_name, 
    5255            jack_options_t options, 
    5356            jack_status_t *status, ...); 
    …… 
    261264    if (getenv("JACK_START_SERVER") == NULL) 
    262265        options |= JackNoStartServer; 
    263     return jack_client_open(client_name, (jack_options_t)options, NULL); 
     266    return jack_client_open_aux(client_name, (jack_options_t)options, NULL); 
    264267} 
    265268 

  • jack2/trunk/jackmp/common/JackAPIWrapper.cpp

    r1909 r1911  
    3232#endif 
    3333 
    34     EXPORT jack_client_t * jack_client_open (const char *client_name, 
    35             jack_options_t options, 
    36             jack_status_t *status, ...); 
    37     EXPORT jack_client_t * jack_client_new (const char *client_name); 
    3834    EXPORT int jack_client_name_size (void); 
    3935    EXPORT char* jack_get_client_name (jack_client_t *client); 
    …… 
    829825EXPORT jack_client_t * jack_client_open(const char *client_name, jack_options_t options, jack_status_t *status, ...) 
    830826{ 
     827        // TODO : in "autodstart mode", has to load jackdrc file and figure out which server has to be started... 
     828         
    831829    // Library check... 
    832830    if (!open_library()) 

  • jack2/trunk/jackmp/common/JackLibAPI.cpp

    r1909 r1911  
    4040#endif 
    4141 
    42     EXPORT jack_client_t * jack_client_open (const char *client_name, 
     42        EXPORT jack_client_t * jack_client_open_aux (const char *client_name, 
     43            jack_options_t options, 
     44            jack_status_t *status, ...); 
     45        EXPORT jack_client_t * jack_client_open (const char *client_name, 
    4346            jack_options_t options, 
    4447            jack_status_t *status, ...); 
    …… 
    5255int JackLibGlobals::fClientCount = 0; 
    5356 
    54 EXPORT jack_client_t* jack_client_open(const char* ext_client_name, jack_options_t options, jack_status_t* status, ...) 
     57EXPORT jack_client_t* jack_client_open_aux(const char* ext_client_name, jack_options_t options, jack_status_t* status, ...) 
    5558{ 
    5659    va_list ap;                         /* variable argument pointer */ 
    …… 
    8184    JackLog("jack_client_open %s\n", client_name); 
    8285    if (client_name == NULL) { 
    83         jack_error("jack_client_new called with a NULL client_name"); 
     86        jack_error("jack_client_open called with a NULL client_name"); 
    8487        return NULL; 
    8588    } 
    …… 
    117120} 
    118121 
     122EXPORT jack_client_t* jack_client_open(const char* ext_client_name, jack_options_t options, jack_status_t* status, ...) 
     123{ 
     124        va_list ap; 
     125    va_start(ap, status); 
     126    jack_client_t* res =  jack_client_open_aux(ext_client_name, options, status, ap); 
     127    va_end(ap); 
     128    return res; 
     129} 
     130 
    119131EXPORT int jack_client_close(jack_client_t* ext_client) 
    120132{ 

  • jack2/trunk/jackmp/common/JackServerAPI.cpp

    r1909 r1911  
    4343#endif 
    4444 
     45        EXPORT jack_client_t * jack_client_open_aux (const char *client_name, 
     46            jack_options_t options, 
     47            jack_status_t *status, ...); 
    4548    EXPORT jack_client_t * jack_client_open (const char *client_name, 
    4649            jack_options_t options, 
    …… 
    5457using namespace Jack; 
    5558 
    56 EXPORT jack_client_t* jack_client_open(const char* ext_client_name, jack_options_t options, jack_status_t* status, ...) 
     59EXPORT jack_client_t* jack_client_open_aux(const char* ext_client_name, jack_options_t options, jack_status_t* status, ...) 
    5760{ 
    5861    va_list ap;                         /* variable argument pointer */ 
    …… 
    8285    JackLog("jack_client_open %s\n", client_name); 
    8386    if (client_name == NULL) { 
    84         jack_error("jack_client_new called with a NULL client_name"); 
     87        jack_error("jack_client_open called with a NULL client_name"); 
    8588        return NULL; 
    8689    } 
    …… 
    114117} 
    115118 
     119EXPORT jack_client_t* jack_client_open(const char* ext_client_name, jack_options_t options, jack_status_t* status, ...) 
     120{ 
     121        va_list ap; 
     122    va_start(ap, status); 
     123    jack_client_t* res =  jack_client_open_aux(ext_client_name, options, status, ap); 
     124    va_end(ap); 
     125    return res; 
     126} 
     127 
    116128EXPORT int jack_client_close(jack_client_t* ext_client) 
    117129{