/[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 177 by capela, Tue Jul 6 14:06:17 2004 UTC revision 623 by capela, Thu Jun 9 10:37:19 2005 UTC
# Line 2  Line 2 
2  //  //
3  /****************************************************************************  /****************************************************************************
4     liblscp - LinuxSampler Control Protocol API     liblscp - LinuxSampler Control Protocol API
5     Copyright (C) 2004, rncbc aka Rui Nuno Capela. All rights reserved.     Copyright (C) 2004-2005, rncbc aka Rui Nuno Capela. All rights reserved.
6    
7     This library is free software; you can redistribute it and/or     This library is free software; you can redistribute it and/or
8     modify it under the terms of the GNU Lesser General Public     modify it under the terms of the GNU Lesser General Public
# Line 14  Line 14 
14     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15     Lesser General Public License for more details.     Lesser General Public License for more details.
16    
17     You should have received a copy of the GNU Lesser General Public     You should 14have received a copy of the GNU Lesser General Public
18     License along with this library; if not, write to the Free Software     License along with this library; if not, write to the Free Software
19     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
20    
# 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        
44      fd_set fds;                         // File descriptor list for select().      fd_set fds;                         // File descriptor list for select().
45      int    fd, fdmax;                   // Maximum file descriptor number.      int    fd, fdmax;                   // Maximum file descriptor number.
46      struct timeval tv;                  // For specifying a timeout value.      struct timeval tv;                  // For specifying a timeout value.
47      int    iSelect;                     // Holds select return status.      int    iSelect;                     // Holds select return status.
48      int    iTimeout;      int    iTimeout;
49        
50      char   achBuffer[LSCP_BUFSIZ];      char   achBuffer[LSCP_BUFSIZ];
51      int    cchBuffer;      int    cchBuffer;
52      const char *pszSeps = ":\r\n";      const char *pszSeps = ":\r\n";
# Line 111  static void _lscp_client_evt_proc ( void Line 111  static void _lscp_client_evt_proc ( void
111              }              }
112          }   // Check if select has in error.          }   // Check if select has in error.
113          else if (iSelect < 0) {          else if (iSelect < 0) {
114              lscp_socket_perror("_lscp_client_call: select");              lscp_socket_perror("_lscp_client_evt_proc: select");
115              pClient->evt.iState = 0;              pClient->evt.iState = 0;
116          }          }
117            
118          // Finally, always signal the event.          // Finally, always signal the event.
119          lscp_cond_signal(pClient->cond);          lscp_cond_signal(pClient->cond);
120      }      }
# Line 164  static lscp_status_t _lscp_client_evt_co Line 164  static lscp_status_t _lscp_client_evt_co
164          closesocket(sock);          closesocket(sock);
165          return LSCP_FAILED;          return LSCP_FAILED;
166      }      }
167        
168      // Set our socket agent struct...      // Set our socket agent struct...
169      lscp_socket_agent_init(&(pClient->evt), sock, &addr, cAddr);      lscp_socket_agent_init(&(pClient->evt), sock, &addr, cAddr);
170        
171      // And finally the service thread...      // And finally the service thread...
172      return lscp_socket_agent_start(&(pClient->evt), _lscp_client_evt_proc, pClient, 0);      return lscp_socket_agent_start(&(pClient->evt), _lscp_client_evt_proc, pClient, 0);
173  }  }
# Line 198  static lscp_status_t _lscp_client_evt_re Line 198  static lscp_status_t _lscp_client_evt_re
198    
199      // Wait on response.      // Wait on response.
200      lscp_cond_wait(pClient->cond, pClient->mutex);      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 337  lscp_client_t* lscp_client_create ( cons Line 337  lscp_client_t* lscp_client_create ( cons
337      lscp_device_port_info_init(&(pClient->midi_port_info));      lscp_device_port_info_init(&(pClient->midi_port_info));
338      lscp_param_info_init(&(pClient->audio_channel_param_info));      lscp_param_info_init(&(pClient->audio_channel_param_info));
339      lscp_param_info_init(&(pClient->midi_port_param_info));      lscp_param_info_init(&(pClient->midi_port_param_info));
340        lscp_server_info_init(&(pClient->server_info));
341      lscp_engine_info_init(&(pClient->engine_info));      lscp_engine_info_init(&(pClient->engine_info));
342      lscp_channel_info_init(&(pClient->channel_info));      lscp_channel_info_init(&(pClient->channel_info));
343      // Initialize error stuff.      // Initialize error stuff.
# Line 347  lscp_client_t* lscp_client_create ( cons Line 348  lscp_client_t* lscp_client_create ( cons
348      pClient->iStreamCount = 0;      pClient->iStreamCount = 0;
349      // Default timeout value.      // Default timeout value.
350      pClient->iTimeout = LSCP_TIMEOUT_MSECS;      pClient->iTimeout = LSCP_TIMEOUT_MSECS;
351        pClient->iTimeoutCount = 0;
352    
353      // Initialize the transaction mutex.      // Initialize the transaction mutex.
354      lscp_mutex_init(pClient->mutex);      lscp_mutex_init(pClient->mutex);
# Line 396  lscp_status_t lscp_client_destroy ( lscp Line 398  lscp_status_t lscp_client_destroy ( lscp
398    
399      // Lock this section up.      // Lock this section up.
400      lscp_mutex_lock(pClient->mutex);      lscp_mutex_lock(pClient->mutex);
401        
402      // Free up all cached members.      // Free up all cached members.
403      lscp_channel_info_reset(&(pClient->channel_info));      lscp_channel_info_free(&(pClient->channel_info));
404      lscp_engine_info_reset(&(pClient->engine_info));      lscp_engine_info_free(&(pClient->engine_info));
405      lscp_param_info_reset(&(pClient->midi_port_param_info));      lscp_server_info_free(&(pClient->server_info));
406      lscp_param_info_reset(&(pClient->audio_channel_param_info));      lscp_param_info_free(&(pClient->midi_port_param_info));
407      lscp_device_port_info_reset(&(pClient->midi_port_info));      lscp_param_info_free(&(pClient->audio_channel_param_info));
408      lscp_device_port_info_reset(&(pClient->audio_channel_info));      lscp_device_port_info_free(&(pClient->midi_port_info));
409      lscp_param_info_reset(&(pClient->midi_param_info));      lscp_device_port_info_free(&(pClient->audio_channel_info));
410      lscp_param_info_reset(&(pClient->audio_param_info));      lscp_param_info_free(&(pClient->midi_param_info));
411      lscp_device_info_reset(&(pClient->midi_device_info));      lscp_param_info_free(&(pClient->audio_param_info));
412      lscp_device_info_reset(&(pClient->audio_device_info));      lscp_device_info_free(&(pClient->midi_device_info));
413      lscp_driver_info_reset(&(pClient->midi_driver_info));      lscp_device_info_free(&(pClient->audio_device_info));
414      lscp_driver_info_reset(&(pClient->audio_driver_info));      lscp_driver_info_free(&(pClient->midi_driver_info));
415        lscp_driver_info_free(&(pClient->audio_driver_info));
416      // Free available engine table.      // Free available engine table.
417      lscp_szsplit_destroy(pClient->audio_drivers);      lscp_szsplit_destroy(pClient->audio_drivers);
418      lscp_szsplit_destroy(pClient->midi_drivers);      lscp_szsplit_destroy(pClient->midi_drivers);
# Line 500  int lscp_client_get_timeout ( lscp_clien Line 503  int lscp_client_get_timeout ( lscp_clien
503  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 )
504  {  {
505      lscp_status_t ret;      lscp_status_t ret;
506        
507      // Lock this section up.      // Lock this section up.
508      lscp_mutex_lock(pClient->mutex);      lscp_mutex_lock(pClient->mutex);
509    
510      // Just make the now guarded call.      // Just make the now guarded call.
511      ret = lscp_client_call(pClient, pszQuery);      ret = lscp_client_call(pClient, pszQuery);
512        
513      // Unlock this section down.      // Unlock this section down.
514      lscp_mutex_unlock(pClient->mutex);      lscp_mutex_unlock(pClient->mutex);
515        
516      return ret;      return ret;
517  }  }
518    
# Line 553  int lscp_client_get_errno ( lscp_client_ Line 556  int lscp_client_get_errno ( lscp_client_
556    
557  /**  /**
558   *  Register frontend for receiving event messages:   *  Register frontend for receiving event messages:
559   *  SUBSCRIBE CHANNELS | VOICE_COUNT | STREAM_COUNT | BUFFER_FILL   *  SUBSCRIBE CHANNEL_COUNT | VOICE_COUNT | STREAM_COUNT | BUFFER_FILL
560   *      | CHANNEL_INFO | MISCELLANEOUS   *      | CHANNEL_INFO | MISCELLANEOUS
561   *   *
562   *  @param pClient  Pointer to client instance structure.   *  @param pClient  Pointer to client instance structure.
# Line 574  lscp_status_t lscp_client_subscribe ( ls Line 577  lscp_status_t lscp_client_subscribe ( ls
577      // If applicable, start the alternate connection...      // If applicable, start the alternate connection...
578      if (pClient->events == LSCP_EVENT_NONE)      if (pClient->events == LSCP_EVENT_NONE)
579          ret = _lscp_client_evt_connect(pClient);          ret = _lscp_client_evt_connect(pClient);
580        
581      // Send the subscription commands.      // Send the subscription commands.
582      if (ret == LSCP_OK && (events & LSCP_EVENT_CHANNELS))      if (ret == LSCP_OK && (events & LSCP_EVENT_CHANNEL_COUNT))
583          ret = _lscp_client_evt_request(pClient, 1, LSCP_EVENT_CHANNELS);          ret = _lscp_client_evt_request(pClient, 1, LSCP_EVENT_CHANNEL_COUNT);
584      if (ret == LSCP_OK && (events & LSCP_EVENT_VOICE_COUNT))      if (ret == LSCP_OK && (events & LSCP_EVENT_VOICE_COUNT))
585          ret = _lscp_client_evt_request(pClient, 1, LSCP_EVENT_VOICE_COUNT);          ret = _lscp_client_evt_request(pClient, 1, LSCP_EVENT_VOICE_COUNT);
586      if (ret == LSCP_OK && (events & LSCP_EVENT_STREAM_COUNT))      if (ret == LSCP_OK && (events & LSCP_EVENT_STREAM_COUNT))
# Line 598  lscp_status_t lscp_client_subscribe ( ls Line 601  lscp_status_t lscp_client_subscribe ( ls
601    
602  /**  /**
603   *  Deregister frontend from receiving UDP event messages anymore:   *  Deregister frontend from receiving UDP event messages anymore:
604   *  SUBSCRIBE CHANNELS | VOICE_COUNT | STREAM_COUNT | BUFFER_FILL   *  SUBSCRIBE CHANNEL_COUNT | VOICE_COUNT | STREAM_COUNT | BUFFER_FILL
605   *      | CHANNEL_INFO | MISCELLANEOUS   *      | CHANNEL_INFO | MISCELLANEOUS
606   *   *
607   *  @param pClient  Pointer to client instance structure.   *  @param pClient  Pointer to client instance structure.
# Line 617  lscp_status_t lscp_client_unsubscribe ( Line 620  lscp_status_t lscp_client_unsubscribe (
620      lscp_mutex_lock(pClient->mutex);      lscp_mutex_lock(pClient->mutex);
621    
622      // Send the unsubscription commands.      // Send the unsubscription commands.
623      if (ret == LSCP_OK && (events & LSCP_EVENT_CHANNELS))      if (ret == LSCP_OK && (events & LSCP_EVENT_CHANNEL_COUNT))
624          ret = _lscp_client_evt_request(pClient, 0, LSCP_EVENT_CHANNELS);          ret = _lscp_client_evt_request(pClient, 0, LSCP_EVENT_CHANNEL_COUNT);
625      if (ret == LSCP_OK && (events & LSCP_EVENT_VOICE_COUNT))      if (ret == LSCP_OK && (events & LSCP_EVENT_VOICE_COUNT))
626          ret = _lscp_client_evt_request(pClient, 0, LSCP_EVENT_VOICE_COUNT);          ret = _lscp_client_evt_request(pClient, 0, LSCP_EVENT_VOICE_COUNT);
627      if (ret == LSCP_OK && (events & LSCP_EVENT_STREAM_COUNT))      if (ret == LSCP_OK && (events & LSCP_EVENT_STREAM_COUNT))
# Line 641  lscp_status_t lscp_client_unsubscribe ( Line 644  lscp_status_t lscp_client_unsubscribe (
644  }  }
645    
646    
647    /**
648     *  Getting current subscribed events.
649     *
650     *  @param pClient  Pointer to client instance structure.
651     *
652     *  @returns The current subscrived bit-wise OR'ed event flags.
653     */
654    lscp_event_t lscp_client_get_events ( lscp_client_t *pClient )
655    {
656        if (pClient == NULL)
657            return LSCP_EVENT_NONE;
658    
659        return pClient->events;
660    }
661    
662    
663  //-------------------------------------------------------------------------  //-------------------------------------------------------------------------
664  // Client command protocol functions.  // Client command protocol functions.
665    
# Line 753  int *lscp_list_channels ( lscp_client_t Line 772  int *lscp_list_channels ( lscp_client_t
772    
773      if (pClient == NULL)      if (pClient == NULL)
774          return NULL;          return NULL;
775            
776      // Lock this section up.      // Lock this section up.
777      lscp_mutex_lock(pClient->mutex);      lscp_mutex_lock(pClient->mutex);
778    
# Line 790  int lscp_add_channel ( lscp_client_t *pC Line 809  int lscp_add_channel ( lscp_client_t *pC
809    
810      if (lscp_client_call(pClient, "ADD CHANNEL\r\n") == LSCP_OK)      if (lscp_client_call(pClient, "ADD CHANNEL\r\n") == LSCP_OK)
811          iSamplerChannel = atoi(lscp_client_get_result(pClient));          iSamplerChannel = atoi(lscp_client_get_result(pClient));
812            
813      // Unlock this section down.      // Unlock this section down.
814      lscp_mutex_unlock(pClient->mutex);      lscp_mutex_unlock(pClient->mutex);
815    
# Line 820  lscp_status_t lscp_remove_channel ( lscp Line 839  lscp_status_t lscp_remove_channel ( lscp
839    
840    
841  /**  /**
842   *  Getting all available engines:   *  Getting all available engines count:
843   *  GET AVAILABLE_ENGINES   *  GET AVAILABLE_ENGINES
844   *   *
845   *  @param pClient  Pointer to client instance structure.   *  @param pClient  Pointer to client instance structure.
846   *   *
847     *  @returns The current total number of sampler engines on success,
848     *  -1 otherwise.
849     */
850    int lscp_get_available_engines ( lscp_client_t *pClient )
851    {
852        int iAvailableEngines = -1;
853    
854        // Lock this section up.
855        lscp_mutex_lock(pClient->mutex);
856    
857        if (lscp_client_call(pClient, "GET AVAILABLE_ENGINES\r\n") == LSCP_OK)
858            iAvailableEngines = atoi(lscp_client_get_result(pClient));
859    
860        // Unlock this section down.
861        lscp_mutex_unlock(pClient->mutex);
862    
863        return iAvailableEngines;
864    }
865    
866    
867    /**
868     *  Getting all available engines:
869     *  LIST AVAILABLE_ENGINES
870     *
871     *  @param pClient  Pointer to client instance structure.
872     *
873   *  @returns A NULL terminated array of engine name strings,   *  @returns A NULL terminated array of engine name strings,
874   *  or NULL in case of failure.   *  or NULL in case of failure.
875   */   */
876  const char **lscp_get_available_engines ( lscp_client_t *pClient )  const char **lscp_list_available_engines ( lscp_client_t *pClient )
877  {  {
878      const char *pszSeps = ",";      const char *pszSeps = ",";
879    
# Line 840  const char **lscp_get_available_engines Line 885  const char **lscp_get_available_engines
885          pClient->engines = NULL;          pClient->engines = NULL;
886      }      }
887    
888      if (lscp_client_call(pClient, "GET AVAILABLE_ENGINES\r\n") == LSCP_OK)      if (lscp_client_call(pClient, "LIST AVAILABLE_ENGINES\r\n") == LSCP_OK)
889          pClient->engines = lscp_szsplit_create(lscp_client_get_result(pClient), pszSeps);          pClient->engines = lscp_szsplit_create(lscp_client_get_result(pClient), pszSeps);
890    
891      // Unlock this section down.      // Unlock this section down.
# Line 887  lscp_engine_info_t *lscp_get_engine_info Line 932  lscp_engine_info_t *lscp_get_engine_info
932              if (strcasecmp(pszToken, "DESCRIPTION") == 0) {              if (strcasecmp(pszToken, "DESCRIPTION") == 0) {
933                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
934                  if (pszToken)                  if (pszToken)
935                      pEngineInfo->description = lscp_unquote(&pszToken, 1);                      lscp_unquote_dup(&(pEngineInfo->description), &pszToken);
936              }              }
937              else if (strcasecmp(pszToken, "VERSION") == 0) {              else if (strcasecmp(pszToken, "VERSION") == 0) {
938                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
939                  if (pszToken)                  if (pszToken)
940                      pEngineInfo->version = lscp_unquote(&pszToken, 1);                      lscp_unquote_dup(&(pEngineInfo->version), &pszToken);
941              }              }
942              pszToken = lscp_strtok(NULL, pszSeps, &(pch));              pszToken = lscp_strtok(NULL, pszSeps, &(pch));
943          }          }
944      }      }
945      else pEngineInfo = NULL;      else pEngineInfo = NULL;
946        
947      // Unlock this section down.      // Unlock this section down.
948      lscp_mutex_unlock(pClient->mutex);      lscp_mutex_unlock(pClient->mutex);
949    
# Line 931  lscp_channel_info_t *lscp_get_channel_in Line 976  lscp_channel_info_t *lscp_get_channel_in
976    
977      // Lock this section up.      // Lock this section up.
978      lscp_mutex_lock(pClient->mutex);      lscp_mutex_lock(pClient->mutex);
979        
980      pChannelInfo = &(pClient->channel_info);      pChannelInfo = &(pClient->channel_info);
981      lscp_channel_info_reset(pChannelInfo);      lscp_channel_info_reset(pChannelInfo);
982    
# Line 943  lscp_channel_info_t *lscp_get_channel_in Line 988  lscp_channel_info_t *lscp_get_channel_in
988              if (strcasecmp(pszToken, "ENGINE_NAME") == 0) {              if (strcasecmp(pszToken, "ENGINE_NAME") == 0) {
989                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
990                  if (pszToken)                  if (pszToken)
991                      pChannelInfo->engine_name = lscp_unquote(&pszToken, 1);                      lscp_unquote_dup(&(pChannelInfo->engine_name), &pszToken);
992              }              }
993              else if (strcasecmp(pszToken, "AUDIO_OUTPUT_DEVICE") == 0) {              else if (strcasecmp(pszToken, "AUDIO_OUTPUT_DEVICE") == 0) {
994                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
# Line 957  lscp_channel_info_t *lscp_get_channel_in Line 1002  lscp_channel_info_t *lscp_get_channel_in
1002              }              }
1003              else if (strcasecmp(pszToken, "AUDIO_OUTPUT_ROUTING") == 0) {              else if (strcasecmp(pszToken, "AUDIO_OUTPUT_ROUTING") == 0) {
1004                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
1005                  if (pszToken)                  if (pszToken) {
1006                        if (pChannelInfo->audio_routing)
1007                            lscp_szsplit_destroy(pChannelInfo->audio_routing);
1008                      pChannelInfo->audio_routing = lscp_szsplit_create(pszToken, ",");                      pChannelInfo->audio_routing = lscp_szsplit_create(pszToken, ",");
1009                    }
1010              }              }
1011              else if (strcasecmp(pszToken, "INSTRUMENT_FILE") == 0) {              else if (strcasecmp(pszToken, "INSTRUMENT_FILE") == 0) {
1012                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
1013                  if (pszToken)                  if (pszToken)
1014                      pChannelInfo->instrument_file = lscp_unquote(&pszToken, 1);                      lscp_unquote_dup(&(pChannelInfo->instrument_file), &pszToken);
1015              }              }
1016              else if (strcasecmp(pszToken, "INSTRUMENT_NR") == 0) {              else if (strcasecmp(pszToken, "INSTRUMENT_NR") == 0) {
1017                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
1018                  if (pszToken)                  if (pszToken)
1019                      pChannelInfo->instrument_nr = atoi(lscp_ltrim(pszToken));                      pChannelInfo->instrument_nr = atoi(lscp_ltrim(pszToken));
1020              }              }
1021                else if (strcasecmp(pszToken, "INSTRUMENT_NAME") == 0) {
1022                    pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
1023                    if (pszToken)
1024                        lscp_unquote_dup(&(pChannelInfo->instrument_name), &pszToken);
1025                }
1026              else if (strcasecmp(pszToken, "INSTRUMENT_STATUS") == 0) {              else if (strcasecmp(pszToken, "INSTRUMENT_STATUS") == 0) {
1027                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
1028                  if (pszToken)                  if (pszToken)
# Line 987  lscp_channel_info_t *lscp_get_channel_in Line 1040  lscp_channel_info_t *lscp_get_channel_in
1040              }              }
1041              else if (strcasecmp(pszToken, "MIDI_INPUT_CHANNEL") == 0) {              else if (strcasecmp(pszToken, "MIDI_INPUT_CHANNEL") == 0) {
1042                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
1043                  if (pszToken)                  if (pszToken) {
1044                      pChannelInfo->midi_channel = atoi(lscp_ltrim(pszToken));                      pszToken = lscp_ltrim(pszToken);
1045                        if (strcasecmp(pszToken, "ALL") == 0)
1046                            pChannelInfo->midi_channel = LSCP_MIDI_CHANNEL_ALL;
1047                        else
1048                            pChannelInfo->midi_channel = atoi(pszToken);
1049                    }
1050              }              }
1051              else if (strcasecmp(pszToken, "VOLUME") == 0) {              else if (strcasecmp(pszToken, "VOLUME") == 0) {
1052                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
# Line 999  lscp_channel_info_t *lscp_get_channel_in Line 1057  lscp_channel_info_t *lscp_get_channel_in
1057          }          }
1058      }      }
1059      else pChannelInfo = NULL;      else pChannelInfo = NULL;
1060        
1061      // Unlock this section up.      // Unlock this section up.
1062      lscp_mutex_unlock(pClient->mutex);      lscp_mutex_unlock(pClient->mutex);
1063    
# Line 1192  lscp_buffer_fill_t *lscp_get_channel_buf Line 1250  lscp_buffer_fill_t *lscp_get_channel_buf
1250          else while (iStream < pClient->iStreamCount)          else while (iStream < pClient->iStreamCount)
1251              pBufferFill[iStream++].stream_usage = 0;              pBufferFill[iStream++].stream_usage = 0;
1252      }      }
1253        
1254      // Unlock this section down.      // Unlock this section down.
1255      lscp_mutex_unlock(pClient->mutex);      lscp_mutex_unlock(pClient->mutex);
1256    
# Line 1258  lscp_status_t lscp_set_channel_audio_cha Line 1316  lscp_status_t lscp_set_channel_audio_cha
1316      if (iSamplerChannel < 0 || iAudioOut < 0 || iAudioIn < 0)      if (iSamplerChannel < 0 || iAudioOut < 0 || iAudioIn < 0)
1317          return LSCP_FAILED;          return LSCP_FAILED;
1318    
1319      sprintf(szQuery, "SET CHANNEL AUDIO_OUTPUT_CHANNELS %d %d %d\r\n", iSamplerChannel, iAudioOut, iAudioIn);      sprintf(szQuery, "SET CHANNEL AUDIO_OUTPUT_CHANNEL %d %d %d\r\n", iSamplerChannel, iAudioOut, iAudioIn);
1320      return lscp_client_query(pClient, szQuery);      return lscp_client_query(pClient, szQuery);
1321  }  }
1322    
# Line 1333  lscp_status_t lscp_set_channel_midi_port Line 1391  lscp_status_t lscp_set_channel_midi_port
1391   *   *
1392   *  @param pClient          Pointer to client instance structure.   *  @param pClient          Pointer to client instance structure.
1393   *  @param iSamplerChannel  Sampler channel number.   *  @param iSamplerChannel  Sampler channel number.
1394   *  @param iMidiChannel     MIDI channel number to listen (1-16) or   *  @param iMidiChannel     MIDI channel address number to listen (0-15) or
1395   *                          zero (0) to listen on all channels.   *                          LSCP_MIDI_CHANNEL_ALL (16) to listen on all channels.
1396   *   *
1397   *  @returns LSCP_OK on success, LSCP_FAILED otherwise.   *  @returns LSCP_OK on success, LSCP_FAILED otherwise.
1398   */   */
# Line 1345  lscp_status_t lscp_set_channel_midi_chan Line 1403  lscp_status_t lscp_set_channel_midi_chan
1403      if (iSamplerChannel < 0 || iMidiChannel < 0 || iMidiChannel > 16)      if (iSamplerChannel < 0 || iMidiChannel < 0 || iMidiChannel > 16)
1404          return LSCP_FAILED;          return LSCP_FAILED;
1405    
1406      if (iMidiChannel > 0)      if (iMidiChannel == LSCP_MIDI_CHANNEL_ALL)
         sprintf(szQuery, "SET CHANNEL MIDI_INPUT_CHANNEL %d %d\r\n", iSamplerChannel, iMidiChannel);  
     else  
