/[svn]/linuxsampler/trunk/src/network/lscpserver.cpp
ViewVC logotype

Diff of /linuxsampler/trunk/src/network/lscpserver.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2140 by schoenebeck, Tue Oct 5 10:35:13 2010 UTC revision 2528 by schoenebeck, Mon Mar 3 12:02:40 2014 UTC
# Line 3  Line 3 
3   *   LinuxSampler - modular, streaming capable sampler                     *   *   LinuxSampler - modular, streaming capable sampler                     *
4   *                                                                         *   *                                                                         *
5   *   Copyright (C) 2003, 2004 by Benno Senoner and Christian Schoenebeck   *   *   Copyright (C) 2003, 2004 by Benno Senoner and Christian Schoenebeck   *
6   *   Copyright (C) 2005 - 2010 Christian Schoenebeck                       *   *   Copyright (C) 2005 - 2014 Christian Schoenebeck                       *
7   *                                                                         *   *                                                                         *
8   *   This library is free software; you can redistribute it and/or modify  *   *   This library is free software; you can redistribute it and/or modify  *
9   *   it under the terms of the GNU General Public License as published by  *   *   it under the terms of the GNU General Public License as published by  *
# Line 47  Line 47 
47    
48  namespace LinuxSampler {  namespace LinuxSampler {
49    
50    String lscpParserProcessShellInteraction(String& line, yyparse_param_t* param, bool possibilities);
51    
52  /**  /**
53   * Returns a copy of the given string where all special characters are   * Returns a copy of the given string where all special characters are
54   * replaced by LSCP escape sequences ("\xHH"). This function shall be used   * replaced by LSCP escape sequences ("\xHH"). This function shall be used
# Line 97  static String _escapeLscpResponse(String Line 99  static String _escapeLscpResponse(String
99   */   */
100  fd_set LSCPServer::fdSet;  fd_set LSCPServer::fdSet;
101  int LSCPServer::currentSocket = -1;  int LSCPServer::currentSocket = -1;
102  std::vector<yyparse_param_t> LSCPServer::Sessions = std::vector<yyparse_param_t>();  std::vector<yyparse_param_t> LSCPServer::Sessions;
103  std::vector<yyparse_param_t>::iterator itCurrentSession = std::vector<yyparse_param_t>::iterator();  std::vector<yyparse_param_t>::iterator itCurrentSession;
104  std::map<int,String> LSCPServer::bufferedNotifies = std::map<int,String>();  std::map<int,String> LSCPServer::bufferedNotifies;
105  std::map<int,String> LSCPServer::bufferedCommands = std::map<int,String>();  std::map<int,String> LSCPServer::bufferedCommands;
106  std::map< LSCPEvent::event_t, std::list<int> > LSCPServer::eventSubscriptions = std::map< LSCPEvent::event_t, std::list<int> >();  std::map< LSCPEvent::event_t, std::list<int> > LSCPServer::eventSubscriptions;
107  Mutex LSCPServer::NotifyMutex = Mutex();  Mutex LSCPServer::NotifyMutex;
108  Mutex LSCPServer::NotifyBufferMutex = Mutex();  Mutex LSCPServer::NotifyBufferMutex;
109  Mutex LSCPServer::SubscriptionMutex = Mutex();  Mutex LSCPServer::SubscriptionMutex;
110  Mutex LSCPServer::RTNotifyMutex = Mutex();  Mutex LSCPServer::RTNotifyMutex;
111    
112  LSCPServer::LSCPServer(Sampler* pSampler, long int addr, short int port) : Thread(true, false, 0, -4), eventHandler(this) {  LSCPServer::LSCPServer(Sampler* pSampler, long int addr, short int port) : Thread(true, false, 0, -4), eventHandler(this) {
113      SocketAddress.sin_family      = AF_INET;      SocketAddress.sin_family      = AF_INET;
# Line 138  LSCPServer::LSCPServer(Sampler* pSampler Line 140  LSCPServer::LSCPServer(Sampler* pSampler
140      LSCPEvent::RegisterEvent(LSCPEvent::event_global_info, "GLOBAL_INFO");      LSCPEvent::RegisterEvent(LSCPEvent::event_global_info, "GLOBAL_INFO");
141      LSCPEvent::RegisterEvent(LSCPEvent::event_channel_midi, "CHANNEL_MIDI");      LSCPEvent::RegisterEvent(LSCPEvent::event_channel_midi, "CHANNEL_MIDI");
142      LSCPEvent::RegisterEvent(LSCPEvent::event_device_midi, "DEVICE_MIDI");      LSCPEvent::RegisterEvent(LSCPEvent::event_device_midi, "DEVICE_MIDI");
143        LSCPEvent::RegisterEvent(LSCPEvent::event_fx_instance_count, "EFFECT_INSTANCE_COUNT");
144        LSCPEvent::RegisterEvent(LSCPEvent::event_fx_instance_info, "EFFECT_INSTANCE_INFO");
145        LSCPEvent::RegisterEvent(LSCPEvent::event_send_fx_chain_count, "SEND_EFFECT_CHAIN_COUNT");
146        LSCPEvent::RegisterEvent(LSCPEvent::event_send_fx_chain_info, "SEND_EFFECT_CHAIN_INFO");
147      hSocket = -1;      hSocket = -1;
148  }  }
149    
# Line 443  int LSCPServer::Main() { Line 449  int LSCPServer::Main() {
449          #endif          #endif
450          // check if some engine channel's parameter / status changed, if so notify the respective LSCP event subscribers          // check if some engine channel's parameter / status changed, if so notify the respective LSCP event subscribers
451          {          {
452                LockGuard lock(EngineChannelFactory::EngineChannelsMutex);
453              std::set<EngineChannel*> engineChannels = EngineChannelFactory::EngineChannelInstances();              std::set<EngineChannel*> engineChannels = EngineChannelFactory::EngineChannelInstances();
454              std::set<EngineChannel*>::iterator itEngineChannel = engineChannels.begin();              std::set<EngineChannel*>::iterator itEngineChannel = engineChannels.begin();
455              std::set<EngineChannel*>::iterator itEnd           = engineChannels.end();              std::set<EngineChannel*>::iterator itEnd           = engineChannels.end();
# Line 511  int LSCPServer::Main() { Line 518  int LSCPServer::Main() {
518              }              }
519          }          }
520    
521          //Now let's deliver late notifies (if any)          //Now let's deliver late notifies (if any)
522          NotifyBufferMutex.Lock();          {
523          for (std::map<int,String>::iterator iterNotify = bufferedNotifies.begin(); iterNotify != bufferedNotifies.end(); iterNotify++) {              LockGuard lock(NotifyBufferMutex);
524                for (std::map<int,String>::iterator iterNotify = bufferedNotifies.begin(); iterNotify != bufferedNotifies.end(); iterNotify++) {
525  #ifdef MSG_NOSIGNAL  #ifdef MSG_NOSIGNAL
526                  send(iterNotify->first, iterNotify->second.c_str(), iterNotify->second.size(), MSG_NOSIGNAL);                  send(iterNotify->first, iterNotify->second.c_str(), iterNotify->second.size(), MSG_NOSIGNAL);
527  #else  #else
528                  send(iterNotify->first, iterNotify->second.c_str(), iterNotify->second.size(), 0);                  send(iterNotify->first, iterNotify->second.c_str(), iterNotify->second.size(), 0);
529  #endif  #endif
530          }              }
531          bufferedNotifies.clear();              bufferedNotifies.clear();
532          NotifyBufferMutex.Unlock();          }
533    
534          fd_set selectSet = fdSet;          fd_set selectSet = fdSet;
535          timeout.tv_sec  = 0;          timeout.tv_sec  = 0;
# Line 586  int LSCPServer::Main() { Line 594  int LSCPServer::Main() {
594          //Something was selected and it was not the hSocket, so it must be some command(s) coming.          //Something was selected and it was not the hSocket, so it must be some command(s) coming.
595          for (std::vector<yyparse_param_t>::iterator iter = Sessions.begin(); iter != Sessions.end(); iter++) {          for (std::vector<yyparse_param_t>::iterator iter = Sessions.begin(); iter != Sessions.end(); iter++) {
596                  if (FD_ISSET((*iter).hSession, &selectSet)) {   //Was it this socket?                  if (FD_ISSET((*iter).hSession, &selectSet)) {   //Was it this socket?
597                            currentSocket = (*iter).hSession;  //a hack
598                          if (GetLSCPCommand(iter)) {     //Have we read the entire command?                          if (GetLSCPCommand(iter)) {     //Have we read the entire command?
599                                  dmsg(3,("LSCPServer: Got command on socket %d, calling parser.\n", currentSocket));                                  dmsg(3,("LSCPServer: Got command on socket %d, calling parser.\n", currentSocket));
600                                  int dummy; // just a temporary hack to fulfill the restart() function prototype                                  int dummy; // just a temporary hack to fulfill the restart() function prototype
601                                  restart(NULL, dummy); // restart the 'scanner'                                  restart(NULL, dummy); // restart the 'scanner'
                                 currentSocket = (*iter).hSession;  //a hack  
602                                  itCurrentSession = iter; // another hack                                  itCurrentSession = iter; // another hack
603                                  dmsg(2,("LSCPServer: [%s]\n",bufferedCommands[currentSocket].c_str()));                                  dmsg(2,("LSCPServer: [%s]\n",bufferedCommands[currentSocket].c_str()));
604                                  if ((*iter).bVerbose) { // if echo mode enabled                                  if ((*iter).bVerbose) { // if echo mode enabled
# Line 604  int LSCPServer::Main() { Line 612  int LSCPServer::Main() {
612                                          CloseConnection(iter);                                          CloseConnection(iter);
613                                  }                                  }
614                          }                          }
615                            currentSocket = -1;     //continuation of a hack
616                          //socket may have been closed, iter may be invalid, get out of the loop for now.                          //socket may have been closed, iter may be invalid, get out of the loop for now.
617                          //we'll be back if there is data.                          //we'll be back if there is data.
618                          break;                          break;
# Line 618  void LSCPServer::CloseConnection( std::v Line 627  void LSCPServer::CloseConnection( std::v
627          LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_misc, "Client connection terminated on socket", socket));          LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_misc, "Client connection terminated on socket", socket));
628          Sessions.erase(iter);          Sessions.erase(iter);
629          FD_CLR(socket,  &fdSet);          FD_CLR(socket,  &fdSet);
630          SubscriptionMutex.Lock(); //Must unsubscribe this socket from all events (if any)          {
631          for (std::map< LSCPEvent::event_t, std::list<int> >::iterator iter = eventSubscriptions.begin(); iter != eventSubscriptions.end(); iter++) {              LockGuard lock(SubscriptionMutex);
632                  iter->second.remove(socket);              // Must unsubscribe this socket from all events (if any)
633          }              for (std::map< LSCPEvent::event_t, std::list<int> >::iterator iter = eventSubscriptions.begin(); iter != eventSubscriptions.end(); iter++) {
634          SubscriptionMutex.Unlock();                  iter->second.remove(socket);
635          NotifyMutex.Lock();              }
636            }
637            LockGuard lock(NotifyMutex);
638          bufferedCommands.erase(socket);          bufferedCommands.erase(socket);
639          bufferedNotifies.erase(socket);          bufferedNotifies.erase(socket);
640          #if defined(WIN32)          #if defined(WIN32)
# Line 631  void LSCPServer::CloseConnection( std::v Line 642  void LSCPServer::CloseConnection( std::v
642          #else          #else
643          close(socket);          close(socket);
644          #endif          #endif
         NotifyMutex.Unlock();  
