/[svn]/liblscp/trunk/src/client.c
ViewVC logotype

Diff of /liblscp/trunk/src/client.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 114 by capela, Mon Jun 7 21:40:23 2004 UTC revision 565 by capela, Sun May 22 22:22:26 2005 UTC
# Line 2  Line 2 
2  //  //
3  /****************************************************************************  /****************************************************************************
4     liblscp - LinuxSampler Control Protocol API     liblscp - LinuxSampler Control Protocol API
5     Copyright (C) 2004, rncbc aka Rui Nuno Capela. All rights reserved.     Copyright (C) 2004-2005, rncbc aka Rui Nuno Capela. All rights reserved.
6    
7     This library is free software; you can redistribute it and/or     This library is free software; you can redistribute it and/or
8     modify it under the terms of the GNU Lesser General Public     modify it under the terms of the GNU Lesser General Public
# Line 14  Line 14 
14     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15     Lesser General Public License for more details.     Lesser General Public License for more details.
16    
17     You should have received a copy of the GNU Lesser General Public     You should 14have received a copy of the GNU Lesser General Public
18     License along with this library; if not, write to the Free Software     License along with this library; if not, write to the Free Software
19     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
20    
# Line 28  Line 28 
28    
29  // Local prototypes.  // Local prototypes.
30    
31  static void _lscp_client_set_result (lscp_client_t *pClient, char *pszResult, int iErrno);  static void             _lscp_client_evt_proc       (void *pvClient);
 static void _lscp_client_udp_proc   (void *pvClient);  
32    
33    static lscp_status_t    _lscp_client_evt_connect    (lscp_client_t *pClient);
34  //-------------------------------------------------------------------------  static lscp_status_t    _lscp_client_evt_request    (lscp_client_t *pClient, int iSubscribe, lscp_event_t event);
 // Helper functions.  
   
 // Result buffer internal settler.  
 static void _lscp_client_set_result ( lscp_client_t *pClient, char *pszResult, int iErrno )  
 {  
     if (pClient->pszResult)  
         free(pClient->pszResult);  
     pClient->pszResult = NULL;  
   
     pClient->iErrno = iErrno;  
   
     if (pszResult)  
         pClient->pszResult = strdup(lscp_ltrim(pszResult));  
 }  
35    
36    
37  //-------------------------------------------------------------------------  //-------------------------------------------------------------------------
38  // UDP service (datagram oriented).  // Event service (datagram oriented).
39    
40  static void _lscp_client_udp_proc ( void *pvClient )  static void _lscp_client_evt_proc ( void *pvClient )
41  {  {
42      lscp_client_t *pClient = (lscp_client_t *) pvClient;      lscp_client_t *pClient = (lscp_client_t *) pvClient;
     struct sockaddr_in addr;  
     int   cAddr;  
     char  achBuffer[LSCP_BUFSIZ];  
     int   cchBuffer;  
     const char *pszSeps = " \r\n";  
     char *pszToken;  
     char *pch;  
43    
44  #ifdef DEBUG      fd_set fds;                         // File descriptor list for select().
45      fprintf(stderr, "_lscp_client_udp_proc: Client waiting for events.\n");      int    fd, fdmax;                   // Maximum file descriptor number.
46  #endif      struct timeval tv;                  // For specifying a timeout value.
47        int    iSelect;                     // Holds select return status.
48        int    iTimeout;
49    
50        char   achBuffer[LSCP_BUFSIZ];
51        int    cchBuffer;
52        const char *pszSeps = ":\r\n";
53        char * pszToken;
54        char * pch;
55        int     cchToken;
56        lscp_event_t event;
57    
     while (pClient->udp.iState) {  
         cAddr = sizeof(struct sockaddr_in);  
         cchBuffer = recvfrom(pClient->udp.sock, achBuffer, sizeof(achBuffer), 0, (struct sockaddr *) &addr, &cAddr);  
         if (cchBuffer > 0) {  
58  #ifdef DEBUG  #ifdef DEBUG
59              lscp_socket_trace("_lscp_client_udp_proc: recvfrom", &addr, achBuffer, cchBuffer);      fprintf(stderr, "_lscp_client_evt_proc: Client waiting for events.\n");
60  #endif  #endif
61              if (strncasecmp(achBuffer, "PING ", 5) == 0) {  
62        while (pClient->evt.iState) {
63    
64            // Prepare for waiting on select...
65            fd = (int) pClient->evt.sock;
66            FD_ZERO(&fds);
67            FD_SET((unsigned int) fd, &fds);
68            fdmax = fd;
69    
70            // Use the timeout (x10) select feature ...
71            iTimeout = 10 * pClient->iTimeout;
72            if (iTimeout > 1000) {
73                tv.tv_sec = iTimeout / 1000;
74                iTimeout -= tv.tv_sec * 1000;
75            }
76            else tv.tv_sec = 0;
77            tv.tv_usec = iTimeout * 1000;
78    
79            // Wait for event...
80            iSelect = select(fdmax + 1, &fds, NULL, NULL, &tv);
81            if (iSelect > 0 && FD_ISSET(fd, &fds)) {
82                // May recv now...
83                cchBuffer = recv(pClient->evt.sock, achBuffer, sizeof(achBuffer), 0);
84                if (cchBuffer > 0) {
85                  // Make sure received buffer it's null terminated.                  // Make sure received buffer it's null terminated.
86                  achBuffer[cchBuffer] = (char) 0;                  achBuffer[cchBuffer] = (char) 0;
87                  lscp_strtok(achBuffer, pszSeps, &(pch));       // Skip "PING"                  // Parse for the notification event message...
88                  lscp_strtok(NULL, pszSeps, &(pch));            // Skip port (must be the same as in addr)                  pszToken = lscp_strtok(achBuffer, pszSeps, &(pch)); // Have "NOTIFY".
89                  pszToken = lscp_strtok(NULL, pszSeps, &(pch)); // Have session-id.                  if (strcasecmp(pszToken, "NOTIFY") == 0) {
90                  if (pszToken) {                      pszToken = lscp_strtok(NULL, pszSeps, &(pch));
91                      // Set now client's session-id, if not already                      event    = lscp_event_from_text(pszToken);
92                      if (pClient->sessid == NULL)                      // And pick the rest of data...
93                          pClient->sessid = strdup(pszToken);                      pszToken = lscp_strtok(NULL, pszSeps, &(pch));
94                      if (pClient->sessid && strcmp(pszToken, pClient->sessid) == 0) {                      cchToken = (pszToken == NULL ? 0 : strlen(pszToken));
95                          sprintf(achBuffer, "PONG %s\r\n", pClient->sessid);                      // Double-check if we're really up to it...
96                          cchBuffer = strlen(achBuffer);                      if (pClient->events & event) {
97                          if (sendto(pClient->udp.sock, achBuffer, cchBuffer, 0, (struct sockaddr *) &addr, cAddr) < cchBuffer)                          // Invoke the client event callback...
98                              lscp_socket_perror("_lscp_client_udp_proc: sendto");                          if ((*pClient->pfnCallback)(
99  #ifdef DEBUG                                  pClient,
100                          fprintf(stderr, "> %s", achBuffer);                                  event,
101  #endif                                  pszToken,
102                                    cchToken,
103                                    pClient->pvData) != LSCP_OK) {
104                                pClient->evt.iState = 0;
105                            }
106                      }                      }
107                  }                  }
                 // Done with life proof.  
108              } else {              } else {
109                  //                  lscp_socket_perror("_lscp_client_evt_proc: recv");
110                  if ((*pClient->pfnCallback)(                  pClient->evt.iState = 0;
                         pClient,  
                         achBuffer,  
                         cchBuffer,  
                         pClient->pvData) != LSCP_OK) {  
                     pClient->udp.iState = 0;  
                 }  
111              }              }
112          } else {          }   // Check if select has in error.
113              lscp_socket_perror("_lscp_client_udp_proc: recvfrom");          else if (iSelect < 0) {
114              pClient->udp.iState = 0;              lscp_socket_perror("_lscp_client_evt_proc: select");
115                pClient->evt.iState = 0;
116          }          }
117    
118            // Finally, always signal the event.
119            lscp_cond_signal(pClient->cond);
120      }      }
121    
122  #ifdef DEBUG  #ifdef DEBUG
123      fprintf(stderr, "_lscp_client_udp_proc: Client closing.\n");      fprintf(stderr, "_lscp_client_evt_proc: Client closing.\n");
124  #endif  #endif
125  }  }
126    
127    
128  //-------------------------------------------------------------------------  //-------------------------------------------------------------------------
129    // Event subscription helpers.
130    
131    // Open the event service socket connection.
132    static lscp_status_t _lscp_client_evt_connect ( lscp_client_t *pClient )
133    {
134        lscp_socket_t sock;
135        struct sockaddr_in addr;
136        int cAddr;
137    #if defined(WIN32)
138        int iSockOpt = (-1);
139    #endif
140    
141        // Prepare the event connection socket...
142        sock = socket(AF_INET, SOCK_STREAM, 0);
143        if (sock == INVALID_SOCKET) {
144            lscp_socket_perror("_lscp_client_evt_connect: socket");
145            return LSCP_FAILED;
146        }
147    
148    #if defined(WIN32)
149        if (setsockopt(sock, SOL_SOCKET, SO_DONTLINGER, (char *) &iSockOpt, sizeof(int)) == SOCKET_ERROR)
150            lscp_socket_perror("lscp_client_evt_connect: setsockopt(SO_DONTLINGER)");
151    #endif
152    
153    #ifdef DEBUG
154        lscp_socket_getopts("_lscp_client_evt_connect:", sock);
155    #endif
156    
157        // Use same address of the command connection.
158        cAddr = sizeof(struct sockaddr_in);
159        memmove((char *) &addr, &(pClient->cmd.addr), cAddr);
160    
161        // Start the connection...
162        if (connect(sock, (struct sockaddr *) &addr, cAddr) == SOCKET_ERROR) {
163            lscp_socket_perror("_lscp_client_evt_connect: connect");
164            closesocket(sock);
165            return LSCP_FAILED;
166        }
167    
168        // Set our socket agent struct...
169        lscp_socket_agent_init(&(pClient->evt), sock, &addr, cAddr);
170    
171        // And finally the service thread...
172        return lscp_socket_agent_start(&(pClient->evt), _lscp_client_evt_proc, pClient, 0);
173    }
174    
175    
176    // Subscribe to a single event.
177    static lscp_status_t _lscp_client_evt_request ( lscp_client_t *pClient, int iSubscribe, lscp_event_t event )
178    {
179        const char *pszEvent;
180        char  szQuery[LSCP_BUFSIZ];
181        int   cchQuery;
182    
183        if (pClient == NULL)
184            return LSCP_FAILED;
185    
186        // Which (single) event?
187        pszEvent = lscp_event_to_text(event);
188        if (pszEvent == NULL)
189            return LSCP_FAILED;
190    
191        // Build the query string...
192        cchQuery = sprintf(szQuery, "%sSUBSCRIBE %s\n\n", (iSubscribe == 0 ? "UN" : ""), pszEvent);
193        // Just send data, forget result...
194        if (send(pClient->evt.sock, szQuery, cchQuery, 0) < cchQuery) {
195            lscp_socket_perror("_lscp_client_evt_request: send");
196            return LSCP_FAILED;
197        }
198    
199        // Wait on response.
200        lscp_cond_wait(pClient->cond, pClient->mutex);
201    
202        // Update as naively as we can...
203        if (iSubscribe)
204            pClient->events |=  event;
205        else
206            pClient->events &= ~event;
207    
208        return LSCP_OK;
209    }
210    
211    
212    //-------------------------------------------------------------------------
213  // Client versioning teller fuunction.  // Client versioning teller fuunction.
214    
215    
# Line 155  lscp_client_t* lscp_client_create ( cons Line 247  lscp_client_t* lscp_client_create ( cons
247      lscp_socket_t sock;      lscp_socket_t sock;
248      struct sockaddr_in addr;      struct sockaddr_in addr;
249      int cAddr;      int cAddr;
250    #if defined(WIN32)
251      int iSockOpt = (-1);      int iSockOpt = (-1);
252    #endif
253    
254      if (pfnCallback == NULL) {      if (pfnCallback == NULL) {
255          fprintf(stderr, "lscp_client_create: Invalid client callback function.\n");          fprintf(stderr, "lscp_client_create: Invalid client callback function.\n");
# Line 184  lscp_client_t* lscp_client_create ( cons Line 278  lscp_client_t* lscp_client_create ( cons
278      fprintf(stderr, "lscp_client_create: pClient=%p: pszHost=%s iPort=%d.\n", pClient, pszHost, iPort);      fprintf(stderr, "lscp_client_create: pClient=%p: pszHost=%s iPort=%d.\n", pClient, pszHost, iPort);
279  #endif  #endif
280    
281      // Prepare the TCP connection socket...      // Prepare the command connection socket...
282    
283      sock = socket(AF_INET, SOCK_STREAM, 0);      sock = socket(AF_INET, SOCK_STREAM, 0);
284      if (sock == INVALID_SOCKET) {      if (sock == INVALID_SOCKET) {
285          lscp_socket_perror("lscp_client_create: tcp: socket");          lscp_socket_perror("lscp_client_create: cmd: socket");
286          free(pClient);          free(pClient);
287          return NULL;          return NULL;
288      }      }
289    
290  #if defined(WIN32)  #if defined(WIN32)
291      if (setsockopt(sock, SOL_SOCKET, SO_DONTLINGER, (char *) &iSockOpt, sizeof(int)) == SOCKET_ERROR)      if (setsockopt(sock, SOL_SOCKET, SO_DONTLINGER, (char *) &iSockOpt, sizeof(int)) == SOCKET_ERROR)
292          lscp_socket_perror("lscp_client_create: tcp: setsockopt(SO_DONTLINGER)");          lscp_socket_perror("lscp_client_create: cmd: setsockopt(SO_DONTLINGER)");
293  #endif  #endif
294    
295  #ifdef DEBUG  #ifdef DEBUG
296      lscp_socket_getopts("lscp_client_create: tcp", sock);      lscp_socket_getopts("lscp_client_create: cmd", sock);
297  #endif  #endif
298    
299      cAddr = sizeof(struct sockaddr_in);      cAddr = sizeof(struct sockaddr_in);
# Line 209  lscp_client_t* lscp_client_create ( cons Line 303  lscp_client_t* lscp_client_create ( cons
303      addr.sin_port = htons((short) iPort);      addr.sin_port = htons((short) iPort);
304    
305      if (connect(sock, (struct sockaddr *) &addr, cAddr) == SOCKET_ERROR) {      if (connect(sock, (struct sockaddr *) &addr, cAddr) == SOCKET_ERROR) {
306          lscp_socket_perror("lscp_client_create: tcp: connect");          lscp_socket_perror("lscp_client_create: cmd: connect");
307          closesocket(sock);          closesocket(sock);
308          free(pClient);          free(pClient);
309          return NULL;          return NULL;
310      }      }
311    
312      lscp_socket_agent_init(&(pClient->tcp), sock, &addr, cAddr);      // Initialize the command socket agent struct...
313        lscp_socket_agent_init(&(pClient->cmd), sock, &addr, cAddr);
314    
315  #ifdef DEBUG  #ifdef DEBUG
316      fprintf(stderr, "lscp_client_create: tcp: pClient=%p: sock=%d addr=%s port=%d.\n", pClient, pClient->tcp.sock, inet_ntoa(pClient->tcp.addr.sin_addr), ntohs(pClient->tcp.addr.sin_port));      fprintf(stderr, "lscp_client_create: cmd: pClient=%p: sock=%d addr=%s port=%d.\n", pClient, pClient->cmd.sock, inet_ntoa(pClient->cmd.addr.sin_addr), ntohs(pClient->cmd.addr.sin_port));
317  #endif  #endif
318    
319      // Prepare the UDP datagram service socket...      // Initialize the event service socket struct...
320        lscp_socket_agent_init(&(pClient->evt), INVALID_SOCKET, NULL, 0);
321      sock = socket(AF_INET, SOCK_DGRAM, 0);      // No events subscribed, yet.
322      if (sock == INVALID_SOCKET) {      pClient->events = LSCP_EVENT_NONE;
         lscp_socket_perror("lscp_client_create: udp: socket");  
         lscp_socket_agent_free(&(pClient->tcp));  
         free(pClient);  
         return NULL;  
     }  
   
     if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (char *) &iSockOpt, sizeof(int)) == SOCKET_ERROR)  
         lscp_socket_perror("lscp_client_create: udp: setsockopt(SO_REUSEADDR)");  
   
 #ifdef DEBUG  
     lscp_socket_getopts("lscp_client_create: udp", sock);  
 #endif  
   
     cAddr = sizeof(struct sockaddr_in);  
     memset((char *) &addr, 0, cAddr);  
     addr.sin_family = AF_INET;  
     addr.sin_addr.s_addr = htonl(INADDR_ANY);  
     addr.sin_port = htons(0);  
   
     if (bind(sock, (const struct sockaddr *) &addr, cAddr) == SOCKET_ERROR) {  
         lscp_socket_perror("lscp_client_create: udp: bind");  
         lscp_socket_agent_free(&(pClient->tcp));  
         closesocket(sock);  
         free(pClient);  
         return NULL;  
     }  
   
     if (getsockname(sock, (struct sockaddr *) &addr, &cAddr) == SOCKET_ERROR) {  
         lscp_socket_perror("lscp_client_create: udp: getsockname");  
         lscp_socket_agent_free(&(pClient->tcp));  
         closesocket(sock);  
         free(pClient);  
         return NULL;  
     }  
   
     lscp_socket_agent_init(&(pClient->udp), sock, &addr, cAddr);  
   
 #ifdef DEBUG  
     fprintf(stderr, "lscp_client_create: udp: pClient=%p: sock=%d addr=%s port=%d.\n", pClient, pClient->udp.sock, inet_ntoa(pClient->udp.addr.sin_addr), ntohs(pClient->udp.addr.sin_port));  
 #endif  
   
     // No session id, yet.  
     pClient->sessid = NULL;  
323      // Initialize cached members.      // Initialize cached members.
324      pClient->audio_drivers = NULL;      pClient->audio_drivers = NULL;
325      pClient->midi_drivers = NULL;      pClient->midi_drivers = NULL;
326        pClient->audio_devices = NULL;
327        pClient->midi_devices = NULL;
328      pClient->engines = NULL;      pClient->engines = NULL;
329      lscp_driver_info_init(&(pClient->audio_info));      pClient->channels = NULL;
330      lscp_driver_info_init(&(pClient->midi_info));      lscp_driver_info_init(&(pClient->audio_driver_info));
331        lscp_driver_info_init(&(pClient->midi_driver_info));
332        lscp_device_info_init(&(pClient->audio_device_info));
333        lscp_device_info_init(&(pClient->midi_device_info));
334        lscp_param_info_init(&(pClient->audio_param_info));
335        lscp_param_info_init(&(pClient->midi_param_info));
336        lscp_device_port_info_init(&(pClient->audio_channel_info));
337        lscp_device_port_info_init(&(pClient->midi_port_info));
338        lscp_param_info_init(&(pClient->audio_channel_param_info));
339        lscp_param_info_init(&(pClient->midi_port_param_info));
340        lscp_server_info_init(&(pClient->server_info));
341      lscp_engine_info_init(&(pClient->engine_info));      lscp_engine_info_init(&(pClient->engine_info));
342      lscp_channel_info_init(&(pClient->channel_info));      lscp_channel_info_init(&(pClient->channel_info));
343      // Initialize error stuff.      // Initialize error stuff.
# Line 287  lscp_client_t* lscp_client_create ( cons Line 351  lscp_client_t* lscp_client_create ( cons
351    
352      // Initialize the transaction mutex.      // Initialize the transaction mutex.
353      lscp_mutex_init(pClient->mutex);      lscp_mutex_init(pClient->mutex);
354        lscp_cond_init(pClient->cond);
     // Now's finally time to startup threads...  
     // UDP service thread...  
     if (lscp_socket_agent_start(&(pClient->udp), _lscp_client_udp_proc, pClient, 0) != LSCP_OK) {  
         lscp_socket_agent_free(&(pClient->tcp));  
         lscp_socket_agent_free(&(pClient->udp));  
         lscp_mutex_destroy(pClient->mutex);  
         free(pClient);  
         return NULL;  
     }  
355    
356      // Finally we've some success...      // Finally we've some success...
357      return pClient;      return pClient;
# Line 317  lscp_status_t lscp_client_join ( lscp_cl Line 372  lscp_status_t lscp_client_join ( lscp_cl
372      fprintf(stderr, "lscp_client_join: pClient=%p.\n", pClient);      fprintf(stderr, "lscp_client_join: pClient=%p.\n", pClient);
373  #endif  #endif
374    
375  //  lscp_socket_agent_join(&(pClient->udp));  //  lscp_socket_agent_join(&(pClient->evt));
376      lscp_socket_agent_join(&(pClient->tcp));      lscp_socket_agent_join(&(pClient->cmd));
377    
378      return LSCP_OK;      return LSCP_OK;
379  }  }
# Line 340  lscp_status_t lscp_client_destroy ( lscp Line 395  lscp_status_t lscp_client_destroy ( lscp
395      fprintf(stderr, "lscp_client_destroy: pClient=%p.\n", pClient);      fprintf(stderr, "lscp_client_destroy: pClient=%p.\n", pClient);
396  #endif  #endif
397    
398      // Free session-id, if any.      // Lock this section up.
399      if (pClient->sessid)      lscp_mutex_lock(pClient->mutex);
400          free(pClient->sessid);  
     pClient->sessid = NULL;  
401      // Free up all cached members.      // Free up all cached members.
402      lscp_channel_info_reset(&(pClient->channel_info));      lscp_channel_info_free(&(pClient->channel_info));
403      lscp_engine_info_reset(&(pClient->engine_info));      lscp_engine_info_free(&(pClient->engine_info));
404      lscp_driver_info_reset(&(pClient->midi_info));      lscp_server_info_free(&(pClient->server_info));
405      lscp_driver_info_reset(&(pClient->audio_info));      lscp_param_info_free(&(pClient->midi_port_param_info));
406        lscp_param_info_free(&(pClient->audio_channel_param_info));
407        lscp_device_port_info_free(&(pClient->midi_port_info));
408        lscp_device_port_info_free(&(pClient->audio_channel_info));
409        lscp_param_info_free(&(pClient->midi_param_info));
410        lscp_param_info_free(&(pClient->audio_param_info));
411        lscp_device_info_free(&(pClient->midi_device_info));
412        lscp_device_info_free(&(pClient->audio_device_info));
413        lscp_driver_info_free(&(pClient->midi_driver_info));
414        lscp_driver_info_free(&(pClient->audio_driver_info));
415      // Free available engine table.      // Free available engine table.
416      lscp_szsplit_destroy(pClient->audio_drivers);      lscp_szsplit_destroy(pClient->audio_drivers);
417      lscp_szsplit_destroy(pClient->midi_drivers);      lscp_szsplit_destroy(pClient->midi_drivers);
418        lscp_isplit_destroy(pClient->audio_devices);
419        lscp_isplit_destroy(pClient->midi_devices);
420      lscp_szsplit_destroy(pClient->engines);      lscp_szsplit_destroy(pClient->engines);
421        lscp_isplit_destroy(pClient->channels);
422      // Make them null.      // Make them null.
423      pClient->audio_drivers = NULL;      pClient->audio_drivers = NULL;
424      pClient->midi_drivers = NULL;      pClient->midi_drivers = NULL;
425      pClient->engines = NULL;      pClient->engines = NULL;
426      // Free result error stuff.      // Free result error stuff.
427      _lscp_client_set_result(pClient, NULL, 0);      lscp_client_set_result(pClient, NULL, 0);
428      // Frre stream usage stuff.      // Free stream usage stuff.
429      if (pClient->buffer_fill)      if (pClient->buffer_fill)
430          free(pClient->buffer_fill);          free(pClient->buffer_fill);
431      pClient->buffer_fill = NULL;      pClient->buffer_fill = NULL;
# Line 367  lscp_status_t lscp_client_destroy ( lscp Line 433  lscp_status_t lscp_client_destroy ( lscp
433      pClient->iTimeout = 0;      pClient->iTimeout = 0;
434    
435      // Free socket agents.      // Free socket agents.
436      lscp_socket_agent_free(&(pClient->udp));      lscp_socket_agent_free(&(pClient->evt));
437      lscp_socket_agent_free(&(pClient->tcp));      lscp_socket_agent_free(&(pClient->cmd));
438    
439      // Last but not least, free good ol'transaction mutex.      // Last but not least, free good ol'transaction mutex.
440        lscp_mutex_unlock(pClient->mutex);
441      lscp_mutex_destroy(pClient->mutex);      lscp_mutex_destroy(pClient->mutex);
442        lscp_cond_destroy(pClient->cond);
443    
444      free(pClient);      free(pClient);
445    
# Line 418  int lscp_client_get_timeout ( lscp_clien Line 486  int lscp_client_get_timeout ( lscp_clien
486  //-------------------------------------------------------------------------  //-------------------------------------------------------------------------
487  // Client common protocol functions.  // Client common protocol functions.
488    
   
489  /**  /**
490   *  Submit a command query line string to the server. The query string   *  Submit a command query line string to the server. The query string
491   *  must be cr/lf and null terminated. Besides the return code, the   *  must be cr/lf and null terminated. Besides the return code, the
# Line 434  int lscp_client_get_timeout ( lscp_clien Line 501  int lscp_client_get_timeout ( lscp_clien
501   */   */
502  lscp_status_t lscp_client_query ( lscp_client_t *pClient, const char *pszQuery )  lscp_status_t lscp_client_query ( lscp_client_t *pClient, const char *pszQuery )
503  {  {
504      fd_set fds;                         // File descriptor list for select().      lscp_status_t ret;
     int    fd, fdmax;                   // Maximum file descriptor number.  
     struct timeval tv;                  // For specifying a timeout value.  
     int    iSelect;                     // Holds select return status.  
     int    iTimeout;  
     int    cchQuery;  
     char   achResult[LSCP_BUFSIZ];  
     int    cchResult;  
     const  char *pszSeps = ":[]";  
     char  *pszResult;  
     char  *pszToken;  
     char  *pch;  
     int    iErrno;  
   
     lscp_status_t ret = LSCP_FAILED;  
   
     if (pClient == NULL)  
         return ret;  
505    
506      // Lock this section up.      // Lock this section up.
507      lscp_mutex_lock(pClient->mutex);      lscp_mutex_lock(pClient->mutex);
508    
509      pszResult = NULL;      // Just make the now guarded call.
510      iErrno = -1;      ret = lscp_client_call(pClient, pszQuery);
511    
512      // Send data, and then, wait for the result...      // Unlock this section down.
     cchQuery = strlen(pszQuery);  
     if (send(pClient->tcp.sock, pszQuery, cchQuery, 0) < cchQuery) {  
         lscp_socket_perror("lscp_client_query: send");  
         lscp_mutex_unlock(pClient->mutex);  
         return ret;  
     }  
   
     // Prepare for waiting on select...  
     fd = (int) pClient->tcp.sock;  
     FD_ZERO(&fds);  
     FD_SET((unsigned int) fd, &fds);  
     fdmax = fd;  
   
     // Use the timeout select feature...  
     iTimeout = pClient->iTimeout;  
     if (iTimeout > 1000) {  
         tv.tv_sec = iTimeout / 1000;  
         iTimeout -= tv.tv_sec * 1000;  
     }  
     else tv.tv_sec = 0;  
     tv.tv_usec = iTimeout * 1000;  
   
     // Wait for event...  
     iSelect = select(fdmax + 1, &fds, NULL, NULL, &tv);  
     if (iSelect > 0 && FD_ISSET(fd, &fds)) {  
         // May recv now...  
         cchResult = recv(pClient->tcp.sock, achResult, sizeof(achResult), 0);  
         if (cchResult > 0) {  
             // Assume early success.  
             ret = LSCP_OK;  
             // Always force the result to be null terminated (and trim trailing CRLFs)!  
             while (cchResult > 0 && (achResult[cchResult - 1] == '\n' || achResult[cchResult- 1] == '\r'))  
                 cchResult--;  
             achResult[cchResult] = (char) 0;  
             // Check if the response it's an error or warning message.  
             if (strncasecmp(achResult, "WRN:", 4) == 0)  
                 ret = LSCP_WARNING;  
             else if (strncasecmp(achResult, "ERR:", 4) == 0)  
                 ret = LSCP_ERROR;  
             // So we got a result...  
             if (ret == LSCP_OK) {  
                 // Reset errno in case of success.  
                 iErrno = 0;  
                 // Is it a special successful response?  
                 if (strncasecmp(achResult, "OK[", 3) == 0) {  
                     // Parse the OK message, get the return string under brackets...  
                     pszToken = lscp_strtok(achResult, pszSeps, &(pch));  
                     if (pszToken)  
                         pszResult = lscp_strtok(NULL, pszSeps, &(pch));  
                 }  
                 else pszResult = achResult;  
                 // The result string is now set to the command response, if any.  
             } else {  
                 // Parse the error/warning message, skip first colon...  
                 pszToken = lscp_strtok(achResult, pszSeps, &(pch));  
                 if (pszToken) {  
                     // Get the error number...  
                     pszToken = lscp_strtok(NULL, pszSeps, &(pch));  
                     if (pszToken) {  
                         iErrno = atoi(pszToken);  
                         // And make the message text our final result.  
                         pszResult = lscp_strtok(NULL, pszSeps, &(pch));  
                     }  
                 }  
                 // The result string is set to the error/warning message text.  
             }  
         }  
         else if (cchResult == 0) {  
             // Fake a result message.  
             pszResult = "Server terminated the connection";  
             ret = LSCP_QUIT;  
         }  
         else lscp_socket_perror("lscp_client_query: recv");  
     }   // Check if select has timed out.  
     else if (iSelect == 0) {  
         // Fake a result message.  
         pszResult = "Timeout during receive operation";  
         ret = LSCP_TIMEOUT;  
     }  
     else lscp_socket_perror("lscp_client_query: select");  
   
     // Make the result official...  
     _lscp_client_set_result(pClient, pszResult, iErrno);  
   
     // Can go on with it...  
513      lscp_mutex_unlock(pClient->mutex);      lscp_mutex_unlock(pClient->mutex);
514    
515      return ret;      return ret;
516  }  }
517    
   