1407          sprintf(szQuery, "SET CHANNEL MIDI_INPUT_CHANNEL %d ALL\r\n", iSamplerChannel);          sprintf(szQuery, "SET CHANNEL MIDI_INPUT_CHANNEL %d ALL\r\n", iSamplerChannel);
1408        else
1409            sprintf(szQuery, "SET CHANNEL MIDI_INPUT_CHANNEL %d %d\r\n", iSamplerChannel, iMidiChannel);
1410      return lscp_client_query(pClient, szQuery);      return lscp_client_query(pClient, szQuery);
1411  }  }
1412    
# Line 1398  lscp_status_t lscp_reset_channel ( lscp_ Line 1456  lscp_status_t lscp_reset_channel ( lscp_
1456  }  }
1457    
1458    
1459    /**
1460     *  Resetting the sampler:
1461     *  RESET
1462     *
1463     *  @param pClient  Pointer to client instance structure.
1464     *
1465     *  @returns LSCP_OK on success, LSCP_FAILED otherwise.
1466     */
1467    lscp_status_t lscp_reset_sampler ( lscp_client_t *pClient )
1468    {
1469        return lscp_client_query(pClient, "RESET\r\n");
1470    }
1471    
1472    
1473    /**
1474     *  Getting information about the server.
1475     *  GET SERVER INFO
1476     *
1477     *  @param pClient  Pointer to client instance structure.
1478     *
1479     *  @returns A pointer to a @ref lscp_server_info_t structure, with all the
1480     *  information of the current connected server, or NULL in case of failure.
1481     */
1482    lscp_server_info_t *lscp_get_server_info ( lscp_client_t *pClient )
1483    {
1484        lscp_server_info_t *pServerInfo;
1485        const char *pszResult;
1486        const char *pszSeps = ":";
1487        const char *pszCrlf = "\r\n";
1488        char *pszToken;
1489        char *pch;
1490    
1491        // Lock this section up.
1492        lscp_mutex_lock(pClient->mutex);
1493    
1494        pServerInfo = &(pClient->server_info);
1495        lscp_server_info_reset(pServerInfo);
1496    
1497        if (lscp_client_call(pClient, "GET SERVER INFO\r\n") == LSCP_OK) {
1498            pszResult = lscp_client_get_result(pClient);
1499            pszToken = lscp_strtok((char *) pszResult, pszSeps, &(pch));
1500            while (pszToken) {
1501                if (strcasecmp(pszToken, "DESCRIPTION") == 0) {
1502                    pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
1503                    if (pszToken)
1504                        lscp_unquote_dup(&(pServerInfo->description), &pszToken);
1505                }
1506                else if (strcasecmp(pszToken, "VERSION") == 0) {
1507                    pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
1508                    if (pszToken)
1509                        lscp_unquote_dup(&(pServerInfo->version), &pszToken);
1510                }
1511                pszToken = lscp_strtok(NULL, pszSeps, &(pch));
1512            }
1513        }
1514        else pServerInfo = NULL;
1515    
1516        // Unlock this section down.
1517        lscp_mutex_unlock(pClient->mutex);
1518    
1519        return pServerInfo;
1520    }
1521    
1522    
1523  // end of client.c  // end of client.c
Legend:
Removed from v.177  
changed lines
  Added in v.623
  ViewVC Help
Powered by ViewVC