/[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 132 by capela, Fri Jun 18 14:19:19 2004 UTC revision 171 by capela, Mon Jul 5 16:26:44 2004 UTC
# Line 28  Line 28 
28    
29  // Local prototypes.  // Local prototypes.
30    
31  static void _lscp_client_evt_proc   (void *pvClient);  static void             _lscp_client_evt_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);
35    
36    
37  //-------------------------------------------------------------------------  //-------------------------------------------------------------------------
# Line 37  static void _lscp_client_evt_proc   (voi Line 40  static void _lscp_client_evt_proc   (voi
40  static void _lscp_client_evt_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_evt_proc: Client waiting for events.\n");      fprintf(stderr, "_lscp_client_evt_proc: Client waiting for events.\n");
53  #endif  #endif
54    
55      while (pClient->evt.iState) {      while (pClient->evt.iState) {
56          cAddr = sizeof(struct sockaddr_in);          // Wait for event...
57          cchBuffer = recvfrom(pClient->evt.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_evt_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->evt.sock, achBuffer, cchBuffer, 0, (struct sockaddr *) &addr, cAddr) < cchBuffer)                              pszToken,
76                              lscp_socket_perror("_lscp_client_evt_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->evt.iState = 0;  
                 }  
81              }              }
82          } else {          } else {
83              lscp_socket_perror("_lscp_client_evt_proc: recvfrom");              lscp_socket_perror("_lscp_client_evt_proc: recv");
84              pClient->evt.iState = 0;              pClient->evt.iState = 0;
85          }          }
86      }      }
# Line 100  static void _lscp_client_evt_proc ( void Line 92  static void _lscp_client_evt_proc ( void
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
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    
175    //-------------------------------------------------------------------------
176  // Client versioning teller fuunction.  // Client versioning teller fuunction.
177    
178    
# Line 137  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 197  lscp_client_t* lscp_client_create ( cons Line 272  lscp_client_t* lscp_client_create ( cons
272          return NULL;          return NULL;
273      }      }
274    
275        // Initialize the command socket agent struct...
276      lscp_socket_agent_init(&(pClient->cmd), sock, &addr, cAddr);      lscp_socket_agent_init(&(pClient->cmd), sock, &addr, cAddr);
277    
278  #ifdef DEBUG  #ifdef DEBUG
279      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));      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 event 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: evt: socket");  
         lscp_socket_agent_free(&(pClient->cmd));  
         free(pClient);  
         return NULL;  
     }  
   
     if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (char *) &iSockOpt, sizeof(int)) == SOCKET_ERROR)  
         lscp_socket_perror("lscp_client_create: evt: setsockopt(SO_REUSEADDR)");  
   
 #ifdef DEBUG  
     lscp_socket_getopts("lscp_client_create: evt", 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: evt: bind");  
         lscp_socket_agent_free(&(pClient->cmd));  
         closesocket(sock);  
         free(pClient);  
         return NULL;  
     }  
   
     if (getsockname(sock, (struct sockaddr *) &addr, &cAddr) == SOCKET_ERROR) {  
         lscp_socket_perror("lscp_client_create: evt: getsockname");  
         lscp_socket_agent_free(&(pClient->cmd));  
         closesocket(sock);  
         free(pClient);  
         return NULL;  
     }  
   
     lscp_socket_agent_init(&(pClient->evt), sock, &addr, cAddr);  
   
 #ifdef DEBUG  
     fprintf(stderr, "lscp_client_create: evt: pClient=%p: sock=%d addr=%s port=%d.\n", pClient, pClient->evt.sock, inet_ntoa(pClient->evt.addr.sin_addr), ntohs(pClient->evt.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;
# Line 257  lscp_client_t* lscp_client_create ( cons Line 290  lscp_client_t* lscp_client_create ( cons
290      pClient->midi_devices = NULL;      pClient->midi_devices = NULL;
291      pClient->engines = NULL;      pClient->engines = NULL;
292      pClient->channels = NULL;      pClient->channels = NULL;
293      lscp_driver_info_init(&(pClient->audio_info));      lscp_driver_info_init(&(pClient->audio_driver_info));
294      lscp_driver_info_init(&(pClient->midi_info));      lscp_driver_info_init(&(pClient->midi_driver_info));
295        lscp_device_info_init(&(pClient->audio_device_info));
296        lscp_device_info_init(&(pClient->midi_device_info));
297        lscp_param_info_init(&(pClient->audio_param_info));
298        lscp_param_info_init(&(pClient->midi_param_info));
299        lscp_device_port_info_init(&(pClient->audio_channel_info));
300        lscp_device_port_info_init(&(pClient->midi_port_info));
301        lscp_param_info_init(&(pClient->audio_channel_param_info));
302        lscp_param_info_init(&(pClient->midi_port_param_info));
303      lscp_engine_info_init(&(pClient->engine_info));      lscp_engine_info_init(&(pClient->engine_info));
304      lscp_channel_info_init(&(pClient->channel_info));      lscp_channel_info_init(&(pClient->channel_info));
305      // Initialize error stuff.      // Initialize error stuff.
# Line 273  lscp_client_t* lscp_client_create ( cons Line 314  lscp_client_t* lscp_client_create ( cons
314      // Initialize the transaction mutex.      // Initialize the transaction mutex.
315      lscp_mutex_init(pClient->mutex);      lscp_mutex_init(pClient->mutex);
316    
     // Now's finally time to startup threads...  
     // Event service thread...  
     if (lscp_socket_agent_start(&(pClient->evt), _lscp_client_evt_proc, pClient, 0) != LSCP_OK) {  
         lscp_socket_agent_free(&(pClient->cmd));  
         lscp_socket_agent_free(&(pClient->evt));  
         lscp_mutex_destroy(pClient->mutex);  
         free(pClient);  
         return NULL;  
     }  
   
317      // Finally we've some success...      // Finally we've some success...
318      return pClient;      return pClient;
319  }  }
# Line 328  lscp_status_t lscp_client_destroy ( lscp Line 359  lscp_status_t lscp_client_destroy ( lscp
359      // Lock this section up.      // Lock this section up.
360      lscp_mutex_lock(pClient->mutex);      lscp_mutex_lock(pClient->mutex);
361            
    // Free session-id, if any.  
     if (pClient->sessid)  
         free(pClient->sessid);  
     pClient->sessid = NULL;  
