/[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 107 by capela, Fri Jun 4 21:06:59 2004 UTC revision 948 by capela, Tue Nov 28 15:31:20 2006 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-2006, 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 have received a copy of the GNU General Public License along
18     License along with this library; if not, write to the Free Software     with this program; if not, write to the Free Software Foundation, Inc.,
19     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
20    
21  *****************************************************************************/  *****************************************************************************/
22    
# 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
123        fprintf(stderr, "_lscp_client_evt_proc: Client closing.\n");
124    #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  #ifdef DEBUG
154      fprintf(stderr, "_lscp_client_udp_proc: Client closing.\n");      lscp_socket_getopts("_lscp_client_evt_connect:", sock);
155  #endif  #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    
# 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 164  lscp_client_t* lscp_client_create ( cons Line 258  lscp_client_t* lscp_client_create ( cons
258    
259      pHost = gethostbyname(pszHost);      pHost = gethostbyname(pszHost);
260      if (pHost == NULL) {      if (pHost == NULL) {
261          lscp_socket_perror("lscp_client_create: gethostbyname");          lscp_socket_herror("lscp_client_create: gethostbyname");
262          return NULL;          return NULL;
263      }      }
264    
# 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));      pClient->midi_instruments = NULL;
331        lscp_driver_info_init(&(pClient->audio_driver_info));
332        lscp_driver_info_init(&(pClient->midi_driver_info));
333        lscp_device_info_init(&(pClient->audio_device_info));
334        lscp_device_info_init(&(pClient->midi_device_info));
335        lscp_param_info_init(&(pClient->audio_param_info));
336        lscp_param_info_init(&(pClient->midi_param_info));
337        lscp_device_port_info_init(&(pClient->audio_channel_info));
338        lscp_device_port_info_init(&(pClient->midi_port_info));
339        lscp_param_info_init(&(pClient->audio_channel_param_info));
340        lscp_param_info_init(&(pClient->midi_port_param_info));
341        lscp_server_info_init(&(pClient->server_info));
342      lscp_engine_info_init(&(pClient->engine_info));      lscp_engine_info_init(&(pClient->engine_info));
343      lscp_channel_info_init(&(pClient->channel_info));      lscp_channel_info_init(&(pClient->channel_info));
344        lscp_midi_instrument_info_init(&(pClient->midi_instrument_info));
345      // Initialize error stuff.      // Initialize error stuff.
346      pClient->pszResult = NULL;      pClient->pszResult = NULL;
347      pClient->iErrno = -1;      pClient->iErrno = -1;
# Line 284  lscp_client_t* lscp_client_create ( cons Line 350  lscp_client_t* lscp_client_create ( cons
350      pClient->iStreamCount = 0;      pClient->iStreamCount = 0;
351      // Default timeout value.      // Default timeout value.
352      pClient->iTimeout = LSCP_TIMEOUT_MSECS;      pClient->iTimeout = LSCP_TIMEOUT_MSECS;
353            pClient->iTimeoutCount = 0;
354    
355      // Initialize the transaction mutex.      // Initialize the transaction mutex.
356      lscp_mutex_init(pClient->mutex);      lscp_mutex_init(pClient->mutex);
357        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;  
     }  
358    
359      // Finally we've some success...      // Finally we've some success...
360      return pClient;      return pClient;
# Line 317  lscp_status_t lscp_client_join ( lscp_cl Line 375  lscp_status_t lscp_client_join ( lscp_cl
375      fprintf(stderr, "lscp_client_join: pClient=%p.\n", pClient);      fprintf(stderr, "lscp_client_join: pClient=%p.\n", pClient);
376  #endif  #endif
377    
378  //  lscp_socket_agent_join(&(pClient->udp));  //  lscp_socket_agent_join(&(pClient->evt));
379      lscp_socket_agent_join(&(pClient->tcp));      lscp_socket_agent_join(&(pClient->cmd));
380    
381      return LSCP_OK;      return LSCP_OK;
382  }  }
# Line 340  lscp_status_t lscp_client_destroy ( lscp Line 398  lscp_status_t lscp_client_destroy ( lscp
398      fprintf(stderr, "lscp_client_destroy: pClient=%p.\n", pClient);      fprintf(stderr, "lscp_client_destroy: pClient=%p.\n", pClient);
399  #endif  #endif
400    
401      // Free session-id, if any.      // Lock this section up.
402      if (pClient->sessid)      lscp_mutex_lock(pClient->mutex);
403          free(pClient->sessid);  
     pClient->sessid = NULL;  
404      // Free up all cached members.      // Free up all cached members.
405      lscp_channel_info_reset(&(pClient->channel_info));      lscp_midi_instrument_info_free(&(pClient->midi_instrument_info));
406      lscp_engine_info_reset(&(pClient->engine_info));      lscp_channel_info_free(&(pClient->channel_info));
407      lscp_driver_info_reset(&(pClient->midi_info));      lscp_engine_info_free(&(pClient->engine_info));
408      lscp_driver_info_reset(&(pClient->audio_info));      lscp_server_info_free(&(pClient->server_info));
409        lscp_param_info_free(&(pClient->midi_port_param_info));
410        lscp_param_info_free(&(pClient->audio_channel_param_info));
411        lscp_device_port_info_free(&(pClient->midi_port_info));
412        lscp_device_port_info_free(&(pClient->audio_channel_info));
413        lscp_param_info_free(&(pClient->midi_param_info));
414        lscp_param_info_free(&(pClient->audio_param_info));
415        lscp_device_info_free(&(pClient->midi_device_info));
416        lscp_device_info_free(&(pClient->audio_device_info));
417        lscp_driver_info_free(&(pClient->midi_driver_info));
418        lscp_driver_info_free(&(pClient->audio_driver_info));
419      // Free available engine table.      // Free available engine table.
420      lscp_szsplit_destroy(pClient->audio_drivers);      lscp_szsplit_destroy(pClient->audio_drivers);
421      lscp_szsplit_destroy(pClient->midi_drivers);      lscp_szsplit_destroy(pClient->midi_drivers);
422        lscp_isplit_destroy(pClient->audio_devices);
423        lscp_isplit_destroy(pClient->midi_devices);
424      lscp_szsplit_destroy(pClient->engines);      lscp_szsplit_destroy(pClient->engines);
425        lscp_isplit_destroy(pClient->channels);
426        lscp_midi_instruments_destroy(pClient->midi_instruments);
427      // Make them null.      // Make them null.
428      pClient->audio_drivers = NULL;      pClient->audio_drivers = NULL;
429      pClient->midi_drivers = NULL;      pClient->midi_drivers = NULL;
430        pClient->audio_devices = NULL;
431        pClient->midi_devices = NULL;
432      pClient->engines = NULL;      pClient->engines = NULL;
433        pClient->channels = NULL;
434        pClient->midi_instruments = NULL;
435      // Free result error stuff.      // Free result error stuff.
436      _lscp_client_set_result(pClient, NULL, 0);      lscp_client_set_result(pClient, NULL, 0);
437      // Frre stream usage stuff.      // Free stream usage stuff.
438      if (pClient->buffer_fill)      if (pClient->buffer_fill)
439          free(pClient->buffer_fill);          free(pClient->buffer_fill);
440      pClient->buffer_fill = NULL;      pClient->buffer_fill = NULL;
# Line 367  lscp_status_t lscp_client_destroy ( lscp Line 442  lscp_status_t lscp_client_destroy ( lscp
442      pClient->iTimeout = 0;      pClient->iTimeout = 0;
443    
444      // Free socket agents.      // Free socket agents.
445      lscp_socket_agent_free(&(pClient->udp));      lscp_socket_agent_free(&(pClient->evt));
446      lscp_socket_agent_free(&(pClient->tcp));      lscp_socket_agent_free(&(pClient->cmd));
447    
448      // Last but not least, free good ol'transaction mutex.      // Last but not least, free good ol'transaction mutex.
449        lscp_mutex_unlock(pClient->mutex);
450      lscp_mutex_destroy(pClient->mutex);      lscp_mutex_destroy(pClient->mutex);
451        lscp_cond_destroy(pClient->cond);
452    
453      free(pClient);      free(pClient);
454    
# Line 418  int lscp_client_get_timeout ( lscp_clien Line 495  int lscp_client_get_timeout ( lscp_clien
495  //-------------------------------------------------------------------------  //-------------------------------------------------------------------------
496  // Client common protocol functions.  // Client common protocol functions.
497    
   
498  /**  /**
499   *  Submit a command query line string to the server. The query string   *  Submit a command query line string to the server. The query string
500   *  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 510  int lscp_client_get_timeout ( lscp_clien
510   */   */
511  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 )
512  {  {
513      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;  
514    
515      // Lock this section up.      // Lock this section up.
516      lscp_mutex_lock(pClient->mutex);      lscp_mutex_lock(pClient->mutex);
517    
518      pszResult = NULL;      // Just make the now guarded call.
519      iErrno = -1;      ret = lscp_client_call(pClient, pszQuery, 0);
   
     // Send data, and then, wait for the result...  
     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);  
520    
521      // Can go on with it...      // Unlock this section down.
522      lscp_mutex_unlock(pClient->mutex);      lscp_mutex_unlock(pClient->mutex);
523    
524      return ret;      return ret;
525  }  }
526    
   
