/[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 146 by capela, Fri Jun 25 12:00:25 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;
     struct sockaddr_in addr;  
     int   cAddr;  
43      char  achBuffer[LSCP_BUFSIZ];      char  achBuffer[LSCP_BUFSIZ];
44      int   cchBuffer;      int   cchBuffer;
45      const char *pszSeps = " \r\n";      const char *pszSeps = ":\r\n";
46      char *pszToken;      char *pszToken;
47      char *pch;      char *pch;
48        int   cchToken;
49        lscp_event_t event;
50    
51  #ifdef DEBUG  #ifdef DEBUG
52      fprintf(stderr, "_lscp_client_udp_proc: Client waiting for events.\n");      fprintf(stderr, "_lscp_client_evt_proc: Client waiting for events.\n");
53  #endif  #endif
54    
55      while (pClient->udp.iState) {      while (pClient->evt.iState) {
56          cAddr = sizeof(struct sockaddr_in);          // Wait for event...
57          cchBuffer = recvfrom(pClient->udp.sock, achBuffer, sizeof(achBuffer), 0, (struct sockaddr *) &addr, &cAddr);          cchBuffer = recv(pClient->evt.sock, achBuffer, sizeof(achBuffer), 0);
58          if (cchBuffer > 0) {          if (cchBuffer > 0) {
59  #ifdef DEBUG              // Make sure received buffer it's null terminated.
60              lscp_socket_trace("_lscp_client_udp_proc: recvfrom", &addr, achBuffer, cchBuffer);              achBuffer[cchBuffer] = (char) 0;
61  #endif              // Parse for the notification event message...
62              if (strncasecmp(achBuffer, "PING ", 5) == 0) {              pszToken = lscp_strtok(achBuffer, pszSeps, &(pch)); // Have "NOTIFY".
63                  // Make sure received buffer it's null terminated.              if (strcasecmp(pszToken, "NOTIFY") == 0) {
64                  achBuffer[cchBuffer] = (char) 0;                  pszToken = lscp_strtok(NULL, pszSeps, &(pch));
65                  lscp_strtok(achBuffer, pszSeps, &(pch));       // Skip "PING"                  event    = lscp_event_from_text(pszToken);
66                  lscp_strtok(NULL, pszSeps, &(pch));            // Skip port (must be the same as in addr)                  // And pick the rest of data...
67                  pszToken = lscp_strtok(NULL, pszSeps, &(pch)); // Have session-id.                  pszToken = lscp_strtok(NULL, pszSeps, &(pch));
68                  if (pszToken) {                  cchToken = (pszToken == NULL ? 0 : strlen(pszToken));
69                      // Set now client's session-id, if not already                  // Double-check if we're really up to it...
70                      if (pClient->sessid == NULL)                  if (pClient->events & event) {
71                          pClient->sessid = strdup(pszToken);                      // Invoke the client event callback...
72                      if (pClient->sessid && strcmp(pszToken, pClient->sessid) == 0) {                      if ((*pClient->pfnCallback)(
73                          sprintf(achBuffer, "PONG %s\r\n", pClient->sessid);                              pClient,
74                          cchBuffer = strlen(achBuffer);                              event,
75                          if (sendto(pClient->udp.sock, achBuffer, cchBuffer, 0, (struct sockaddr *) &addr, cAddr) < cchBuffer)                              pszToken,
76                              lscp_socket_perror("_lscp_client_udp_proc: sendto");                              cchToken,
77  #ifdef DEBUG                              pClient->pvData) != LSCP_OK) {
78                          fprintf(stderr, "> %s", achBuffer);                          pClient->evt.iState = 0;
 #endif  
79                      }                      }
80                  }                  }
                 // Done with life proof.  
             } else {  
                 //  
                 if ((*pClient->pfnCallback)(  
                         pClient,  
                         achBuffer,  
                         cchBuffer,  
                         pClient->pvData) != LSCP_OK) {  
                     pClient->udp.iState = 0;  
                 }  
81              }              }
82          } else {          } else {
83              lscp_socket_perror("_lscp_client_udp_proc: recvfrom");              lscp_socket_perror("_lscp_client_evt_proc: recv");
84              pClient->udp.iState = 0;              pClient->evt.iState = 0;
85          }          }
86      }      }
87    
88  #ifdef DEBUG  #ifdef DEBUG
89      fprintf(stderr, "_lscp_client_udp_proc: Client closing.\n");      fprintf(stderr, "_lscp_client_evt_proc: Client closing.\n");
90    #endif
91    }
92    
93    
94    //-------------------------------------------------------------------------
95    // Event subscription helpers.
96    
97    // Open the event service socket connection.
98    static lscp_status_t _lscp_client_evt_connect ( lscp_client_t *pClient )
99    {
100        lscp_socket_t sock;
101        struct sockaddr_in addr;
102        int cAddr;
103    #if defined(WIN32)
104        int iSockOpt = (-1);
105    #endif
106    
107        // Prepare the event connection socket...
108        sock = socket(AF_INET, SOCK_STREAM, 0);
109        if (sock == INVALID_SOCKET) {
110            lscp_socket_perror("_lscp_client_evt_connect: socket");
111            return LSCP_FAILED;
112        }
113    
114    #if defined(WIN32)
115        if (setsockopt(sock, SOL_SOCKET, SO_DONTLINGER, (char *) &iSockOpt, sizeof(int)) == SOCKET_ERROR)
116            lscp_socket_perror("lscp_client_evt_connect: setsockopt(SO_DONTLINGER)");
117    #endif
118    
119    #ifdef DEBUG
120        lscp_socket_getopts("_lscp_client_evt_connect:", sock);
121  #endif  #endif
122    
123        // Use same address of the command connection.
124        cAddr = sizeof(struct sockaddr_in);
125        memmove((char *) &addr, &(pClient->cmd.addr), cAddr);
126    
127        // Start the connection...
128        if (connect(sock, (struct sockaddr *) &addr, cAddr) == SOCKET_ERROR) {
129            lscp_socket_perror("_lscp_client_evt_connect: connect");
130            closesocket(sock);
131            return LSCP_FAILED;
132        }
133        
134        // Set our socket agent struct...
135        lscp_socket_agent_init(&(pClient->evt), sock, &addr, cAddr);
136        
137        // And finally the service thread...
138        return lscp_socket_agent_start(&(pClient->evt), _lscp_client_evt_proc, pClient, 0);
139    }
140    
141    
142    // Subscribe to a single event.
143    static lscp_status_t _lscp_client_evt_request ( lscp_client_t *pClient, int iSubscribe, lscp_event_t event )
144    {
145        const char *pszEvent;
146        char  szQuery[LSCP_BUFSIZ];
147        int   cchQuery;
148    
149        if (pClient == NULL)
150            return LSCP_FAILED;
151    
152        // Which (single) event?
153        pszEvent = lscp_event_to_text(event);
154        if (pszEvent == NULL)
155            return LSCP_FAILED;
156    
157        // Build the query string...
158        cchQuery = sprintf(szQuery, "%sSUBSCRIBE %s\n\n", (iSubscribe == 0 ? "UN" : ""), pszEvent);
159        // Just send data, forget result...
160        if (send(pClient->evt.sock, szQuery, cchQuery, 0) < cchQuery) {
161            lscp_socket_perror("_lscp_client_evt_request: send");
162            return LSCP_FAILED;
163        }
164    
165        // Update as naively as we can...
166        if (iSubscribe)
167            pClient->events |=  event;
168        else
169            pClient->events &= ~event;
170    
171        return LSCP_OK;
172  }  }
173    
174    
# Line 155  lscp_client_t* lscp_client_create ( cons Line 210  lscp_client_t* lscp_client_create ( cons
210      lscp_socket_t sock;      lscp_socket_t sock;
211      struct sockaddr_in addr;      struct sockaddr_in addr;
212      int cAddr;      int cAddr;
213    #if defined(WIN32)
214      int iSockOpt = (-1);      int iSockOpt = (-1);
215    #endif
216    
217      if (pfnCallback == NULL) {      if (pfnCallback == NULL) {
218          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 221  lscp_client_t* lscp_client_create ( cons
221    
222      pHost = gethostbyname(pszHost);      pHost = gethostbyname(pszHost);
223      if (pHost == NULL) {      if (pHost == NULL) {
224          lscp_socket_perror("lscp_client_create: gethostbyname");          lscp_socket_herror("lscp_client_create: gethostbyname");
225          return NULL;          return NULL;
226      }      }
227    
# Line 184  lscp_client_t* lscp_client_create ( cons Line 241  lscp_client_t* lscp_client_create ( cons
241      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);
242  #endif  #endif
243    
244      // Prepare the TCP connection socket...      // Prepare the command connection socket...
245    
246      sock = socket(AF_INET, SOCK_STREAM, 0);      sock = socket(AF_INET, SOCK_STREAM, 0);
247      if (sock == INVALID_SOCKET) {      if (sock == INVALID_SOCKET) {
248          lscp_socket_perror("lscp_client_create: tcp: socket");          lscp_socket_perror("lscp_client_create: cmd: socket");
249          free(pClient);          free(pClient);
250          return NULL;          return NULL;
251      }      }
252    
253  #if defined(WIN32)  #if defined(WIN32)
254      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)
255          lscp_socket_perror("lscp_client_create: tcp: setsockopt(SO_DONTLINGER)");          lscp_socket_perror("lscp_client_create: cmd: setsockopt(SO_DONTLINGER)");
256  #endif  #endif
257    
258  #ifdef DEBUG  #ifdef DEBUG
259      lscp_socket_getopts("lscp_client_create: tcp", sock);      lscp_socket_getopts("lscp_client_create: cmd", sock);
260  #endif  #endif
261    
262      cAddr = sizeof(struct sockaddr_in);      cAddr = sizeof(struct sockaddr_in);
# Line 209  lscp_client_t* lscp_client_create ( cons Line 266  lscp_client_t* lscp_client_create ( cons
266      addr.sin_port = htons((short) iPort);      addr.sin_port = htons((short) iPort);
267    
268      if (connect(sock, (struct sockaddr *) &addr, cAddr) == SOCKET_ERROR) {      if (connect(sock, (struct sockaddr *) &addr, cAddr) == SOCKET_ERROR) {
269          lscp_socket_perror("lscp_client_create: tcp: connect");          lscp_socket_perror("lscp_client_create: cmd: connect");
270          closesocket(sock);          closesocket(sock);
271          free(pClient);          free(pClient);
272          return NULL;          return NULL;
273      }      }
274    
275      lscp_socket_agent_init(&(pClient->tcp), sock, &addr, cAddr);      // Initialize the command socket agent struct...
276        lscp_socket_agent_init(&(pClient->cmd), sock, &addr, cAddr);
277    
278  #ifdef DEBUG  #ifdef DEBUG
279      fprintf(stderr, "lscp_client_create: tcp: pClient=%p: sock=%d addr=%s port=%d.\n", pClient, pClient->tcp.sock, inet_ntoa(pClient->tcp.addr.sin_addr), ntohs(pClient->tcp.addr.sin_port));      fprintf(stderr, "lscp_client_create: cmd: pClient=%p: sock=%d addr=%s port=%d.\n", pClient, pClient->cmd.sock, inet_ntoa(pClient->cmd.addr.sin_addr), ntohs(pClient->cmd.addr.sin_port));
280  #endif  #endif
281    
282      // Prepare the UDP datagram service socket...      // Initialize the event service socket struct...
283        lscp_socket_agent_init(&(pClient->evt), INVALID_SOCKET, NULL, 0);
284      sock = socket(AF_INET, SOCK_DGRAM, 0);      // No events subscribed, yet.
285      if (sock == INVALID_SOCKET) {      pClient->events = LSCP_EVENT_NONE;
         lscp_socket_perror("lscp_client_create: udp: socket");  
         lscp_socket_agent_free(&(pClient->tcp));  
         free(pClient);  
         return NULL;  
     }  
   
     if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (char *) &iSockOpt, sizeof(int)) == SOCKET_ERROR)  
         lscp_socket_perror("lscp_client_create: udp: setsockopt(SO_REUSEADDR)");  
   
 #ifdef DEBUG  
     lscp_socket_getopts("lscp_client_create: udp", sock);  
 #endif  
   
     cAddr = sizeof(struct sockaddr_in);  
     memset((char *) &addr, 0, cAddr);  
     addr.sin_family = AF_INET;  
     addr.sin_addr.s_addr = htonl(INADDR_ANY);  
     addr.sin_port = htons(0);  
   
     if (bind(sock, (const struct sockaddr *) &addr, cAddr) == SOCKET_ERROR) {  
         lscp_socket_perror("lscp_client_create: udp: bind");  
         lscp_socket_agent_free(&(pClient->tcp));  
         closesocket(sock);  
         free(pClient);  
         return NULL;  
     }  
   
     if (getsockname(sock, (struct sockaddr *) &addr, &cAddr) == SOCKET_ERROR) {  
         lscp_socket_perror("lscp_client_create: udp: getsockname");  
         lscp_socket_agent_free(&(pClient->tcp));  
         closesocket(sock);  
         free(pClient);  
         return NULL;  
     }  
   
     lscp_socket_agent_init(&(pClient->udp), sock, &addr, cAddr);  
   
 #ifdef DEBUG  
     fprintf(stderr, "lscp_client_create: udp: pClient=%p: sock=%d addr=%s port=%d.\n", pClient, pClient->udp.sock, inet_ntoa(pClient->udp.addr.sin_addr), ntohs(pClient->udp.addr.sin_port));  
 #endif  
   
     // No session id, yet.  
     pClient->sessid = NULL;  
