/[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 146 by capela, Fri Jun 25 12:00:25 2004 UTC revision 179 by capela, Tue Jul 6 16:24:41 2004 UTC
# Line 40  static lscp_status_t    _lscp_client_evt Line 40  static lscp_status_t    _lscp_client_evt
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;
43      char  achBuffer[LSCP_BUFSIZ];      
44      int   cchBuffer;      fd_set fds;                         // File descriptor list for select().
45        int    fd, fdmax;                   // Maximum file descriptor number.
46        struct timeval tv;                  // For specifying a timeout value.
47        int    iSelect;                     // Holds select return status.
48        int    iTimeout;
49        
50        char   achBuffer[LSCP_BUFSIZ];
51        int    cchBuffer;
52      const char *pszSeps = ":\r\n";      const char *pszSeps = ":\r\n";
53      char *pszToken;      char * pszToken;
54      char *pch;      char * pch;
55      int   cchToken;      int     cchToken;
56      lscp_event_t event;      lscp_event_t event;
57    
58  #ifdef DEBUG  #ifdef DEBUG
# Line 53  static void _lscp_client_evt_proc ( void Line 60  static void _lscp_client_evt_proc ( void
60  #endif  #endif
61    
62      while (pClient->evt.iState) {      while (pClient->evt.iState) {
63    
64            // Prepare for waiting on select...
65            fd = (int) pClient->evt.sock;
66            FD_ZERO(&fds);
67            FD_SET((unsigned int) fd, &fds);
68            fdmax = fd;
69    
70            // Use the timeout (x10) select feature ...
71            iTimeout = 10 * pClient->iTimeout;
72            if (iTimeout > 1000) {
73                tv.tv_sec = iTimeout / 1000;
74                iTimeout -= tv.tv_sec * 1000;
75            }
76            else tv.tv_sec = 0;
77            tv.tv_usec = iTimeout * 1000;
78    
79          // Wait for event...          // Wait for event...
80          cchBuffer = recv(pClient->evt.sock, achBuffer, sizeof(achBuffer), 0);          iSelect = select(fdmax + 1, &fds, NULL, NULL, &tv);
81          if (cchBuffer > 0) {          if (iSelect > 0 && FD_ISSET(fd, &fds)) {
82              // Make sure received buffer it's null terminated.              // May recv now...
83              achBuffer[cchBuffer] = (char) 0;              cchBuffer = recv(pClient->evt.sock, achBuffer, sizeof(achBuffer), 0);
84              // Parse for the notification event message...              if (cchBuffer > 0) {
85              pszToken = lscp_strtok(achBuffer, pszSeps, &(pch)); // Have "NOTIFY".                  // Make sure received buffer it's null terminated.
86              if (strcasecmp(pszToken, "NOTIFY") == 0) {                  achBuffer[cchBuffer] = (char) 0;
87                  pszToken = lscp_strtok(NULL, pszSeps, &(pch));                  // Parse for the notification event message...
88                  event    = lscp_event_from_text(pszToken);                  pszToken = lscp_strtok(achBuffer, pszSeps, &(pch)); // Have "NOTIFY".
89                  // And pick the rest of data...                  if (strcasecmp(pszToken, "NOTIFY") == 0) {
90                  pszToken = lscp_strtok(NULL, pszSeps, &(pch));                      pszToken = lscp_strtok(NULL, pszSeps, &(pch));
91                  cchToken = (pszToken == NULL ? 0 : strlen(pszToken));                      event    = lscp_event_from_text(pszToken);
92                  // Double-check if we're really up to it...                      // And pick the rest of data...
93                  if (pClient->events & event) {                      pszToken = lscp_strtok(NULL, pszSeps, &(pch));
94                      // Invoke the client event callback...                      cchToken = (pszToken == NULL ? 0 : strlen(pszToken));
95                      if ((*pClient->pfnCallback)(                      // Double-check if we're really up to it...
96                              pClient,                      if (pClient->events & event) {
97                              event,                          // Invoke the client event callback...
98                              pszToken,                          if ((*pClient->pfnCallback)(
99                              cchToken,                                  pClient,
100                              pClient->pvData) != LSCP_OK) {                                  event,
101                          pClient->evt.iState = 0;                                  pszToken,
102                                    cchToken,
103                                    pClient->pvData) != LSCP_OK) {
104                                pClient->evt.iState = 0;
105                            }
106                      }                      }
107                  }                  }
108                } else {
109                    lscp_socket_perror("_lscp_client_evt_proc: recv");
110                    pClient->evt.iState = 0;
111              }              }
112          } else {          }   // Check if select has in error.
113              lscp_socket_perror("_lscp_client_evt_proc: recv");          else if (iSelect < 0) {
114                lscp_socket_perror("_lscp_client_call: select");
115              pClient->evt.iState = 0;              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
# Line 162  static lscp_status_t _lscp_client_evt_re Line 196  static lscp_status_t _lscp_client_evt_re
196          return LSCP_FAILED;          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...      // Update as naively as we can...
203      if (iSubscribe)      if (iSubscribe)
204          pClient->events |=  event;          pClient->events |=  event;
# Line 290  lscp_client_t* lscp_client_create ( cons Line 327  lscp_client_t* lscp_client_create ( cons
327      pClient->midi_devices = NULL;      pClient->midi_devices = NULL;
328      pClient->engines = NULL;      pClient->engines = NULL;
329      pClient->channels = NULL;      pClient->channels = NULL;
330      lscp_driver_info_init(&(pClient->audio_info));      lscp_driver_info_init(&(pClient->audio_driver_info));
331      lscp_driver_info_init(&(pClient->midi_info));      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 305  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);
354    
355      // Finally we've some success...      // Finally we've some success...
356      return pClient;      return pClient;
# Line 352  lscp_status_t lscp_client_destroy ( lscp Line 398  lscp_status_t lscp_client_destroy ( lscp
398      lscp_mutex_lock(pClient->mutex);      lscp_mutex_lock(pClient->mutex);
399            
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);
# Line 369  lscp_status_t lscp_client_destroy ( lscp Line 423  lscp_status_t lscp_client_destroy ( lscp
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 383  lscp_status_t lscp_client_destroy ( lscp Line 437  lscp_status_t lscp_client_destroy ( lscp
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);      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 987  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 1011  int lscp_get_channel_stream_count ( lscp Line 1069  int lscp_get_channel_stream_count ( lscp
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>

Legend:
Removed from v.146  
changed lines
  Added in v.179

  ViewVC Help
Powered by ViewVC