518  /**  /**
519   *  Get the last received result string. In case of error or warning,   *  Get the last received result string. In case of error or warning,
520   *  this is the text of the error or warning message issued.   *  this is the text of the error or warning message issued.
# Line 590  int lscp_client_get_errno ( lscp_client_ Line 554  int lscp_client_get_errno ( lscp_client_
554  // Client registration protocol functions.  // Client registration protocol functions.
555    
556  /**  /**
557   *  Register frontend for receiving UDP event messages:   *  Register frontend for receiving event messages:
558   *  SUBSCRIBE NOTIFICATION <udp-port>   *  SUBSCRIBE CHANNEL_COUNT | VOICE_COUNT | STREAM_COUNT | BUFFER_FILL
559     *      | CHANNEL_INFO | MISCELLANEOUS
560   *   *
561   *  @param pClient  Pointer to client instance structure.   *  @param pClient  Pointer to client instance structure.
562     *  @param events   Bit-wise OR'ed event flags to subscribe.
563   *   *
564   *  @returns LSCP_OK on success, LSCP_FAILED otherwise.   *  @returns LSCP_OK on success, LSCP_FAILED otherwise.
565   */   */
566  lscp_status_t lscp_client_subscribe ( lscp_client_t *pClient )  lscp_status_t lscp_client_subscribe ( lscp_client_t *pClient, lscp_event_t events )
567  {  {
568      lscp_status_t ret;      lscp_status_t ret = LSCP_FAILED;
     char szQuery[LSCP_BUFSIZ];  
     const char *pszResult;  
     const char *pszSeps = "[]";  
     char *pszToken;  
     char *pch;  
569    
570      if (pClient == NULL || pClient->sessid)      if (pClient == NULL)
571          return LSCP_FAILED;          return LSCP_FAILED;
572    
573      sprintf(szQuery, "SUBSCRIBE NOTIFICATION %d\r\n", ntohs(pClient->udp.addr.sin_port));      // Lock this section up.
574      ret = lscp_client_query(pClient, szQuery);      lscp_mutex_lock(pClient->mutex);
575      if (ret == LSCP_OK) {  
576          pszResult = lscp_client_get_result(pClient);      // If applicable, start the alternate connection...
577  #ifdef DEBUG      if (pClient->events == LSCP_EVENT_NONE)
578          fprintf(stderr, "lscp_client_subscribe: %s\n", pszResult);          ret = _lscp_client_evt_connect(pClient);
579  #endif  
580          // Check for the session-id on "OK[sessid]" response.      // Send the subscription commands.
581          pszToken = lscp_strtok((char *) pszResult, pszSeps, &(pch));      if (ret == LSCP_OK && (events & LSCP_EVENT_CHANNEL_COUNT))
582          if (pszToken && strcasecmp(pszToken, "OK") == 0) {          ret = _lscp_client_evt_request(pClient, 1, LSCP_EVENT_CHANNEL_COUNT);
583              pszToken = lscp_strtok(NULL, pszSeps, &(pch));      if (ret == LSCP_OK && (events & LSCP_EVENT_VOICE_COUNT))
584              if (pszToken)          ret = _lscp_client_evt_request(pClient, 1, LSCP_EVENT_VOICE_COUNT);
585                  pClient->sessid = strdup(pszToken);      if (ret == LSCP_OK && (events & LSCP_EVENT_STREAM_COUNT))
586          }          ret = _lscp_client_evt_request(pClient, 1, LSCP_EVENT_STREAM_COUNT);
587      }      if (ret == LSCP_OK && (events & LSCP_EVENT_BUFFER_FILL))
588            ret = _lscp_client_evt_request(pClient, 1, LSCP_EVENT_BUFFER_FILL);
589        if (ret == LSCP_OK && (events & LSCP_EVENT_CHANNEL_INFO))
590            ret = _lscp_client_evt_request(pClient, 1, LSCP_EVENT_CHANNEL_INFO);
591        if (ret == LSCP_OK && (events & LSCP_EVENT_MISCELLANEOUS))
592            ret = _lscp_client_evt_request(pClient, 1, LSCP_EVENT_MISCELLANEOUS);
593    
594        // Unlock this section down.
595        lscp_mutex_unlock(pClient->mutex);
596    
597      return ret;      return ret;
598  }  }
599    
600    
601  /**  /**
602   *  Deregister frontend for not receiving UDP event messages anymore:   *  Deregister frontend from receiving UDP event messages anymore:
603   *  UNSUBSCRIBE NOTIFICATION <session-id>   *  SUBSCRIBE CHANNEL_COUNT | VOICE_COUNT | STREAM_COUNT | BUFFER_FILL
604     *      | CHANNEL_INFO | MISCELLANEOUS
605   *   *
606   *  @param pClient  Pointer to client instance structure.   *  @param pClient  Pointer to client instance structure.
607     *  @param events   Bit-wise OR'ed event flags to unsubscribe.
608   *   *
609   *  @returns LSCP_OK on success, LSCP_FAILED otherwise.   *  @returns LSCP_OK on success, LSCP_FAILED otherwise.
610   */   */
611  lscp_status_t lscp_client_unsubscribe ( lscp_client_t *pClient )  lscp_status_t lscp_client_unsubscribe ( lscp_client_t *pClient, lscp_event_t events )
612  {  {
613      lscp_status_t ret;      lscp_status_t ret = LSCP_OK;
     char szQuery[LSCP_BUFSIZ];  
614    
615      if (pClient == NULL)      if (pClient == NULL)
616          return LSCP_FAILED;          return LSCP_FAILED;
     if (pClient->sessid == NULL)  
         return LSCP_FAILED;  
617    
618      sprintf(szQuery, "UNSUBSCRIBE NOTIFICATION %s\n\n", pClient->sessid);      // Lock this section up.
619      ret = lscp_client_query(pClient, szQuery);      lscp_mutex_lock(pClient->mutex);
620      if (ret == LSCP_OK) {  
621  #ifdef DEBUG      // Send the unsubscription commands.
622          fprintf(stderr, "lscp_client_unsubscribe: %s\n", lscp_client_get_result(pClient));      if (ret == LSCP_OK && (events & LSCP_EVENT_CHANNEL_COUNT))
623  #endif          ret = _lscp_client_evt_request(pClient, 0, LSCP_EVENT_CHANNEL_COUNT);
624          // Bail out session-id string.      if (ret == LSCP_OK && (events & LSCP_EVENT_VOICE_COUNT))
625          free(pClient->sessid);          ret = _lscp_client_evt_request(pClient, 0, LSCP_EVENT_VOICE_COUNT);
626          pClient->sessid = NULL;      if (ret == LSCP_OK && (events & LSCP_EVENT_STREAM_COUNT))
627      }          ret = _lscp_client_evt_request(pClient, 0, LSCP_EVENT_STREAM_COUNT);
628        if (ret == LSCP_OK && (events & LSCP_EVENT_BUFFER_FILL))
629            ret = _lscp_client_evt_request(pClient, 0, LSCP_EVENT_BUFFER_FILL);
630        if (ret == LSCP_OK && (events & LSCP_EVENT_CHANNEL_INFO))
631            ret = _lscp_client_evt_request(pClient, 0, LSCP_EVENT_CHANNEL_INFO);
632        if (ret == LSCP_OK && (events & LSCP_EVENT_MISCELLANEOUS))
633            ret = _lscp_client_evt_request(pClient, 0, LSCP_EVENT_MISCELLANEOUS);
634    
635        // If necessary, close the alternate connection...
636        if (pClient->events == LSCP_EVENT_NONE)
637            lscp_socket_agent_free(&(pClient->evt));
638    
639        // Unlock this section down.
640        lscp_mutex_unlock(pClient->mutex);
641    
642      return ret;      return ret;
643  }  }
644    
645    
646    /**
647     *  Getting current subscribed events.
648     *
649     *  @param pClient  Pointer to client instance structure.
650     *
651     *  @returns The current subscrived bit-wise OR'ed event flags.
652     */
653    lscp_event_t lscp_client_get_events ( lscp_client_t *pClient )
654    {
655        if (pClient == NULL)
656            return LSCP_EVENT_NONE;
657    
658        return pClient->events;
659    }
660    
661    
662  //-------------------------------------------------------------------------  //-------------------------------------------------------------------------
663  // Client command protocol functions.  // Client command protocol functions.
664    
# Line 683  lscp_status_t lscp_load_instrument ( lsc Line 680  lscp_status_t lscp_load_instrument ( lsc
680      if (pszFileName == NULL || iSamplerChannel < 0)      if (pszFileName == NULL || iSamplerChannel < 0)
681          return LSCP_FAILED;          return LSCP_FAILED;
682    
683      sprintf(szQuery, "LOAD INSTRUMENT %s %d %d\r\n", pszFileName, iInstrIndex, iSamplerChannel);      sprintf(szQuery, "LOAD INSTRUMENT '%s' %d %d\r\n", pszFileName, iInstrIndex, iSamplerChannel);
684        return lscp_client_query(pClient, szQuery);
685    }
686    
687    
688    /**
689     *  Loading an instrument in the background (non modal):
690     *  LOAD INSTRUMENT NON_MODAL <filename> <instr-index> <sampler-channel>
691     *
692     *  @param pClient          Pointer to client instance structure.
693     *  @param pszFileName      Instrument file name.
694     *  @param iInstrIndex      Instrument index number.
695     *  @param iSamplerChannel  Sampler Channel.
696     *
697     *  @returns LSCP_OK on success, LSCP_FAILED otherwise.
698     */
699    lscp_status_t lscp_load_instrument_non_modal ( lscp_client_t *pClient, const char *pszFileName, int iInstrIndex, int iSamplerChannel )
700    {
701        char szQuery[LSCP_BUFSIZ];
702    
703        if (pszFileName == NULL || iSamplerChannel < 0)
704            return LSCP_FAILED;
705    
706        sprintf(szQuery, "LOAD INSTRUMENT NON_MODAL '%s' %d %d\r\n", pszFileName, iInstrIndex, iSamplerChannel);
707      return lscp_client_query(pClient, szQuery);      return lscp_client_query(pClient, szQuery);
708  }  }
709    
# Line 722  lscp_status_t lscp_load_engine ( lscp_cl Line 742  lscp_status_t lscp_load_engine ( lscp_cl
742  int lscp_get_channels ( lscp_client_t *pClient )  int lscp_get_channels ( lscp_client_t *pClient )
743  {  {
744      int iChannels = -1;      int iChannels = -1;
745      if (lscp_client_query(pClient, "GET CHANNELS\r\n") == LSCP_OK)  
746        // Lock this section up.
747        lscp_mutex_lock(pClient->mutex);
748    
749        if (lscp_client_call(pClient, "GET CHANNELS\r\n") == LSCP_OK)
750          iChannels = atoi(lscp_client_get_result(pClient));          iChannels = atoi(lscp_client_get_result(pClient));
751    
752        // Unlock this section doen.
753        lscp_mutex_unlock(pClient->mutex);
754    
755      return iChannels;      return iChannels;
756  }  }
757    
758    
759  /**  /**
760     *  List current sampler channels number identifiers:
761     *  LIST CHANNELS
762     *
763     *  @param pClient  Pointer to client instance structure.
764     *
765     *  @returns An array of the sampler channels identifiers as positive integers,
766     *  terminated with -1 on success, NULL otherwise.
767     */
768    int *lscp_list_channels ( lscp_client_t *pClient )
769    {
770        const char *pszSeps = ",";
771    
772        if (pClient == NULL)
773            return NULL;
774    
775        // Lock this section up.
776        lscp_mutex_lock(pClient->mutex);
777    
778        if (pClient->channels) {
779            lscp_isplit_destroy(pClient->channels);
780            pClient->channels = NULL;
781        }
782    
783        if (lscp_client_call(pClient, "LIST CHANNELS\r\n") == LSCP_OK)
784            pClient->channels = lscp_isplit_create(lscp_client_get_result(pClient), pszSeps);
785    
786        // Unlock this section down.
787        lscp_mutex_unlock(pClient->mutex);
788    
789        return pClient->channels;
790    }
791    
792    
793    /**
794   *  Adding a new sampler channel:   *  Adding a new sampler channel:
795   *  ADD CHANNEL   *  ADD CHANNEL
796   *   *
# Line 740  int lscp_get_channels ( lscp_client_t *p Line 802  int lscp_get_channels ( lscp_client_t *p
802  int lscp_add_channel ( lscp_client_t *pClient )  int lscp_add_channel ( lscp_client_t *pClient )
803  {  {
804      int iSamplerChannel = -1;      int iSamplerChannel = -1;
805      if (lscp_client_query(pClient, "ADD CHANNEL\r\n") == LSCP_OK)  
806        // Lock this section up.
807        lscp_mutex_lock(pClient->mutex);
808    
809        if (lscp_client_call(pClient, "ADD CHANNEL\r\n") == LSCP_OK)
810          iSamplerChannel = atoi(lscp_client_get_result(pClient));          iSamplerChannel = atoi(lscp_client_get_result(pClient));
811    
812        // Unlock this section down.
813        lscp_mutex_unlock(pClient->mutex);
814    
815      return iSamplerChannel;      return iSamplerChannel;
816  }  }
817    
# Line 768  lscp_status_t lscp_remove_channel ( lscp Line 838  lscp_status_t lscp_remove_channel ( lscp
838    
839    
840  /**  /**
841   *  Getting all available engines:   *  Getting all available engines count:
842   *  GET AVAILABLE_ENGINES   *  GET AVAILABLE_ENGINES
843   *   *
844   *  @param pClient  Pointer to client instance structure.   *  @param pClient  Pointer to client instance structure.
845   *   *
846     *  @returns The current total number of sampler engines on success,
847     *  -1 otherwise.
848     */
849    int lscp_get_available_engines ( lscp_client_t *pClient )
850    {
851        int iAvailableEngines = -1;
852    
853        // Lock this section up.
854        lscp_mutex_lock(pClient->mutex);
855    
856        if (lscp_client_call(pClient, "GET AVAILABLE_ENGINES\r\n") == LSCP_OK)
857            iAvailableEngines = atoi(lscp_client_get_result(pClient));
858    
859        // Unlock this section down.
860        lscp_mutex_unlock(pClient->mutex);
861    
862        return iAvailableEngines;
863    }
864    
865    
866    /**
867     *  Getting all available engines:
868     *  LIST AVAILABLE_ENGINES
869     *
870     *  @param pClient  Pointer to client instance structure.
871     *
872   *  @returns A NULL terminated array of engine name strings,   *  @returns A NULL terminated array of engine name strings,
873   *  or NULL in case of failure.   *  or NULL in case of failure.
874   */   */
875  const char **lscp_get_available_engines ( lscp_client_t *pClient )  const char **lscp_list_available_engines ( lscp_client_t *pClient )
876  {  {
877      const char *pszSeps = ",";      const char *pszSeps = ",";
878    
879        // Lock this section up.
880        lscp_mutex_lock(pClient->mutex);
881    
882      if (pClient->engines) {      if (pClient->engines) {
883          lscp_szsplit_destroy(pClient->engines);          lscp_szsplit_destroy(pClient->engines);
884          pClient->engines = NULL;          pClient->engines = NULL;
885      }      }
886    
887      if (lscp_client_query(pClient, "GET AVAILABLE_ENGINES\r\n") == LSCP_OK)      if (lscp_client_call(pClient, "LIST AVAILABLE_ENGINES\r\n") == LSCP_OK)
888          pClient->engines = lscp_szsplit_create(lscp_client_get_result(pClient), pszSeps);          pClient->engines = lscp_szsplit_create(lscp_client_get_result(pClient), pszSeps);
889    
890        // Unlock this section down.
891        lscp_mutex_unlock(pClient->mutex);
892    
893      return (const char **) pClient->engines;      return (const char **) pClient->engines;
894  }  }
895    
# Line 815  lscp_engine_info_t *lscp_get_engine_info Line 917  lscp_engine_info_t *lscp_get_engine_info
917      if (pszEngineName == NULL)      if (pszEngineName == NULL)
918          return NULL;          return NULL;
919    
920        // Lock this section up.
921        lscp_mutex_lock(pClient->mutex);
922    
923      pEngineInfo = &(pClient->engine_info);      pEngineInfo = &(pClient->engine_info);
924      lscp_engine_info_reset(pEngineInfo);      lscp_engine_info_reset(pEngineInfo);
925    
926      sprintf(szQuery, "GET ENGINE INFO %s\r\n", pszEngineName);      sprintf(szQuery, "GET ENGINE INFO %s\r\n", pszEngineName);
927      if (lscp_client_query(pClient, szQuery) != LSCP_OK)      if (lscp_client_call(pClient, szQuery) == LSCP_OK) {
928          return NULL;          pszResult = lscp_client_get_result(pClient);
929            pszToken = lscp_strtok((char *) pszResult, pszSeps, &(pch));
930      pszResult = lscp_client_get_result(pClient);          while (pszToken) {
931      pszToken = lscp_strtok((char *) pszResult, pszSeps, &(pch));              if (strcasecmp(pszToken, "DESCRIPTION") == 0) {
932      while (pszToken) {                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
933          if (strcasecmp(pszToken, "DESCRIPTION") == 0) {                  if (pszToken)
934              pszToken = lscp_strtok(NULL, pszCrlf, &(pch));                      lscp_unquote_dup(&(pEngineInfo->description), &pszToken);
935              if (pszToken)              }
936                  pEngineInfo->description = lscp_unquote(&pszToken, 1);              else if (strcasecmp(pszToken, "VERSION") == 0) {
937          }                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
938          else if (strcasecmp(pszToken, "VERSION") == 0) {                  if (pszToken)
939              pszToken = lscp_strtok(NULL, pszCrlf, &(pch));                      lscp_unquote_dup(&(pEngineInfo->version), &pszToken);
940              if (pszToken)              }
941                  pEngineInfo->version = lscp_unquote(&pszToken, 1);              pszToken = lscp_strtok(NULL, pszSeps, &(pch));
942          }          }
         pszToken = lscp_strtok(NULL, pszSeps, &(pch));  
943      }      }
944        else pEngineInfo = NULL;
945    
946        // Unlock this section down.
947        lscp_mutex_unlock(pClient->mutex);
948    
949      return pEngineInfo;      return pEngineInfo;
950  }  }
# Line 865  lscp_channel_info_t *lscp_get_channel_in Line 973  lscp_channel_info_t *lscp_get_channel_in
973      if (iSamplerChannel < 0)      if (iSamplerChannel < 0)
974          return NULL;          return NULL;
975    
976        // Lock this section up.
977        lscp_mutex_lock(pClient->mutex);
978    
979      pChannelInfo = &(pClient->channel_info);      pChannelInfo = &(pClient->channel_info);
980      lscp_channel_info_reset(pChannelInfo);      lscp_channel_info_reset(pChannelInfo);
981    
982      sprintf(szQuery, "GET CHANNEL INFO %d\r\n", iSamplerChannel);      sprintf(szQuery, "GET CHANNEL INFO %d\r\n", iSamplerChannel);
983      if (lscp_client_query(pClient, szQuery) != LSCP_OK)      if (lscp_client_call(pClient, szQuery) == LSCP_OK) {
984          return NULL;          pszResult = lscp_client_get_result(pClient);
985            pszToken = lscp_strtok((char *) pszResult, pszSeps, &(pch));
986      pszResult = lscp_client_get_result(pClient);          while (pszToken) {
987      pszToken = lscp_strtok((char *) pszResult, pszSeps, &(pch));              if (strcasecmp(pszToken, "ENGINE_NAME") == 0) {
988      while (pszToken) {                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
989          if (strcasecmp(pszToken, "ENGINE_NAME") == 0) {                  if (pszToken)
990              pszToken = lscp_strtok(NULL, pszCrlf, &(pch));                      lscp_unquote_dup(&(pChannelInfo->engine_name), &pszToken);
991              if (pszToken)              }
992                  pChannelInfo->engine_name = lscp_unquote(&pszToken, 1);              else if (strcasecmp(pszToken, "AUDIO_OUTPUT_DEVICE") == 0) {
993          }                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
994          else if (strcasecmp(pszToken, "AUDIO_OUTPUT_DEVICE") == 0) {                  if (pszToken)
995              pszToken = lscp_strtok(NULL, pszCrlf, &(pch));                      pChannelInfo->audio_device = atoi(lscp_ltrim(pszToken));
996              if (pszToken)              }
997                  pChannelInfo->audio_device = atoi(lscp_ltrim(pszToken));              else if (strcasecmp(pszToken, "AUDIO_OUTPUT_CHANNELS") == 0) {
998          }                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
999          else if (strcasecmp(pszToken, "AUDIO_OUTPUT_CHANNELS") == 0) {                  if (pszToken)
1000              pszToken = lscp_strtok(NULL, pszCrlf, &(pch));                      pChannelInfo->audio_channels = atoi(lscp_ltrim(pszToken));
1001              if (pszToken)              }
1002                  pChannelInfo->audio_channels = atoi(lscp_ltrim(pszToken));              else if (strcasecmp(pszToken, "AUDIO_OUTPUT_ROUTING") == 0) {
1003          }                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
1004          else if (strcasecmp(pszToken, "AUDIO_OUTPUT_ROUTING") == 0) {                  if (pszToken) {
1005              pszToken = lscp_strtok(NULL, pszCrlf, &(pch));                      if (pChannelInfo->audio_routing)
1006              if (pszToken)                          lscp_szsplit_destroy(pChannelInfo->audio_routing);
1007                  pChannelInfo->audio_routing = lscp_szsplit_create(pszToken, ",");                      pChannelInfo->audio_routing = lscp_szsplit_create(pszToken, ",");
1008          }                  }
1009          else if (strcasecmp(pszToken, "INSTRUMENT_FILE") == 0) {              }
1010              pszToken = lscp_strtok(NULL, pszCrlf, &(pch));              else if (strcasecmp(pszToken, "INSTRUMENT_FILE") == 0) {
1011              if (pszToken)                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
1012                  pChannelInfo->instrument_file = lscp_unquote(&pszToken, 1);                  if (pszToken)
1013          }                      lscp_unquote_dup(&(pChannelInfo->instrument_file), &pszToken);
1014          else if (strcasecmp(pszToken, "INSTRUMENT_NR") == 0) {              }
1015              pszToken = lscp_strtok(NULL, pszCrlf, &(pch));              else if (strcasecmp(pszToken, "INSTRUMENT_NR") == 0) {
1016              if (pszToken)                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
1017                  pChannelInfo->instrument_nr = atoi(lscp_ltrim(pszToken));                  if (pszToken)
1018          }                      pChannelInfo->instrument_nr = atoi(lscp_ltrim(pszToken));
1019          else if (strcasecmp(pszToken, "MIDI_INPUT_DEVICE") == 0) {              }
1020              pszToken = lscp_strtok(NULL, pszCrlf, &(pch));              else if (strcasecmp(pszToken, "INSTRUMENT_NAME") == 0) {
1021              if (pszToken)                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
1022                  pChannelInfo->midi_device = atoi(lscp_ltrim(pszToken));                  if (pszToken)
1023          }                      lscp_unquote_dup(&(pChannelInfo->instrument_name), &pszToken);
1024          else if (strcasecmp(pszToken, "MIDI_INPUT_PORT") == 0) {              }
1025              pszToken = lscp_strtok(NULL, pszCrlf, &(pch));              else if (strcasecmp(pszToken, "INSTRUMENT_STATUS") == 0) {
1026              if (pszToken)                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
1027                  pChannelInfo->midi_port = atoi(lscp_ltrim(pszToken));                  if (pszToken)
1028          }                      pChannelInfo->instrument_status = atoi(lscp_ltrim(pszToken));
1029          else if (strcasecmp(pszToken, "MIDI_INPUT_CHANNEL") == 0) {              }
1030              pszToken = lscp_strtok(NULL, pszCrlf, &(pch));              else if (strcasecmp(pszToken, "MIDI_INPUT_DEVICE") == 0) {
1031              if (pszToken)                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
1032                  pChannelInfo->midi_channel = atoi(lscp_ltrim(pszToken));                  if (pszToken)
1033          }                      pChannelInfo->midi_device = atoi(lscp_ltrim(pszToken));
1034          else if (strcasecmp(pszToken, "VOLUME") == 0) {              }
1035              pszToken = lscp_strtok(NULL, pszCrlf, &(pch));              else if (strcasecmp(pszToken, "MIDI_INPUT_PORT") == 0) {
1036              if (pszToken)                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
1037                  pChannelInfo->volume = (float) atof(lscp_ltrim(pszToken));                  if (pszToken)
1038                        pChannelInfo->midi_port = atoi(lscp_ltrim(pszToken));
1039                }
1040                else if (strcasecmp(pszToken, "MIDI_INPUT_CHANNEL") == 0) {
1041                    pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
1042                    if (pszToken) {
1043                        pszToken = lscp_ltrim(pszToken);
1044                        if (strcasecmp(pszToken, "ALL") == 0)
1045                            pChannelInfo->midi_channel = LSCP_MIDI_CHANNEL_ALL;
1046                        else
1047                            pChannelInfo->midi_channel = atoi(pszToken);
1048                    }
1049                }
1050                else if (strcasecmp(pszToken, "VOLUME") == 0) {
1051                    pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
1052                    if (pszToken)
1053                        pChannelInfo->volume = (float) atof(lscp_ltrim(pszToken));
1054                }
1055                pszToken = lscp_strtok(NULL, pszSeps, &(pch));
1056          }          }
         pszToken = lscp_strtok(NULL, pszSeps, &(pch));  
1057      }      }
1058        else pChannelInfo = NULL;
1059    
1060        // Unlock this section up.
1061        lscp_mutex_unlock(pClient->mutex);
1062    
1063      return pChannelInfo;      return pChannelInfo;
1064  }  }
# Line 949  int lscp_get_channel_voice_count ( lscp_ Line 1081  int lscp_get_channel_voice_count ( lscp_
1081      if (iSamplerChannel < 0)      if (iSamplerChannel < 0)
1082          return iVoiceCount;          return iVoiceCount;
1083    
1084        // Lock this section up.
1085        lscp_mutex_lock(pClient->mutex);
1086    
1087      sprintf(szQuery, "GET CHANNEL VOICE_COUNT %d\r\n", iSamplerChannel);      sprintf(szQuery, "GET CHANNEL VOICE_COUNT %d\r\n", iSamplerChannel);
1088      if (lscp_client_query(pClient, szQuery) == LSCP_OK)      if (lscp_client_call(pClient, szQuery) == LSCP_OK)
1089          iVoiceCount = atoi(lscp_client_get_result(pClient));          iVoiceCount = atoi(lscp_client_get_result(pClient));
1090    
1091        // Unlock this section down.
1092        lscp_mutex_unlock(pClient->mutex);
1093    
1094      return iVoiceCount;      return iVoiceCount;
1095  }  }
1096    
# Line 961  int lscp_get_channel_voice_count ( lscp_ Line 1099  int lscp_get_channel_voice_count ( lscp_
1099   *  Current number of active disk streams:   *  Current number of active disk streams:
1100   *  GET CHANNEL STREAM_COUNT <sampler-channel>   *  GET CHANNEL STREAM_COUNT <sampler-channel>
1101   *   *
1102     *  @param pClient          Pointer to client instance structure.
1103     *  @param iSamplerChannel  Sampler channel number.
1104     *
1105   *  @returns The number of active disk streams on success, -1 otherwise.   *  @returns The number of active disk streams on success, -1 otherwise.
1106   */   */
1107  int lscp_get_channel_stream_count ( lscp_client_t *pClient, int iSamplerChannel )  int lscp_get_channel_stream_count ( lscp_client_t *pClient, int iSamplerChannel )
# Line 971  int lscp_get_channel_stream_count ( lscp Line 1112  int lscp_get_channel_stream_count ( lscp
1112      if (iSamplerChannel < 0)      if (iSamplerChannel < 0)
1113          return iStreamCount;          return iStreamCount;
1114    
1115        // Lock this section up.
1116        lscp_mutex_lock(pClient->mutex);
1117    
1118      sprintf(szQuery, "GET CHANNEL STREAM_COUNT %d\r\n", iSamplerChannel);      sprintf(szQuery, "GET CHANNEL STREAM_COUNT %d\r\n", iSamplerChannel);
1119      if (lscp_client_query(pClient, szQuery) == LSCP_OK)      if (lscp_client_call(pClient, szQuery) == LSCP_OK)
1120          iStreamCount = atoi(lscp_client_get_result(pClient));          iStreamCount = atoi(lscp_client_get_result(pClient));
1121    
1122        // Unlock this section down.
1123        lscp_mutex_unlock(pClient->mutex);
1124    
1125      return iStreamCount;      return iStreamCount;
1126  }  }
1127    
1128    
1129  /**  /**
1130     *  Current least usage of active disk streams.
1131     *
1132     *  @param pClient          Pointer to client instance structure.
1133     *  @param iSamplerChannel  Sampler channel number.
1134     *
1135     *  @returns The usage percentage of the least filled active disk stream
1136     *  on success, -1 otherwise.
1137     */
1138    int lscp_get_channel_stream_usage ( lscp_client_t *pClient, int iSamplerChannel )
1139    {
1140        char szQuery[LSCP_BUFSIZ];
1141        int  iStreamUsage = -1;
1142        const char *pszResult;
1143        const char *pszSeps = "[]%,";
1144        char *pszToken;
1145        char *pch;
1146        int   iStream;
1147        int   iPercent;
1148    
1149        if (iSamplerChannel < 0)
1150            return iStreamUsage;
1151    
1152        // Lock this section up.
1153        lscp_mutex_lock(pClient->mutex);
1154    
1155        iStream = 0;
1156        sprintf(szQuery, "GET CHANNEL BUFFER_FILL PERCENTAGE %d\r\n", iSamplerChannel);
1157        if (lscp_client_call(pClient, szQuery) == LSCP_OK) {
1158            pszResult = lscp_client_get_result(pClient);
1159            pszToken = lscp_strtok((char *) pszResult, pszSeps, &(pch));
1160            while (pszToken) {
1161                if (*pszToken) {
1162                    // Skip stream id.
1163                    pszToken = lscp_strtok(NULL, pszSeps, &(pch));
1164                    if (pszToken == NULL)
1165                        break;
1166                    // Get least buffer fill percentage.
1167                    iPercent = atol(pszToken);
1168                    if (iStreamUsage > iPercent || iStream == 0)
1169                        iStreamUsage = iPercent;
1170                    iStream++;
1171                }
1172                pszToken = lscp_strtok(NULL, pszSeps, &(pch));
1173            }
1174        }
1175    
1176        // Unlock this section down.
1177        lscp_mutex_unlock(pClient->mutex);
1178    
1179        return iStreamUsage;
1180    }
1181    
1182    
1183    /**
1184   *  Current fill state of disk stream buffers:   *  Current fill state of disk stream buffers:
1185   *  GET CHANNEL BUFFER_FILL {BYTES|PERCENTAGE} <sampler-channel>   *  GET CHANNEL BUFFER_FILL {BYTES|PERCENTAGE} <sampler-channel>
1186   *   *
# Line 1005  lscp_buffer_fill_t *lscp_get_channel_buf Line 1206  lscp_buffer_fill_t *lscp_get_channel_buf
1206      char *pch;      char *pch;
1207      int   iStream;      int   iStream;
1208    
1209        // Retrieve a channel stream estimation.
1210      iStreamCount = lscp_get_channel_stream_count(pClient, iSamplerChannel);      iStreamCount = lscp_get_channel_stream_count(pClient, iSamplerChannel);
1211        if (pClient->iStreamCount < 0)
1212            return NULL;
1213    
1214        // Lock this section up.
1215        lscp_mutex_lock(pClient->mutex);
1216    
1217        // Check if we need to reallocate the stream usage array.
1218      if (pClient->iStreamCount != iStreamCount) {      if (pClient->iStreamCount != iStreamCount) {
1219          if (pClient->buffer_fill)          if (pClient->buffer_fill)
1220              free(pClient->buffer_fill);              free(pClient->buffer_fill);
# Line 1016  lscp_buffer_fill_t *lscp_get_channel_buf Line 1225  lscp_buffer_fill_t *lscp_get_channel_buf
1225          pClient->iStreamCount = iStreamCount;          pClient->iStreamCount = iStreamCount;
1226      }      }
1227    
     if (pClient->iStreamCount < 1)  
         return NULL;  
   
     iStream = 0;  
     pBufferFill = pClient->buffer_fill;  
   
1228      // Get buffer fill usage...      // Get buffer fill usage...
1229      sprintf(szQuery, "GET CHANNEL BUFFER_FILL %s %d\r\n", pszUsageType, iSamplerChannel);      pBufferFill = pClient->buffer_fill;
1230      if (lscp_client_query(pClient, szQuery) == LSCP_OK) {      if (pBufferFill && iStreamCount > 0) {
1231          pszResult = lscp_client_get_result(pClient);          iStream = 0;
1232          pszToken = lscp_strtok((char *) pszResult, pszSeps, &(pch));          pBufferFill = pClient->buffer_fill;
1233          while (pszToken && iStream < pClient->iStreamCount) {          sprintf(szQuery, "GET CHANNEL BUFFER_FILL %s %d\r\n", pszUsageType, iSamplerChannel);
1234              if (*pszToken) {          if (lscp_client_call(pClient, szQuery) == LSCP_OK) {
1235                  pBufferFill[iStream].stream_id = atol(pszToken);              pszResult = lscp_client_get_result(pClient);
1236                pszToken = lscp_strtok((char *) pszResult, pszSeps, &(pch));
1237                while (pszToken && iStream < pClient->iStreamCount) {
1238                    if (*pszToken) {
1239                        pBufferFill[iStream].stream_id = atol(pszToken);
1240                        pszToken = lscp_strtok(NULL, pszSeps, &(pch));
1241                        if (pszToken == NULL)
1242                            break;
1243                        pBufferFill[iStream].stream_usage = atol(pszToken);
1244                        iStream++;
1245                    }
1246                  pszToken = lscp_strtok(NULL, pszSeps, &(pch));                  pszToken = lscp_strtok(NULL, pszSeps, &(pch));
                 if (pszToken == NULL)  
                     break;  
                 pBufferFill[iStream].stream_usage = atol(pszToken);  
                 iStream++;  
1247              }              }
1248              pszToken = lscp_strtok(NULL, pszSeps, &(pch));          }   // Reset the usage, whatever it was before.
1249          }          else while (iStream < pClient->iStreamCount)
1250      }   // Reset the usage, whatever it was before.              pBufferFill[iStream++].stream_usage = 0;
1251      else while (iStream < pClient->iStreamCount)      }
1252          pBufferFill[iStream++].stream_usage = 0;  
1253        // Unlock this section down.
1254        lscp_mutex_unlock(pClient->mutex);
1255    
1256      return pBufferFill;      return pBufferFill;
1257  }  }
# Line 1067  lscp_status_t lscp_set_channel_audio_typ Line 1278  lscp_status_t lscp_set_channel_audio_typ
1278    
1279    
1280  /**  /**
1281     *  Setting audio output device:
1282     *  SET CHANNEL AUDIO_OUTPUT_DEVICE <sampler-channel> <device-id>
1283     *
1284     *  @param pClient          Pointer to client instance structure.
1285     *  @param iSamplerChannel  Sampler channel number.
1286     *  @param iAudioDevice     Audio output device number identifier.
1287     */
1288    lscp_status_t lscp_set_channel_audio_device ( lscp_client_t *pClient, int iSamplerChannel, int iAudioDevice )
1289    {
1290        char szQuery[LSCP_BUFSIZ];
1291    
1292        if (iSamplerChannel < 0 || iAudioDevice < 0)
1293            return LSCP_FAILED;
1294    
1295        sprintf(szQuery, "SET CHANNEL AUDIO_OUTPUT_DEVICE %d %d\r\n", iSamplerChannel, iAudioDevice);
1296        return lscp_client_query(pClient, szQuery);
1297    }
1298    
1299    
1300    /**
1301   *  Setting audio output channel:   *  Setting audio output channel:
1302   *  SET CHANNEL AUDIO_OUTPUT_CHANNEL <sampler-channel> <audio-output-chan> <audio-input-chan>   *  SET CHANNEL AUDIO_OUTPUT_CHANNEL <sampler-channel> <audio-output-chan> <audio-input-chan>
1303   *   *
# Line 1084  lscp_status_t lscp_set_channel_audio_cha Line 1315  lscp_status_t lscp_set_channel_audio_cha
1315      if (iSamplerChannel < 0 || iAudioOut < 0 || iAudioIn < 0)      if (iSamplerChannel < 0 || iAudioOut < 0 || iAudioIn < 0)
1316          return LSCP_FAILED;          return LSCP_FAILED;
1317    
1318      sprintf(szQuery, "SET CHANNEL AUDIO_OUTPUT_CHANNELS %d %d %d\r\n", iSamplerChannel, iAudioOut, iAudioIn);      sprintf(szQuery, "SET CHANNEL AUDIO_OUTPUT_CHANNEL %d %d %d\r\n", iSamplerChannel, iAudioOut, iAudioIn);
1319      return lscp_client_query(pClient, szQuery);      return lscp_client_query(pClient, szQuery);
1320  }  }
1321    
# Line 1112  lscp_status_t lscp_set_channel_midi_type Line 1343  lscp_status_t lscp_set_channel_midi_type
1343    
1344    
1345  /**  /**
1346     *  Setting MIDI input device:
1347     *  SET CHANNEL MIDI_INPUT_DEVICE <sampler-channel> <device-id>
1348     *
1349     *  @param pClient          Pointer to client instance structure.
1350     *  @param iSamplerChannel  Sampler channel number.
1351     *  @param iMidiDevice      MIDI input device number identifier.
1352     */
1353    lscp_status_t lscp_set_channel_midi_device ( lscp_client_t *pClient, int iSamplerChannel, int iMidiDevice )
1354    {
1355        char szQuery[LSCP_BUFSIZ];
1356    
1357        if (iSamplerChannel < 0 || iMidiDevice < 0)
1358            return LSCP_FAILED;
1359    
1360        sprintf(szQuery, "SET CHANNEL MIDI_INPUT_DEVICE %d %d\r\n", iSamplerChannel, iMidiDevice);
1361        return lscp_client_query(pClient, szQuery);
1362    }
1363    
1364    
1365    /**
1366   *  Setting MIDI input port:   *  Setting MIDI input port:
1367   *  SET CHANNEL MIDI_INPUT_PORT <sampler-channel> <midi-input-port>   *  SET CHANNEL MIDI_INPUT_PORT <sampler-channel> <midi-input-port>
1368   *   *
# Line 1139  lscp_status_t lscp_set_channel_midi_port Line 1390  lscp_status_t lscp_set_channel_midi_port
1390   *   *
1391   *  @param pClient          Pointer to client instance structure.   *  @param pClient          Pointer to client instance structure.
1392   *  @param iSamplerChannel  Sampler channel number.   *  @param iSamplerChannel  Sampler channel number.
1393   *  @param iMidiChannel     MIDI channel number to listen (1-16) or   *  @param iMidiChannel     MIDI channel address number to listen (0-15) or
1394   *                          zero (0) to listen on all channels.   *                          LSCP_MIDI_CHANNEL_ALL (16) to listen on all channels.
1395   *   *
1396   *  @returns LSCP_OK on success, LSCP_FAILED otherwise.   *  @returns LSCP_OK on success, LSCP_FAILED otherwise.
1397   */   */
# Line 1151  lscp_status_t lscp_set_channel_midi_chan Line 1402  lscp_status_t lscp_set_channel_midi_chan
1402      if (iSamplerChannel < 0 || iMidiChannel < 0 || iMidiChannel > 16)      if (iSamplerChannel < 0 || iMidiChannel < 0 || iMidiChannel > 16)
1403          return LSCP_FAILED;          return LSCP_FAILED;
1404    
1405      if (iMidiChannel > 0)      if (iMidiChannel == LSCP_MIDI_CHANNEL_ALL)
         sprintf(szQuery, "SET CHANNEL MIDI_INPUT_CHANNEL %d %d\r\n", iSamplerChannel, iMidiChannel);  
     else  