645  }  }
646    
647  void LSCPServer::CloseAllConnections() {  void LSCPServer::CloseAllConnections() {
# Line 642  void LSCPServer::CloseAllConnections() { Line 652  void LSCPServer::CloseAllConnections() {
652      }      }
653  }  }
654    
 void LSCPServer::LockRTNotify() {  
     RTNotifyMutex.Lock();  
 }  
   
 void LSCPServer::UnlockRTNotify() {  
     RTNotifyMutex.Unlock();  
 }  
   
655  int LSCPServer::EventSubscribers( std::list<LSCPEvent::event_t> events ) {  int LSCPServer::EventSubscribers( std::list<LSCPEvent::event_t> events ) {
656          int subs = 0;          int subs = 0;
657          SubscriptionMutex.Lock();          LockGuard lock(SubscriptionMutex);
658          for( std::list<LSCPEvent::event_t>::iterator iter = events.begin();          for( std::list<LSCPEvent::event_t>::iterator iter = events.begin();
659                          iter != events.end(); iter++)                          iter != events.end(); iter++)
660          {          {
661                  subs += eventSubscriptions.count(*iter);                  subs += eventSubscriptions.count(*iter);
662          }          }
         SubscriptionMutex.Unlock();  
663          return subs;          return subs;
664  }  }
665    
666  void LSCPServer::SendLSCPNotify( LSCPEvent event ) {  void LSCPServer::SendLSCPNotify( LSCPEvent event ) {
667          SubscriptionMutex.Lock();          LockGuard lock(SubscriptionMutex);
668          if (eventSubscriptions.count(event.GetType()) == 0) {          if (eventSubscriptions.count(event.GetType()) == 0) {
669                  SubscriptionMutex.Unlock();     //Nobody is subscribed to this event                  // Nobody is subscribed to this event
670                  return;                  return;
671          }          }
672          std::list<int>::iterator iter = eventSubscriptions[event.GetType()].begin();          std::list<int>::iterator iter = eventSubscriptions[event.GetType()].begin();
# Line 691  void LSCPServer::SendLSCPNotify( LSCPEve Line 692  void LSCPServer::SendLSCPNotify( LSCPEve
692                          }                          }
693                  }                  }
694          }          }
         SubscriptionMutex.Unlock();  