527  /**  /**
528   *  Get the last received result string. In case of error or warning,   *  Get the last received result string. In case of error or warning,
529   *  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 563  int lscp_client_get_errno ( lscp_client_
563  // Client registration protocol functions.  // Client registration protocol functions.
564    
565  /**  /**
566   *  Register frontend for receiving UDP event messages:   *  Register frontend for receiving event messages:
567   *  SUBSCRIBE NOTIFICATION <udp-port>   *  SUBSCRIBE CHANNEL_COUNT | VOICE_COUNT | STREAM_COUNT | BUFFER_FILL
568     *      | CHANNEL_INFO | MISCELLANEOUS
569   *   *
570   *  @param pClient  Pointer to client instance structure.   *  @param pClient  Pointer to client instance structure.
571     *  @param events   Bit-wise OR'ed event flags to subscribe.
572   *   *
573   *  @returns LSCP_OK on success, LSCP_FAILED otherwise.   *  @returns LSCP_OK on success, LSCP_FAILED otherwise.
574   */   */
575  lscp_status_t lscp_client_subscribe ( lscp_client_t *pClient )  lscp_status_t lscp_client_subscribe ( lscp_client_t *pClient, lscp_event_t events )
576  {  {
577      lscp_status_t ret;      lscp_status_t ret = LSCP_FAILED;
     char szQuery[LSCP_BUFSIZ];  
     const char *pszResult;  
     const char *pszSeps = "[]";  
     char *pszToken;  
     char *pch;  
578    
579      if (pClient == NULL || pClient->sessid)      if (pClient == NULL)
580          return LSCP_FAILED;          return LSCP_FAILED;
581    
582      sprintf(szQuery, "SUBSCRIBE NOTIFICATION %d\r\n", ntohs(pClient->udp.addr.sin_port));      // Lock this section up.
583      ret = lscp_client_query(pClient, szQuery);      lscp_mutex_lock(pClient->mutex);
584      if (ret == LSCP_OK) {  
585          pszResult = lscp_client_get_result(pClient);      // If applicable, start the alternate connection...
586  #ifdef DEBUG      if (pClient->events == LSCP_EVENT_NONE)
587          fprintf(stderr, "lscp_client_subscribe: %s\n", pszResult);          ret = _lscp_client_evt_connect(pClient);
588  #endif  
589          // Check for the session-id on "OK[sessid]" response.      // Send the subscription commands.
590          pszToken = lscp_strtok(pszResult, pszSeps, &(pch));      if (ret == LSCP_OK && (events & LSCP_EVENT_CHANNEL_COUNT))
591          if (pszToken && strcasecmp(pszToken, "OK") == 0) {          ret = _lscp_client_evt_request(pClient, 1, LSCP_EVENT_CHANNEL_COUNT);
592              pszToken = lscp_strtok(NULL, pszSeps, &(pch));      if (ret == LSCP_OK && (events & LSCP_EVENT_VOICE_COUNT))
593              if (pszToken)          ret = _lscp_client_evt_request(pClient, 1, LSCP_EVENT_VOICE_COUNT);
594                  pClient->sessid = strdup(pszToken);      if (ret == LSCP_OK && (events & LSCP_EVENT_STREAM_COUNT))
595          }          ret = _lscp_client_evt_request(pClient, 1, LSCP_EVENT_STREAM_COUNT);
596      }      if (ret == LSCP_OK && (events & LSCP_EVENT_BUFFER_FILL))
597            ret = _lscp_client_evt_request(pClient, 1, LSCP_EVENT_BUFFER_FILL);
598        if (ret == LSCP_OK && (events & LSCP_EVENT_CHANNEL_INFO))
599            ret = _lscp_client_evt_request(pClient, 1, LSCP_EVENT_CHANNEL_INFO);
600        if (ret == LSCP_OK && (events & LSCP_EVENT_MISCELLANEOUS))
601            ret = _lscp_client_evt_request(pClient, 1, LSCP_EVENT_MISCELLANEOUS);
602    
603        // Unlock this section down.
604        lscp_mutex_unlock(pClient->mutex);
605    
606      return ret;      return ret;
607  }  }
608    
609    
610  /**  /**
611   *  Deregister frontend for not receiving UDP event messages anymore:   *  Deregister frontend from receiving UDP event messages anymore:
612   *  UNSUBSCRIBE NOTIFICATION <session-id>   *  SUBSCRIBE CHANNEL_COUNT | VOICE_COUNT | STREAM_COUNT | BUFFER_FILL
613     *      | CHANNEL_INFO | MISCELLANEOUS
614   *   *
615   *  @param pClient  Pointer to client instance structure.   *  @param pClient  Pointer to client instance structure.
616     *  @param events   Bit-wise OR'ed event flags to unsubscribe.
617   *   *
618   *  @returns LSCP_OK on success, LSCP_FAILED otherwise.   *  @returns LSCP_OK on success, LSCP_FAILED otherwise.
619   */   */
620  lscp_status_t lscp_client_unsubscribe ( lscp_client_t *pClient )  lscp_status_t lscp_client_unsubscribe ( lscp_client_t *pClient, lscp_event_t events )
621  {  {
622      lscp_status_t ret;      lscp_status_t ret = LSCP_OK;
     char szQuery[LSCP_BUFSIZ];  
623    
624      if (pClient == NULL)      if (pClient == NULL)
625          return LSCP_FAILED;          return LSCP_FAILED;
     if (pClient->sessid == NULL)  
         return LSCP_FAILED;  
626    
627      sprintf(szQuery, "UNSUBSCRIBE NOTIFICATION %s\n\n", pClient->sessid);      // Lock this section up.
628      ret = lscp_client_query(pClient, szQuery);      lscp_mutex_lock(pClient->mutex);
629      if (ret == LSCP_OK) {  
630  #ifdef DEBUG      // Send the unsubscription commands.
631          fprintf(stderr, "lscp_client_unsubscribe: %s\n", lscp_client_get_result(pClient));      if (ret == LSCP_OK && (events & LSCP_EVENT_CHANNEL_COUNT))
632  #endif          ret = _lscp_client_evt_request(pClient, 0, LSCP_EVENT_CHANNEL_COUNT);
633          // Bail out session-id string.      if (ret == LSCP_OK && (events & LSCP_EVENT_VOICE_COUNT))
634          free(pClient->sessid);          ret = _lscp_client_evt_request(pClient, 0, LSCP_EVENT_VOICE_COUNT);
635          pClient->sessid = NULL;      if (ret == LSCP_OK && (events & LSCP_EVENT_STREAM_COUNT))
636      }          ret = _lscp_client_evt_request(pClient, 0, LSCP_EVENT_STREAM_COUNT);
637        if (ret == LSCP_OK && (events & LSCP_EVENT_BUFFER_FILL))
638            ret = _lscp_client_evt_request(pClient, 0, LSCP_EVENT_BUFFER_FILL);
639        if (ret == LSCP_OK && (events & LSCP_EVENT_CHANNEL_INFO))
640            ret = _lscp_client_evt_request(pClient, 0, LSCP_EVENT_CHANNEL_INFO);
641        if (ret == LSCP_OK && (events & LSCP_EVENT_MISCELLANEOUS))
642            ret = _lscp_client_evt_request(pClient, 0, LSCP_EVENT_MISCELLANEOUS);
643    
644        // If necessary, close the alternate connection...
645        if (pClient->events == LSCP_EVENT_NONE)
646            lscp_socket_agent_free(&(pClient->evt));
647    
648        // Unlock this section down.
649        lscp_mutex_unlock(pClient->mutex);
650    
651      return ret;      return ret;
652  }  }
653    
654    
655    /**
656     *  Getting current subscribed events.
657     *
658     *  @param pClient  Pointer to client instance structure.
659     *
660     *  @returns The current subscrived bit-wise OR'ed event flags.
661     */
662    lscp_event_t lscp_client_get_events ( lscp_client_t *pClient )
663    {
664        if (pClient == NULL)
665            return LSCP_EVENT_NONE;
666    
667        return pClient->events;
668    }
669    
670    
671  //-------------------------------------------------------------------------  //-------------------------------------------------------------------------
672  // Client command protocol functions.  // Client command protocol functions.
673    
# Line 683  lscp_status_t lscp_load_instrument ( lsc Line 689  lscp_status_t lscp_load_instrument ( lsc
689      if (pszFileName == NULL || iSamplerChannel < 0)      if (pszFileName == NULL || iSamplerChannel < 0)
690          return LSCP_FAILED;          return LSCP_FAILED;
691    
692      sprintf(szQuery, "LOAD INSTRUMENT %s %d %d\r\n", pszFileName, iInstrIndex, iSamplerChannel);      sprintf(szQuery, "LOAD INSTRUMENT '%s' %d %d\r\n", pszFileName, iInstrIndex, iSamplerChannel);
693        return lscp_client_query(pClient, szQuery);
694    }
695    
696    
697    /**
698     *  Loading an instrument in the background (non modal):
699     *  LOAD INSTRUMENT NON_MODAL <filename> <instr-index> <sampler-channel>
700     *
701     *  @param pClient          Pointer to client instance structure.
702     *  @param pszFileName      Instrument file name.
703     *  @param iInstrIndex      Instrument index number.
704     *  @param iSamplerChannel  Sampler Channel.
705     *
706     *  @returns LSCP_OK on success, LSCP_FAILED otherwise.
707     */
708    lscp_status_t lscp_load_instrument_non_modal ( lscp_client_t *pClient, const char *pszFileName, int iInstrIndex, int iSamplerChannel )
709    {
710        char szQuery[LSCP_BUFSIZ];
711    
712        if (pszFileName == NULL || iSamplerChannel < 0)
713            return LSCP_FAILED;
714    
715        sprintf(szQuery, "LOAD INSTRUMENT NON_MODAL '%s' %d %d\r\n", pszFileName, iInstrIndex, iSamplerChannel);
716      return lscp_client_query(pClient, szQuery);      return lscp_client_query(pClient, szQuery);
717  }  }
718    
# Line 722  lscp_status_t lscp_load_engine ( lscp_cl Line 751  lscp_status_t lscp_load_engine ( lscp_cl
751  int lscp_get_channels ( lscp_client_t *pClient )  int lscp_get_channels ( lscp_client_t *pClient )
752  {  {
753      int iChannels = -1;      int iChannels = -1;
754      if (lscp_client_query(pClient, "GET CHANNELS\r\n") == LSCP_OK)  
755        // Lock this section up.
756        lscp_mutex_lock(pClient->mutex);
757    
758        if (lscp_client_call(pClient, "GET CHANNELS\r\n", 0) == LSCP_OK)
759          iChannels = atoi(lscp_client_get_result(pClient));          iChannels = atoi(lscp_client_get_result(pClient));
760    
761        // Unlock this section doen.
762        lscp_mutex_unlock(pClient->mutex);
763    
764      return iChannels;      return iChannels;
765  }  }
766    
767    
768  /**  /**
769     *  List current sampler channels number identifiers:
770     *  LIST CHANNELS
771     *
772     *  @param pClient  Pointer to client instance structure.
773     *
774     *  @returns An array of the sampler channels identifiers as positive integers,
775     *  terminated with -1 on success, NULL otherwise.
776     */
777    int *lscp_list_channels ( lscp_client_t *pClient )
778    {
779        const char *pszSeps = ",";
780    
781        if (pClient == NULL)
782            return NULL;
783    
784        // Lock this section up.
785        lscp_mutex_lock(pClient->mutex);
786    
787        if (pClient->channels) {
788            lscp_isplit_destroy(pClient->channels);
789            pClient->channels = NULL;
790        }
791    
792        if (lscp_client_call(pClient, "LIST CHANNELS\r\n", 0) == LSCP_OK)
793            pClient->channels = lscp_isplit_create(lscp_client_get_result(pClient), pszSeps);
794    
795        // Unlock this section down.
796        lscp_mutex_unlock(pClient->mutex);
797    
798        return pClient->channels;
799    }
800    
801    
802    /**
803   *  Adding a new sampler channel:   *  Adding a new sampler channel:
804   *  ADD CHANNEL   *  ADD CHANNEL
805   *   *
# Line 740  int lscp_get_channels ( lscp_client_t *p Line 811  int lscp_get_channels ( lscp_client_t *p
811  int lscp_add_channel ( lscp_client_t *pClient )  int lscp_add_channel ( lscp_client_t *pClient )
812  {  {
813      int iSamplerChannel = -1;      int iSamplerChannel = -1;
814      if (lscp_client_query(pClient, "ADD CHANNEL\r\n") == LSCP_OK)  
815        // Lock this section up.
816        lscp_mutex_lock(pClient->mutex);
817    
818        if (lscp_client_call(pClient, "ADD CHANNEL\r\n", 0) == LSCP_OK)
819          iSamplerChannel = atoi(lscp_client_get_result(pClient));          iSamplerChannel = atoi(lscp_client_get_result(pClient));
820    
821        // Unlock this section down.
822        lscp_mutex_unlock(pClient->mutex);
823    
824      return iSamplerChannel;      return iSamplerChannel;
825  }  }
826    
# Line 768  lscp_status_t lscp_remove_channel ( lscp Line 847  lscp_status_t lscp_remove_channel ( lscp
847    
848    
849  /**  /**
850   *  Getting all available engines:   *  Getting all available engines count:
851   *  GET AVAILABLE_ENGINES   *  GET AVAILABLE_ENGINES
852   *   *
853   *  @param pClient  Pointer to client instance structure.   *  @param pClient  Pointer to client instance structure.
854   *   *
855     *  @returns The current total number of sampler engines on success,
856     *  -1 otherwise.
857     */
858    int lscp_get_available_engines ( lscp_client_t *pClient )
859    {
860        int iAvailableEngines = -1;
861    
862        // Lock this section up.
863        lscp_mutex_lock(pClient->mutex);
864    
865        if (lscp_client_call(pClient, "GET AVAILABLE_ENGINES\r\n", 0) == LSCP_OK)
866            iAvailableEngines = atoi(lscp_client_get_result(pClient));
867    
868        // Unlock this section down.
869        lscp_mutex_unlock(pClient->mutex);
870    
871        return iAvailableEngines;
872    }
873    
874    
875    /**
876     *  Getting all available engines:
877     *  LIST AVAILABLE_ENGINES
878     *
879     *  @param pClient  Pointer to client instance structure.
880     *
881   *  @returns A NULL terminated array of engine name strings,   *  @returns A NULL terminated array of engine name strings,
882   *  or NULL in case of failure.   *  or NULL in case of failure.
883   */   */
884  const char **lscp_get_available_engines ( lscp_client_t *pClient )  const char **lscp_list_available_engines ( lscp_client_t *pClient )
885  {  {
886      const char *pszSeps = ",";      const char *pszSeps = ",";
887    
888        // Lock this section up.
889        lscp_mutex_lock(pClient->mutex);
890    
891      if (pClient->engines) {      if (pClient->engines) {
892          lscp_szsplit_destroy(pClient->engines);          lscp_szsplit_destroy(pClient->engines);
893          pClient->engines = NULL;          pClient->engines = NULL;
894      }      }
895    
896      if (lscp_client_query(pClient, "GET AVAILABLE_ENGINES\r\n") == LSCP_OK)      if (lscp_client_call(pClient, "LIST AVAILABLE_ENGINES\r\n", 0) == LSCP_OK)
897          pClient->engines = lscp_szsplit_create(lscp_client_get_result(pClient), pszSeps);          pClient->engines = lscp_szsplit_create(lscp_client_get_result(pClient), pszSeps);
898    
899        // Unlock this section down.
900        lscp_mutex_unlock(pClient->mutex);
901    
902      return (const char **) pClient->engines;      return (const char **) pClient->engines;
903  }  }
904    
# Line 815  lscp_engine_info_t *lscp_get_engine_info Line 926  lscp_engine_info_t *lscp_get_engine_info
926      if (pszEngineName == NULL)      if (pszEngineName == NULL)
927          return NULL;          return NULL;
928    
929        // Lock this section up.
930        lscp_mutex_lock(pClient->mutex);
931    
932      pEngineInfo = &(pClient->engine_info);      pEngineInfo = &(pClient->engine_info);
933      lscp_engine_info_reset(pEngineInfo);      lscp_engine_info_reset(pEngineInfo);
934    
935      sprintf(szQuery, "GET ENGINE INFO %s\r\n", pszEngineName);      sprintf(szQuery, "GET ENGINE INFO %s\r\n", pszEngineName);
936      if (lscp_client_query(pClient, szQuery) != LSCP_OK)      if (lscp_client_call(pClient, szQuery, 1) == LSCP_OK) {
937          return NULL;          pszResult = lscp_client_get_result(pClient);
938            pszToken = lscp_strtok((char *) pszResult, pszSeps, &(pch));
939      pszResult = lscp_client_get_result(pClient);          while (pszToken) {
940      pszToken = lscp_strtok(pszResult, pszSeps, &(pch));              if (strcasecmp(pszToken, "DESCRIPTION") == 0) {
941      while (pszToken) {                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
942          if (strcasecmp(pszToken, "DESCRIPTION") == 0) {                  if (pszToken)
943              pszToken = lscp_strtok(NULL, pszCrlf, &(pch));                      lscp_unquote_dup(&(pEngineInfo->description), &pszToken);
944              if (pszToken)              }
945                  pEngineInfo->description = lscp_unquote(&pszToken, 1);              else if (strcasecmp(pszToken, "VERSION") == 0) {
946          }                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
947          else if (strcasecmp(pszToken, "VERSION") == 0) {                  if (pszToken)
948              pszToken = lscp_strtok(NULL, pszCrlf, &(pch));                      lscp_unquote_dup(&(pEngineInfo->version), &pszToken);
949              if (pszToken)              }
950                  pEngineInfo->version = lscp_unquote(&pszToken, 1);              pszToken = lscp_strtok(NULL, pszSeps, &(pch));
951          }          }
         pszToken = lscp_strtok(NULL, pszSeps, &(pch));  
952      }      }
953        else pEngineInfo = NULL;
954    
955        // Unlock this section down.
956        lscp_mutex_unlock(pClient->mutex);
957    
958      return pEngineInfo;      return pEngineInfo;
959  }  }
# Line 865  lscp_channel_info_t *lscp_get_channel_in Line 982  lscp_channel_info_t *lscp_get_channel_in
982      if (iSamplerChannel < 0)      if (iSamplerChannel < 0)
983          return NULL;          return NULL;
984    
985        // Lock this section up.
986        lscp_mutex_lock(pClient->mutex);
987    
988      pChannelInfo = &(pClient->channel_info);      pChannelInfo = &(pClient->channel_info);
989      lscp_channel_info_reset(pChannelInfo);      lscp_channel_info_reset(pChannelInfo);
990    
991      sprintf(szQuery, "GET CHANNEL INFO %d\r\n", iSamplerChannel);      sprintf(szQuery, "GET CHANNEL INFO %d\r\n", iSamplerChannel);
992      if (lscp_client_query(pClient, szQuery) != LSCP_OK)      if (lscp_client_call(pClient, szQuery, 1) == LSCP_OK) {
993          return NULL;          pszResult = lscp_client_get_result(pClient);
994            pszToken = lscp_strtok((char *) pszResult, pszSeps, &(pch));
995      pszResult = lscp_client_get_result(pClient);          while (pszToken) {
996      pszToken = lscp_strtok(pszResult, pszSeps, &(pch));              if (strcasecmp(pszToken, "ENGINE_NAME") == 0) {
997      while (pszToken) {                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
998          if (strcasecmp(pszToken, "ENGINE_NAME") == 0) {                  if (pszToken)
999              pszToken = lscp_strtok(NULL, pszCrlf, &(pch));                      lscp_unquote_dup(&(pChannelInfo->engine_name), &pszToken);
1000              if (pszToken)              }
1001                  pChannelInfo->engine_name = lscp_unquote(&pszToken, 1);              else if (strcasecmp(pszToken, "AUDIO_OUTPUT_DEVICE") == 0) {
1002          }                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
1003          else if (strcasecmp(pszToken, "AUDIO_OUTPUT_DEVICE") == 0) {                  if (pszToken)
1004              pszToken = lscp_strtok(NULL, pszCrlf, &(pch));                      pChannelInfo->audio_device = atoi(lscp_ltrim(pszToken));
1005              if (pszToken)              }
1006                  pChannelInfo->audio_device = atoi(lscp_ltrim(pszToken));              else if (strcasecmp(pszToken, "AUDIO_OUTPUT_CHANNELS") == 0) {
1007          }                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
1008          else if (strcasecmp(pszToken, "AUDIO_OUTPUT_CHANNELS") == 0) {                  if (pszToken)
1009              pszToken = lscp_strtok(NULL, pszCrlf, &(pch));                      pChannelInfo->audio_channels = atoi(lscp_ltrim(pszToken));
1010              if (pszToken)              }
1011                  pChannelInfo->audio_channels = atoi(lscp_ltrim(pszToken));              else if (strcasecmp(pszToken, "AUDIO_OUTPUT_ROUTING") == 0) {
1012          }                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
1013          else if (strcasecmp(pszToken, "AUDIO_OUTPUT_ROUTING") == 0) {                  if (pszToken) {
1014              pszToken = lscp_strtok(NULL, pszCrlf, &(pch));                      if (pChannelInfo->audio_routing)
1015              if (pszToken)                          lscp_szsplit_destroy(pChannelInfo->audio_routing);
1016                  pChannelInfo->audio_routing = lscp_szsplit_create(pszToken, ",");                      pChannelInfo->audio_routing = lscp_szsplit_create(pszToken, ",");
1017          }                  }
1018          else if (strcasecmp(pszToken, "INSTRUMENT_FILE") == 0) {              }
1019              pszToken = lscp_strtok(NULL, pszCrlf, &(pch));              else if (strcasecmp(pszToken, "INSTRUMENT_FILE") == 0) {
1020              if (pszToken)                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
1021                  pChannelInfo->instrument_file = lscp_unquote(&pszToken, 1);                  if (pszToken)
1022          }                      lscp_unquote_dup(&(pChannelInfo->instrument_file), &pszToken);
1023          else if (strcasecmp(pszToken, "INSTRUMENT_NR") == 0) {              }
1024              pszToken = lscp_strtok(NULL, pszCrlf, &(pch));              else if (strcasecmp(pszToken, "INSTRUMENT_NR") == 0) {
1025              if (pszToken)                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
1026                  pChannelInfo->instrument_nr = atoi(lscp_ltrim(pszToken));                  if (pszToken)
1027          }                      pChannelInfo->instrument_nr = atoi(lscp_ltrim(pszToken));
1028          else if (strcasecmp(pszToken, "MIDI_INPUT_DEVICE") == 0) {              }
1029              pszToken = lscp_strtok(NULL, pszCrlf, &(pch));              else if (strcasecmp(pszToken, "INSTRUMENT_NAME") == 0) {
1030              if (pszToken)                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
1031                  pChannelInfo->midi_device = atoi(lscp_ltrim(pszToken));                  if (pszToken)
1032          }                      lscp_unquote_dup(&(pChannelInfo->instrument_name), &pszToken);
1033          else if (strcasecmp(pszToken, "MIDI_INPUT_PORT") == 0) {              }
1034              pszToken = lscp_strtok(NULL, pszCrlf, &(pch));              else if (strcasecmp(pszToken, "INSTRUMENT_STATUS") == 0) {
1035              if (pszToken)                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
1036                  pChannelInfo->midi_port = atoi(lscp_ltrim(pszToken));                  if (pszToken)
1037          }                      pChannelInfo->instrument_status = atoi(lscp_ltrim(pszToken));
1038          else if (strcasecmp(pszToken, "MIDI_INPUT_CHANNEL") == 0) {              }
1039              pszToken = lscp_strtok(NULL, pszCrlf, &(pch));              else if (strcasecmp(pszToken, "MIDI_INPUT_DEVICE") == 0) {
1040              if (pszToken)                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
1041                  pChannelInfo->midi_channel = atoi(lscp_ltrim(pszToken));                  if (pszToken)
1042          }                      pChannelInfo->midi_device = atoi(lscp_ltrim(pszToken));
1043          else if (strcasecmp(pszToken, "VOLUME") == 0) {              }
1044              pszToken = lscp_strtok(NULL, pszCrlf, &(pch));              else if (strcasecmp(pszToken, "MIDI_INPUT_PORT") == 0) {
1045              if (pszToken)                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
1046                  pChannelInfo->volume = (float) atof(lscp_ltrim(pszToken));                  if (pszToken)
1047                        pChannelInfo->midi_port = atoi(lscp_ltrim(pszToken));
1048                }
1049                else if (strcasecmp(pszToken, "MIDI_INPUT_CHANNEL") == 0) {
1050                    pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
1051                    if (pszToken) {
1052                        pszToken = lscp_ltrim(pszToken);
1053                        if (strcasecmp(pszToken, "ALL") == 0)
1054                            pChannelInfo->midi_channel = LSCP_MIDI_CHANNEL_ALL;
1055                        else
1056                            pChannelInfo->midi_channel = atoi(pszToken);
1057                    }
1058                }
1059                else if (strcasecmp(pszToken, "VOLUME") == 0) {
1060                    pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
1061                    if (pszToken)
1062                        pChannelInfo->volume = (float) atof(lscp_ltrim(pszToken));
1063                }
1064                else if (strcasecmp(pszToken, "MUTE") == 0) {
1065                    pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
1066                    if (pszToken)
1067                        pChannelInfo->mute = (strcasecmp(lscp_unquote(&pszToken, 0), "TRUE") == 0);
1068                }
1069                else if (strcasecmp(pszToken, "SOLO") == 0) {
1070                    pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
1071                    if (pszToken)
1072                        pChannelInfo->solo = (strcasecmp(lscp_unquote(&pszToken, 0), "TRUE") == 0);
1073                }
1074                pszToken = lscp_strtok(NULL, pszSeps, &(pch));
1075          }          }
         pszToken = lscp_strtok(NULL, pszSeps, &(pch));  
1076      }      }
1077        else pChannelInfo = NULL;
1078    
1079        // Unlock this section up.
1080        lscp_mutex_unlock(pClient->mutex);
1081    
1082      return pChannelInfo;      return pChannelInfo;
1083  }  }
# Line 949  int lscp_get_channel_voice_count ( lscp_ Line 1100  int lscp_get_channel_voice_count ( lscp_
1100      if (iSamplerChannel < 0)      if (iSamplerChannel < 0)
1101          return iVoiceCount;          return iVoiceCount;
1102    
1103        // Lock this section up.
1104        lscp_mutex_lock(pClient->mutex);
1105    
1106      sprintf(szQuery, "GET CHANNEL VOICE_COUNT %d\r\n", iSamplerChannel);      sprintf(szQuery, "GET CHANNEL VOICE_COUNT %d\r\n", iSamplerChannel);
1107      if (lscp_client_query(pClient, szQuery) == LSCP_OK)      if (lscp_client_call(pClient, szQuery, 0) == LSCP_OK)
1108          iVoiceCount = atoi(lscp_client_get_result(pClient));          iVoiceCount = atoi(lscp_client_get_result(pClient));
1109    
1110        // Unlock this section down.
1111        lscp_mutex_unlock(pClient->mutex);
1112    
1113      return iVoiceCount;      return iVoiceCount;
1114  }  }
1115    
# Line 961  int lscp_get_channel_voice_count ( lscp_ Line 1118  int lscp_get_channel_voice_count ( lscp_
1118   *  Current number of active disk streams:   *  Current number of active disk streams:
1119   *  GET CHANNEL STREAM_COUNT <sampler-channel>   *  GET CHANNEL STREAM_COUNT <sampler-channel>
1120   *   *
1121     *  @param pClient          Pointer to client instance structure.
1122     *  @param iSamplerChannel  Sampler channel number.
1123     *
1124   *  @returns The number of active disk streams on success, -1 otherwise.   *  @returns The number of active disk streams on success, -1 otherwise.
1125   */   */
1126  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 1131  int lscp_get_channel_stream_count ( lscp
1131      if (iSamplerChannel < 0)      if (iSamplerChannel < 0)
1132          return iStreamCount;          return iStreamCount;
1133    
1134        // Lock this section up.
1135        lscp_mutex_lock(pClient->mutex);
1136    
1137      sprintf(szQuery, "GET CHANNEL STREAM_COUNT %d\r\n", iSamplerChannel);      sprintf(szQuery, "GET CHANNEL STREAM_COUNT %d\r\n", iSamplerChannel);
1138      if (lscp_client_query(pClient, szQuery) == LSCP_OK)      if (lscp_client_call(pClient, szQuery, 0) == LSCP_OK)
1139          iStreamCount = atoi(lscp_client_get_result(pClient));          iStreamCount = atoi(lscp_client_get_result(pClient));
1140    
1141        // Unlock this section down.
1142        lscp_mutex_unlock(pClient->mutex);
1143    
1144      return iStreamCount;      return iStreamCount;
1145  }  }
1146    
1147    
1148  /**  /**
1149     *  Current least usage of active disk streams.
1150     *
1151     *  @param pClient          Pointer to client instance structure.
1152     *  @param iSamplerChannel  Sampler channel number.
1153     *
1154     *  @returns The usage percentage of the least filled active disk stream
1155     *  on success, -1 otherwise.
1156     */
1157    int lscp_get_channel_stream_usage ( lscp_client_t *pClient, int iSamplerChannel )
1158    {
1159        char szQuery[LSCP_BUFSIZ];
1160        int  iStreamUsage = -1;
1161        const char *pszResult;
1162        const char *pszSeps = "[]%,";
1163        char *pszToken;
1164        char *pch;
1165        int   iStream;
1166        int   iPercent;
1167    
1168        if (iSamplerChannel < 0)
1169            return iStreamUsage;
1170    
1171        // Lock this section up.
1172        lscp_mutex_lock(pClient->mutex);
1173    
1174        iStream = 0;
1175        sprintf(szQuery, "GET CHANNEL BUFFER_FILL PERCENTAGE %d\r\n", iSamplerChannel);
1176        if (lscp_client_call(pClient, szQuery, 0) == LSCP_OK) {
1177            pszResult = lscp_client_get_result(pClient);
1178            pszToken = lscp_strtok((char *) pszResult, pszSeps, &(pch));
1179            while (pszToken) {
1180                if (*pszToken) {
1181                    // Skip stream id.
1182                    pszToken = lscp_strtok(NULL, pszSeps, &(pch));
1183                    if (pszToken == NULL)
1184                        break;
1185                    // Get least buffer fill percentage.
1186                    iPercent = atol(pszToken);
1187                    if (iStreamUsage > iPercent || iStream == 0)
1188                        iStreamUsage = iPercent;
1189                    iStream++;
1190                }
1191                pszToken = lscp_strtok(NULL, pszSeps, &(pch));
1192            }
1193        }
1194    
1195        // Unlock this section down.
1196        lscp_mutex_unlock(pClient->mutex);
1197    
1198        return iStreamUsage;
1199    }
1200    
1201    
1202    /**
1203   *  Current fill state of disk stream buffers:   *  Current fill state of disk stream buffers:
1204   *  GET CHANNEL BUFFER_FILL {BYTES|PERCENTAGE} <sampler-channel>   *  GET CHANNEL BUFFER_FILL {BYTES|PERCENTAGE} <sampler-channel>
1205   *   *
# Line 1005  lscp_buffer_fill_t *lscp_get_channel_buf Line 1225  lscp_buffer_fill_t *lscp_get_channel_buf
1225      char *pch;      char *pch;
1226      int   iStream;      int   iStream;
1227    
1228        // Retrieve a channel stream estimation.
1229      iStreamCount = lscp_get_channel_stream_count(pClient, iSamplerChannel);      iStreamCount = lscp_get_channel_stream_count(pClient, iSamplerChannel);
1230        if (pClient->iStreamCount < 0)
1231            return NULL;
1232    
1233        // Lock this section up.
1234        lscp_mutex_lock(pClient->mutex);
1235    
1236        // Check if we need to reallocate the stream usage array.
1237      if (pClient->iStreamCount != iStreamCount) {      if (pClient->iStreamCount != iStreamCount) {
1238          if (pClient->buffer_fill)          if (pClient->buffer_fill)
1239              free(pClient->buffer_fill);              free(pClient->buffer_fill);
# Line 1016  lscp_buffer_fill_t *lscp_get_channel_buf Line 1244  lscp_buffer_fill_t *lscp_get_channel_buf
1244          pClient->iStreamCount = iStreamCount;          pClient->iStreamCount = iStreamCount;
1245      }      }
1246    
     if (pClient->iStreamCount < 1)  
         return NULL;  
   
     iStream = 0;  
     pBufferFill = pClient->buffer_fill;  
   
1247      // Get buffer fill usage...      // Get buffer fill usage...
1248      sprintf(szQuery, "GET CHANNEL BUFFER_FILL %s %d\r\n", pszUsageType, iSamplerChannel);      pBufferFill = pClient->buffer_fill;
1249      if (lscp_client_query(pClient, szQuery) == LSCP_OK) {      if (pBufferFill && iStreamCount > 0) {
1250          pszResult = lscp_client_get_result(pClient);          iStream = 0;
1251          pszToken = lscp_strtok(pszResult, pszSeps, &(pch));          pBufferFill = pClient->buffer_fill;
1252          while (pszToken && iStream < pClient->iStreamCount) {          sprintf(szQuery, "GET CHANNEL BUFFER_FILL %s %d\r\n", pszUsageType, iSamplerChannel);
1253              if (*pszToken) {          if (lscp_client_call(pClient, szQuery, 0) == LSCP_OK) {
1254                  pBufferFill[iStream].stream_id = atol(pszToken);              pszResult = lscp_client_get_result(pClient);
1255                pszToken = lscp_strtok((char *) pszResult, pszSeps, &(pch));
1256                while (pszToken && iStream < pClient->iStreamCount) {
1257                    if (*pszToken) {
1258                        pBufferFill[iStream].stream_id = atol(pszToken);
1259                        pszToken = lscp_strtok(NULL, pszSeps, &(pch));
1260                        if (pszToken == NULL)
1261                            break;
1262                        pBufferFill[iStream].stream_usage = atol(pszToken);
1263                        iStream++;
1264                    }
1265                  pszToken = lscp_strtok(NULL, pszSeps, &(pch));                  pszToken = lscp_strtok(NULL, pszSeps, &(pch));
                 if (pszToken == NULL)  
                     break;  
                 pBufferFill[iStream].stream_usage = atol(pszToken);  
                 iStream++;  
1266              }              }
1267              pszToken = lscp_strtok(NULL, pszSeps, &(pch));          }   // Reset the usage, whatever it was before.
1268          }          else while (iStream < pClient->iStreamCount)
1269      }   // Reset the usage, whatever it was before.              pBufferFill[iStream++].stream_usage = 0;
1270      else while (iStream < pClient->iStreamCount)      }
1271          pBufferFill[iStream++].stream_usage = 0;  
1272        // Unlock this section down.
1273        lscp_mutex_unlock(pClient->mutex);
1274    
1275      return pBufferFill;      return pBufferFill;
1276  }  }
# Line 1053  lscp_buffer_fill_t *lscp_get_channel_buf Line 1283  lscp_buffer_fill_t *lscp_get_channel_buf
1283   *  @param pClient          Pointer to client instance structure.   *  @param pClient          Pointer to client instance structure.
1284   *  @param iSamplerChannel  Sampler channel number.   *  @param iSamplerChannel  Sampler channel number.
1285   *  @param pszAudioDriver   Audio output driver type (e.g. "ALSA" or "JACK").   *  @param pszAudioDriver   Audio output driver type (e.g. "ALSA" or "JACK").
1286     *
1287     *  @returns LSCP_OK on success, LSCP_FAILED otherwise.
1288   */   */
1289  lscp_status_t lscp_set_channel_audio_type ( lscp_client_t *pClient, int iSamplerChannel, const char *pszAudioDriver )  lscp_status_t lscp_set_channel_audio_type ( lscp_client_t *pClient, int iSamplerChannel, const char *pszAudioDriver )
1290  {  {
# Line 1067  lscp_status_t lscp_set_channel_audio_typ Line 1299  lscp_status_t lscp_set_channel_audio_typ
1299    
1300    
1301  /**  /**
1302     *  Setting audio output device:
1303     *  SET CHANNEL AUDIO_OUTPUT_DEVICE <sampler-channel> <device-id>
1304     *
1305     *  @param pClient          Pointer to client instance structure.
1306     *  @param iSamplerChannel  Sampler channel number.
1307     *  @param iAudioDevice     Audio output device number identifier.
1308     *
1309     *  @returns LSCP_OK on success, LSCP_FAILED otherwise.
1310     */
1311    lscp_status_t lscp_set_channel_audio_device ( lscp_client_t *pClient, int iSamplerChannel, int iAudioDevice )
1312    {
1313        char szQuery[LSCP_BUFSIZ];
1314    
1315        if (iSamplerChannel < 0 || iAudioDevice < 0)
1316            return LSCP_FAILED;
1317    
1318        sprintf(szQuery, "SET CHANNEL AUDIO_OUTPUT_DEVICE %d %d\r\n", iSamplerChannel, iAudioDevice);
1319        return lscp_client_query(pClient, szQuery);
1320    }
1321    
1322    
1323    /**
1324   *  Setting audio output channel:   *  Setting audio output channel:
1325   *  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>
1326   *   *
# Line 1084  lscp_status_t lscp_set_channel_audio_cha Line 1338  lscp_status_t lscp_set_channel_audio_cha
1338      if (iSamplerChannel < 0 || iAudioOut < 0 || iAudioIn < 0)      if (iSamplerChannel < 0 || iAudioOut < 0 || iAudioIn < 0)
1339          return LSCP_FAILED;          return LSCP_FAILED;
1340    
1341      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);
1342      return lscp_client_query(pClient, szQuery);      return lscp_client_query(pClient, szQuery);
1343  }  }
1344    
# Line 1112  lscp_status_t lscp_set_channel_midi_type Line 1366  lscp_status_t lscp_set_channel_midi_type
1366    
1367    
1368  /**  /**
1369     *  Setting MIDI input device:
1370     *  SET CHANNEL MIDI_INPUT_DEVICE <sampler-channel> <device-id>
1371     *
1372     *  @param pClient          Pointer to client instance structure.
1373     *  @param iSamplerChannel  Sampler channel number.
1374     *  @param iMidiDevice      MIDI input device number identifier.
1375     *
1376     *  @returns LSCP_OK on success, LSCP_FAILED otherwise.
1377     */
1378    lscp_status_t lscp_set_channel_midi_device ( lscp_client_t *pClient, int iSamplerChannel, int iMidiDevice )
1379    {
1380        char szQuery[LSCP_BUFSIZ];
1381    
1382        if (iSamplerChannel < 0 || iMidiDevice < 0)
1383            return LSCP_FAILED;
1384    
1385        sprintf(szQuery, "SET CHANNEL MIDI_INPUT_DEVICE %d %d\r\n", iSamplerChannel, iMidiDevice);
1386        return lscp_client_query(pClient, szQuery);
1387    }
1388    
1389    
1390    /**
1391   *  Setting MIDI input port:   *  Setting MIDI input port:
1392   *  SET CHANNEL MIDI_INPUT_PORT <sampler-channel> <midi-input-port>   *  SET CHANNEL MIDI_INPUT_PORT <sampler-channel> <midi-input-port>
1393   *   *
# Line 1139  lscp_status_t lscp_set_channel_midi_port Line 1415  lscp_status_t lscp_set_channel_midi_port
1415   *   *
1416   *  @param pClient          Pointer to client instance structure.   *  @param pClient          Pointer to client instance structure.
1417   *  @param iSamplerChannel  Sampler channel number.   *  @param iSamplerChannel  Sampler channel number.
1418   *  @param iMidiChannel     MIDI channel number to listen (1-16) or   *  @param iMidiChannel     MIDI channel address number to listen (0-15) or
1419   *                          zero (0) to listen on all channels.   *                          LSCP_MIDI_CHANNEL_ALL (16) to listen on all channels.
1420   *   *
1421   *  @returns LSCP_OK on success, LSCP_FAILED otherwise.   *  @returns LSCP_OK on success, LSCP_FAILED otherwise.
1422   */   */
# Line 1151  lscp_status_t lscp_set_channel_midi_chan Line 1427  lscp_status_t lscp_set_channel_midi_chan
1427      if (iSamplerChannel < 0 || iMidiChannel < 0 || iMidiChannel > 16)      if (iSamplerChannel < 0 || iMidiChannel < 0 || iMidiChannel > 16)
1428          return LSCP_FAILED;          return LSCP_FAILED;
1429    
1430      if (iMidiChannel > 0)      if (iMidiChannel == LSCP_MIDI_CHANNEL_ALL)
         sprintf(szQuery, "SET CHANNEL MIDI_INPUT_CHANNEL %d %d\r\n", iSamplerChannel, iMidiChannel);  
     else  
1431          sprintf(szQuery, "SET CHANNEL MIDI_INPUT_CHANNEL %d ALL\r\n", iSamplerChannel);          sprintf(szQuery, "SET CHANNEL MIDI_INPUT_CHANNEL %d ALL\r\n", iSamplerChannel);
1432        else
1433            sprintf(szQuery, "SET CHANNEL MIDI_INPUT_CHANNEL %d %d\r\n", iSamplerChannel, iMidiChannel);
1434      return lscp_client_query(pClient, szQuery);      return lscp_client_query(pClient, szQuery);
1435  }  }
1436    
# Line 1184  lscp_status_t lscp_set_channel_volume ( Line 1460  lscp_status_t lscp_set_channel_volume (
1460    
1461    
1462  /**  /**
1463     *  Muting a sampler channel:
1464     *  SET CHANNEL MUTE <sampler-channel> <mute>
1465     *
1466     *  @param pClient          Pointer to client instance structure.
1467     *  @param iSamplerChannel  Sampler channel number.
1468     *  @param iMute            Sampler channel mute state as a boolean value,
1469     *                          either 1 (one) to mute the channel or 0 (zero)
1470     *                          to unmute the channel.
1471     *
1472     *  @returns LSCP_OK on success, LSCP_FAILED otherwise.
1473     */
1474    lscp_status_t lscp_set_channel_mute ( lscp_client_t *pClient, int iSamplerChannel, int iMute )
1475    {
1476        char szQuery[LSCP_BUFSIZ];
1477    
1478        if (iSamplerChannel < 0 || iMute < 0 || iMute > 1)
1479            return LSCP_FAILED;
1480    
1481        sprintf(szQuery, "SET CHANNEL MUTE %d %d\r\n", iSamplerChannel, iMute);
1482        return lscp_client_query(pClient, szQuery);
1483    }
1484    
1485    
1486    /**
1487     *  Soloing a sampler channel:
1488     *  SET CHANNEL SOLO <sampler-channel> <solo>
1489     *
1490     *  @param pClient          Pointer to client instance structure.
1491     *  @param iSamplerChannel  Sampler channel number.
1492     *  @param iSolo            Sampler channel solo state as a boolean value,
1493     *                          either 1 (one) to solo the channel or 0 (zero)
1494     *                          to unsolo the channel.
1495     *
1496     *  @returns LSCP_OK on success, LSCP_FAILED otherwise.
1497     */
1498    lscp_status_t lscp_set_channel_solo ( lscp_client_t *pClient, int iSamplerChannel, int iSolo )
1499    {
1500        char szQuery[LSCP_BUFSIZ];
1501    
1502        if (iSamplerChannel < 0 || iSolo < 0 || iSolo > 1)
1503            return LSCP_FAILED;
1504    
1505        sprintf(szQuery, "SET CHANNEL SOLO %d %d\r\n", iSamplerChannel, iSolo);
1506        return lscp_client_query(pClient, szQuery);
1507    }
1508    
1509    
1510    /**
1511   *  Resetting a sampler channel:   *  Resetting a sampler channel:
1512   *  RESET CHANNEL <sampler-channel>   *  RESET CHANNEL <sampler-channel>
1513   *   *
# Line 1204  lscp_status_t lscp_reset_channel ( lscp_ Line 1528  lscp_status_t lscp_reset_channel ( lscp_
1528  }  }
1529    
1530    
1531    /**
1532     *  Resetting the sampler:
1533     *  RESET
1534     *
1535     *  @param pClient  Pointer to client instance structure.
1536     *
1537     *  @returns LSCP_OK on success, LSCP_FAILED otherwise.
1538     */
1539    lscp_status_t lscp_reset_sampler ( lscp_client_t *pClient )
1540    {
1541        return lscp_client_query(pClient, "RESET\r\n");
1542    }
1543    
1544    
1545    /**
1546     *  Getting information about the server.
1547     *  GET SERVER INFO
1548     *
1549     *  @param pClient  Pointer to client instance structure.
1550     *
1551     *  @returns A pointer to a @ref lscp_server_info_t structure, with all the
1552     *  information of the current connected server, or NULL in case of failure.
1553     */
1554    lscp_server_info_t *lscp_get_server_info ( lscp_client_t *pClient )
1555    {
1556        lscp_server_info_t *pServerInfo;
1557        const char *pszResult;
1558        const char *pszSeps = ":";
1559        const char *pszCrlf = "\r\n";
1560        char *pszToken;
1561        char *pch;
1562    
1563        // Lock this section up.
1564        lscp_mutex_lock(pClient->mutex);
1565    
1566        pServerInfo = &(pClient->server_info);
1567        lscp_server_info_reset(pServerInfo);
1568    
1569        if (lscp_client_call(pClient, "GET SERVER INFO\r\n", 1) == LSCP_OK) {
1570            pszResult = lscp_client_get_result(pClient);
1571            pszToken = lscp_strtok((char *) pszResult, pszSeps, &(pch));
1572            while (pszToken) {
1573                if (strcasecmp(pszToken, "DESCRIPTION") == 0) {
1574                    pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
1575                    if (pszToken)
1576                        lscp_unquote_dup(&(pServerInfo->description), &pszToken);
1577                }
1578                else if (strcasecmp(pszToken, "VERSION") == 0) {
1579                    pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
1580                    if (pszToken)
1581                        lscp_unquote_dup(&(pServerInfo->version), &pszToken);
1582                }
1583                pszToken = lscp_strtok(NULL, pszSeps, &(pch));
1584            }
1585        }
1586        else pServerInfo = NULL;
1587    
1588        // Unlock this section down.
1589        lscp_mutex_unlock(pClient->mutex);
1590    
1591        return pServerInfo;
1592    }
1593    
1594    
1595    /**
1596     *  Current total number of active voices:
1597     *  GET TOTAL_VOICE_COUNT
1598     *
1599     *  @param pClient  Pointer to client instance structure.
1600     *
1601     *  @returns The total number of voices currently active,
1602     *  -1 in case of failure.
1603     */
1604    int lscp_get_total_voice_count ( lscp_client_t *pClient )
1605    {
1606        int iVoiceCount = -1;
1607    
1608        // Lock this section up.
1609        lscp_mutex_lock(pClient->mutex);
1610    
1611        if (lscp_client_call(pClient, "GET TOTAL_VOICE_COUNT\r\n", 0) == LSCP_OK)
1612            iVoiceCount = atoi(lscp_client_get_result(pClient));
1613    
1614        // Unlock this section down.
1615        lscp_mutex_unlock(pClient->mutex);
1616    
1617        return iVoiceCount;
1618    }
1619    
1620    
1621    /**
1622     *  Maximum amount of active voices:
1623     *  GET TOTAL_VOICE_COUNT_MAX
1624     *
1625     *  @param pClient  Pointer to client instance structure.
1626     *
1627     *  @returns The maximum amount of voices currently active,
1628     *  -1 in case of failure.
1629     */
1630    int lscp_get_total_voice_count_max ( lscp_client_t *pClient )
1631    {
1632        int iVoiceCount = -1;
1633    
1634        // Lock this section up.
1635        lscp_mutex_lock(pClient->mutex);
1636    
1637        if (lscp_client_call(pClient, "GET TOTAL_VOICE_COUNT_MAX\r\n", 0) == LSCP_OK)
1638            iVoiceCount = atoi(lscp_client_get_result(pClient));
1639    
1640        // Unlock this section down.
1641        lscp_mutex_unlock(pClient->mutex);
1642    
1643        return iVoiceCount;
1644    }
1645    
1646    
1647    /**
1648     *  Create or replace a MIDI instrumnet map entry:
1649     *  MAP MIDI_INSTRUMENT <midi-bank-msb> <midi-bank-lsb> <midi-prog>
1650     *      <engine-name> <filename> <instr-index> <volume> <load-mode> [<name>]
1651     *
1652     *  @param pClient          Pointer to client instance structure.
1653     *  @param pMidiInstr       MIDI instrument bank and program parameter key.
1654     *  @param pszEngineName    Engine name.
1655     *  @param pszFileName      Instrument file name.
1656     *  @param iInstrIndex      Instrument index number.
1657     *  @param fVolume          Reflects the master volume of the instrument as
1658     *                          a positive floating point number, where a value
1659     *                          less than 1.0 for attenuation, and greater than
1660     *                          1.0 for amplification.
1661     *  @param load_mode        Instrument load life-time strategy, either
1662     *                          @ref LSCP_LOAD_DEFAULT, or
1663     *                          @ref LSCP_LOAD_ON_DEMAND, or
1664     *                          @ref LSCP_LOAD_ON_DEMAND_HOLD, or
1665     *                          @ref LSCP_LOAD_PERSISTENT.
1666     *  @param pszName          Instrument custom name for the map entry.
1667     *
1668     *  @returns LSCP_OK on success, LSCP_FAILED otherwise.
1669     */
1670    lscp_status_t lscp_map_midi_instrument ( lscp_client_t *pClient, lscp_midi_instrument_t *pMidiInstr, const char *pszEngineName, const char *pszFileName, int iInstrIndex, float fVolume, lscp_load_mode_t load_mode, const char *pszName )
1671    {
1672        char szQuery[LSCP_BUFSIZ];
1673        
1674        if (pMidiInstr->bank_msb < 0 || pMidiInstr->bank_msb > 127)
1675            return LSCP_FAILED;
1676        if (pMidiInstr->bank_lsb < 0 || pMidiInstr->bank_lsb > 127)
1677            return LSCP_FAILED;
1678        if (pMidiInstr->program < 0 || pMidiInstr->program > 127)
1679            return LSCP_FAILED;
1680        if (pszEngineName == NULL || pszFileName == NULL)
1681            return LSCP_FAILED;
1682        
1683        if (fVolume < 0.0f)
1684            fVolume = 1.0f;
1685        
1686        sprintf(szQuery, "MAP MIDI_INSTRUMENT %d %d %d %s '%s' %d %g",
1687            pMidiInstr->bank_msb, pMidiInstr->bank_lsb, pMidiInstr->program,
1688            pszEngineName, pszFileName, iInstrIndex, fVolume);
1689        
1690        switch (load_mode) {
1691        case LSCP_LOAD_PERSISTENT:
1692            strcat(szQuery, " PERSISTENT");
1693            break;
1694        case LSCP_LOAD_ON_DEMAND_HOLD:
1695            strcat(szQuery, " ON_DEMAND_HOLD");
1696            break;
1697        case LSCP_LOAD_ON_DEMAND:
1698            strcat(szQuery, " ON_DEMAND_HOLD");
1699            break;
1700        case LSCP_LOAD_DEFAULT:
1701        default:
1702            break;
1703        }
1704        
1705        if (pszName)
1706            sprintf(szQuery + strlen(szQuery), " '%s'", pszName);
1707        
1708        strcat(szQuery, "\r\n");
1709        
1710        return lscp_client_query(pClient, szQuery);
1711    }
1712    
1713    
1714    /**
1715     *  Remove an entry from the MIDI instrument map:
1716     *  UNMAP MIDI_INSTRUMENT <midi-bank-msb> <midi-bank-lsb> <midi-prog>
1717     *
1718     *  @param pClient      Pointer to client instance structure.
1719     *  @param pMidiInstr   MIDI instrument bank and program parameter key.
1720     *
1721     *  @returns LSCP_OK on success, LSCP_FAILED otherwise.
1722     */
1723    lscp_status_t lscp_unmap_midi_instrument ( lscp_client_t *pClient, lscp_midi_instrument_t *pMidiInstr )
1724    {
1725        char szQuery[LSCP_BUFSIZ];
1726    
1727        if (pMidiInstr->bank_msb < 0 || pMidiInstr->bank_msb > 127)
1728            return LSCP_FAILED;
1729        if (pMidiInstr->bank_lsb < 0 || pMidiInstr->bank_lsb > 127)
1730            return LSCP_FAILED;
1731        if (pMidiInstr->program < 0 || pMidiInstr->program > 127)
1732            return LSCP_FAILED;
1733    
1734        sprintf(szQuery, "UNMAP MIDI_INSTRUMENT %d %d %d\r\n",
1735                    pMidiInstr->bank_msb, pMidiInstr->bank_lsb, pMidiInstr->program);
1736    
1737        return lscp_client_query(pClient, szQuery);
1738    }
1739    
1740    
1741    /**
1742     *  Get the total count of MIDI instrument map entries:
1743     *  GET MIDI_INSTRUMENTS
1744     *
1745     *  @param pClient  Pointer to client instance structure.
1746     *
1747     *  @returns The current total number of MIDI instrument map entries
1748     *  on success, -1 otherwise.
1749     */
1750    int lscp_get_midi_instruments ( lscp_client_t *pClient )
1751    {
1752        int iInstruments = -1;
1753    
1754        // Lock this section up.
1755        lscp_mutex_lock(pClient->mutex);
1756    
1757        if (lscp_client_call(pClient, "GET MIDI_INSTRUMENTS\r\n", 0) == LSCP_OK)
1758            iInstruments = atoi(lscp_client_get_result(pClient));
1759    
1760        // Unlock this section down.
1761        lscp_mutex_unlock(pClient->mutex);
1762    
1763        return iInstruments;
1764    }
1765    
1766    
1767    /**
1768     *  Getting indeces of all MIDI instrument map entries:
1769     *  LIST MIDI_INSTRUMENTS
1770     *
1771     *  @param pClient  Pointer to client instance structure.
1772     *
1773     *  @returns An array of @ref lscp_midi_instrument_t, terminated with the
1774     *  {-1,-1,-1} triplet, NULL otherwise.
1775     */
1776    lscp_midi_instrument_t *lscp_list_midi_instruments ( lscp_client_t *pClient )
1777    {
1778        if (pClient == NULL)
1779            return NULL;
1780    
1781        // Lock this section up.
1782        lscp_mutex_lock(pClient->mutex);
1783    
1784        if (pClient->midi_instruments) {
1785            lscp_midi_instruments_destroy(pClient->midi_instruments);
1786            pClient->midi_instruments = NULL;
1787        }
1788    
1789        if (lscp_client_call(pClient, "LIST MIDI_INSTRUMENTS\r\n", 0) == LSCP_OK)
1790            pClient->midi_instruments = lscp_midi_instruments_create(lscp_client_get_result(pClient));
1791    
1792        // Unlock this section down.
1793        lscp_mutex_unlock(pClient->mutex);
1794    
1795        return pClient->midi_instruments;
1796    }
1797    
1798    
1799    /**
1800     *  Getting information about a MIDI instrument map entry:
1801     *  GET MIDI_INSTRUMENT INFO <midi-bank-msb> <midi-bank-lsb> <midi-prog>
1802     *
1803     *  @param pClient      Pointer to client instance structure.
1804     *  @param pMidiInstr   MIDI instrument bank and program parameter key.
1805     *
1806     *  @returns A pointer to a @ref lscp_midi_instrument_info_t structure,
1807     *  with all the information of the given MIDI instrument map entry,
1808     *  or NULL in case of failure.
1809     */
1810    lscp_midi_instrument_info_t *lscp_get_midi_instrument_info ( lscp_client_t *pClient, lscp_midi_instrument_t *pMidiInstr )
1811    {
1812        lscp_midi_instrument_info_t *pInstrInfo;
1813        char szQuery[LSCP_BUFSIZ];
1814        const char *pszResult;
1815        const char *pszSeps = ":";
1816        const char *pszCrlf = "\r\n";
1817        char *pszToken;
1818        char *pch;
1819        
1820        if (pMidiInstr->bank_msb < 0 || pMidiInstr->bank_msb > 127)
1821            return NULL;
1822        if (pMidiInstr->bank_lsb < 0 || pMidiInstr->bank_lsb > 127)
1823            return NULL;
1824        if (pMidiInstr->program < 0 || pMidiInstr->program > 127)
1825            return NULL;
1826        
1827        // Lock this section up.
1828        lscp_mutex_lock(pClient->mutex);
1829        
1830        pInstrInfo = &(pClient->midi_instrument_info);
1831        lscp_midi_instrument_info_reset(pInstrInfo);
1832        
1833        sprintf(szQuery, "GET MIDI_INSTRUMENT INFO %d %d %d\r\n",
1834            pMidiInstr->bank_msb, pMidiInstr->bank_lsb, pMidiInstr->program);
1835        if (lscp_client_call(pClient, szQuery, 1) == LSCP_OK) {
1836            pszResult = lscp_client_get_result(pClient);
1837            pszToken = lscp_strtok((char *) pszResult, pszSeps, &(pch));
1838            while (pszToken) {
1839                if (strcasecmp(pszToken, "NAME") == 0) {
1840                    pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
1841                    if (pszToken)
1842                        lscp_unquote_dup(&(pInstrInfo->name), &pszToken);
1843                }
1844                else if (strcasecmp(pszToken, "ENGINE_NAME") == 0) {
1845                    pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
1846                    if (pszToken)
1847                        lscp_unquote_dup(&(pInstrInfo->engine_name), &pszToken);
1848                }
1849                else if (strcasecmp(pszToken, "INSTRUMENT_FILE") == 0) {
1850                    pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
1851                    if (pszToken)
1852                        lscp_unquote_dup(&(pInstrInfo->instrument_file), &pszToken);
1853                }
1854                else if (strcasecmp(pszToken, "INSTRUMENT_NR") == 0) {
1855                    pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
1856                    if (pszToken)
1857                        pInstrInfo->instrument_nr = atoi(lscp_ltrim(pszToken));
1858                }
1859                else if (strcasecmp(pszToken, "INSTRUMENT_NAME") == 0) {
1860                    pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
1861                    if (pszToken)
1862                        lscp_unquote_dup(&(pInstrInfo->instrument_name), &pszToken);
1863                }
1864                else if (strcasecmp(pszToken, "LOAD_MODE") == 0) {
1865                    pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
1866                    if (pszToken) {
1867                        pszToken = lscp_ltrim(pszToken);
1868                        if (strcasecmp(pszToken, "ON_DEMAND") == 0)
1869                            pInstrInfo->load_mode = LSCP_LOAD_ON_DEMAND;
1870                        else
1871                        if (strcasecmp(pszToken, "ON_DEMAND_HOLD") == 0)
1872                            pInstrInfo->load_mode = LSCP_LOAD_ON_DEMAND_HOLD;
1873                        else
1874                        if (strcasecmp(pszToken, "PERSISTENT") == 0)
1875                            pInstrInfo->load_mode = LSCP_LOAD_PERSISTENT;
1876                        else
1877                            pInstrInfo->load_mode = LSCP_LOAD_DEFAULT;
1878                    }
1879                }
1880                else if (strcasecmp(pszToken, "VOLUME") == 0) {
1881                    pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
1882                    if (pszToken)
1883                        pInstrInfo->volume = (float) atof(lscp_ltrim(pszToken));
1884                }
1885                pszToken = lscp_strtok(NULL, pszSeps, &(pch));
1886            }
1887        }
1888        else pInstrInfo = NULL;
1889        
1890        // Unlock this section down.
1891        lscp_mutex_unlock(pClient->mutex);
1892        
1893        return pInstrInfo;
1894    }
1895    
1896    
1897    /**
1898     *  Clear the MIDI instrumnet map:
1899     *  CLEAR MIDI_INSTRUMENTS
1900     *
1901     *  @param pClient          Pointer to client instance structure.
1902     *  @param iSamplerChannel  Sampler channel number.
1903     *
1904     *  @returns LSCP_OK on success, LSCP_FAILED otherwise.
1905     */
1906    lscp_status_t lscp_clear_midi_instruments  ( lscp_client_t *pClient )
1907    {
1908        return lscp_client_query(pClient, "CLEAR MIDI_INSTRUMENTS\r\n");
1909    }
1910    
1911    
1912  // end of client.c  // end of client.c
Legend:
Removed from v.107  
changed lines
  Added in v.948
  ViewVC Help
Powered by ViewVC