/[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 179 by capela, Tue Jul 6 16:24:41 2004 UTC
# 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;
43      struct sockaddr_in addr;      
44      int   cAddr;      fd_set fds;                         // File descriptor list for select().
45      char  achBuffer[LSCP_BUFSIZ];      int    fd, fdmax;                   // Maximum file descriptor number.
46      int   cchBuffer;      struct timeval tv;                  // For specifying a timeout value.
47      const char *pszSeps = " \r\n";      int    iSelect;                     // Holds select return status.
48      char *pszToken;      int    iTimeout;
49      char *pch;      
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    
58  #ifdef DEBUG  #ifdef DEBUG
59      fprintf(stderr, "_lscp_client_udp_proc: Client waiting for events.\n");      fprintf(stderr, "_lscp_client_evt_proc: Client waiting for events.\n");
60  #endif  #endif
61    
62      while (pClient->udp.iState) {      while (pClient->evt.iState) {
63          cAddr = sizeof(struct sockaddr_in);  
64          cchBuffer = recvfrom(pClient->udp.sock, achBuffer, sizeof(achBuffer), 0, (struct sockaddr *) &addr, &cAddr);          // Prepare for waiting on select...
65          if (cchBuffer > 0) {          fd = (int) pClient->evt.sock;
66  #ifdef DEBUG          FD_ZERO(&fds);
67              lscp_socket_trace("_lscp_client_udp_proc: recvfrom", &addr, achBuffer, cchBuffer);          FD_SET((unsigned int) fd, &fds);
68  #endif          fdmax = fd;
69              if (strncasecmp(achBuffer, "PING ", 5) == 0) {  
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_call: select");
115                pClient->evt.iState = 0;
116          }          }
117            
118            // Finally, always signal the event.
119            lscp_cond_signal(pClient->cond);
120      }      }
121    
122  #ifdef DEBUG  #ifdef DEBUG
123      fprintf(stderr, "_lscp_client_udp_proc: Client closing.\n");      fprintf(stderr, "_lscp_client_evt_proc: Client closing.\n");
124  #endif  #endif
125  }  }
126    
127    
128  //-------------------------------------------------------------------------  //-------------------------------------------------------------------------
129    // Event subscription helpers.
130    
131    // Open the event service socket connection.
132    static lscp_status_t _lscp_client_evt_connect ( lscp_client_t *pClient )
133    {
134        lscp_socket_t sock;
135        struct sockaddr_in addr;
136        int cAddr;
137    #if defined(WIN32)
138        int iSockOpt = (-1);
139    #endif
140    
141        // Prepare the event connection socket...
142        sock = socket(AF_INET, SOCK_STREAM, 0);
143        if (sock == INVALID_SOCKET) {
144            lscp_socket_perror("_lscp_client_evt_connect: socket");
145            return LSCP_FAILED;
146        }
147    
148    #if defined(WIN32)
149        if (setsockopt(sock, SOL_SOCKET, SO_DONTLINGER, (char *) &iSockOpt, sizeof(int)) == SOCKET_ERROR)
150            lscp_socket_perror("lscp_client_evt_connect: setsockopt(SO_DONTLINGER)");
151    #endif
152    
153    #ifdef DEBUG
154        lscp_socket_getopts("_lscp_client_evt_connect:", sock);
155    #endif
156    
157        // Use same address of the command connection.
158        cAddr = sizeof(struct sockaddr_in);
159        memmove((char *) &addr, &(pClient->cmd.addr), cAddr);
160    
161        // Start the connection...
162        if (connect(sock, (struct sockaddr *) &addr, cAddr) == SOCKET_ERROR) {
163            lscp_socket_perror("_lscp_client_evt_connect: connect");
164            closesocket(sock);
165            return LSCP_FAILED;
166        }
167        
168        // Set our socket agent struct...
169        lscp_socket_agent_init(&(pClient->evt), sock, &addr, cAddr);
170        
171        // And finally the service thread...
172        return lscp_socket_agent_start(&(pClient->evt), _lscp_client_evt_proc, pClient, 0);
173    }
174    
175    
176    // Subscribe to a single event.
177    static lscp_status_t _lscp_client_evt_request ( lscp_client_t *pClient, int iSubscribe, lscp_event_t event )
178    {
179        const char *pszEvent;
180        char  szQuery[LSCP_BUFSIZ];
181        int   cchQuery;
182    
183        if (pClient == NULL)
184            return LSCP_FAILED;
185    
186        // Which (single) event?
187        pszEvent = lscp_event_to_text(event);
188        if (pszEvent == NULL)
189            return LSCP_FAILED;
190    
191        // Build the query string...
192        cchQuery = sprintf(szQuery, "%sSUBSCRIBE %s\n\n", (iSubscribe == 0 ? "UN" : ""), pszEvent);
193        // Just send data, forget result...
194        if (send(pClient->evt.sock, szQuery, cchQuery, 0) < cchQuery) {
195            lscp_socket_perror("_lscp_client_evt_request: send");
196            return LSCP_FAILED;
197        }
198    
199        // Wait on response.
200        lscp_cond_wait(pClient->cond, pClient->mutex);
201        
202        // Update as naively as we can...
203        if (iSubscribe)
204            pClient->events |=  event;
205        else
206            pClient->events &= ~event;
207    
208        return LSCP_OK;
209    }
210    
211    
212    //-------------------------------------------------------------------------
213  // Client versioning teller fuunction.  // Client versioning teller fuunction.
214    
215    
# Line 155  lscp_client_t* lscp_client_create ( cons Line 247  lscp_client_t* lscp_client_create ( cons
247      lscp_socket_t sock;      lscp_socket_t sock;
248      struct sockaddr_in addr;      struct sockaddr_in addr;
249      int cAddr;      int cAddr;
250    #if defined(WIN32)
251      int iSockOpt = (-1);      int iSockOpt = (-1);
252    #endif
253    
254      if (pfnCallback == NULL) {      if (pfnCallback == NULL) {
255          fprintf(stderr, "lscp_client_create: Invalid client callback function.\n");          fprintf(stderr, "lscp_client_create: Invalid client callback function.\n");
# Line 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);
 #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)");  
314    
315  #ifdef DEBUG  #ifdef DEBUG
316      lscp_socket_getopts("lscp_client_create: udp", sock);      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      cAddr = sizeof(struct sockaddr_in);      // Initialize the event service socket struct...
320      memset((char *) &addr, 0, cAddr);      lscp_socket_agent_init(&(pClient->evt), INVALID_SOCKET, NULL, 0);
321      addr.sin_family = AF_INET;      // No events subscribed, yet.
322      addr.sin_addr.s_addr = htonl(INADDR_ANY);      pClient->events = LSCP_EVENT_NONE;
     addr.sin_port = htons(0);  
   
     if (bind(sock, (const struct sockaddr *) &addr, cAddr) == SOCKET_ERROR) {  
         lscp_socket_perror("lscp_client_create: udp: bind");  
         lscp_socket_agent_free(&(pClient->tcp));  
         closesocket(sock);  
         free(pClient);  
         return NULL;  
     }  
   
     if (getsockname(sock, (struct sockaddr *) &addr, &cAddr) == SOCKET_ERROR) {  
         lscp_socket_perror("lscp_client_create: udp: getsockname");  
         lscp_socket_agent_free(&(pClient->tcp));  
         closesocket(sock);  
         free(pClient);  
         return NULL;  
     }  
   
     lscp_socket_agent_init(&(pClient->udp), sock, &addr, cAddr);  
   
 #ifdef DEBUG  
     fprintf(stderr, "lscp_client_create: udp: pClient=%p: sock=%d addr=%s port=%d.\n", pClient, pClient->udp.sock, inet_ntoa(pClient->udp.addr.sin_addr), ntohs(pClient->udp.addr.sin_port));  
 #endif  
   
     // No session id, yet.  
     pClient->sessid = NULL;  
323      // Initialize cached members.      // Initialize cached members.
324      pClient->audio_drivers = NULL;      pClient->audio_drivers = NULL;
325      pClient->midi_drivers = NULL;      pClient->midi_drivers = NULL;
326        pClient->audio_devices = NULL;
327        pClient->midi_devices = NULL;
328      pClient->engines = NULL;      pClient->engines = NULL;
329      lscp_driver_info_init(&(pClient->audio_info));      pClient->channels = NULL;
330      lscp_driver_info_init(&(pClient->midi_info));      lscp_driver_info_init(&(pClient->audio_driver_info));
331        lscp_driver_info_init(&(pClient->midi_driver_info));
332        lscp_device_info_init(&(pClient->audio_device_info));
333        lscp_device_info_init(&(pClient->midi_device_info));
334        lscp_param_info_init(&(pClient->audio_param_info));
335        lscp_param_info_init(&(pClient->midi_param_info));
336        lscp_device_port_info_init(&(pClient->audio_channel_info));
337        lscp_device_port_info_init(&(pClient->midi_port_info));
338        lscp_param_info_init(&(pClient->audio_channel_param_info));
339        lscp_param_info_init(&(pClient->midi_port_param_info));
340      lscp_engine_info_init(&(pClient->engine_info));      lscp_engine_info_init(&(pClient->engine_info));
341      lscp_channel_info_init(&(pClient->channel_info));      lscp_channel_info_init(&(pClient->channel_info));
342      // Initialize error stuff.      // Initialize error stuff.
# Line 287  lscp_client_t* lscp_client_create ( cons Line 350  lscp_client_t* lscp_client_create ( cons
350    
351      // Initialize the transaction mutex.      // Initialize the transaction mutex.
352      lscp_mutex_init(pClient->mutex);      lscp_mutex_init(pClient->mutex);
353        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;  
     }  
354    
355      // Finally we've some success...      // Finally we've some success...
356      return pClient;      return pClient;
# Line 317  lscp_status_t lscp_client_join ( lscp_cl Line 371  lscp_status_t lscp_client_join ( lscp_cl
371      fprintf(stderr, "lscp_client_join: pClient=%p.\n", pClient);      fprintf(stderr, "lscp_client_join: pClient=%p.\n", pClient);
372  #endif  #endif
373    
374  //  lscp_socket_agent_join(&(pClient->udp));  //  lscp_socket_agent_join(&(pClient->evt));
375      lscp_socket_agent_join(&(pClient->tcp));      lscp_socket_agent_join(&(pClient->cmd));
376    
377      return LSCP_OK;      return LSCP_OK;
378  }  }
# Line 340  lscp_status_t lscp_client_destroy ( lscp Line 394  lscp_status_t lscp_client_destroy ( lscp
394      fprintf(stderr, "lscp_client_destroy: pClient=%p.\n", pClient);      fprintf(stderr, "lscp_client_destroy: pClient=%p.\n", pClient);
395  #endif  #endif
396    
397      // Free session-id, if any.      // Lock this section up.
398      if (pClient->sessid)      lscp_mutex_lock(pClient->mutex);
399          free(pClient->sessid);      
     pClient->sessid = NULL;  
