/[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 180 by capela, Tue Jul 6 20:20:51 2004 UTC
# Line 398  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_param_info_reset(&(pClient->midi_port_param_info));      lscp_param_info_free(&(pClient->midi_port_param_info));
404      lscp_param_info_reset(&(pClient->audio_channel_param_info));      lscp_param_info_free(&(pClient->audio_channel_param_info));
405      lscp_device_port_info_reset(&(pClient->midi_port_info));      lscp_device_port_info_free(&(pClient->midi_port_info));
406      lscp_device_port_info_reset(&(pClient->audio_channel_info));      lscp_device_port_info_free(&(pClient->audio_channel_info));
407      lscp_param_info_reset(&(pClient->midi_param_info));      lscp_param_info_free(&(pClient->midi_param_info));
408      lscp_param_info_reset(&(pClient->audio_param_info));      lscp_param_info_free(&(pClient->audio_param_info));
409      lscp_device_info_reset(&(pClient->midi_device_info));      lscp_device_info_free(&(pClient->midi_device_info));
410      lscp_device_info_reset(&(pClient->audio_device_info));      lscp_device_info_free(&(pClient->audio_device_info));
411      lscp_driver_info_reset(&(pClient->midi_driver_info));      lscp_driver_info_free(&(pClient->midi_driver_info));
412      lscp_driver_info_reset(&(pClient->audio_driver_info));      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 887  lscp_engine_info_t *lscp_get_engine_info Line 887  lscp_engine_info_t *lscp_get_engine_info
887              if (strcasecmp(pszToken, "DESCRIPTION") == 0) {              if (strcasecmp(pszToken, "DESCRIPTION") == 0) {
888                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
889                  if (pszToken)                  if (pszToken)
890                      pEngineInfo->description = lscp_unquote(&pszToken, 1);                      lscp_unquote_dup(&(pEngineInfo->description), &pszToken);
891              }              }
892              else if (strcasecmp(pszToken, "VERSION") == 0) {              else if (strcasecmp(pszToken, "VERSION") == 0) {
893                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
894                  if (pszToken)                  if (pszToken)
895                      pEngineInfo->version = lscp_unquote(&pszToken, 1);                      lscp_unquote_dup(&(pEngineInfo->version), &pszToken);
896              }              }
897              pszToken = lscp_strtok(NULL, pszSeps, &(pch));              pszToken = lscp_strtok(NULL, pszSeps, &(pch));
898          }          }
# Line 943  lscp_channel_info_t *lscp_get_channel_in Line 943  lscp_channel_info_t *lscp_get_channel_in
943              if (strcasecmp(pszToken, "ENGINE_NAME") == 0) {              if (strcasecmp(pszToken, "ENGINE_NAME") == 0) {
944                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
945                  if (pszToken)                  if (pszToken)
946                      pChannelInfo->engine_name = lscp_unquote(&pszToken, 1);                      lscp_unquote_dup(&(pChannelInfo->engine_name), &pszToken);
947              }              }
948              else if (strcasecmp(pszToken, "AUDIO_OUTPUT_DEVICE") == 0) {              else if (strcasecmp(pszToken, "AUDIO_OUTPUT_DEVICE") == 0) {
949                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
# Line 957  lscp_channel_info_t *lscp_get_channel_in Line 957  lscp_channel_info_t *lscp_get_channel_in
957              }              }
958              else if (strcasecmp(pszToken, "AUDIO_OUTPUT_ROUTING") == 0) {              else if (strcasecmp(pszToken, "AUDIO_OUTPUT_ROUTING") == 0) {
959                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
960                  if (pszToken)                  if (pszToken) {
961                        if (pChannelInfo->audio_routing)
962                            lscp_szsplit_destroy(pChannelInfo->audio_routing);
963                      pChannelInfo->audio_routing = lscp_szsplit_create(pszToken, ",");                      pChannelInfo->audio_routing = lscp_szsplit_create(pszToken, ",");
964                    }
965              }              }
966              else if (strcasecmp(pszToken, "INSTRUMENT_FILE") == 0) {              else if (strcasecmp(pszToken, "INSTRUMENT_FILE") == 0) {
967                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
968                  if (pszToken)                  if (pszToken)
969                      pChannelInfo->instrument_file = lscp_unquote(&pszToken, 1);                      lscp_unquote_dup(&(pChannelInfo->instrument_file), &pszToken);
970              }              }
971              else if (strcasecmp(pszToken, "INSTRUMENT_NR") == 0) {              else if (strcasecmp(pszToken, "INSTRUMENT_NR") == 0) {
972                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));                  pszToken = lscp_strtok(NULL, pszCrlf, &(pch));

Legend:
Removed from v.177  
changed lines
  Added in v.180

  ViewVC Help
Powered by ViewVC