695  }  }
696    
697  extern int GetLSCPCommand( void *buf, int max_size ) {  extern int GetLSCPCommand( void *buf, int max_size ) {
# Line 722  extern yyparse_param_t* GetCurrentYaccSe Line 722  extern yyparse_param_t* GetCurrentYaccSe
722   */   */
723  bool LSCPServer::GetLSCPCommand( std::vector<yyparse_param_t>::iterator iter ) {  bool LSCPServer::GetLSCPCommand( std::vector<yyparse_param_t>::iterator iter ) {
724          int socket = (*iter).hSession;          int socket = (*iter).hSession;
725            int result;
726          char c;          char c;
727          int i = 0;          std::vector<char> input;
728    
729            // first get as many character as possible and add it to the 'input' buffer
730          while (true) {          while (true) {
731                  #if defined(WIN32)                  #if defined(WIN32)
732                  int result = recv(socket, (char *)&c, 1, 0); //Read one character at a time for now                  result = recv(socket, (char *)&c, 1, 0); //Read one character at a time for now
733                  #else                  #else
734                  int result = recv(socket, (void *)&c, 1, 0); //Read one character at a time for now                  result = recv(socket, (void *)&c, 1, 0); //Read one character at a time for now
735                  #endif                  #endif
736                  if (result == 0) { //socket was selected, so 0 here means client has closed the connection                  if (result == 1) input.push_back(c);
737                          CloseConnection(iter);                  else break; // end of input or some error
738                          break;                  if (c == '\n') break; // process line by line
739            }
740    
741            // process input buffer
742            for (int i = 0; i < input.size(); ++i) {
743                    c = input[i];
744                    if (c == '\r') continue; //Ignore CR
745                    if (c == '\n') {
746                            // only if the other side is the LSCP shell application:
747                            // check the current (incomplete) command line for syntax errors,
748                            // possible completions and report everything back to the shell
749                            if ((*iter).bShellInteract || (*iter).bShellAutoCorrect) {
750                                    String s = lscpParserProcessShellInteraction(bufferedCommands[socket], &(*iter), false);
751                                    if (!s.empty() && (*iter).bShellInteract) AnswerClient(s + "\n");
752                            }
753    
754                            LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_misc, "Received \'" + bufferedCommands[socket] + "\' on socket", socket));
755                            bufferedCommands[socket] += "\r\n";
756                            return true; //Complete command was read
757                  }                  }
758                  if (result == 1) {                  // backspace character - should only happen with shell
759                          if (c == '\r')                  if (c == '\b') {
760                                  continue; //Ignore CR                          if (!bufferedCommands[socket].empty()) {
761                          if (c == '\n') {                                  bufferedCommands[socket] = bufferedCommands[socket].substr(
762                                  LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_misc, "Received \'" + bufferedCommands[socket] + "\' on socket", socket));                                          0, bufferedCommands[socket].length() - 1
763                                  bufferedCommands[socket] += "\r\n";                                  );
                                 return true; //Complete command was read  
764                          }                          }
765                          bufferedCommands[socket] += c;                  } else bufferedCommands[socket] += c;
766                    // only if the other side is the LSCP shell application:
767                    // check the current (incomplete) command line for syntax errors,
768                    // possible completions and report everything back to the shell
769                    if ((*iter).bShellInteract || (*iter).bShellAutoCorrect) {
770                            String s = lscpParserProcessShellInteraction(bufferedCommands[socket], &(*iter), true);
771                            if (!s.empty() && (*iter).bShellInteract && i == input.size() - 1)
772                                    AnswerClient(s + "\n");
773                  }                  }
774                  #if defined(WIN32)          }
775                  if (result == SOCKET_ERROR) {  
776                      int wsa_lasterror = WSAGetLastError();          // handle network errors ...
777                          if (wsa_lasterror == WSAEWOULDBLOCK) //Would block, try again later.          if (result == 0) { //socket was selected, so 0 here means client has closed the connection
778                    CloseConnection(iter);
779                    return false;
780            }
781            #if defined(WIN32)
782            if (result == SOCKET_ERROR) {
783                    int wsa_lasterror = WSAGetLastError();
784                    if (wsa_lasterror == WSAEWOULDBLOCK) //Would block, try again later.
785                            return false;
786                    dmsg(2,("LSCPScanner: Socket error after recv() Error %d.\n", wsa_lasterror));
787                    CloseConnection(iter);
788                    return false;
789            }
790            #else
791            if (result == -1) {
792                    if (errno == EAGAIN) //Would block, try again later.
793                            return false;
794                    switch(errno) {
795                            case EBADF:
796                                    dmsg(2,("LSCPScanner: The argument s is an invalid descriptor.\n"));
797                                  return false;                                  return false;
798                          dmsg(2,("LSCPScanner: Socket error after recv() Error %d.\n", wsa_lasterror));                          case ECONNREFUSED:
799                          CloseConnection(iter);                                  dmsg(2,("LSCPScanner: A remote host refused to allow the network connection (typically because it is not running the requested service).\n"));
800                          break;                                  return false;
801                  }                          case ENOTCONN:
802                  #else                                  dmsg(2,("LSCPScanner: The socket is associated with a connection-oriented protocol and has not been connected (see connect(2) and accept(2)).\n"));
803                  if (result == -1) {                                  return false;
804                          if (errno == EAGAIN) //Would block, try again later.                          case ENOTSOCK:
805                                    dmsg(2,("LSCPScanner: The argument s does not refer to a socket.\n"));
806                                    return false;
807                            case EAGAIN:
808                                    dmsg(2,("LSCPScanner: The socket is marked non-blocking and the receive operation would block, or a receive timeout had been set and the timeout expired before data was received.\n"));
809                                    return false;
810                            case EINTR:
811                                    dmsg(2,("LSCPScanner: The receive was interrupted by delivery of a signal before any data were available.\n"));
812                                    return false;
813                            case EFAULT:
814                                    dmsg(2,("LSCPScanner: The receive buffer pointer(s) point outside the process's address space.\n"));
815                                    return false;
816                            case EINVAL:
817                                    dmsg(2,("LSCPScanner: Invalid argument passed.\n"));
818                                    return false;
819                            case ENOMEM:
820                                    dmsg(2,("LSCPScanner: Could not allocate memory for recvmsg.\n"));
821                                    return false;
822                            default:
823                                    dmsg(2,("LSCPScanner: Unknown recv() error.\n"));
824                                  return false;                                  return false;
                         switch(errno) {  
                                 case EBADF:  
                                         dmsg(2,("LSCPScanner: The argument s is an invalid descriptor.\n"));  
                                         break;  
                                 case ECONNREFUSED:  
                                         dmsg(2,("LSCPScanner: A remote host refused to allow the network connection (typically because it is not running the requested service).\n"));  
                                         break;  
                                 case ENOTCONN:  
                                         dmsg(2,("LSCPScanner: The socket is associated with a connection-oriented protocol and has not been connected (see connect(2) and accept(2)).\n"));  
                                         break;  
                                 case ENOTSOCK:  
                                         dmsg(2,("LSCPScanner: The argument s does not refer to a socket.\n"));  
                                         break;  
                                 case EAGAIN:  
                                         dmsg(2,("LSCPScanner: The socket is marked non-blocking and the receive operation would block, or a receive timeout had been set and the timeout expired before data was received.\n"));  
                                         break;  
                                 case EINTR:  
                                         dmsg(2,("LSCPScanner: The receive was interrupted by delivery of a signal before any data were available.\n"));  
                                         break;  
                                 case EFAULT:  
                                         dmsg(2,("LSCPScanner: The receive buffer pointer(s) point outside the process's address space.\n"));  
                                         break;  
                                 case EINVAL:  
                                         dmsg(2,("LSCPScanner: Invalid argument passed.\n"));  
                                         break;  
                                 case ENOMEM:  
                                         dmsg(2,("LSCPScanner: Could not allocate memory for recvmsg.\n"));  
                                         break;  
                                 default:  
                                         dmsg(2,("LSCPScanner: Unknown recv() error.\n"));  
                                         break;  
                         }  
                         CloseConnection(iter);  
                         break;  
825                  }                  }
826                  #endif                  CloseConnection(iter);
827                    return false;
828          }          }
829            #endif
830    
831          return false;          return false;
832  }  }
833    
# Line 804  bool LSCPServer::GetLSCPCommand( std::ve Line 838  bool LSCPServer::GetLSCPCommand( std::ve
838   * @param ReturnMessage - message that will be send to the client   * @param ReturnMessage - message that will be send to the client
839   */   */
840  void LSCPServer::AnswerClient(String ReturnMessage) {  void LSCPServer::AnswerClient(String ReturnMessage) {
841      dmsg(2,("LSCPServer::AnswerClient(ReturnMessage=%s)", ReturnMessage.c_str()));      dmsg(2,("LSCPServer::AnswerClient(ReturnMessage='%s')", ReturnMessage.c_str()));
842      if (currentSocket != -1) {      if (currentSocket != -1) {
843              NotifyMutex.Lock();              LockGuard lock(NotifyMutex);
844    
845            // just if other side is LSCP shell: in case respose is a multi-line
846            // one, then inform client about it before sending the actual mult-line
847            // response
848            if (GetCurrentYaccSession()->bShellInteract) {
849                // check if this is a multi-line response
850                int n = 0;
851                for (int i = 0; i < ReturnMessage.size(); ++i)
852                    if (ReturnMessage[i] == '\n') ++n;
853                if (n >= 2) {
854                    dmsg(2,("LSCP Shell <- expect mult-line response\n"));
855                    String s = LSCP_SHK_EXPECT_MULTI_LINE "\r\n";
856    #ifdef MSG_NOSIGNAL
857                    send(currentSocket, s.c_str(), s.size(), MSG_NOSIGNAL);
858    #else
859                    send(currentSocket, s.c_str(), s.size(), 0);
860    #endif                
861                }
862            }
863    
864  #ifdef MSG_NOSIGNAL  #ifdef MSG_NOSIGNAL
865              send(currentSocket, ReturnMessage.c_str(), ReturnMessage.size(), MSG_NOSIGNAL);              send(currentSocket, ReturnMessage.c_str(), ReturnMessage.size(), MSG_NOSIGNAL);
866  #else  #else
867              send(currentSocket, ReturnMessage.c_str(), ReturnMessage.size(), 0);              send(currentSocket, ReturnMessage.c_str(), ReturnMessage.size(), 0);
868  #endif  #endif
             NotifyMutex.Unlock();  
869      }      }
870  }  }
871    
# Line 962  String LSCPServer::SetEngineType(String Line 1015  String LSCPServer::SetEngineType(String
1015      try {      try {
1016          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1017          if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));          if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));
1018          LockRTNotify();          LockGuard lock(RTNotifyMutex);
1019          pSamplerChannel->SetEngineType(EngineName);          pSamplerChannel->SetEngineType(EngineName);
1020          if(HasSoloChannel()) pSamplerChannel->GetEngineChannel()->SetMute(-1);          if(HasSoloChannel()) pSamplerChannel->GetEngineChannel()->SetMute(-1);
         UnlockRTNotify();  