400      // Free up all cached members.      // Free up all cached members.
401      lscp_channel_info_reset(&(pClient->channel_info));      lscp_channel_info_free(&(pClient->channel_info));
402      lscp_engine_info_reset(&(pClient->engine_info));      lscp_engine_info_free(&(pClient->engine_info));
403      lscp_driver_info_reset(&(pClient->midi_info));      lscp_param_info_free(&(pClient->midi_port_param_info));
404      lscp_driver_info_reset(&(pClient->audio_info));      lscp_param_info_free(&(pClient->audio_channel_param_info));
405        lscp_device_port_info_free(&(pClient->midi_port_info));
406        lscp_device_port_info_free(&(pClient->audio_channel_info));
407        lscp_param_info_free(&(pClient->midi_param_info));
408        lscp_param_info_free(&(pClient->audio_param_info));
409        lscp_device_info_free(&(pClient->midi_device_info));
410        lscp_device_info_free(&(pClient->audio_device_info));
411        lscp_driver_info_free(&(pClient->midi_driver_info));
412        lscp_driver_info_free(&(pClient->audio_driver_info));
413      // Free available engine table.      // Free available engine table.
414      lscp_szsplit_destroy(pClient->audio_drivers);      lscp_szsplit_destroy(pClient->audio_drivers);
415      lscp_szsplit_destroy(pClient->midi_drivers);      lscp_szsplit_destroy(pClient->midi_drivers);
416        lscp_isplit_destroy(pClient->audio_devices);
417        lscp_isplit_destroy(pClient->midi_devices);
418      lscp_szsplit_destroy(pClient->engines);      lscp_szsplit_destroy(pClient->engines);
419        lscp_isplit_destroy(pClient->channels);
420      // Make them null.      // Make them null.
421      pClient->audio_drivers = NULL;      pClient->audio_drivers = NULL;
422      pClient->midi_drivers = NULL;      pClient->midi_drivers = NULL;
423      pClient->engines = NULL;      pClient->engines = NULL;
424      // Free result error stuff.      // Free result error stuff.
425      _lscp_client_set_result(pClient, NULL, 0);      lscp_client_set_result(pClient, NULL, 0);
426      // Frre stream usage stuff.      // Free stream usage stuff.
427      if (pClient->buffer_fill)      if (pClient->buffer_fill)
428          free(pClient->buffer_fill);          free(pClient->buffer_fill);
429      pClient->buffer_fill = NULL;      pClient->buffer_fill = NULL;
# Line 367  lscp_status_t lscp_client_destroy ( lscp Line 431  lscp_status_t lscp_client_destroy ( lscp
431      pClient->iTimeout = 0;      pClient->iTimeout = 0;
432    
433      // Free socket agents.      // Free socket agents.
434      lscp_socket_agent_free(&(pClient->udp));      lscp_socket_agent_free(&(pClient->evt));
435      lscp_socket_agent_free(&(pClient->tcp));      lscp_socket_agent_free(&(pClient->cmd));
436    
437      // Last but not least, free good ol'transaction mutex.      // Last but not least, free good ol'transaction mutex.
438        lscp_mutex_unlock(pClient->mutex);
439      lscp_mutex_destroy(pClient->mutex);      lscp_mutex_destroy(pClient->mutex);
440        lscp_cond_destroy(pClient->cond);
441    
442      free(pClient);      free(pClient);
443    
# Line 418  int lscp_client_get_timeout ( lscp_clien Line 484  int lscp_client_get_timeout ( lscp_clien
484  //-------------------------------------------------------------------------  //-------------------------------------------------------------------------
485  // Client common protocol functions.  // Client common protocol functions.
486    
   