286      // Initialize cached members.      // Initialize cached members.
287      pClient->audio_drivers = NULL;      pClient->audio_drivers = NULL;
288      pClient->midi_drivers = NULL;      pClient->midi_drivers = NULL;
289        pClient->audio_devices = NULL;
290        pClient->midi_devices = NULL;
291      pClient->engines = NULL;      pClient->engines = NULL;
292        pClient->channels = NULL;
293      lscp_driver_info_init(&(pClient->audio_info));      lscp_driver_info_init(&(pClient->audio_info));
294      lscp_driver_info_init(&(pClient->midi_info));      lscp_driver_info_init(&(pClient->midi_info));
295      lscp_engine_info_init(&(pClient->engine_info));      lscp_engine_info_init(&(pClient->engine_info));
# Line 288  lscp_client_t* lscp_client_create ( cons Line 306  lscp_client_t* lscp_client_create ( cons
306      // Initialize the transaction mutex.      // Initialize the transaction mutex.
307      lscp_mutex_init(pClient->mutex);      lscp_mutex_init(pClient->mutex);
308    
     // 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;  
     }  
   
309      // Finally we've some success...      // Finally we've some success...
310      return pClient;      return pClient;
311  }  }
# Line 317  lscp_status_t lscp_client_join ( lscp_cl Line 325  lscp_status_t lscp_client_join ( lscp_cl
325      fprintf(stderr, "lscp_client_join: pClient=%p.\n", pClient);      fprintf(stderr, "lscp_client_join: pClient=%p.\n", pClient);
326  #endif  #endif
327    
328  //  lscp_socket_agent_join(&(pClient->udp));  //  lscp_socket_agent_join(&(pClient->evt));
329      lscp_socket_agent_join(&(pClient->tcp));      lscp_socket_agent_join(&(pClient->cmd));
330    
331      return LSCP_OK;      return LSCP_OK;
332  }  }
# Line 340  lscp_status_t lscp_client_destroy ( lscp Line 348  lscp_status_t lscp_client_destroy ( lscp
348      fprintf(stderr, "lscp_client_destroy: pClient=%p.\n", pClient);      fprintf(stderr, "lscp_client_destroy: pClient=%p.\n", pClient);
349  #endif  #endif
350    
351      // Free session-id, if any.      // Lock this section up.
352      if (pClient->sessid)      lscp_mutex_lock(pClient->mutex);
353          free(pClient->sessid);      
     pClient->sessid = NULL;  