1021      }      }
1022      catch (Exception e) {      catch (Exception e) {
1023           result.Error(e);           result.Error(e);
# Line 1005  String LSCPServer::ListChannels() { Line 1057  String LSCPServer::ListChannels() {
1057   */   */
1058  String LSCPServer::AddChannel() {  String LSCPServer::AddChannel() {
1059      dmsg(2,("LSCPServer: AddChannel()\n"));      dmsg(2,("LSCPServer: AddChannel()\n"));
1060      LockRTNotify();      SamplerChannel* pSamplerChannel;
1061      SamplerChannel* pSamplerChannel = pSampler->AddSamplerChannel();      {
1062      UnlockRTNotify();          LockGuard lock(RTNotifyMutex);
1063            pSamplerChannel = pSampler->AddSamplerChannel();
1064        }
1065      LSCPResultSet result(pSamplerChannel->Index());      LSCPResultSet result(pSamplerChannel->Index());
1066      return result.Produce();      return result.Produce();
1067  }  }
# Line 1018  String LSCPServer::AddChannel() { Line 1072  String LSCPServer::AddChannel() {
1072  String LSCPServer::RemoveChannel(uint uiSamplerChannel) {  String LSCPServer::RemoveChannel(uint uiSamplerChannel) {
1073      dmsg(2,("LSCPServer: RemoveChannel(SamplerChannel=%d)\n", uiSamplerChannel));      dmsg(2,("LSCPServer: RemoveChannel(SamplerChannel=%d)\n", uiSamplerChannel));
1074      LSCPResultSet result;      LSCPResultSet result;
1075      LockRTNotify();      {
1076      pSampler->RemoveSamplerChannel(uiSamplerChannel);          LockGuard lock(RTNotifyMutex);
1077      UnlockRTNotify();          pSampler->RemoveSamplerChannel(uiSamplerChannel);
1078        }
1079      return result.Produce();      return result.Produce();
1080  }  }
1081    
# Line 1063  String LSCPServer::ListAvailableEngines( Line 1118  String LSCPServer::ListAvailableEngines(
1118  String LSCPServer::GetEngineInfo(String EngineName) {  String LSCPServer::GetEngineInfo(String EngineName) {
1119      dmsg(2,("LSCPServer: GetEngineInfo(EngineName=%s)\n", EngineName.c_str()));      dmsg(2,("LSCPServer: GetEngineInfo(EngineName=%s)\n", EngineName.c_str()));
1120      LSCPResultSet result;      LSCPResultSet result;
1121      LockRTNotify();      {
1122      try {          LockGuard lock(RTNotifyMutex);
1123          Engine* pEngine = EngineFactory::Create(EngineName);          try {
1124          result.Add("DESCRIPTION", _escapeLscpResponse(pEngine->Description()));              Engine* pEngine = EngineFactory::Create(EngineName);
1125          result.Add("VERSION",     pEngine->Version());              result.Add("DESCRIPTION", _escapeLscpResponse(pEngine->Description()));
1126          EngineFactory::Destroy(pEngine);              result.Add("VERSION",     pEngine->Version());
1127      }              EngineFactory::Destroy(pEngine);
1128      catch (Exception e) {          }
1129           result.Error(e);          catch (Exception e) {
1130                result.Error(e);
1131            }
1132      }      }
     UnlockRTNotify();  
1133      return result.Produce();      return result.Produce();
1134  }  }
1135    
# Line 1722  String LSCPServer::SetAudioOutputChannel Line 1778  String LSCPServer::SetAudioOutputChannel
1778  String LSCPServer::SetAudioOutputDevice(uint AudioDeviceId, uint uiSamplerChannel) {  String LSCPServer::SetAudioOutputDevice(uint AudioDeviceId, uint uiSamplerChannel) {
1779      dmsg(2,("LSCPServer: SetAudiotOutputDevice(AudioDeviceId=%d, SamplerChannel=%d)\n",AudioDeviceId,uiSamplerChannel));      dmsg(2,("LSCPServer: SetAudiotOutputDevice(AudioDeviceId=%d, SamplerChannel=%d)\n",AudioDeviceId,uiSamplerChannel));
1780      LSCPResultSet result;      LSCPResultSet result;
1781      LockRTNotify();      {
1782            LockGuard lock(RTNotifyMutex);
1783            try {
1784                SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1785                if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));
1786                std::map<uint, AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
1787                if (!devices.count(AudioDeviceId)) throw Exception("There is no audio output device with index " + ToString(AudioDeviceId));
1788                AudioOutputDevice* pDevice = devices[AudioDeviceId];
1789                pSamplerChannel->SetAudioOutputDevice(pDevice);
1790            }
1791            catch (Exception e) {
1792                result.Error(e);
1793            }
1794        }
1795        return result.Produce();
1796    }
1797    
1798    String LSCPServer::SetAudioOutputType(String AudioOutputDriver, uint uiSamplerChannel) {
1799        dmsg(2,("LSCPServer: SetAudioOutputType(String AudioOutputDriver=%s, SamplerChannel=%d)\n",AudioOutputDriver.c_str(),uiSamplerChannel));
1800        LSCPResultSet result;
1801        {
1802            LockGuard lock(RTNotifyMutex);
1803            try {
1804                SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1805                if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));
1806                // Driver type name aliasing...
1807                if (AudioOutputDriver == "Alsa") AudioOutputDriver = "ALSA";
1808                if (AudioOutputDriver == "Jack") AudioOutputDriver = "JACK";
1809                // Check if there's one audio output device already created
1810                // for the intended audio driver type (AudioOutputDriver)...
1811                AudioOutputDevice *pDevice = NULL;
1812                std::map<uint, AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
1813                std::map<uint, AudioOutputDevice*>::iterator iter = devices.begin();
1814                for (; iter != devices.end(); iter++) {
1815                    if ((iter->second)->Driver() == AudioOutputDriver) {
1816                        pDevice = iter->second;
1817                        break;
1818                    }
1819                }
1820                // If it doesn't exist, create a new one with default parameters...
1821                if (pDevice == NULL) {
1822                    std::map<String,String> params;
1823                    pDevice = pSampler->CreateAudioOutputDevice(AudioOutputDriver, params);
1824                }
1825                // Must have a device...
1826                if (pDevice == NULL)
1827                    throw Exception("Internal error: could not create audio output device.");
1828                // Set it as the current channel device...
1829                pSamplerChannel->SetAudioOutputDevice(pDevice);
1830            }
1831            catch (Exception e) {
1832                result.Error(e);
1833            }
1834        }
1835        return result.Produce();
1836    }
1837    
1838    String LSCPServer::AddChannelMidiInput(uint uiSamplerChannel, uint MIDIDeviceId, uint MIDIPort) {
1839        dmsg(2,("LSCPServer: AddChannelMidiInput(uiSamplerChannel=%d, MIDIDeviceId=%d, MIDIPort=%d)\n",uiSamplerChannel,MIDIDeviceId,MIDIPort));
1840        LSCPResultSet result;
1841      try {      try {
1842          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1843          if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));          if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));
1844          std::map<uint, AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();  
1845          if (!devices.count(AudioDeviceId)) throw Exception("There is no audio output device with index " + ToString(AudioDeviceId));          std::map<uint, MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
1846          AudioOutputDevice* pDevice = devices[AudioDeviceId];          if (!devices.count(MIDIDeviceId)) throw Exception("There is no MIDI input device with index " + ToString(MIDIDeviceId));
1847          pSamplerChannel->SetAudioOutputDevice(pDevice);          MidiInputDevice* pDevice = devices[MIDIDeviceId];
1848    
1849            MidiInputPort* pPort = pDevice->GetPort(MIDIPort);
1850            if (!pPort) throw Exception("There is no MIDI input port with index " + ToString(MIDIPort) + " on MIDI input device with index " + ToString(MIDIDeviceId));
1851    
1852            pSamplerChannel->Connect(pPort);
1853        } catch (Exception e) {
1854            result.Error(e);
1855      }      }
1856      catch (Exception e) {      return result.Produce();
1857           result.Error(e);  }
1858    
1859    String LSCPServer::RemoveChannelMidiInput(uint uiSamplerChannel) {
1860        dmsg(2,("LSCPServer: RemoveChannelMidiInput(uiSamplerChannel=%d)\n",uiSamplerChannel));
1861        LSCPResultSet result;
1862        try {
1863            SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1864            if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));
1865            pSamplerChannel->DisconnectAllMidiInputPorts();
1866        } catch (Exception e) {
1867            result.Error(e);
1868      }      }
     UnlockRTNotify();  