487  /**  /**
488   *  Submit a command query line string to the server. The query string   *  Submit a command query line string to the server. The query string
489   *  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 499  int lscp_client_get_timeout ( lscp_clien
499   */   */
500  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 )
501  {  {
502      fd_set fds;                         // File descriptor list for select().      lscp_status_t ret;
503      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;  
   
504      // Lock this section up.      // Lock this section up.
505      lscp_mutex_lock(pClient->mutex);      lscp_mutex_lock(pClient->mutex);
506    
507      pszResult = NULL;      // Just make the now guarded call.
508      iErrno = -1;      ret = lscp_client_call(pClient, pszQuery);
509        
510      // Send data, and then, wait for the result...      // Unlock this section down.
     cchQuery = strlen(pszQuery);  
     if (send(pClient->tcp.sock, pszQuery, cchQuery, 0) < cchQuery) {  
         lscp_socket_perror("lscp_client_query: send");  
         lscp_mutex_unlock(pClient->mutex);  
         return ret;  
     }  
   
     // Prepare for waiting on select...  
     fd = (int) pClient->tcp.sock;  
     FD_ZERO(&fds);  
     FD_SET((unsigned int) fd, &fds);  
     fdmax = fd;  
   
     // Use the timeout select feature...  
     iTimeout = pClient->iTimeout;  
     if (iTimeout > 1000) {  
         tv.tv_sec = iTimeout / 1000;  
         iTimeout -= tv.tv_sec * 1000;  
     }  
     else tv.tv_sec = 0;  
     tv.tv_usec = iTimeout * 1000;  
   
     // Wait for event...  
     iSelect = select(fdmax + 1, &fds, NULL, NULL, &tv);  
     if (iSelect > 0 && FD_ISSET(fd, &fds)) {  
         // May recv now...  
         cchResult = recv(pClient->tcp.sock, achResult, sizeof(achResult), 0);  
         if (cchResult > 0) {  
             // Assume early success.  
             ret = LSCP_OK;  
             // Always force the result to be null terminated (and trim trailing CRLFs)!  
             while (cchResult > 0 && (achResult[cchResult - 1] == '\n' || achResult[cchResult- 1] == '\r'))  
                 cchResult--;  
             achResult[cchResult] = (char) 0;  
             // Check if the response it's an error or warning message.  
             if (strncasecmp(achResult, "WRN:", 4) == 0)  
                 ret = LSCP_WARNING;  
             else if (strncasecmp(achResult, "ERR:", 4) == 0)  
                 ret = LSCP_ERROR;  
             // So we got a result...  
             if (ret == LSCP_OK) {  
                 // Reset errno in case of success.  
                 iErrno = 0;  
                 // Is it a special successful response?  
                 if (strncasecmp(achResult, "OK[", 3) == 0) {  
                     // Parse the OK message, get the return string under brackets...  
                     pszToken = lscp_strtok(achResult, pszSeps, &(pch));  
                     if (pszToken)  
                         pszResult = lscp_strtok(NULL, pszSeps, &(pch));  
                 }  
                 else pszResult = achResult;  
                 // The result string is now set to the command response, if any.  
             } else {  
                 // Parse the error/warning message, skip first colon...  
                 pszToken = lscp_strtok(achResult, pszSeps, &(pch));  
                 if (pszToken) {  
                     // Get the error number...  
                     pszToken = lscp_strtok(NULL, pszSeps, &(pch));  
                     if (pszToken) {  
                         iErrno = atoi(pszToken);  
                         // And make the message text our final result.  
                         pszResult = lscp_strtok(NULL, pszSeps, &(pch));  
                     }  
                 }  
                 // The result string is set to the error/warning message text.  
             }  
         }  
         else if (cchResult == 0) {  
             // Fake a result message.  
             pszResult = "Server terminated the connection";  
             ret = LSCP_QUIT;  
         }  
         else lscp_socket_perror("lscp_client_query: recv");  
     }   // Check if select has timed out.  
     else if (iSelect == 0) {  
         // Fake a result message.  
         pszResult = "Timeout during receive operation";  
         ret = LSCP_TIMEOUT;  
     }  
     else lscp_socket_perror("lscp_client_query: select");  
   
     // Make the result official...  
     _lscp_client_set_result(pClient, pszResult, iErrno);  
   
     // Can go on with it...  
511      lscp_mutex_unlock(pClient->mutex);      lscp_mutex_unlock(pClient->mutex);
512        
513      return ret;      return ret;
514  }  }
515    
   