354      // Free up all cached members.      // Free up all cached members.
355      lscp_channel_info_reset(&(pClient->channel_info));      lscp_channel_info_reset(&(pClient->channel_info));
356      lscp_engine_info_reset(&(pClient->engine_info));      lscp_engine_info_reset(&(pClient->engine_info));
# Line 352  lscp_status_t lscp_client_destroy ( lscp Line 359  lscp_status_t lscp_client_destroy ( lscp
359      // Free available engine table.      // Free available engine table.
360      lscp_szsplit_destroy(pClient->audio_drivers);      lscp_szsplit_destroy(pClient->audio_drivers);
361      lscp_szsplit_destroy(pClient->midi_drivers);      lscp_szsplit_destroy(pClient->midi_drivers);
362        lscp_isplit_destroy(pClient->audio_devices);
363        lscp_isplit_destroy(pClient->midi_devices);
364      lscp_szsplit_destroy(pClient->engines);      lscp_szsplit_destroy(pClient->engines);
365        lscp_isplit_destroy(pClient->channels);
366      // Make them null.      // Make them null.
367      pClient->audio_drivers = NULL;      pClient->audio_drivers = NULL;
368      pClient->midi_drivers = NULL;      pClient->midi_drivers = NULL;
369      pClient->engines = NULL;      pClient->engines = NULL;
370      // Free result error stuff.      // Free result error stuff.
371      _lscp_client_set_result(pClient, NULL, 0);      lscp_client_set_result(pClient, NULL, 0);
372      // Frre stream usage stuff.      // Frre stream usage stuff.
373      if (pClient->buffer_fill)      if (pClient->buffer_fill)
374          free(pClient->buffer_fill);          free(pClient->buffer_fill);
# Line 367  lscp_status_t lscp_client_destroy ( lscp Line 377  lscp_status_t lscp_client_destroy ( lscp
377      pClient->iTimeout = 0;      pClient->iTimeout = 0;
378    
379      // Free socket agents.      // Free socket agents.
380      lscp_socket_agent_free(&(pClient->udp));      lscp_socket_agent_free(&(pClient->evt));
381      lscp_socket_agent_free(&(pClient->tcp));      lscp_socket_agent_free(&(pClient->cmd));
382    
383      // Last but not least, free good ol'transaction mutex.      // Last but not least, free good ol'transaction mutex.
384        lscp_mutex_unlock(pClient->mutex);
385      lscp_mutex_destroy(pClient->mutex);      lscp_mutex_destroy(pClient->mutex);
386    
387      free(pClient);      free(pClient);
# Line 418  int lscp_client_get_timeout ( lscp_clien Line 429  int lscp_client_get_timeout ( lscp_clien
429  //-------------------------------------------------------------------------  //-------------------------------------------------------------------------
430  // Client common protocol functions.  // Client common protocol functions.
431    
   