1869      return result.Produce();      return result.Produce();
1870  }  }
1871    
1872  String LSCPServer::SetAudioOutputType(String AudioOutputDriver, uint uiSamplerChannel) {  String LSCPServer::RemoveChannelMidiInput(uint uiSamplerChannel, uint MIDIDeviceId) {
1873      dmsg(2,("LSCPServer: SetAudioOutputType(String AudioOutputDriver=%s, SamplerChannel=%d)\n",AudioOutputDriver.c_str(),uiSamplerChannel));      dmsg(2,("LSCPServer: RemoveChannelMidiInput(uiSamplerChannel=%d, MIDIDeviceId=%d)\n",uiSamplerChannel,MIDIDeviceId));
1874      LSCPResultSet result;      LSCPResultSet result;
     LockRTNotify();  
1875      try {      try {
1876          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);          SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1877          if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));          if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));
1878          // Driver type name aliasing...  
1879          if (AudioOutputDriver == "Alsa") AudioOutputDriver = "ALSA";          std::map<uint, MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
1880          if (AudioOutputDriver == "Jack") AudioOutputDriver = "JACK";          if (!devices.count(MIDIDeviceId)) throw Exception("There is no MIDI input device with index " + ToString(MIDIDeviceId));
1881          // Check if there's one audio output device already created          MidiInputDevice* pDevice = devices[MIDIDeviceId];
1882          // for the intended audio driver type (AudioOutputDriver)...          
1883          AudioOutputDevice *pDevice = NULL;          std::vector<MidiInputPort*> vPorts = pSamplerChannel->GetMidiInputPorts();
1884          std::map<uint, AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();          for (int i = 0; i < vPorts.size(); ++i)
1885          std::map<uint, AudioOutputDevice*>::iterator iter = devices.begin();              if (vPorts[i]->GetDevice() == pDevice)
1886          for (; iter != devices.end(); iter++) {                  pSamplerChannel->Disconnect(vPorts[i]);
1887              if ((iter->second)->Driver() == AudioOutputDriver) {  
1888                  pDevice = iter->second;      } catch (Exception e) {
1889                  break;          result.Error(e);
             }  
         }  
         // If it doesn't exist, create a new one with default parameters...  
         if (pDevice == NULL) {  
             std::map<String,String> params;  
             pDevice = pSampler->CreateAudioOutputDevice(AudioOutputDriver, params);  
         }  
         // Must have a device...  
         if (pDevice == NULL)  
             throw Exception("Internal error: could not create audio output device.");  
         // Set it as the current channel device...  
         pSamplerChannel->SetAudioOutputDevice(pDevice);  