1406          sprintf(szQuery, "SET CHANNEL MIDI_INPUT_CHANNEL %d ALL\r\n", iSamplerChannel);          sprintf(szQuery, "SET CHANNEL MIDI_INPUT_CHANNEL %d ALL\r\n", iSamplerChannel);
1407        else
1408            sprintf(szQuery, "SET CHANNEL MIDI_INPUT_CHANNEL %d %d\r\n", iSamplerChannel, iMidiChannel);
1409      return lscp_client_query(pClient, szQuery);      return lscp_client_query(pClient, szQuery);
1410  }  }
1411    
# Line 1204  lscp_status_t lscp_reset_channel ( lscp_ Line 1455  lscp_status_t lscp_reset_channel ( lscp_
1455  }  }
1456    
1457    
1458    /**
1459     *  Resetting the sampler:
1460     *  RESET
1461     *
1462     *  @param pClient  Pointer to client instance structure.
1463     *
1464     *  @returns LSCP_OK on success, LSCP_FAILED otherwise.
1465     */
1466    lscp_status_t lscp_reset_sampler ( lscp_client_t *pClient )
1467    {
1468        return lscp_client_query(pClient, "RESET\r\n");
1469    }
1470    
1471    
1472    /**
1473     *  Getting information about the server.
1474     *  GET SERVER INFO
1475     *
1476     *  @param pClient  Pointer to client instance structure.
1477     *
1478     *  @returns A pointer to a @ref lscp_server_info_t structure, with all the
1479     *  information of the current connected server, or NULL in case of failure.
1480     */
1481    lscp_server_info_t *lscp_get_server_info ( lscp_client_t *pClient )
1482    {
1483        lscp_server_info_t *pServerInfo;
1484        const char *pszResult;
1485        const char *pszSeps = ":";
1486        const char *pszCrlf = "\r\n";
1487        char *pszToken;
1488        char *pch;
1489    
1490        // Lock this section up.
1491        lscp_mutex_lock(pClient->mutex);
1492    
1493        pServerInfo = &(pClient->server_info);
1494        lscp_server_info_reset(pServerInfo);
1495    
1496        if (lscp_client_call(pClient, "GET SERVER INFO\r\n") == LSCP_OK) {
1497            pszResult = lscp_client_get_result(pClient);
1498            pszToken = lscp_strtok((char *) pszResult, pszSeps, &(pch));
1499            while (pszToken) {
1500                if (strcasecmp(pszToken, "DESCRIPTION") == 0) {
1501                    pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
1502                    if (pszToken)
1503                        lscp_unquote_dup(&(pServerInfo->description), &pszToken);
1504                }
1505                else if (strcasecmp(pszToken, "VERSION") == 0) {
1506                    pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
1507                    if (pszToken)
1508                        lscp_unquote_dup(&(pServerInfo->version), &pszToken);
1509                }
1510                pszToken = lscp_strtok(NULL, pszSeps, &(pch));
1511            }
1512        }
1513        else pServerInfo = NULL;
1514    
1515        // Unlock this section down.
1516        lscp_mutex_unlock(pClient->mutex);
1517    
1518        return pServerInfo;
1519    }
1520    
1521    
1522  // end of client.c  // end of client.c
Legend:
Removed from v.114  
changed lines
  Added in v.565
  ViewVC Help
Powered by ViewVC