432  /**  /**
433   *  Submit a command query line string to the server. The query string   *  Submit a command query line string to the server. The query string
434   *  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 444  int lscp_client_get_timeout ( lscp_clien
444   */   */
445  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 )
446  {  {
447      fd_set fds;                         // File descriptor list for select().      lscp_status_t ret;
448      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;  
   
449      // Lock this section up.      // Lock this section up.
450      lscp_mutex_lock(pClient->mutex);      lscp_mutex_lock(pClient->mutex);
451    
452      pszResult = NULL;      // Just make the now guarded call.
453      iErrno = -1;      ret = lscp_client_call(pClient, pszQuery);
454        
455      // 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...  
456      lscp_mutex_unlock(pClient->mutex);      lscp_mutex_unlock(pClient->mutex);
457        
458      return ret;      return ret;
459  }  }
460    
   
461  /**  /**
462   *  Get the last received result string. In case of error or warning,   *  Get the last received result string. In case of error or warning,
463   *  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 497  int lscp_client_get_errno ( lscp_client_
497  // Client registration protocol functions.  // Client registration protocol functions.
498    
499  /**  /**
500   *  Register frontend for receiving UDP event messages:   *  Register frontend for receiving event messages:
501   *  SUBSCRIBE NOTIFICATION <udp-port>   *  SUBSCRIBE CHANNELS | VOICE_COUNT | STREAM_COUNT | BUFFER_FILL
502     *      | CHANNEL_INFO | MISCELLANEOUS
503   *   *
504   *  @param pClient  Pointer to client instance structure.   *  @param pClient  Pointer to client instance structure.
505     *  @param events   Bit-wise OR'ed event flags to subscribe.
506   *   *
507   *  @returns LSCP_OK on success, LSCP_FAILED otherwise.   *  @returns LSCP_OK on success, LSCP_FAILED otherwise.
508   */   */
509  lscp_status_t lscp_client_subscribe ( lscp_client_t *pClient )  lscp_status_t lscp_client_subscribe ( lscp_client_t *pClient, lscp_event_t events )
510  {  {
511      lscp_status_t ret;      lscp_status_t ret = LSCP_FAILED;
     char szQuery[LSCP_BUFSIZ];  
     const char *pszResult;  
     const char *pszSeps = "[]";  
     char *pszToken;  
     char *pch;  
512    
513      if (pClient == NULL || pClient->sessid)      if (pClient == NULL)
514          return LSCP_FAILED;          return LSCP_FAILED;
515    
516      sprintf(szQuery, "SUBSCRIBE NOTIFICATION %d\r\n", ntohs(pClient->udp.addr.sin_port));      // Lock this section up.
517      ret = lscp_client_query(pClient, szQuery);      lscp_mutex_lock(pClient->mutex);
518      if (ret == LSCP_OK) {  
519          pszResult = lscp_client_get_result(pClient);      // If applicable, start the alternate connection...
520  #ifdef DEBUG      if (pClient->events == LSCP_EVENT_NONE)
521          fprintf(stderr, "lscp_client_subscribe: %s\n", pszResult);          ret = _lscp_client_evt_connect(pClient);
522  #endif      
523          // Check for the session-id on "OK[sessid]" response.      // Send the subscription commands.
524          pszToken = lscp_strtok(pszResult, pszSeps, &(pch));      if (ret == LSCP_OK && (events & LSCP_EVENT_CHANNELS))
525          if (pszToken && strcasecmp(pszToken, "OK") == 0) {          ret = _lscp_client_evt_request(pClient, 1, LSCP_EVENT_CHANNELS);
526              pszToken = lscp_strtok(NULL, pszSeps, &(pch));      if (ret == LSCP_OK && (events & LSCP_EVENT_VOICE_COUNT))
527              if (pszToken)          ret = _lscp_client_evt_request(pClient, 1, LSCP_EVENT_VOICE_COUNT);
528                  pClient->sessid = strdup(pszToken);      if (ret == LSCP_OK && (events & LSCP_EVENT_STREAM_COUNT))
529          }          ret = _lscp_client_evt_request(pClient, 1, LSCP_EVENT_STREAM_COUNT);
530      }      if (ret == LSCP_OK && (events & LSCP_EVENT_BUFFER_FILL))
531            ret = _lscp_client_evt_request(pClient, 1, LSCP_EVENT_BUFFER_FILL);
532        if (ret == LSCP_OK && (events & LSCP_EVENT_CHANNEL_INFO))
533            ret = _lscp_client_evt_request(pClient, 1, LSCP_EVENT_CHANNEL_INFO);
534        if (ret == LSCP_OK && (events & LSCP_EVENT_MISCELLANEOUS))
535            ret = _lscp_client_evt_request(pClient, 1, LSCP_EVENT_MISCELLANEOUS);
536    
537        // Unlock this section down.
538        lscp_mutex_unlock(pClient->mutex);
539    
540      return ret;      return ret;
541  }  }
542    
543    
544  /**  /**
545   *  Deregister frontend for not receiving UDP event messages anymore:   *  Deregister frontend from receiving UDP event messages anymore:
546   *  UNSUBSCRIBE NOTIFICATION <session-id>   *  SUBSCRIBE CHANNELS | VOICE_COUNT | STREAM_COUNT | BUFFER_FILL
547     *      | CHANNEL_INFO | MISCELLANEOUS
548   *   *
549   *  @param pClient  Pointer to client instance structure.   *  @param pClient  Pointer to client instance structure.
550     *  @param events   Bit-wise OR'ed event flags to unsubscribe.
551   *   *
552   *  @returns LSCP_OK on success, LSCP_FAILED otherwise.   *  @returns LSCP_OK on success, LSCP_FAILED otherwise.
553   */   */
554  lscp_status_t lscp_client_unsubscribe ( lscp_client_t *pClient )  lscp_status_t lscp_client_unsubscribe ( lscp_client_t *pClient, lscp_event_t events )
555  {  {
556      lscp_status_t ret;      lscp_status_t ret = LSCP_OK;
     char szQuery[LSCP_BUFSIZ];  
557    
558      if (pClient == NULL)      if (pClient == NULL)
559          return LSCP_FAILED;          return LSCP_FAILED;
     if (pClient->sessid == NULL)  
         return LSCP_FAILED;  
560    
561      sprintf(szQuery, "UNSUBSCRIBE NOTIFICATION %s\n\n", pClient->sessid);      // Lock this section up.
562      ret = lscp_client_query(pClient, szQuery);      lscp_mutex_lock(pClient->mutex);
563      if (ret == LSCP_OK) {  
564  #ifdef DEBUG      // Send the unsubscription commands.
565          fprintf(stderr, "lscp_client_unsubscribe: %s\n", lscp_client_get_result(pClient));      if (ret == LSCP_OK && (events & LSCP_EVENT_CHANNELS))
566  #endif          ret = _lscp_client_evt_request(pClient, 0, LSCP_EVENT_CHANNELS);
567          // Bail out session-id string.      if (ret == LSCP_OK && (events & LSCP_EVENT_VOICE_COUNT))
568          free(pClient->sessid);          ret = _lscp_client_evt_request(pClient, 0, LSCP_EVENT_VOICE_COUNT);
569          pClient->sessid = NULL;      if (ret == LSCP_OK && (events & LSCP_EVENT_STREAM_COUNT))
570      }          ret = _lscp_client_evt_request(pClient, 0, LSCP_EVENT_STREAM_COUNT);
571        if (ret == LSCP_OK && (events & LSCP_EVENT_BUFFER_FILL))
572            ret = _lscp_client_evt_request(pClient, 0, LSCP_EVENT_BUFFER_FILL);
573        if (ret == LSCP_OK && (events & LSCP_EVENT_CHANNEL_INFO))
574            ret = _lscp_client_evt_request(pClient, 0, LSCP_EVENT_CHANNEL_INFO);
575        if (ret == LSCP_OK && (events & LSCP_EVENT_MISCELLANEOUS))
576            ret = _lscp_client_evt_request(pClient, 0, LSCP_EVENT_MISCELLANEOUS);
577    
578        // If necessary, close the alternate connection...
579        if (pClient->events == LSCP_EVENT_NONE)
580            lscp_socket_agent_free(&(pClient->evt));
581    
582        // Unlock this section down.
583        lscp_mutex_unlock(pClient->mutex);
584    
585      return ret;      return ret;
586  }  }
# Line 683  lscp_status_t lscp_load_instrument ( lsc Line 607  lscp_status_t lscp_load_instrument ( lsc
607      if (pszFileName == NULL || iSamplerChannel < 0)      if (pszFileName == NULL || iSamplerChannel < 0)
608          return LSCP_FAILED;          return LSCP_FAILED;
609    
610      sprintf(szQuery, "LOAD INSTRUMENT %s %d %d\r\n", pszFileName, iInstrIndex, iSamplerChannel);      sprintf(szQuery, "LOAD INSTRUMENT '%s' %d %d\r\n", pszFileName, iInstrIndex, iSamplerChannel);
611        return lscp_client_query(pClient, szQuery);
612    }
613    
614    
615    /**
616     *  Loading an instrument in the background (non modal):
617     *  LOAD INSTRUMENT NON_MODAL <filename> <instr-index> <sampler-channel>
618     *
619     *  @param pClient          Pointer to client instance structure.
620     *  @param pszFileName      Instrument file name.
621     *  @param iInstrIndex      Instrument index number.
622     *  @param iSamplerChannel  Sampler Channel.
623     *
624     *  @returns LSCP_OK on success, LSCP_FAILED otherwise.
625     */
626    lscp_status_t lscp_load_instrument_non_modal ( lscp_client_t *pClient, const char *pszFileName, int iInstrIndex, int iSamplerChannel )
627    {
628        char szQuery[LSCP_BUFSIZ];
629    
630        if (pszFileName == NULL || iSamplerChannel < 0)
631            return LSCP_FAILED;
632    
633        sprintf(szQuery, "LOAD INSTRUMENT NON_MODAL '%s' %d %d\r\n", pszFileName, iInstrIndex, iSamplerChannel);
634      return lscp_client_query(pClient, szQuery);      return lscp_client_query(pClient, szQuery);
635  }  }
636    
# Line 722  lscp_status_t lscp_load_engine ( lscp_cl Line 669  lscp_status_t lscp_load_engine ( lscp_cl
669  int lscp_get_channels ( lscp_client_t *pClient )  int lscp_get_channels ( lscp_client_t *pClient )
670  {  {
671      int iChannels = -1;      int iChannels = -1;
672      if (lscp_client_query(pClient, "GET CHANNELS\r\n") == LSCP_OK)  
673        // Lock this section up.
674        lscp_mutex_lock(pClient->mutex);
675    
676        if (lscp_client_call(pClient, "GET CHANNELS\r\n") == LSCP_OK)
677          iChannels = atoi(lscp_client_get_result(pClient));          iChannels = atoi(lscp_client_get_result(pClient));
678    
679        // Unlock this section doen.
680        lscp_mutex_unlock(pClient->mutex);
681    
682      return iChannels;      return iChannels;
683  }  }
684    
685    
686  /**  /**
687     *  List current sampler channels number identifiers:
688     *  LIST CHANNELS
689     *
690     *  @param pClient  Pointer to client instance structure.
691     *
692     *  @returns An array of the sampler channels identifiers as positive integers,
693     *  terminated with -1 on success, NULL otherwise.
694     */
695    int *lscp_list_channels ( lscp_client_t *pClient )
696    {
697        const char *pszSeps = ",";
698    
699        if (pClient == NULL)
700            return NULL;
701            
702        // Lock this section up.
703        lscp_mutex_lock(pClient->mutex);
704    
705        if (pClient->channels) {
706            lscp_isplit_destroy(pClient->channels);
707            pClient->channels = NULL;
708        }
709    
710        if (lscp_client_call(pClient, "LIST CHANNELS\r\n") == LSCP_OK)
711            pClient->channels = lscp_isplit_create(lscp_client_get_result(pClient), pszSeps);
712    
713        // Unlock this section down.
714        lscp_mutex_unlock(pClient->mutex);
715    
716        return pClient->channels;
717    }
718    
719    
720    /**
721   *  Adding a new sampler channel:   *  Adding a new sampler channel:
722   *  ADD CHANNEL   *  ADD CHANNEL
723   *   *
# Line 740  int lscp_get_channels ( lscp_client_t *p Line 729  int lscp_get_channels ( lscp_client_t *p
729  int lscp_add_channel ( lscp_client_t *pClient )  int lscp_add_channel ( lscp_client_t *pClient )
730  {  {
731      int iSamplerChannel = -1;      int iSamplerChannel = -1;
732      if (lscp_client_query(pClient, "ADD CHANNEL\r\n") == LSCP_OK)  
733        // Lock this section up.
734        lscp_mutex_lock(pClient->mutex);
735    
736        if (lscp_client_call(pClient, "ADD CHANNEL\r\n") == LSCP_OK)
737          iSamplerChannel = atoi(lscp_client_get_result(pClient));          iSamplerChannel = atoi(lscp_client_get_result(pClient));
738            
739        // Unlock this section down.
740        lscp_mutex_unlock(pClient->mutex);
741    
742      return iSamplerChannel;      return iSamplerChannel;
743  }  }
744    
# Line 780  const char **lscp_get_available_engines Line 777  const char **lscp_get_available_engines
777  {  {
778      const char *pszSeps = ",";      const char *pszSeps = ",";
779    
780        // Lock this section up.
781        lscp_mutex_lock(pClient->mutex);
782    
783      if (pClient->engines) {      if (pClient->engines) {
784          lscp_szsplit_destroy(pClient->engines);          lscp_szsplit_destroy(pClient->engines);
785          pClient->engines = NULL;          pClient->engines = NULL;
786      }      }
787    
788      if (lscp_client_query(pClient, "GET AVAILABLE_ENGINES\r\n") == LSCP_OK)      if (lscp_client_call(pClient, "GET AVAILABLE_ENGINES\r\n") == LSCP_OK)
789          pClient->engines = lscp_szsplit_create(lscp_client_get_result(pClient), pszSeps);          pClient->engines = lscp_szsplit_create(lscp_client_get_result(pClient), pszSeps);
790    
791        // Unlock this section down.
792        lscp_mutex_unlock(pClient->mutex);
793    
794      return (const char **) pClient->engines;      return (const char **) pClient->engines;
795  }  }
796    
# Line 815  lscp_engine_info_t *lscp_get_engine_info Line 818  lscp_engine_info_t *lscp_get_engine_info
818      if (pszEngineName == NULL)      if (pszEngineName == NULL)
819          return NULL;          return NULL;
820    
821        // Lock this section up.
822        lscp_mutex_lock(pClient->mutex);
823    
824      pEngineInfo = &(pClient->engine_info);      pEngineInfo = &(pClient->engine_info);
825      lscp_engine_info_reset(pEngineInfo);      lscp_engine_info_reset(pEngineInfo);
826    
827      sprintf(szQuery, "GET ENGINE INFO %s\r\n", pszEngineName);      sprintf(szQuery, "GET ENGINE INFO %s\r\n", pszEngineName);
828      if (lscp_client_query(pClient, szQuery) != LSCP_OK)      if (lscp_client_call(pClient, szQuery) == LSCP_OK) {
829          return NULL;          pszResult = lscp_client_get_result(pClient);
830            pszToken = lscp_strtok((char *) pszResult, pszSeps, &(pch));
831      pszResult = lscp_client_get_result(pClient);          while (pszToken) {
832      pszToken = lscp_strtok(pszResult, pszSeps, &(pch));              if (strcasecmp(pszToken, "DESCRIPTION") == 0) {
833      while (pszToken) {                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
834          if (strcasecmp(pszToken, "DESCRIPTION") == 0) {                  if (pszToken)
835              pszToken = lscp_strtok(NULL, pszCrlf, &(pch));                      pEngineInfo->description = lscp_unquote(&pszToken, 1);
836              if (pszToken)              }
837                  pEngineInfo->description = lscp_unquote(&pszToken, 1);              else if (strcasecmp(pszToken, "VERSION") == 0) {
838          }                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
839          else if (strcasecmp(pszToken, "VERSION") == 0) {                  if (pszToken)
840              pszToken = lscp_strtok(NULL, pszCrlf, &(pch));                      pEngineInfo->version = lscp_unquote(&pszToken, 1);
841              if (pszToken)              }
842                  pEngineInfo->version = lscp_unquote(&pszToken, 1);              pszToken = lscp_strtok(NULL, pszSeps, &(pch));
843          }          }
         pszToken = lscp_strtok(NULL, pszSeps, &(pch));  
844      }      }
845        else pEngineInfo = NULL;
846        
847        // Unlock this section down.
848        lscp_mutex_unlock(pClient->mutex);
849    
850      return pEngineInfo;      return pEngineInfo;
851  }  }
# Line 865  lscp_channel_info_t *lscp_get_channel_in Line 874  lscp_channel_info_t *lscp_get_channel_in
874      if (iSamplerChannel < 0)      if (iSamplerChannel < 0)
875          return NULL;          return NULL;
876    
877        // Lock this section up.
878        lscp_mutex_lock(pClient->mutex);
879        
880      pChannelInfo = &(pClient->channel_info);      pChannelInfo = &(pClient->channel_info);
881      lscp_channel_info_reset(pChannelInfo);      lscp_channel_info_reset(pChannelInfo);
882    
883      sprintf(szQuery, "GET CHANNEL INFO %d\r\n", iSamplerChannel);      sprintf(szQuery, "GET CHANNEL INFO %d\r\n", iSamplerChannel);
884      if (lscp_client_query(pClient, szQuery) != LSCP_OK)      if (lscp_client_call(pClient, szQuery) == LSCP_OK) {
885          return NULL;          pszResult = lscp_client_get_result(pClient);
886            pszToken = lscp_strtok((char *) pszResult, pszSeps, &(pch));
887      pszResult = lscp_client_get_result(pClient);          while (pszToken) {
888      pszToken = lscp_strtok(pszResult, pszSeps, &(pch));              if (strcasecmp(pszToken, "ENGINE_NAME") == 0) {
889      while (pszToken) {                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
890          if (strcasecmp(pszToken, "ENGINE_NAME") == 0) {                  if (pszToken)
891              pszToken = lscp_strtok(NULL, pszCrlf, &(pch));                      pChannelInfo->engine_name = lscp_unquote(&pszToken, 1);
892              if (pszToken)              }
893                  pChannelInfo->engine_name = lscp_unquote(&pszToken, 1);              else if (strcasecmp(pszToken, "AUDIO_OUTPUT_DEVICE") == 0) {
894          }                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
895          else if (strcasecmp(pszToken, "AUDIO_OUTPUT_DEVICE") == 0) {                  if (pszToken)
896              pszToken = lscp_strtok(NULL, pszCrlf, &(pch));                      pChannelInfo->audio_device = atoi(lscp_ltrim(pszToken));
897              if (pszToken)              }
898                  pChannelInfo->audio_device = atoi(lscp_ltrim(pszToken));              else if (strcasecmp(pszToken, "AUDIO_OUTPUT_CHANNELS") == 0) {
899          }                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
900          else if (strcasecmp(pszToken, "AUDIO_OUTPUT_CHANNELS") == 0) {                  if (pszToken)
901              pszToken = lscp_strtok(NULL, pszCrlf, &(pch));                      pChannelInfo->audio_channels = atoi(lscp_ltrim(pszToken));
902              if (pszToken)              }
903                  pChannelInfo->audio_channels = atoi(lscp_ltrim(pszToken));              else if (strcasecmp(pszToken, "AUDIO_OUTPUT_ROUTING") == 0) {
904          }                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
905          else if (strcasecmp(pszToken, "AUDIO_OUTPUT_ROUTING") == 0) {                  if (pszToken)
906              pszToken = lscp_strtok(NULL, pszCrlf, &(pch));                      pChannelInfo->audio_routing = lscp_szsplit_create(pszToken, ",");
907              if (pszToken)              }
908                  pChannelInfo->audio_routing = lscp_szsplit_create(pszToken, ",");              else if (strcasecmp(pszToken, "INSTRUMENT_FILE") == 0) {
909          }                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
910          else if (strcasecmp(pszToken, "INSTRUMENT_FILE") == 0) {                  if (pszToken)
911              pszToken = lscp_strtok(NULL, pszCrlf, &(pch));                      pChannelInfo->instrument_file = lscp_unquote(&pszToken, 1);
912              if (pszToken)              }
913                  pChannelInfo->instrument_file = lscp_unquote(&pszToken, 1);              else if (strcasecmp(pszToken, "INSTRUMENT_NR") == 0) {
914          }                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
915          else if (strcasecmp(pszToken, "INSTRUMENT_NR") == 0) {                  if (pszToken)
916              pszToken = lscp_strtok(NULL, pszCrlf, &(pch));                      pChannelInfo->instrument_nr = atoi(lscp_ltrim(pszToken));
917              if (pszToken)              }
918                  pChannelInfo->instrument_nr = atoi(lscp_ltrim(pszToken));              else if (strcasecmp(pszToken, "INSTRUMENT_STATUS") == 0) {
919          }                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
920          else if (strcasecmp(pszToken, "MIDI_INPUT_DEVICE") == 0) {                  if (pszToken)
921              pszToken = lscp_strtok(NULL, pszCrlf, &(pch));                      pChannelInfo->instrument_status = atoi(lscp_ltrim(pszToken));
922              if (pszToken)              }
923                  pChannelInfo->midi_device = atoi(lscp_ltrim(pszToken));              else if (strcasecmp(pszToken, "MIDI_INPUT_DEVICE") == 0) {
924          }                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
925          else if (strcasecmp(pszToken, "MIDI_INPUT_PORT") == 0) {                  if (pszToken)
926              pszToken = lscp_strtok(NULL, pszCrlf, &(pch));                      pChannelInfo->midi_device = atoi(lscp_ltrim(pszToken));
927              if (pszToken)              }
928                  pChannelInfo->midi_port = atoi(lscp_ltrim(pszToken));              else if (strcasecmp(pszToken, "MIDI_INPUT_PORT") == 0) {
929          }                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
930          else if (strcasecmp(pszToken, "MIDI_INPUT_CHANNEL") == 0) {                  if (pszToken)
931              pszToken = lscp_strtok(NULL, pszCrlf, &(pch));                      pChannelInfo->midi_port = atoi(lscp_ltrim(pszToken));
932              if (pszToken)              }
933                  pChannelInfo->midi_channel = atoi(lscp_ltrim(pszToken));              else if (strcasecmp(pszToken, "MIDI_INPUT_CHANNEL") == 0) {
934          }                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
935          else if (strcasecmp(pszToken, "VOLUME") == 0) {                  if (pszToken)
936              pszToken = lscp_strtok(NULL, pszCrlf, &(pch));                      pChannelInfo->midi_channel = atoi(lscp_ltrim(pszToken));
937              if (pszToken)              }
938                  pChannelInfo->volume = (float) atof(lscp_ltrim(pszToken));              else if (strcasecmp(pszToken, "VOLUME") == 0) {
939                    pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
940                    if (pszToken)
941                        pChannelInfo->volume = (float) atof(lscp_ltrim(pszToken));
942                }
943                pszToken = lscp_strtok(NULL, pszSeps, &(pch));
944          }          }
         pszToken = lscp_strtok(NULL, pszSeps, &(pch));  
945      }      }
946        else pChannelInfo = NULL;
947        
948        // Unlock this section up.
949        lscp_mutex_unlock(pClient->mutex);
950    
951      return pChannelInfo;      return pChannelInfo;
952  }  }
# Line 949  int lscp_get_channel_voice_count ( lscp_ Line 969  int lscp_get_channel_voice_count ( lscp_
969      if (iSamplerChannel < 0)      if (iSamplerChannel < 0)
970          return iVoiceCount;          return iVoiceCount;
971    
972        // Lock this section up.
973        lscp_mutex_lock(pClient->mutex);
974    
975      sprintf(szQuery, "GET CHANNEL VOICE_COUNT %d\r\n", iSamplerChannel);      sprintf(szQuery, "GET CHANNEL VOICE_COUNT %d\r\n", iSamplerChannel);
976      if (lscp_client_query(pClient, szQuery) == LSCP_OK)      if (lscp_client_call(pClient, szQuery) == LSCP_OK)
977          iVoiceCount = atoi(lscp_client_get_result(pClient));          iVoiceCount = atoi(lscp_client_get_result(pClient));
978    
979        // Unlock this section down.
980        lscp_mutex_unlock(pClient->mutex);
981    
982      return iVoiceCount;      return iVoiceCount;
983  }  }
984    
# Line 971  int lscp_get_channel_stream_count ( lscp Line 997  int lscp_get_channel_stream_count ( lscp
997      if (iSamplerChannel < 0)      if (iSamplerChannel < 0)
998          return iStreamCount;          return iStreamCount;
999    
1000        // Lock this section up.
1001        lscp_mutex_lock(pClient->mutex);
1002    
1003      sprintf(szQuery, "GET CHANNEL STREAM_COUNT %d\r\n", iSamplerChannel);      sprintf(szQuery, "GET CHANNEL STREAM_COUNT %d\r\n", iSamplerChannel);
1004      if (lscp_client_query(pClient, szQuery) == LSCP_OK)      if (lscp_client_call(pClient, szQuery) == LSCP_OK)
1005          iStreamCount = atoi(lscp_client_get_result(pClient));          iStreamCount = atoi(lscp_client_get_result(pClient));
1006    
1007        // Unlock this section down.
1008        lscp_mutex_unlock(pClient->mutex);
1009    
1010      return iStreamCount;      return iStreamCount;
1011  }  }
1012    
# Line 1005  lscp_buffer_fill_t *lscp_get_channel_buf Line 1037  lscp_buffer_fill_t *lscp_get_channel_buf
1037      char *pch;      char *pch;
1038      int   iStream;      int   iStream;
1039    
1040        // Retrieve a channel stream estimation.
1041      iStreamCount = lscp_get_channel_stream_count(pClient, iSamplerChannel);      iStreamCount = lscp_get_channel_stream_count(pClient, iSamplerChannel);
1042        if (pClient->iStreamCount < 0)
1043            return NULL;
1044    
1045        // Lock this section up.
1046        lscp_mutex_lock(pClient->mutex);
1047    
1048        // Check if we need to reallocate the stream usage array.
1049      if (pClient->iStreamCount != iStreamCount) {      if (pClient->iStreamCount != iStreamCount) {
1050          if (pClient->buffer_fill)          if (pClient->buffer_fill)
1051              free(pClient->buffer_fill);              free(pClient->buffer_fill);
# Line 1016  lscp_buffer_fill_t *lscp_get_channel_buf Line 1056  lscp_buffer_fill_t *lscp_get_channel_buf
1056          pClient->iStreamCount = iStreamCount;          pClient->iStreamCount = iStreamCount;
1057      }      }
1058    
     if (pClient->iStreamCount < 1)  
         return NULL;  
   
     iStream = 0;  
     pBufferFill = pClient->buffer_fill;  
   
1059      // Get buffer fill usage...      // Get buffer fill usage...
1060      sprintf(szQuery, "GET CHANNEL BUFFER_FILL %s %d\r\n", pszUsageType, iSamplerChannel);      pBufferFill = pClient->buffer_fill;
1061      if (lscp_client_query(pClient, szQuery) == LSCP_OK) {      if (pBufferFill && iStreamCount > 0) {
1062          pszResult = lscp_client_get_result(pClient);          iStream = 0;
1063          pszToken = lscp_strtok(pszResult, pszSeps, &(pch));          pBufferFill = pClient->buffer_fill;
1064          while (pszToken && iStream < pClient->iStreamCount) {          sprintf(szQuery, "GET CHANNEL BUFFER_FILL %s %d\r\n", pszUsageType, iSamplerChannel);
1065              if (*pszToken) {          if (lscp_client_call(pClient, szQuery) == LSCP_OK) {
1066                  pBufferFill[iStream].stream_id = atol(pszToken);              pszResult = lscp_client_get_result(pClient);
1067                pszToken = lscp_strtok((char *) pszResult, pszSeps, &(pch));
1068                while (pszToken && iStream < pClient->iStreamCount) {
1069                    if (*pszToken) {
1070                        pBufferFill[iStream].stream_id = atol(pszToken);
1071                        pszToken = lscp_strtok(NULL, pszSeps, &(pch));
1072                        if (pszToken == NULL)
1073                            break;
1074                        pBufferFill[iStream].stream_usage = atol(pszToken);
1075                        iStream++;
1076                    }
1077                  pszToken = lscp_strtok(NULL, pszSeps, &(pch));                  pszToken = lscp_strtok(NULL, pszSeps, &(pch));
                 if (pszToken == NULL)  
                     break;  
                 pBufferFill[iStream].stream_usage = atol(pszToken);  
                 iStream++;  
1078              }              }
1079              pszToken = lscp_strtok(NULL, pszSeps, &(pch));          }   // Reset the usage, whatever it was before.
1080          }          else while (iStream < pClient->iStreamCount)
1081      }   // Reset the usage, whatever it was before.              pBufferFill[iStream++].stream_usage = 0;
1082      else while (iStream < pClient->iStreamCount)      }
1083          pBufferFill[iStream++].stream_usage = 0;      
1084        // Unlock this section down.
1085        lscp_mutex_unlock(pClient->mutex);
1086    
1087      return pBufferFill;      return pBufferFill;
1088  }  }
# Line 1067  lscp_status_t lscp_set_channel_audio_typ Line 1109  lscp_status_t lscp_set_channel_audio_typ
1109    
1110    
1111  /**  /**
1112     *  Setting audio output device:
1113     *  SET CHANNEL AUDIO_OUTPUT_DEVICE <sampler-channel> <device-id>
1114     *
1115     *  @param pClient          Pointer to client instance structure.
1116     *  @param iSamplerChannel  Sampler channel number.
1117     *  @param iAudioDevice     Audio output device number identifier.
1118     */
1119    lscp_status_t lscp_set_channel_audio_device ( lscp_client_t *pClient, int iSamplerChannel, int iAudioDevice )
1120    {
1121        char szQuery[LSCP_BUFSIZ];
1122    
1123        if (iSamplerChannel < 0 || iAudioDevice < 0)
1124            return LSCP_FAILED;
1125    
1126        sprintf(szQuery, "SET CHANNEL AUDIO_OUTPUT_DEVICE %d %d\r\n", iSamplerChannel, iAudioDevice);
1127        return lscp_client_query(pClient, szQuery);
1128    }
1129    
1130    
1131    /**
1132   *  Setting audio output channel:   *  Setting audio output channel:
1133   *  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>
1134   *   *
# Line 1110  lscp_status_t lscp_set_channel_midi_type Line 1172  lscp_status_t lscp_set_channel_midi_type
1172      return lscp_client_query(pClient, szQuery);      return lscp_client_query(pClient, szQuery);
1173  }  }
1174    
1175    
1176    /**
1177     *  Setting MIDI input device:
1178     *  SET CHANNEL MIDI_INPUT_DEVICE <sampler-channel> <device-id>
1179     *
1180     *  @param pClient          Pointer to client instance structure.
1181     *  @param iSamplerChannel  Sampler channel number.
1182     *  @param iMidiDevice      MIDI input device number identifier.
1183     */
1184    lscp_status_t lscp_set_channel_midi_device ( lscp_client_t *pClient, int iSamplerChannel, int iMidiDevice )
1185    {
1186        char szQuery[LSCP_BUFSIZ];
1187    
1188        if (iSamplerChannel < 0 || iMidiDevice < 0)
1189            return LSCP_FAILED;
1190    
1191        sprintf(szQuery, "SET CHANNEL MIDI_INPUT_DEVICE %d %d\r\n", iSamplerChannel, iMidiDevice);
1192        return lscp_client_query(pClient, szQuery);
1193    }
1194    
1195    
1196  /**  /**
1197   *  Setting MIDI input port:   *  Setting MIDI input port:
Legend:
Removed from v.107  
changed lines
  Added in v.146
  ViewVC Help
Powered by ViewVC