1890      }      }
1891      catch (Exception e) {      return result.Produce();
1892           result.Error(e);  }
1893    
1894    String LSCPServer::RemoveChannelMidiInput(uint uiSamplerChannel, uint MIDIDeviceId, uint MIDIPort) {
1895        dmsg(2,("LSCPServer: RemoveChannelMidiInput(uiSamplerChannel=%d, MIDIDeviceId=%d, MIDIPort=%d)\n",uiSamplerChannel,MIDIDeviceId,MIDIPort));
1896        LSCPResultSet result;
1897        try {
1898            SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1899            if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));
1900    
1901            std::map<uint, MidiInputDevice*> devices = pSampler->GetMidiInputDevices();
1902            if (!devices.count(MIDIDeviceId)) throw Exception("There is no MIDI input device with index " + ToString(MIDIDeviceId));
1903            MidiInputDevice* pDevice = devices[MIDIDeviceId];
1904    
1905            MidiInputPort* pPort = pDevice->GetPort(MIDIPort);
1906            if (!pPort) throw Exception("There is no MIDI input port with index " + ToString(MIDIPort) + " on MIDI input device with index " + ToString(MIDIDeviceId));
1907    
1908            pSamplerChannel->Disconnect(pPort);
1909        } catch (Exception e) {
1910            result.Error(e);
1911        }
1912        return result.Produce();
1913    }
1914    
1915    String LSCPServer::ListChannelMidiInputs(uint uiSamplerChannel) {
1916        dmsg(2,("LSCPServer: ListChannelMidiInputs(uiSamplerChannel=%d)\n",uiSamplerChannel));
1917        LSCPResultSet result;
1918        try {
1919            SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
1920            if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));
1921            std::vector<MidiInputPort*> vPorts = pSamplerChannel->GetMidiInputPorts();
1922    
1923            String s;
1924            for (int i = 0; i < vPorts.size(); ++i) {
1925                const int iDeviceID = vPorts[i]->GetDevice()->MidiInputDeviceID();
1926                const int iPortNr   = vPorts[i]->GetPortNumber();
1927                if (s.size()) s += ",";
1928                s += "{" + ToString(iDeviceID) + ","
1929                         + ToString(iPortNr) + "}";
1930            }
1931            result.Add(s);
1932        } catch (Exception e) {
1933            result.Error(e);
1934      }      }
     UnlockRTNotify();  
1935      return result.Produce();      return result.Produce();
1936  }  }
1937    
# Line 2610  String LSCPServer::SetEffectInstanceInpu Line 2768  String LSCPServer::SetEffectInstanceInpu
2768              );              );
2769    
2770          pEffectControl->SetValue(dValue);          pEffectControl->SetValue(dValue);
2771            LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_fx_instance_info, iEffectInstance));
2772      } catch (Exception e) {      } catch (Exception e) {
2773          result.Error(e);          result.Error(e);
2774      }      }
# Line 2625  String LSCPServer::CreateEffectInstance( Line 2784  String LSCPServer::CreateEffectInstance(
2784              throw Exception("There is no effect with index " + ToString(iEffectIndex));              throw Exception("There is no effect with index " + ToString(iEffectIndex));
2785          Effect* pEffect = EffectFactory::Create(pEffectInfo);          Effect* pEffect = EffectFactory::Create(pEffectInfo);
2786          result = pEffect->ID(); // success          result = pEffect->ID(); // success
2787            LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_fx_instance_count, EffectFactory::EffectInstancesCount()));
2788      } catch (Exception e) {      } catch (Exception e) {
2789          result.Error(e);          result.Error(e);
2790      }      }
# Line 2671  String LSCPServer::CreateEffectInstance( Line 2831  String LSCPServer::CreateEffectInstance(
2831    
2832          Effect* pEffect = EffectFactory::Create(pEffectInfo);          Effect* pEffect = EffectFactory::Create(pEffectInfo);
2833          result = LSCPResultSet(pEffect->ID());          result = LSCPResultSet(pEffect->ID());
2834            LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_fx_instance_count, EffectFactory::EffectInstancesCount()));
2835      } catch (Exception e) {      } catch (Exception e) {
2836          result.Error(e);          result.Error(e);
2837      }      }
# Line 2685  String LSCPServer::DestroyEffectInstance Line 2846  String LSCPServer::DestroyEffectInstance
2846          if (!pEffect)          if (!pEffect)
2847              throw Exception("There is no effect instance with ID " + ToString(iEffectInstance));              throw Exception("There is no effect instance with ID " + ToString(iEffectInstance));
2848          EffectFactory::Destroy(pEffect);          EffectFactory::Destroy(pEffect);
2849            LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_fx_instance_count, EffectFactory::EffectInstancesCount()));
2850      } catch (Exception e) {      } catch (Exception e) {
2851          result.Error(e);          result.Error(e);
2852      }      }
# Line 2769  String LSCPServer::AddSendEffectChain(in Line 2931  String LSCPServer::AddSendEffectChain(in
2931          AudioOutputDevice* pDevice = devices[iAudioOutputDevice];          AudioOutputDevice* pDevice = devices[iAudioOutputDevice];
2932          EffectChain* pEffectChain = pDevice->AddSendEffectChain();          EffectChain* pEffectChain = pDevice->AddSendEffectChain();
2933          result = pEffectChain->ID();          result = pEffectChain->ID();
2934            LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_send_fx_chain_count, iAudioOutputDevice, pDevice->SendEffectChainCount()));
2935      } catch (Exception e) {      } catch (Exception e) {
2936          result.Error(e);          result.Error(e);
2937      }      }
# Line 2782  String LSCPServer::RemoveSendEffectChain Line 2945  String LSCPServer::RemoveSendEffectChain
2945          std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();          std::map<uint,AudioOutputDevice*> devices = pSampler->GetAudioOutputDevices();
2946          if (!devices.count(iAudioOutputDevice))          if (!devices.count(iAudioOutputDevice))
2947              throw Exception("There is no audio output device with index " + ToString(iAudioOutputDevice) + ".");              throw Exception("There is no audio output device with index " + ToString(iAudioOutputDevice) + ".");
2948    
2949            std::set<EngineChannel*> engineChannels = EngineChannelFactory::EngineChannelInstances();
2950            std::set<EngineChannel*>::iterator itEngineChannel = engineChannels.begin();
2951            std::set<EngineChannel*>::iterator itEnd           = engineChannels.end();
2952            for (; itEngineChannel != itEnd; ++itEngineChannel) {
2953                AudioOutputDevice* pDev = (*itEngineChannel)->GetAudioOutputDevice();
2954                if (pDev != NULL && pDev->deviceId() == iAudioOutputDevice) {
2955                    for (int i = 0; i < (*itEngineChannel)->GetFxSendCount(); i++) {
2956                        FxSend* fxs = (*itEngineChannel)->GetFxSend(i);
2957                        if(fxs != NULL && fxs->DestinationEffectChain() == iSendEffectChain) {
2958                            throw Exception("The effect chain is still in use by channel " + ToString((*itEngineChannel)->GetSamplerChannel()->Index()));
2959                        }
2960                    }
2961                }
2962            }
2963    
2964          AudioOutputDevice* pDevice = devices[iAudioOutputDevice];          AudioOutputDevice* pDevice = devices[iAudioOutputDevice];
2965          for (int i = 0; i < pDevice->SendEffectChainCount(); i++) {          for (int i = 0; i < pDevice->SendEffectChainCount(); i++) {
2966              EffectChain* pEffectChain = pDevice->SendEffectChain(i);              EffectChain* pEffectChain = pDevice->SendEffectChain(i);
2967              if (pEffectChain->ID() == iSendEffectChain) {              if (pEffectChain->ID() == iSendEffectChain) {
2968                  pDevice->RemoveSendEffectChain(i);                  pDevice->RemoveSendEffectChain(i);
2969                    LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_send_fx_chain_count, iAudioOutputDevice, pDevice->SendEffectChainCount()));
2970                  return result.Produce();                  return result.Produce();
2971              }              }
2972          }          }
# Line 2809  static EffectChain* _getSendEffectChain( Line 2989  static EffectChain* _getSendEffectChain(
2989              ToString(iAudioOutputDevice) + "."              ToString(iAudioOutputDevice) + "."
2990          );          );
2991      AudioOutputDevice* pDevice = devices[iAudioOutputDevice];      AudioOutputDevice* pDevice = devices[iAudioOutputDevice];
2992      for (int i = 0; i < pDevice->SendEffectChainCount(); i++) {      EffectChain* pEffectChain = pDevice->SendEffectChainByID(iSendEffectChain);
2993          EffectChain* pEffectChain = pDevice->SendEffectChain(i);      if(pEffectChain != NULL) return pEffectChain;
         if (pEffectChain->ID() == iSendEffectChain) {  
             return pEffectChain;  
         }  
     }  
