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