362      // Free up all cached members.      // Free up all cached members.
363      lscp_channel_info_reset(&(pClient->channel_info));      lscp_channel_info_reset(&(pClient->channel_info));
364      lscp_engine_info_reset(&(pClient->engine_info));      lscp_engine_info_reset(&(pClient->engine_info));
365      lscp_driver_info_reset(&(pClient->midi_info));      lscp_param_info_reset(&(pClient->midi_port_param_info));
366      lscp_driver_info_reset(&(pClient->audio_info));      lscp_param_info_reset(&(pClient->audio_channel_param_info));
367        lscp_device_port_info_reset(&(pClient->midi_port_info));
368        lscp_device_port_info_reset(&(pClient->audio_channel_info));
369        lscp_param_info_reset(&(pClient->midi_param_info));
370        lscp_param_info_reset(&(pClient->audio_param_info));
371        lscp_device_info_reset(&(pClient->midi_device_info));
372        lscp_device_info_reset(&(pClient->audio_device_info));
373        lscp_driver_info_reset(&(pClient->midi_driver_info));
374        lscp_driver_info_reset(&(pClient->audio_driver_info));
375      // Free available engine table.      // Free available engine table.
376      lscp_szsplit_destroy(pClient->audio_drivers);      lscp_szsplit_destroy(pClient->audio_drivers);
377      lscp_szsplit_destroy(pClient->midi_drivers);      lscp_szsplit_destroy(pClient->midi_drivers);
# Line 350  lscp_status_t lscp_client_destroy ( lscp Line 385  lscp_status_t lscp_client_destroy ( lscp
385      pClient->engines = NULL;      pClient->engines = NULL;
386      // Free result error stuff.      // Free result error stuff.
387      lscp_client_set_result(pClient, NULL, 0);      lscp_client_set_result(pClient, NULL, 0);
388      // Frre stream usage stuff.      // Free stream usage stuff.
389      if (pClient->buffer_fill)      if (pClient->buffer_fill)
390          free(pClient->buffer_fill);          free(pClient->buffer_fill);
391      pClient->buffer_fill = NULL;      pClient->buffer_fill = NULL;
# Line 478  int lscp_client_get_errno ( lscp_client_ Line 513  int lscp_client_get_errno ( lscp_client_
513  // Client registration protocol functions.  // Client registration protocol functions.
514    
515  /**  /**
516   *  Register frontend for receiving UDP event messages:   *  Register frontend for receiving event messages:
517   *  SUBSCRIBE NOTIFICATION <udp-port>   *  SUBSCRIBE CHANNELS | VOICE_COUNT | STREAM_COUNT | BUFFER_FILL
518     *      | CHANNEL_INFO | MISCELLANEOUS
519   *   *
520   *  @param pClient  Pointer to client instance structure.   *  @param pClient  Pointer to client instance structure.
521     *  @param events   Bit-wise OR'ed event flags to subscribe.
522   *   *
523   *  @returns LSCP_OK on success, LSCP_FAILED otherwise.   *  @returns LSCP_OK on success, LSCP_FAILED otherwise.
524   */   */
525  lscp_status_t lscp_client_subscribe ( lscp_client_t *pClient )  lscp_status_t lscp_client_subscribe ( lscp_client_t *pClient, lscp_event_t events )
526  {  {
527      lscp_status_t ret;      lscp_status_t ret = LSCP_FAILED;
     char szQuery[LSCP_BUFSIZ];  
     const char *pszResult;  
     const char *pszSeps = "[]";  
     char *pszToken;  
     char *pch;  
528    
529      if (pClient == NULL || pClient->sessid)      if (pClient == NULL)
530          return LSCP_FAILED;          return LSCP_FAILED;
531    
532      // Lock this section up.      // Lock this section up.
533      lscp_mutex_lock(pClient->mutex);      lscp_mutex_lock(pClient->mutex);
534    
535        // If applicable, start the alternate connection...
536        if (pClient->events == LSCP_EVENT_NONE)
537            ret = _lscp_client_evt_connect(pClient);
538            
539      sprintf(szQuery, "SUBSCRIBE NOTIFICATION %d\r\n", ntohs(pClient->evt.addr.sin_port));      // Send the subscription commands.
540      ret = lscp_client_call(pClient, szQuery);      if (ret == LSCP_OK && (events & LSCP_EVENT_CHANNELS))
541      if (ret == LSCP_OK) {          ret = _lscp_client_evt_request(pClient, 1, LSCP_EVENT_CHANNELS);
542          pszResult = lscp_client_get_result(pClient);      if (ret == LSCP_OK && (events & LSCP_EVENT_VOICE_COUNT))
543  #ifdef DEBUG          ret = _lscp_client_evt_request(pClient, 1, LSCP_EVENT_VOICE_COUNT);
544          fprintf(stderr, "lscp_client_subscribe: %s\n", pszResult);      if (ret == LSCP_OK && (events & LSCP_EVENT_STREAM_COUNT))
545  #endif          ret = _lscp_client_evt_request(pClient, 1, LSCP_EVENT_STREAM_COUNT);
546          // Check for the session-id on "OK[sessid]" response.      if (ret == LSCP_OK && (events & LSCP_EVENT_BUFFER_FILL))
547          pszToken = lscp_strtok((char *) pszResult, pszSeps, &(pch));          ret = _lscp_client_evt_request(pClient, 1, LSCP_EVENT_BUFFER_FILL);
548          if (pszToken && strcasecmp(pszToken, "OK") == 0) {      if (ret == LSCP_OK && (events & LSCP_EVENT_CHANNEL_INFO))
549              pszToken = lscp_strtok(NULL, pszSeps, &(pch));          ret = _lscp_client_evt_request(pClient, 1, LSCP_EVENT_CHANNEL_INFO);
550              if (pszToken)      if (ret == LSCP_OK && (events & LSCP_EVENT_MISCELLANEOUS))
551                  pClient->sessid = strdup(pszToken);          ret = _lscp_client_evt_request(pClient, 1, LSCP_EVENT_MISCELLANEOUS);
         }  
     }  
552    
553      // Unlock this section down.      // Unlock this section down.
554      lscp_mutex_unlock(pClient->mutex);      lscp_mutex_unlock(pClient->mutex);
# Line 524  lscp_status_t lscp_client_subscribe ( ls Line 558  lscp_status_t lscp_client_subscribe ( ls
558    
559    
560  /**  /**
561   *  Deregister frontend for not receiving UDP event messages anymore:   *  Deregister frontend from receiving UDP event messages anymore:
562   *  UNSUBSCRIBE NOTIFICATION <session-id>   *  SUBSCRIBE CHANNELS | VOICE_COUNT | STREAM_COUNT | BUFFER_FILL
563     *      | CHANNEL_INFO | MISCELLANEOUS
564   *   *
565   *  @param pClient  Pointer to client instance structure.   *  @param pClient  Pointer to client instance structure.
566     *  @param events   Bit-wise OR'ed event flags to unsubscribe.
567   *   *
568   *  @returns LSCP_OK on success, LSCP_FAILED otherwise.   *  @returns LSCP_OK on success, LSCP_FAILED otherwise.
569   */   */
570  lscp_status_t lscp_client_unsubscribe ( lscp_client_t *pClient )  lscp_status_t lscp_client_unsubscribe ( lscp_client_t *pClient, lscp_event_t events )
571  {  {
572      lscp_status_t ret;      lscp_status_t ret = LSCP_OK;
     char szQuery[LSCP_BUFSIZ];  
573    
574      if (pClient == NULL)      if (pClient == NULL)
575          return LSCP_FAILED;          return LSCP_FAILED;
     if (pClient->sessid == NULL)  
         return LSCP_FAILED;  
576    
577      // Lock this section up.      // Lock this section up.
578      lscp_mutex_lock(pClient->mutex);      lscp_mutex_lock(pClient->mutex);
579    
580      sprintf(szQuery, "UNSUBSCRIBE NOTIFICATION %s\n\n", pClient->sessid);      // Send the unsubscription commands.
581      ret = lscp_client_call(pClient, szQuery);      if (ret == LSCP_OK && (events & LSCP_EVENT_CHANNELS))
582      if (ret == LSCP_OK) {          ret = _lscp_client_evt_request(pClient, 0, LSCP_EVENT_CHANNELS);
583  #ifdef DEBUG      if (ret == LSCP_OK && (events & LSCP_EVENT_VOICE_COUNT))
584          fprintf(stderr, "lscp_client_unsubscribe: %s\n", lscp_client_get_result(pClient));          ret = _lscp_client_evt_request(pClient, 0, LSCP_EVENT_VOICE_COUNT);
585  #endif      if (ret == LSCP_OK && (events & LSCP_EVENT_STREAM_COUNT))
586          // Bail out session-id string.          ret = _lscp_client_evt_request(pClient, 0, LSCP_EVENT_STREAM_COUNT);
587          free(pClient->sessid);      if (ret == LSCP_OK && (events & LSCP_EVENT_BUFFER_FILL))
588          pClient->sessid = NULL;          ret = _lscp_client_evt_request(pClient, 0, LSCP_EVENT_BUFFER_FILL);
589      }      if (ret == LSCP_OK && (events & LSCP_EVENT_CHANNEL_INFO))
590            ret = _lscp_client_evt_request(pClient, 0, LSCP_EVENT_CHANNEL_INFO);
591        if (ret == LSCP_OK && (events & LSCP_EVENT_MISCELLANEOUS))
592            ret = _lscp_client_evt_request(pClient, 0, LSCP_EVENT_MISCELLANEOUS);
593    
594        // If necessary, close the alternate connection...
595        if (pClient->events == LSCP_EVENT_NONE)
596            lscp_socket_agent_free(&(pClient->evt));
597    
598      // Unlock this section down.      // Unlock this section down.
599      lscp_mutex_unlock(pClient->mutex);      lscp_mutex_unlock(pClient->mutex);
# Line 583  lscp_status_t lscp_load_instrument ( lsc Line 623  lscp_status_t lscp_load_instrument ( lsc
623      if (pszFileName == NULL || iSamplerChannel < 0)      if (pszFileName == NULL || iSamplerChannel < 0)
624          return LSCP_FAILED;          return LSCP_FAILED;
625    
626      sprintf(szQuery, "LOAD INSTRUMENT %s %d %d\r\n", pszFileName, iInstrIndex, iSamplerChannel);      sprintf(szQuery, "LOAD INSTRUMENT '%s' %d %d\r\n", pszFileName, iInstrIndex, iSamplerChannel);
627        return lscp_client_query(pClient, szQuery);
628    }
629    
630    
631    /**
632     *  Loading an instrument in the background (non modal):
633     *  LOAD INSTRUMENT NON_MODAL <filename> <instr-index> <sampler-channel>
634     *
635     *  @param pClient          Pointer to client instance structure.
636     *  @param pszFileName      Instrument file name.
637     *  @param iInstrIndex      Instrument index number.
638     *  @param iSamplerChannel  Sampler Channel.
639     *
640     *  @returns LSCP_OK on success, LSCP_FAILED otherwise.
641     */
642    lscp_status_t lscp_load_instrument_non_modal ( lscp_client_t *pClient, const char *pszFileName, int iInstrIndex, int iSamplerChannel )
643    {
644        char szQuery[LSCP_BUFSIZ];
645    
646        if (pszFileName == NULL || iSamplerChannel < 0)
647            return LSCP_FAILED;
648    
649        sprintf(szQuery, "LOAD INSTRUMENT NON_MODAL '%s' %d %d\r\n", pszFileName, iInstrIndex, iSamplerChannel);
650      return lscp_client_query(pClient, szQuery);      return lscp_client_query(pClient, szQuery);
651  }  }
652    
# Line 940  int lscp_get_channel_voice_count ( lscp_ Line 1003  int lscp_get_channel_voice_count ( lscp_
1003   *  Current number of active disk streams:   *  Current number of active disk streams:
1004   *  GET CHANNEL STREAM_COUNT <sampler-channel>   *  GET CHANNEL STREAM_COUNT <sampler-channel>
1005   *   *
1006     *  @param pClient          Pointer to client instance structure.
1007     *  @param iSamplerChannel  Sampler channel number.
1008     *
1009   *  @returns The number of active disk streams on success, -1 otherwise.   *  @returns The number of active disk streams on success, -1 otherwise.
1010   */   */
1011  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 965  int lscp_get_channel_stream_count ( lscp Line 1031  int lscp_get_channel_stream_count ( lscp
1031    
1032    
1033  /**  /**
1034     *  Current least usage of active disk streams.
1035     *
1036     *  @param pClient          Pointer to client instance structure.
1037     *  @param iSamplerChannel  Sampler channel number.
1038     *
1039     *  @returns The usage percentage of the least filled active disk stream
1040     *  on success, -1 otherwise.
1041     */
1042    int lscp_get_channel_stream_usage ( lscp_client_t *pClient, int iSamplerChannel )
1043    {
1044        char szQuery[LSCP_BUFSIZ];
1045        int  iStreamUsage = -1;
1046        const char *pszResult;
1047        const char *pszSeps = "[]%,";
1048        char *pszToken;
1049        char *pch;
1050        int   iStream;
1051        int   iPercent;
1052    
1053        if (iSamplerChannel < 0)
1054            return iStreamUsage;
1055    
1056        // Lock this section up.
1057        lscp_mutex_lock(pClient->mutex);
1058    
1059        iStream = 0;
1060        sprintf(szQuery, "GET CHANNEL BUFFER_FILL PERCENTAGE %d\r\n", iSamplerChannel);
1061        if (lscp_client_call(pClient, szQuery) == LSCP_OK) {
1062            pszResult = lscp_client_get_result(pClient);
1063            pszToken = lscp_strtok((char *) pszResult, pszSeps, &(pch));
1064            while (pszToken) {
1065                if (*pszToken) {
1066                    // Skip stream id.
1067                    pszToken = lscp_strtok(NULL, pszSeps, &(pch));
1068                    if (pszToken == NULL)
1069                        break;
1070                    // Get least buffer fill percentage.
1071                    iPercent = atol(pszToken);
1072                    if (iStreamUsage > iPercent || iStream == 0)
1073                        iStreamUsage = iPercent;
1074                    iStream++;
1075                }
1076                pszToken = lscp_strtok(NULL, pszSeps, &(pch));
1077            }
1078        }
1079    
1080        // Unlock this section down.
1081        lscp_mutex_unlock(pClient->mutex);
1082    
1083        return iStreamUsage;
1084    }
1085    
1086    
1087    /**
1088   *  Current fill state of disk stream buffers:   *  Current fill state of disk stream buffers:
1089   *  GET CHANNEL BUFFER_FILL {BYTES|PERCENTAGE} <sampler-channel>   *  GET CHANNEL BUFFER_FILL {BYTES|PERCENTAGE} <sampler-channel>
1090   *   *
# Line 1062  lscp_status_t lscp_set_channel_audio_typ Line 1182  lscp_status_t lscp_set_channel_audio_typ
1182    
1183    
1184  /**  /**
1185     *  Setting audio output device:
1186     *  SET CHANNEL AUDIO_OUTPUT_DEVICE <sampler-channel> <device-id>
1187     *
1188     *  @param pClient          Pointer to client instance structure.
1189     *  @param iSamplerChannel  Sampler channel number.
1190     *  @param iAudioDevice     Audio output device number identifier.
1191     */
1192    lscp_status_t lscp_set_channel_audio_device ( lscp_client_t *pClient, int iSamplerChannel, int iAudioDevice )
1193    {
1194        char szQuery[LSCP_BUFSIZ];
1195    
1196        if (iSamplerChannel < 0 || iAudioDevice < 0)
1197            return LSCP_FAILED;
1198    
1199        sprintf(szQuery, "SET CHANNEL AUDIO_OUTPUT_DEVICE %d %d\r\n", iSamplerChannel, iAudioDevice);
1200        return lscp_client_query(pClient, szQuery);
1201    }
1202    
1203    
1204    /**
1205   *  Setting audio output channel:   *  Setting audio output channel:
1206   *  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>
1207   *   *
# Line 1105  lscp_status_t lscp_set_channel_midi_type Line 1245  lscp_status_t lscp_set_channel_midi_type
1245      return lscp_client_query(pClient, szQuery);      return lscp_client_query(pClient, szQuery);
1246  }  }
1247    
1248    
1249    /**
1250     *  Setting MIDI input device:
1251     *  SET CHANNEL MIDI_INPUT_DEVICE <sampler-channel> <device-id>
1252     *
1253     *  @param pClient          Pointer to client instance structure.
1254     *  @param iSamplerChannel  Sampler channel number.
1255     *  @param iMidiDevice      MIDI input device number identifier.
1256     */
1257    lscp_status_t lscp_set_channel_midi_device ( lscp_client_t *pClient, int iSamplerChannel, int iMidiDevice )
1258    {
1259        char szQuery[LSCP_BUFSIZ];
1260    
1261        if (iSamplerChannel < 0 || iMidiDevice < 0)
1262            return LSCP_FAILED;
1263    
1264        sprintf(szQuery, "SET CHANNEL MIDI_INPUT_DEVICE %d %d\r\n", iSamplerChannel, iMidiDevice);
1265        return lscp_client_query(pClient, szQuery);
1266    }
1267    
1268    
1269  /**  /**
1270   *  Setting MIDI input port:   *  Setting MIDI input port:
Legend:
Removed from v.132  
changed lines
  Added in v.171
  ViewVC Help
Powered by ViewVC