2994      throw Exception(      throw Exception(
2995          "There is no send effect chain with ID " +          "There is no send effect chain with ID " +
2996          ToString(iSendEffectChain) + " for audio output device " +          ToString(iSendEffectChain) + " for audio output device " +
# Line 2851  String LSCPServer::AppendSendEffectChain Line 3027  String LSCPServer::AppendSendEffectChain
3027          if (!pEffect)          if (!pEffect)
3028              throw Exception("There is no effect instance with ID " + ToString(iEffectInstance));              throw Exception("There is no effect instance with ID " + ToString(iEffectInstance));
3029          pEffectChain->AppendEffect(pEffect);          pEffectChain->AppendEffect(pEffect);
3030            LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_send_fx_chain_info, iAudioOutputDevice, iSendEffectChain, pEffectChain->EffectCount()));
3031      } catch (Exception e) {      } catch (Exception e) {
3032          result.Error(e);          result.Error(e);
3033      }      }
# Line 2867  String LSCPServer::InsertSendEffectChain Line 3044  String LSCPServer::InsertSendEffectChain
3044          if (!pEffect)          if (!pEffect)
3045              throw Exception("There is no effect instance with index " + ToString(iEffectInstance));              throw Exception("There is no effect instance with index " + ToString(iEffectInstance));
3046          pEffectChain->InsertEffect(pEffect, iEffectChainPosition);          pEffectChain->InsertEffect(pEffect, iEffectChainPosition);
3047            LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_send_fx_chain_info, iAudioOutputDevice, iSendEffectChain, pEffectChain->EffectCount()));
3048      } catch (Exception e) {      } catch (Exception e) {
3049          result.Error(e);          result.Error(e);
3050      }      }
# Line 2879  String LSCPServer::RemoveSendEffectChain Line 3057  String LSCPServer::RemoveSendEffectChain
3057      try {      try {
3058          EffectChain* pEffectChain =          EffectChain* pEffectChain =
3059              _getSendEffectChain(pSampler, iAudioOutputDevice, iSendEffectChain);              _getSendEffectChain(pSampler, iAudioOutputDevice, iSendEffectChain);
3060    
3061            std::set<EngineChannel*> engineChannels = EngineChannelFactory::EngineChannelInstances();
3062            std::set<EngineChannel*>::iterator itEngineChannel = engineChannels.begin();
3063            std::set<EngineChannel*>::iterator itEnd           = engineChannels.end();
3064            for (; itEngineChannel != itEnd; ++itEngineChannel) {
3065                AudioOutputDevice* pDev = (*itEngineChannel)->GetAudioOutputDevice();
3066                if (pDev != NULL && pDev->deviceId() == iAudioOutputDevice) {
3067                    for (int i = 0; i < (*itEngineChannel)->GetFxSendCount(); i++) {
3068                        FxSend* fxs = (*itEngineChannel)->GetFxSend(i);
3069                        if(fxs != NULL && fxs->DestinationEffectChain() == iSendEffectChain && fxs->DestinationEffectChainPosition() == iEffectChainPosition) {
3070                            throw Exception("The effect instance is still in use by channel " + ToString((*itEngineChannel)->GetSamplerChannel()->Index()));
3071                        }
3072                    }
3073                }
3074            }
3075    
3076          pEffectChain->RemoveEffect(iEffectChainPosition);          pEffectChain->RemoveEffect(iEffectChainPosition);
3077            LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_send_fx_chain_info, iAudioOutputDevice, iSendEffectChain, pEffectChain->EffectCount()));
3078      } catch (Exception e) {      } catch (Exception e) {
3079          result.Error(e);          result.Error(e);
3080      }      }
# Line 3020  String LSCPServer::GetTotalVoiceCount() Line 3215  String LSCPServer::GetTotalVoiceCount()
3215  String LSCPServer::GetTotalVoiceCountMax() {  String LSCPServer::GetTotalVoiceCountMax() {
3216      dmsg(2,("LSCPServer: GetTotalVoiceCountMax()\n"));      dmsg(2,("LSCPServer: GetTotalVoiceCountMax()\n"));
3217      LSCPResultSet result;      LSCPResultSet result;
3218      result.Add(EngineFactory::EngineInstances().size() * GLOBAL_MAX_VOICES);      result.Add(EngineFactory::EngineInstances().size() * pSampler->GetGlobalMaxVoices());
3219      return result.Produce();      return result.Produce();
3220  }  }
3221    
# Line 3031  String LSCPServer::GetTotalVoiceCountMax Line 3226  String LSCPServer::GetTotalVoiceCountMax
3226  String LSCPServer::GetGlobalMaxVoices() {  String LSCPServer::GetGlobalMaxVoices() {
3227      dmsg(2,("LSCPServer: GetGlobalMaxVoices()\n"));      dmsg(2,("LSCPServer: GetGlobalMaxVoices()\n"));
3228      LSCPResultSet result;      LSCPResultSet result;
3229      result.Add(GLOBAL_MAX_VOICES);      result.Add(pSampler->GetGlobalMaxVoices());
3230      return result.Produce();      return result.Produce();
3231  }  }
3232    
# Line 3043  String LSCPServer::SetGlobalMaxVoices(in Line 3238  String LSCPServer::SetGlobalMaxVoices(in
3238      dmsg(2,("LSCPServer: SetGlobalMaxVoices(%d)\n", iVoices));      dmsg(2,("LSCPServer: SetGlobalMaxVoices(%d)\n", iVoices));
3239      LSCPResultSet result;      LSCPResultSet result;
3240      try {      try {
3241          if (iVoices < 1) throw Exception("Maximum voices may not be less than 1");          pSampler->SetGlobalMaxVoices(iVoices);
3242          GLOBAL_MAX_VOICES = iVoices; // see common/global_private.cpp          LSCPServer::SendLSCPNotify(
3243          const std::set<Engine*>& engines = EngineFactory::EngineInstances();              LSCPEvent(LSCPEvent::event_global_info, "VOICES", pSampler->GetGlobalMaxVoices())
3244          if (engines.size() > 0) {          );
             std::set<Engine*>::iterator iter = engines.begin();  
             std::set<Engine*>::iterator end  = engines.end();  
             for (; iter != end; ++iter) {  
                 (*iter)->SetMaxVoices(iVoices);  
             }  
         }  
         LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_global_info, "VOICES", GLOBAL_MAX_VOICES));  