516  /**  /**
517   *  Get the last received result string. In case of error or warning,   *  Get the last received result string. In case of error or warning,
518   *  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 552  int lscp_client_get_errno ( lscp_client_
552  // Client registration protocol functions.  // Client registration protocol functions.
553    
554  /**  /**
555   *  Register frontend for receiving UDP event messages:   *  Register frontend for receiving event messages:
556   *  SUBSCRIBE NOTIFICATION <udp-port>   *  SUBSCRIBE CHANNELS | VOICE_COUNT | STREAM_COUNT | BUFFER_FILL
557     *      | CHANNEL_INFO | MISCELLANEOUS
558   *   *
559   *  @param pClient  Pointer to client instance structure.   *  @param pClient  Pointer to client instance structure.
560     *  @param events   Bit-wise OR'ed event flags to subscribe.
561   *   *
562   *  @returns LSCP_OK on success, LSCP_FAILED otherwise.   *  @returns LSCP_OK on success, LSCP_FAILED otherwise.
563   */   */
564  lscp_status_t lscp_client_subscribe ( lscp_client_t *pClient )  lscp_status_t lscp_client_subscribe ( lscp_client_t *pClient, lscp_event_t events )
565  {  {
566      lscp_status_t ret;      lscp_status_t ret = LSCP_FAILED;
     char szQuery[LSCP_BUFSIZ];  
     const char *pszResult;  
     const char *pszSeps = "[]";  
     char *pszToken;  
     char *pch;  
567    
568      if (pClient == NULL || pClient->sessid)      if (pClient == NULL)
569          return LSCP_FAILED;          return LSCP_FAILED;
570    
571      sprintf(szQuery, "SUBSCRIBE NOTIFICATION %d\r\n", ntohs(pClient->udp.addr.sin_port));      // Lock this section up.
572      ret = lscp_client_query(pClient, szQuery);      lscp_mutex_lock(pClient->mutex);
573      if (ret == LSCP_OK) {  
574          pszResult = lscp_client_get_result(pClient);      // If applicable, start the alternate connection...
575  #ifdef DEBUG      if (pClient->events == LSCP_EVENT_NONE)
576          fprintf(stderr, "lscp_client_subscribe: %s\n", pszResult);          ret = _lscp_client_evt_connect(pClient);
577  #endif      
578          // Check for the session-id on "OK[sessid]" response.      // Send the subscription commands.
579          pszToken = lscp_strtok(pszResult, pszSeps, &(pch));      if (ret == LSCP_OK && (events & LSCP_EVENT_CHANNELS))
580          if (pszToken && strcasecmp(pszToken, "OK") == 0) {          ret = _lscp_client_evt_request(pClient, 1, LSCP_EVENT_CHANNELS);
581              pszToken = lscp_strtok(NULL, pszSeps, &(pch));      if (ret == LSCP_OK && (events & LSCP_EVENT_VOICE_COUNT))
582              if (pszToken)          ret = _lscp_client_evt_request(pClient, 1, LSCP_EVENT_VOICE_COUNT);
583                  pClient->sessid = strdup(pszToken);      if (ret == LSCP_OK && (events & LSCP_EVENT_STREAM_COUNT))
584          }          ret = _lscp_client_evt_request(pClient, 1, LSCP_EVENT_STREAM_COUNT);
585      }      if (ret == LSCP_OK && (events & LSCP_EVENT_BUFFER_FILL))
586            ret = _lscp_client_evt_request(pClient, 1, LSCP_EVENT_BUFFER_FILL);
587        if (ret == LSCP_OK && (events & LSCP_EVENT_CHANNEL_INFO))
588            ret = _lscp_client_evt_request(pClient, 1, LSCP_EVENT_CHANNEL_INFO);
589        if (ret == LSCP_OK && (events & LSCP_EVENT_MISCELLANEOUS))
590            ret = _lscp_client_evt_request(pClient, 1, LSCP_EVENT_MISCELLANEOUS);
591    
592        // Unlock this section down.
593        lscp_mutex_unlock(pClient->mutex);
594    
595      return ret;      return ret;
596  }  }
597    
598    
599  /**  /**
600   *  Deregister frontend for not receiving UDP event messages anymore:   *  Deregister frontend from receiving UDP event messages anymore:
601   *  UNSUBSCRIBE NOTIFICATION <session-id>   *  SUBSCRIBE CHANNELS | VOICE_COUNT | STREAM_COUNT | BUFFER_FILL
602     *      | CHANNEL_INFO | MISCELLANEOUS
603   *   *
604   *  @param pClient  Pointer to client instance structure.   *  @param pClient  Pointer to client instance structure.
605     *  @param events   Bit-wise OR'ed event flags to unsubscribe.
606   *   *
607   *  @returns LSCP_OK on success, LSCP_FAILED otherwise.   *  @returns LSCP_OK on success, LSCP_FAILED otherwise.
608   */   */
609  lscp_status_t lscp_client_unsubscribe ( lscp_client_t *pClient )  lscp_status_t lscp_client_unsubscribe ( lscp_client_t *pClient, lscp_event_t events )
610  {  {
611      lscp_status_t ret;      lscp_status_t ret = LSCP_OK;
     char szQuery[LSCP_BUFSIZ];  
612    
613      if (pClient == NULL)      if (pClient == NULL)
614          return LSCP_FAILED;          return LSCP_FAILED;
     if (pClient->sessid == NULL)  
         return LSCP_FAILED;  
615    
616      sprintf(szQuery, "UNSUBSCRIBE NOTIFICATION %s\n\n", pClient->sessid);      // Lock this section up.
617      ret = lscp_client_query(pClient, szQuery);      lscp_mutex_lock(pClient->mutex);
618      if (ret == LSCP_OK) {  
619  #ifdef DEBUG      // Send the unsubscription commands.
620          fprintf(stderr, "lscp_client_unsubscribe: %s\n", lscp_client_get_result(pClient));      if (ret == LSCP_OK && (events & LSCP_EVENT_CHANNELS))
621  #endif          ret = _lscp_client_evt_request(pClient, 0, LSCP_EVENT_CHANNELS);
622          // Bail out session-id string.      if (ret == LSCP_OK && (events & LSCP_EVENT_VOICE_COUNT))
623          free(pClient->sessid);          ret = _lscp_client_evt_request(pClient, 0, LSCP_EVENT_VOICE_COUNT);
624          pClient->sessid = NULL;      if (ret == LSCP_OK && (events & LSCP_EVENT_STREAM_COUNT))
625      }          ret = _lscp_client_evt_request(pClient, 0, LSCP_EVENT_STREAM_COUNT);
626        if (ret == LSCP_OK && (events & LSCP_EVENT_BUFFER_FILL))
627            ret = _lscp_client_evt_request(pClient, 0, LSCP_EVENT_BUFFER_FILL);
628        if (ret == LSCP_OK && (events & LSCP_EVENT_CHANNEL_INFO))
629            ret = _lscp_client_evt_request(pClient, 0, LSCP_EVENT_CHANNEL_INFO);
630        if (ret == LSCP_OK && (events & LSCP_EVENT_MISCELLANEOUS))
631            ret = _lscp_client_evt_request(pClient, 0, LSCP_EVENT_MISCELLANEOUS);
632    
633        // If necessary, close the alternate connection...
634        if (pClient->events == LSCP_EVENT_NONE)
635            lscp_socket_agent_free(&(pClient->evt));
636    
637        // Unlock this section down.
638        lscp_mutex_unlock(pClient->mutex);
639    
640      return ret;      return ret;
641  }  }
# Line 683  lscp_status_t lscp_load_instrument ( lsc Line 662  lscp_status_t lscp_load_instrument ( lsc
662      if (pszFileName == NULL || iSamplerChannel < 0)      if (pszFileName == NULL || iSamplerChannel < 0)
663          return LSCP_FAILED;          return LSCP_FAILED;
664    
665      sprintf(szQuery, "LOAD INSTRUMENT %s %d %d\r\n", pszFileName, iInstrIndex, iSamplerChannel);      sprintf(szQuery, "LOAD INSTRUMENT '%s' %d %d\r\n", pszFileName, iInstrIndex, iSamplerChannel);
666        return lscp_client_query(pClient, szQuery);
667    }
668    
669    
670    /**
671     *  Loading an instrument in the background (non modal):
672     *  LOAD INSTRUMENT NON_MODAL <filename> <instr-index> <sampler-channel>
673     *
674     *  @param pClient          Pointer to client instance structure.
675     *  @param pszFileName      Instrument file name.
676     *  @param iInstrIndex      Instrument index number.
677     *  @param iSamplerChannel  Sampler Channel.
678     *
679     *  @returns LSCP_OK on success, LSCP_FAILED otherwise.
680     */
681    lscp_status_t lscp_load_instrument_non_modal ( lscp_client_t *pClient, const char *pszFileName, int iInstrIndex, int iSamplerChannel )
682    {
683        char szQuery[LSCP_BUFSIZ];
684    
685        if (pszFileName == NULL || iSamplerChannel < 0)
686            return LSCP_FAILED;
687    
688        sprintf(szQuery, "LOAD INSTRUMENT NON_MODAL '%s' %d %d\r\n", pszFileName, iInstrIndex, iSamplerChannel);
689      return lscp_client_query(pClient, szQuery);      return lscp_client_query(pClient, szQuery);
690  }  }
691    
# Line 722  lscp_status_t lscp_load_engine ( lscp_cl Line 724  lscp_status_t lscp_load_engine ( lscp_cl
724  int lscp_get_channels ( lscp_client_t *pClient )  int lscp_get_channels ( lscp_client_t *pClient )
725  {  {
726      int iChannels = -1;      int iChannels = -1;
727      if (lscp_client_query(pClient, "GET CHANNELS\r\n") == LSCP_OK)  
728        // Lock this section up.
729        lscp_mutex_lock(pClient->mutex);
730    
731        if (lscp_client_call(pClient, "GET CHANNELS\r\n") == LSCP_OK)
732          iChannels = atoi(lscp_client_get_result(pClient));          iChannels = atoi(lscp_client_get_result(pClient));
733    
734        // Unlock this section doen.
735        lscp_mutex_unlock(pClient->mutex);
736    
737      return iChannels;      return iChannels;
738  }  }
739    
740    
741  /**  /**
742     *  List current sampler channels number identifiers:
743     *  LIST CHANNELS
744     *
745     *  @param pClient  Pointer to client instance structure.
746     *
747     *  @returns An array of the sampler channels identifiers as positive integers,
748     *  terminated with -1 on success, NULL otherwise.
749     */
750    int *lscp_list_channels ( lscp_client_t *pClient )
751    {
752        const char *pszSeps = ",";
753    
754        if (pClient == NULL)
755            return NULL;
756            
757        // Lock this section up.
758        lscp_mutex_lock(pClient->mutex);
759    
760        if (pClient->channels) {
761            lscp_isplit_destroy(pClient->channels);
762            pClient->channels = NULL;
763        }
764    
765        if (lscp_client_call(pClient, "LIST CHANNELS\r\n") == LSCP_OK)
766            pClient->channels = lscp_isplit_create(lscp_client_get_result(pClient), pszSeps);
767    
768        // Unlock this section down.
769        lscp_mutex_unlock(pClient->mutex);
770    
771        return pClient->channels;
772    }
773    
774    
775    /**
776   *  Adding a new sampler channel:   *  Adding a new sampler channel:
777   *  ADD CHANNEL   *  ADD CHANNEL
778   *   *
# Line 740  int lscp_get_channels ( lscp_client_t *p Line 784  int lscp_get_channels ( lscp_client_t *p
784  int lscp_add_channel ( lscp_client_t *pClient )  int lscp_add_channel ( lscp_client_t *pClient )
785  {  {
786      int iSamplerChannel = -1;      int iSamplerChannel = -1;
787      if (lscp_client_query(pClient, "ADD CHANNEL\r\n") == LSCP_OK)  
788        // Lock this section up.
789        lscp_mutex_lock(pClient->mutex);
790    
791        if (lscp_client_call(pClient, "ADD CHANNEL\r\n") == LSCP_OK)
792          iSamplerChannel = atoi(lscp_client_get_result(pClient));          iSamplerChannel = atoi(lscp_client_get_result(pClient));
793            
794        // Unlock this section down.
795        lscp_mutex_unlock(pClient->mutex);
796    
797      return iSamplerChannel;      return iSamplerChannel;
798  }  }
799    
# Line 780  const char **lscp_get_available_engines Line 832  const char **lscp_get_available_engines
832  {  {
833      const char *pszSeps = ",";      const char *pszSeps = ",";
834    
835        // Lock this section up.
836        lscp_mutex_lock(pClient->mutex);
837    
838      if (pClient->engines) {      if (pClient->engines) {
839          lscp_szsplit_destroy(pClient->engines);          lscp_szsplit_destroy(pClient->engines);
840          pClient->engines = NULL;          pClient->engines = NULL;
841      }      }
842    
843      if (lscp_client_query(pClient, "GET AVAILABLE_ENGINES\r\n") == LSCP_OK)      if (lscp_client_call(pClient, "GET AVAILABLE_ENGINES\r\n") == LSCP_OK)
844          pClient->engines = lscp_szsplit_create(lscp_client_get_result(pClient), pszSeps);          pClient->engines = lscp_szsplit_create(lscp_client_get_result(pClient), pszSeps);
845    
846        // Unlock this section down.
847        lscp_mutex_unlock(pClient->mutex);
848    
849      return (const char **) pClient->engines;      return (const char **) pClient->engines;
850  }  }
851    
# Line 815  lscp_engine_info_t *lscp_get_engine_info Line 873  lscp_engine_info_t *lscp_get_engine_info
873      if (pszEngineName == NULL)      if (pszEngineName == NULL)
874          return NULL;          return NULL;
875    
876        // Lock this section up.
877        lscp_mutex_lock(pClient->mutex);
878    
879      pEngineInfo = &(pClient->engine_info);      pEngineInfo = &(pClient->engine_info);
880      lscp_engine_info_reset(pEngineInfo);      lscp_engine_info_reset(pEngineInfo);
881    
882      sprintf(szQuery, "GET ENGINE INFO %s\r\n", pszEngineName);      sprintf(szQuery, "GET ENGINE INFO %s\r\n", pszEngineName);
883      if (lscp_client_query(pClient, szQuery) != LSCP_OK)      if (lscp_client_call(pClient, szQuery) == LSCP_OK) {
884          return NULL;          pszResult = lscp_client_get_result(pClient);
885            pszToken = lscp_strtok((char *) pszResult, pszSeps, &(pch));
886      pszResult = lscp_client_get_result(pClient);          while (pszToken) {
887      pszToken = lscp_strtok(pszResult, pszSeps, &(pch));              if (strcasecmp(pszToken, "DESCRIPTION") == 0) {
888      while (pszToken) {                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
889          if (strcasecmp(pszToken, "DESCRIPTION") == 0) {                  if (pszToken)
890              pszToken = lscp_strtok(NULL, pszCrlf, &(pch));                      pEngineInfo->description = lscp_unquote(&pszToken, 1);
891              if (pszToken)              }
892                  pEngineInfo->description = lscp_unquote(&pszToken, 1);              else if (strcasecmp(pszToken, "VERSION") == 0) {
893          }                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
894          else if (strcasecmp(pszToken, "VERSION") == 0) {                  if (pszToken)
895              pszToken = lscp_strtok(NULL, pszCrlf, &(pch));                      pEngineInfo->version = lscp_unquote(&pszToken, 1);
896              if (pszToken)              }
897                  pEngineInfo->version = lscp_unquote(&pszToken, 1);              pszToken = lscp_strtok(NULL, pszSeps, &(pch));
898          }          }
         pszToken = lscp_strtok(NULL, pszSeps, &(pch));  
899      }      }
900        else pEngineInfo = NULL;
901        
902        // Unlock this section down.
903        lscp_mutex_unlock(pClient->mutex);
904    
905      return pEngineInfo;      return pEngineInfo;
906  }  }
# Line 865  lscp_channel_info_t *lscp_get_channel_in Line 929  lscp_channel_info_t *lscp_get_channel_in
929      if (iSamplerChannel < 0)      if (iSamplerChannel < 0)
930          return NULL;          return NULL;
931    
932        // Lock this section up.
933        lscp_mutex_lock(pClient->mutex);
934        
935      pChannelInfo = &(pClient->channel_info);      pChannelInfo = &(pClient->channel_info);
936      lscp_channel_info_reset(pChannelInfo);      lscp_channel_info_reset(pChannelInfo);
937    
938      sprintf(szQuery, "GET CHANNEL INFO %d\r\n", iSamplerChannel);      sprintf(szQuery, "GET CHANNEL INFO %d\r\n", iSamplerChannel);
939      if (lscp_client_query(pClient, szQuery) != LSCP_OK)      if (lscp_client_call(pClient, szQuery) == LSCP_OK) {
940          return NULL;          pszResult = lscp_client_get_result(pClient);
941            pszToken = lscp_strtok((char *) pszResult, pszSeps, &(pch));
942      pszResult = lscp_client_get_result(pClient);          while (pszToken) {
943      pszToken = lscp_strtok(pszResult, pszSeps, &(pch));              if (strcasecmp(pszToken, "ENGINE_NAME") == 0) {
944      while (pszToken) {                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
945          if (strcasecmp(pszToken, "ENGINE_NAME") == 0) {                  if (pszToken)
946              pszToken = lscp_strtok(NULL, pszCrlf, &(pch));                      pChannelInfo->engine_name = lscp_unquote(&pszToken, 1);
947              if (pszToken)              }
948                  pChannelInfo->engine_name = lscp_unquote(&pszToken, 1);              else if (strcasecmp(pszToken, "AUDIO_OUTPUT_DEVICE") == 0) {
949          }                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
950          else if (strcasecmp(pszToken, "AUDIO_OUTPUT_DEVICE") == 0) {                  if (pszToken)
951              pszToken = lscp_strtok(NULL, pszCrlf, &(pch));                      pChannelInfo->audio_device = atoi(lscp_ltrim(pszToken));
952              if (pszToken)              }
953                  pChannelInfo->audio_device = atoi(lscp_ltrim(pszToken));              else if (strcasecmp(pszToken, "AUDIO_OUTPUT_CHANNELS") == 0) {
954          }                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
955          else if (strcasecmp(pszToken, "AUDIO_OUTPUT_CHANNELS") == 0) {                  if (pszToken)
956              pszToken = lscp_strtok(NULL, pszCrlf, &(pch));                      pChannelInfo->audio_channels = atoi(lscp_ltrim(pszToken));
957              if (pszToken)              }
958                  pChannelInfo->audio_channels = atoi(lscp_ltrim(pszToken));              else if (strcasecmp(pszToken, "AUDIO_OUTPUT_ROUTING") == 0) {
959          }                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
960          else if (strcasecmp(pszToken, "AUDIO_OUTPUT_ROUTING") == 0) {                  if (pszToken)
961              pszToken = lscp_strtok(NULL, pszCrlf, &(pch));                      pChannelInfo->audio_routing = lscp_szsplit_create(pszToken, ",");
962              if (pszToken)              }
963                  pChannelInfo->audio_routing = lscp_szsplit_create(pszToken, ",");              else if (strcasecmp(pszToken, "INSTRUMENT_FILE") == 0) {
964          }                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
965          else if (strcasecmp(pszToken, "INSTRUMENT_FILE") == 0) {                  if (pszToken)
966              pszToken = lscp_strtok(NULL, pszCrlf, &(pch));                      pChannelInfo->instrument_file = lscp_unquote(&pszToken, 1);
967              if (pszToken)              }
968                  pChannelInfo->instrument_file = lscp_unquote(&pszToken, 1);              else if (strcasecmp(pszToken, "INSTRUMENT_NR") == 0) {
969          }                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
970          else if (strcasecmp(pszToken, "INSTRUMENT_NR") == 0) {                  if (pszToken)
971              pszToken = lscp_strtok(NULL, pszCrlf, &(pch));                      pChannelInfo->instrument_nr = atoi(lscp_ltrim(pszToken));
972              if (pszToken)              }
973                  pChannelInfo->instrument_nr = atoi(lscp_ltrim(pszToken));              else if (strcasecmp(pszToken, "INSTRUMENT_STATUS") == 0) {
974          }                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
975          else if (strcasecmp(pszToken, "MIDI_INPUT_DEVICE") == 0) {                  if (pszToken)
976              pszToken = lscp_strtok(NULL, pszCrlf, &(pch));                      pChannelInfo->instrument_status = atoi(lscp_ltrim(pszToken));
977              if (pszToken)              }
978                  pChannelInfo->midi_device = atoi(lscp_ltrim(pszToken));              else if (strcasecmp(pszToken, "MIDI_INPUT_DEVICE") == 0) {
979          }                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
980          else if (strcasecmp(pszToken, "MIDI_INPUT_PORT") == 0) {                  if (pszToken)
981              pszToken = lscp_strtok(NULL, pszCrlf, &(pch));                      pChannelInfo->midi_device = atoi(lscp_ltrim(pszToken));
982              if (pszToken)              }
983                  pChannelInfo->midi_port = atoi(lscp_ltrim(pszToken));              else if (strcasecmp(pszToken, "MIDI_INPUT_PORT") == 0) {
984          }                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
985          else if (strcasecmp(pszToken, "MIDI_INPUT_CHANNEL") == 0) {                  if (pszToken)
986              pszToken = lscp_strtok(NULL, pszCrlf, &(pch));                      pChannelInfo->midi_port = atoi(lscp_ltrim(pszToken));
987              if (pszToken)              }
988                  pChannelInfo->midi_channel = atoi(lscp_ltrim(pszToken));              else if (strcasecmp(pszToken, "MIDI_INPUT_CHANNEL") == 0) {
989          }                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
990          else if (strcasecmp(pszToken, "VOLUME") == 0) {                  if (pszToken)
991              pszToken = lscp_strtok(NULL, pszCrlf, &(pch));                      pChannelInfo->midi_channel = atoi(lscp_ltrim(pszToken));
992              if (pszToken)              }
993                  pChannelInfo->volume = (float) atof(lscp_ltrim(pszToken));              else if (strcasecmp(pszToken, "VOLUME") == 0) {
994                    pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
995                    if (pszToken)
996                        pChannelInfo->volume = (float) atof(lscp_ltrim(pszToken));
997                }
998                pszToken = lscp_strtok(NULL, pszSeps, &(pch));
999          }          }
         pszToken = lscp_strtok(NULL, pszSeps, &(pch));  
1000      }      }
1001        else pChannelInfo = NULL;
1002        
1003        // Unlock this section up.
1004        lscp_mutex_unlock(pClient->mutex);
1005    
1006      return pChannelInfo;      return pChannelInfo;
1007  }  }
# Line 949  int lscp_get_channel_voice_count ( lscp_ Line 1024  int lscp_get_channel_voice_count ( lscp_
1024      if (iSamplerChannel < 0)      if (iSamplerChannel < 0)
1025          return iVoiceCount;          return iVoiceCount;
1026    
1027        // Lock this section up.
1028        lscp_mutex_lock(pClient->mutex);
1029    
1030      sprintf(szQuery, "GET CHANNEL VOICE_COUNT %d\r\n", iSamplerChannel);      sprintf(szQuery, "GET CHANNEL VOICE_COUNT %d\r\n", iSamplerChannel);
1031      if (lscp_client_query(pClient, szQuery) == LSCP_OK)      if (lscp_client_call(pClient, szQuery) == LSCP_OK)
1032          iVoiceCount = atoi(lscp_client_get_result(pClient));          iVoiceCount = atoi(lscp_client_get_result(pClient));
1033    
1034        // Unlock this section down.
1035        lscp_mutex_unlock(pClient->mutex);
1036    
1037      return iVoiceCount;      return iVoiceCount;
1038  }  }
1039    
# Line 961  int lscp_get_channel_voice_count ( lscp_ Line 1042  int lscp_get_channel_voice_count ( lscp_
1042   *  Current number of active disk streams:   *  Current number of active disk streams:
1043   *  GET CHANNEL STREAM_COUNT <sampler-channel>   *  GET CHANNEL STREAM_COUNT <sampler-channel>
1044   *   *
1045     *  @param pClient          Pointer to client instance structure.
1046     *  @param iSamplerChannel  Sampler channel number.
1047     *
1048   *  @returns The number of active disk streams on success, -1 otherwise.   *  @returns The number of active disk streams on success, -1 otherwise.
1049   */   */
1050  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 1055  int lscp_get_channel_stream_count ( lscp
1055      if (iSamplerChannel < 0)      if (iSamplerChannel < 0)
1056          return iStreamCount;          return iStreamCount;
1057    
1058        // Lock this section up.
1059        lscp_mutex_lock(pClient->mutex);
1060    
1061      sprintf(szQuery, "GET CHANNEL STREAM_COUNT %d\r\n", iSamplerChannel);      sprintf(szQuery, "GET CHANNEL STREAM_COUNT %d\r\n", iSamplerChannel);
1062      if (lscp_client_query(pClient, szQuery) == LSCP_OK)      if (lscp_client_call(pClient, szQuery) == LSCP_OK)
1063          iStreamCount = atoi(lscp_client_get_result(pClient));          iStreamCount = atoi(lscp_client_get_result(pClient));
1064    
1065        // Unlock this section down.
1066        lscp_mutex_unlock(pClient->mutex);
1067    
1068      return iStreamCount;      return iStreamCount;
1069  }  }
1070    
1071    
1072  /**  /**
1073     *  Current least usage of active disk streams.
1074     *
1075     *  @param pClient          Pointer to client instance structure.
1076     *  @param iSamplerChannel  Sampler channel number.
1077     *
1078     *  @returns The usage percentage of the least filled active disk stream
1079     *  on success, -1 otherwise.
1080     */
1081    int lscp_get_channel_stream_usage ( lscp_client_t *pClient, int iSamplerChannel )
1082    {
1083        char szQuery[LSCP_BUFSIZ];
1084        int  iStreamUsage = -1;
1085        const char *pszResult;
1086        const char *pszSeps = "[]%,";
1087        char *pszToken;
1088        char *pch;
1089        int   iStream;
1090        int   iPercent;
1091    
1092        if (iSamplerChannel < 0)
1093            return iStreamUsage;
1094    
1095        // Lock this section up.
1096        lscp_mutex_lock(pClient->mutex);
1097    
1098        iStream = 0;
1099        sprintf(szQuery, "GET CHANNEL BUFFER_FILL PERCENTAGE %d\r\n", iSamplerChannel);
1100        if (lscp_client_call(pClient, szQuery) == LSCP_OK) {
1101            pszResult = lscp_client_get_result(pClient);
1102            pszToken = lscp_strtok((char *) pszResult, pszSeps, &(pch));
1103            while (pszToken) {
1104                if (*pszToken) {
1105                    // Skip stream id.
1106                    pszToken = lscp_strtok(NULL, pszSeps, &(pch));
1107                    if (pszToken == NULL)
1108                        break;
1109                    // Get least buffer fill percentage.
1110                    iPercent = atol(pszToken);
1111                    if (iStreamUsage > iPercent || iStream == 0)
1112                        iStreamUsage = iPercent;
1113                    iStream++;
1114                }
1115                pszToken = lscp_strtok(NULL, pszSeps, &(pch));
1116            }
1117        }
1118    
1119        // Unlock this section down.
1120        lscp_mutex_unlock(pClient->mutex);
1121    
1122        return iStreamUsage;
1123    }
1124    
1125    
1126    /**
1127   *  Current fill state of disk stream buffers:   *  Current fill state of disk stream buffers:
1128   *  GET CHANNEL BUFFER_FILL {BYTES|PERCENTAGE} <sampler-channel>   *  GET CHANNEL BUFFER_FILL {BYTES|PERCENTAGE} <sampler-channel>
1129   *   *
# Line 1005  lscp_buffer_fill_t *lscp_get_channel_buf Line 1149  lscp_buffer_fill_t *lscp_get_channel_buf
1149      char *pch;      char *pch;
1150      int   iStream;      int   iStream;
1151    
1152        // Retrieve a channel stream estimation.
1153      iStreamCount = lscp_get_channel_stream_count(pClient, iSamplerChannel);      iStreamCount = lscp_get_channel_stream_count(pClient, iSamplerChannel);
1154        if (pClient->iStreamCount < 0)
1155            return NULL;
1156    
1157        // Lock this section up.
1158        lscp_mutex_lock(pClient->mutex);
1159    
1160        // Check if we need to reallocate the stream usage array.
1161      if (pClient->iStreamCount != iStreamCount) {      if (pClient->iStreamCount != iStreamCount) {
1162          if (pClient->buffer_fill)          if (pClient->buffer_fill)
1163              free(pClient->buffer_fill);              free(pClient->buffer_fill);
# Line 1016  lscp_buffer_fill_t *lscp_get_channel_buf Line 1168  lscp_buffer_fill_t *lscp_get_channel_buf
1168          pClient->iStreamCount = iStreamCount;          pClient->iStreamCount = iStreamCount;
1169      }      }
1170    
     if (pClient->iStreamCount < 1)  
         return NULL;  
   
     iStream = 0;  
     pBufferFill = pClient->buffer_fill;  
   
1171      // Get buffer fill usage...      // Get buffer fill usage...
1172      sprintf(szQuery, "GET CHANNEL BUFFER_FILL %s %d\r\n", pszUsageType, iSamplerChannel);      pBufferFill = pClient->buffer_fill;
1173      if (lscp_client_query(pClient, szQuery) == LSCP_OK) {      if (pBufferFill && iStreamCount > 0) {
1174          pszResult = lscp_client_get_result(pClient);          iStream = 0;
1175          pszToken = lscp_strtok(pszResult, pszSeps, &(pch));          pBufferFill = pClient->buffer_fill;
1176          while (pszToken && iStream < pClient->iStreamCount) {          sprintf(szQuery, "GET CHANNEL BUFFER_FILL %s %d\r\n", pszUsageType, iSamplerChannel);
1177              if (*pszToken) {          if (lscp_client_call(pClient, szQuery) == LSCP_OK) {
1178                  pBufferFill[iStream].stream_id = atol(pszToken);              pszResult = lscp_client_get_result(pClient);
1179                pszToken = lscp_strtok((char *) pszResult, pszSeps, &(pch));
1180                while (pszToken && iStream < pClient->iStreamCount) {
1181                    if (*pszToken) {
1182                        pBufferFill[iStream].stream_id = atol(pszToken);
1183                        pszToken = lscp_strtok(NULL, pszSeps, &(pch));
1184                        if (pszToken == NULL)
1185                            break;
1186                        pBufferFill[iStream].stream_usage = atol(pszToken);
1187                        iStream++;
1188                    }
1189                  pszToken = lscp_strtok(NULL, pszSeps, &(pch));                  pszToken = lscp_strtok(NULL, pszSeps, &(pch));
                 if (pszToken == NULL)  
                     break;  
                 pBufferFill[iStream].stream_usage = atol(pszToken);  
                 iStream++;  
1190              }              }
1191              pszToken = lscp_strtok(NULL, pszSeps, &(pch));          }   // Reset the usage, whatever it was before.
1192          }          else while (iStream < pClient->iStreamCount)
1193      }   // Reset the usage, whatever it was before.              pBufferFill[iStream++].stream_usage = 0;
1194      else while (iStream < pClient->iStreamCount)      }
1195          pBufferFill[iStream++].stream_usage = 0;      
1196        // Unlock this section down.
1197        lscp_mutex_unlock(pClient->mutex);
1198    
1199      return pBufferFill;      return pBufferFill;
1200  }  }
# Line 1067  lscp_status_t lscp_set_channel_audio_typ Line 1221  lscp_status_t lscp_set_channel_audio_typ
1221    
1222    
1223  /**  /**
1224     *  Setting audio output device:
1225     *  SET CHANNEL AUDIO_OUTPUT_DEVICE <sampler-channel> <device-id>
1226     *
1227     *  @param pClient          Pointer to client instance structure.
1228     *  @param iSamplerChannel  Sampler channel number.
1229     *  @param iAudioDevice     Audio output device number identifier.
1230     */
1231    lscp_status_t lscp_set_channel_audio_device ( lscp_client_t *pClient, int iSamplerChannel, int iAudioDevice )
1232    {
1233        char szQuery[LSCP_BUFSIZ];
1234    
1235        if (iSamplerChannel < 0 || iAudioDevice < 0)
1236            return LSCP_FAILED;
1237    
1238        sprintf(szQuery, "SET CHANNEL AUDIO_OUTPUT_DEVICE %d %d\r\n", iSamplerChannel, iAudioDevice);
1239        return lscp_client_query(pClient, szQuery);
1240    }
1241    
1242    
1243    /**
1244   *  Setting audio output channel:   *  Setting audio output channel:
1245   *  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>
1246   *   *
# Line 1110  lscp_status_t lscp_set_channel_midi_type Line 1284  lscp_status_t lscp_set_channel_midi_type
1284      return lscp_client_query(pClient, szQuery);      return lscp_client_query(pClient, szQuery);
1285  }  }
1286    
1287    
1288    /**
1289     *  Setting MIDI input device:
1290     *  SET CHANNEL MIDI_INPUT_DEVICE <sampler-channel> <device-id>
1291     *
1292     *  @param pClient          Pointer to client instance structure.
1293     *  @param iSamplerChannel  Sampler channel number.
1294     *  @param iMidiDevice      MIDI input device number identifier.
1295     */
1296    lscp_status_t lscp_set_channel_midi_device ( lscp_client_t *pClient, int iSamplerChannel, int iMidiDevice )
1297    {
1298        char szQuery[LSCP_BUFSIZ];
1299    
1300        if (iSamplerChannel < 0 || iMidiDevice < 0)
1301            return LSCP_FAILED;
1302    
1303        sprintf(szQuery, "SET CHANNEL MIDI_INPUT_DEVICE %d %d\r\n", iSamplerChannel, iMidiDevice);
1304        return lscp_client_query(pClient, szQuery);
1305    }
1306    
1307    
1308  /**  /**
1309   *  Setting MIDI input port:   *  Setting MIDI input port:
Legend:
Removed from v.107  
changed lines
  Added in v.179
  ViewVC Help
Powered by ViewVC