3245      } catch (Exception e) {      } catch (Exception e) {
3246          result.Error(e);          result.Error(e);
3247      }      }
# Line 3067  String LSCPServer::SetGlobalMaxVoices(in Line 3255  String LSCPServer::SetGlobalMaxVoices(in
3255  String LSCPServer::GetGlobalMaxStreams() {  String LSCPServer::GetGlobalMaxStreams() {
3256      dmsg(2,("LSCPServer: GetGlobalMaxStreams()\n"));      dmsg(2,("LSCPServer: GetGlobalMaxStreams()\n"));
3257      LSCPResultSet result;      LSCPResultSet result;
3258      result.Add(GLOBAL_MAX_STREAMS);      result.Add(pSampler->GetGlobalMaxStreams());
3259      return result.Produce();      return result.Produce();
3260  }  }
3261    
# Line 3079  String LSCPServer::SetGlobalMaxStreams(i Line 3267  String LSCPServer::SetGlobalMaxStreams(i
3267      dmsg(2,("LSCPServer: SetGlobalMaxStreams(%d)\n", iStreams));      dmsg(2,("LSCPServer: SetGlobalMaxStreams(%d)\n", iStreams));
3268      LSCPResultSet result;      LSCPResultSet result;
3269      try {      try {
3270          if (iStreams < 0) throw Exception("Maximum disk streams may not be negative");          pSampler->SetGlobalMaxStreams(iStreams);
3271          GLOBAL_MAX_STREAMS = iStreams; // see common/global_private.cpp          LSCPServer::SendLSCPNotify(
3272          const std::set<Engine*>& engines = EngineFactory::EngineInstances();              LSCPEvent(LSCPEvent::event_global_info, "STREAMS", pSampler->GetGlobalMaxStreams())
3273          if (engines.size() > 0) {          );
             std::set<Engine*>::iterator iter = engines.begin();  
             std::set<Engine*>::iterator end  = engines.end();  
             for (; iter != end; ++iter) {  
                 (*iter)->SetMaxDiskStreams(iStreams);  
             }  
         }  
         LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_global_info, "STREAMS", GLOBAL_MAX_STREAMS));  
3274      } catch (Exception e) {      } catch (Exception e) {
3275          result.Error(e);          result.Error(e);
3276      }      }
# Line 3293  void LSCPServer::VerifyFile(String Filen Line 3474  void LSCPServer::VerifyFile(String Filen
3474  String LSCPServer::SubscribeNotification(LSCPEvent::event_t type) {  String LSCPServer::SubscribeNotification(LSCPEvent::event_t type) {
3475      dmsg(2,("LSCPServer: SubscribeNotification(Event=%s)\n", LSCPEvent::Name(type).c_str()));      dmsg(2,("LSCPServer: SubscribeNotification(Event=%s)\n", LSCPEvent::Name(type).c_str()));
3476      LSCPResultSet result;      LSCPResultSet result;
3477      SubscriptionMutex.Lock();      {
3478      eventSubscriptions[type].push_back(currentSocket);          LockGuard lock(SubscriptionMutex);
3479      SubscriptionMutex.Unlock();          eventSubscriptions[type].push_back(currentSocket);
3480        }
3481      return result.Produce();      return result.Produce();
3482  }  }
3483    
# Line 3306  String LSCPServer::SubscribeNotification Line 3488  String LSCPServer::SubscribeNotification
3488  String LSCPServer::UnsubscribeNotification(LSCPEvent::event_t type) {  String LSCPServer::UnsubscribeNotification(LSCPEvent::event_t type) {
3489      dmsg(2,("LSCPServer: UnsubscribeNotification(Event=%s)\n", LSCPEvent::Name(type).c_str()));      dmsg(2,("LSCPServer: UnsubscribeNotification(Event=%s)\n", LSCPEvent::Name(type).c_str()));
3490      LSCPResultSet result;      LSCPResultSet result;
3491      SubscriptionMutex.Lock();      {
3492      eventSubscriptions[type].remove(currentSocket);          LockGuard lock(SubscriptionMutex);
3493      SubscriptionMutex.Unlock();          eventSubscriptions[type].remove(currentSocket);
3494        }
3495      return result.Produce();      return result.Produce();
3496  }  }
3497    
# Line 3833  String LSCPServer::SetEcho(yyparse_param Line 4016  String LSCPServer::SetEcho(yyparse_param
4016      }      }
4017      return result.Produce();      return result.Produce();
4018  }  }
4019    
4020    String LSCPServer::SetShellInteract(yyparse_param_t* pSession, double boolean_value) {
4021        dmsg(2,("LSCPServer: SetShellInteract(val=%f)\n", boolean_value));
4022        LSCPResultSet result;
4023        try {
4024            if      (boolean_value == 0) pSession->bShellInteract = false;
4025            else if (boolean_value == 1) pSession->bShellInteract = true;
4026            else throw Exception("Not a boolean value, must either be 0 or 1");
4027        } catch (Exception e) {
4028            result.Error(e);
4029        }
4030        return result.Produce();
4031    }
4032    
4033    String LSCPServer::SetShellAutoCorrect(yyparse_param_t* pSession, double boolean_value) {
4034        dmsg(2,("LSCPServer: SetShellAutoCorrect(val=%f)\n", boolean_value));
4035        LSCPResultSet result;
4036        try {
4037            if      (boolean_value == 0) pSession->bShellAutoCorrect = false;
4038            else if (boolean_value == 1) pSession->bShellAutoCorrect = true;
4039            else throw Exception("Not a boolean value, must either be 0 or 1");
4040        } catch (Exception e) {
4041            result.Error(e);
4042        }
4043        return result.Produce();
4044    }
4045    
4046  }  }
Legend:
Removed from v.2140  
changed lines
  Added in v.2528
  ViewVC Help
Powered by ViewVC