/[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 1187 by iliev, Wed May 16 14:22:26 2007 UTC revision 1252 by schoenebeck, Sat Jun 23 15:54:18 2007 UTC
# Line 52  Line 52 
52  fd_set LSCPServer::fdSet;  fd_set LSCPServer::fdSet;
53  int LSCPServer::currentSocket = -1;  int LSCPServer::currentSocket = -1;
54  std::vector<yyparse_param_t> LSCPServer::Sessions = std::vector<yyparse_param_t>();  std::vector<yyparse_param_t> LSCPServer::Sessions = std::vector<yyparse_param_t>();
55    std::vector<yyparse_param_t>::iterator itCurrentSession = std::vector<yyparse_param_t>::iterator();
56  std::map<int,String> LSCPServer::bufferedNotifies = std::map<int,String>();  std::map<int,String> LSCPServer::bufferedNotifies = std::map<int,String>();
57  std::map<int,String> LSCPServer::bufferedCommands = std::map<int,String>();  std::map<int,String> LSCPServer::bufferedCommands = std::map<int,String>();
58  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 = std::map< LSCPEvent::event_t, std::list<int> >();
# Line 84  LSCPServer::LSCPServer(Sampler* pSampler Line 85  LSCPServer::LSCPServer(Sampler* pSampler
85      LSCPEvent::RegisterEvent(LSCPEvent::event_db_instr_dir_info, "DB_INSTRUMENT_DIRECTORY_INFO");      LSCPEvent::RegisterEvent(LSCPEvent::event_db_instr_dir_info, "DB_INSTRUMENT_DIRECTORY_INFO");
86      LSCPEvent::RegisterEvent(LSCPEvent::event_db_instr_count, "DB_INSTRUMENT_COUNT");      LSCPEvent::RegisterEvent(LSCPEvent::event_db_instr_count, "DB_INSTRUMENT_COUNT");
87      LSCPEvent::RegisterEvent(LSCPEvent::event_db_instr_info, "DB_INSTRUMENT_INFO");      LSCPEvent::RegisterEvent(LSCPEvent::event_db_instr_info, "DB_INSTRUMENT_INFO");
88        LSCPEvent::RegisterEvent(LSCPEvent::event_db_instrs_job_info, "DB_INSTRUMENTS_JOB_INFO");
89      LSCPEvent::RegisterEvent(LSCPEvent::event_misc, "MISCELLANEOUS");      LSCPEvent::RegisterEvent(LSCPEvent::event_misc, "MISCELLANEOUS");
90      LSCPEvent::RegisterEvent(LSCPEvent::event_total_voice_count, "TOTAL_VOICE_COUNT");      LSCPEvent::RegisterEvent(LSCPEvent::event_total_voice_count, "TOTAL_VOICE_COUNT");
91      LSCPEvent::RegisterEvent(LSCPEvent::event_global_info, "GLOBAL_INFO");      LSCPEvent::RegisterEvent(LSCPEvent::event_global_info, "GLOBAL_INFO");
# Line 164  void LSCPServer::DbInstrumentsEventHandl Line 166  void LSCPServer::DbInstrumentsEventHandl
166  void LSCPServer::DbInstrumentsEventHandler::InstrumentInfoChanged(String Instr) {  void LSCPServer::DbInstrumentsEventHandler::InstrumentInfoChanged(String Instr) {
167      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instr_info, Instr));      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instr_info, Instr));
168  }  }
169    
170  void LSCPServer::DbInstrumentsEventHandler::InstrumentNameChanged(String Instr, String NewName) {  void LSCPServer::DbInstrumentsEventHandler::InstrumentNameChanged(String Instr, String NewName) {
171      Instr = "'" + Instr + "'";      Instr = "'" + Instr + "'";
172      NewName = "'" + NewName + "'";      NewName = "'" + NewName + "'";
173      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instr_info, "NAME", Instr, NewName));      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instr_info, "NAME", Instr, NewName));
174  }  }
175    
176    void LSCPServer::DbInstrumentsEventHandler::JobStatusChanged(int JobId) {
177        LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instrs_job_info, JobId));
178    }
179  #endif // HAVE_SQLITE3  #endif // HAVE_SQLITE3
180    
181    
# Line 212  int LSCPServer::Main() { Line 219  int LSCPServer::Main() {
219    
220      listen(hSocket, 1);      listen(hSocket, 1);
221      Initialized.Set(true);      Initialized.Set(true);
222        
223      // Registering event listeners      // Registering event listeners
224      pSampler->AddChannelCountListener(&eventHandler);      pSampler->AddChannelCountListener(&eventHandler);
225      pSampler->AddAudioDeviceCountListener(&eventHandler);      pSampler->AddAudioDeviceCountListener(&eventHandler);
# Line 321  int LSCPServer::Main() { Line 328  int LSCPServer::Main() {
328                                  int dummy; // just a temporary hack to fulfill the restart() function prototype                                  int dummy; // just a temporary hack to fulfill the restart() function prototype
329                                  restart(NULL, dummy); // restart the 'scanner'                                  restart(NULL, dummy); // restart the 'scanner'
330                                  currentSocket = (*iter).hSession;  //a hack                                  currentSocket = (*iter).hSession;  //a hack
331                                    itCurrentSession = iter; // another hack
332                                  dmsg(2,("LSCPServer: [%s]\n",bufferedCommands[currentSocket].c_str()));                                  dmsg(2,("LSCPServer: [%s]\n",bufferedCommands[currentSocket].c_str()));
333                                  if ((*iter).bVerbose) { // if echo mode enabled                                  if ((*iter).bVerbose) { // if echo mode enabled
334                                      AnswerClient(bufferedCommands[currentSocket]);                                      AnswerClient(bufferedCommands[currentSocket]);
335                                  }                                  }
336                                  int result = yyparse(&(*iter));                                  int result = yyparse(&(*iter));
337                                  currentSocket = -1;     //continuation of a hack                                  currentSocket = -1;     //continuation of a hack
338                                    itCurrentSession = Sessions.end(); // hack as well
339                                  dmsg(3,("LSCPServer: Done parsing on socket %d.\n", currentSocket));                                  dmsg(3,("LSCPServer: Done parsing on socket %d.\n", currentSocket));
340                                  if (result == LSCP_QUIT) { //Was it a quit command by any chance?                                  if (result == LSCP_QUIT) { //Was it a quit command by any chance?
341                                          CloseConnection(iter);                                          CloseConnection(iter);
# Line 419  extern int GetLSCPCommand( void *buf, in Line 428  extern int GetLSCPCommand( void *buf, in
428          return command.size();          return command.size();
429  }  }
430    
431    extern yyparse_param_t* GetCurrentYaccSession() {
432        return &(*itCurrentSession);
433    }
434    
435  /**  /**
436   * Will be called to try to read the command from the socket   * Will be called to try to read the command from the socket
437   * If command is read, it will return true. Otherwise false is returned.   * If command is read, it will return true. Otherwise false is returned.
# Line 606  EngineChannel* LSCPServer::GetEngineChan Line 619  EngineChannel* LSCPServer::GetEngineChan
619      EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();      EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();
620      if (!pEngineChannel) throw Exception("There is no engine deployed on this sampler channel yet");      if (!pEngineChannel) throw Exception("There is no engine deployed on this sampler channel yet");
621    
622      return pEngineChannel;              return pEngineChannel;
623  }  }
624    
625  /**  /**
# Line 1993  String LSCPServer::CreateFxSend(uint uiS Line 2006  String LSCPServer::CreateFxSend(uint uiS
2006      LSCPResultSet result;      LSCPResultSet result;
2007      try {      try {
2008          EngineChannel* pEngineChannel = GetEngineChannel(uiSamplerChannel);          EngineChannel* pEngineChannel = GetEngineChannel(uiSamplerChannel);
2009            
2010          FxSend* pFxSend = pEngineChannel->AddFxSend(MidiCtrl, Name);          FxSend* pFxSend = pEngineChannel->AddFxSend(MidiCtrl, Name);
2011          if (!pFxSend) throw Exception("Could not add FxSend, don't ask, I don't know why (probably a bug)");          if (!pFxSend) throw Exception("Could not add FxSend, don't ask, I don't know why (probably a bug)");
2012    
# Line 2077  String LSCPServer::GetFxSendInfo(uint ui Line 2090  String LSCPServer::GetFxSendInfo(uint ui
2090      try {      try {
2091          EngineChannel* pEngineChannel = GetEngineChannel(uiSamplerChannel);          EngineChannel* pEngineChannel = GetEngineChannel(uiSamplerChannel);
2092          FxSend* pFxSend = GetFxSend(uiSamplerChannel, FxSendID);          FxSend* pFxSend = GetFxSend(uiSamplerChannel, FxSendID);
2093            
2094          // gather audio routing informations          // gather audio routing informations
2095          String AudioRouting;          String AudioRouting;
2096          for (int chan = 0; chan < pEngineChannel->Channels(); chan++) {          for (int chan = 0; chan < pEngineChannel->Channels(); chan++) {
# Line 2152  String LSCPServer::SetFxSendLevel(uint u Line 2165  String LSCPServer::SetFxSendLevel(uint u
2165      return result.Produce();      return result.Produce();
2166  }  }
2167    
2168    String LSCPServer::EditSamplerChannelInstrument(uint uiSamplerChannel) {
2169        dmsg(2,("LSCPServer: EditSamplerChannelInstrument(SamplerChannel=%d)\n", uiSamplerChannel));
2170        LSCPResultSet result;
2171        try {
2172            SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
2173            if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));
2174            EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();
2175            if (!pEngineChannel) throw Exception("No engine type assigned to sampler channel");
2176            Engine* pEngine = pEngineChannel->GetEngine();
2177            InstrumentManager* pInstrumentManager = pEngine->GetInstrumentManager();
2178            if (!pInstrumentManager) throw Exception("Engine does not provide an instrument manager");
2179            InstrumentManager::instrument_id_t instrumentID;
2180            instrumentID.FileName = pEngineChannel->InstrumentFileName();
2181            instrumentID.Index    = pEngineChannel->InstrumentIndex();
2182            pInstrumentManager->LaunchInstrumentEditor(instrumentID);
2183        } catch (Exception e) {
2184            result.Error(e);
2185        }
2186        return result.Produce();
2187    }
2188    
2189  /**  /**
2190   * Will be called by the parser to reset a particular sampler channel.   * Will be called by the parser to reset a particular sampler channel.
2191   */   */
# Line 2196  String LSCPServer::GetServerInfo() { Line 2230  String LSCPServer::GetServerInfo() {
2230  #else  #else
2231      result.Add("INSTRUMENTS_DB_SUPPORT", "no");      result.Add("INSTRUMENTS_DB_SUPPORT", "no");
2232  #endif  #endif
2233        
2234      return result.Produce();      return result.Produce();
2235  }  }
2236    
# Line 2411  String LSCPServer::SetDbInstrumentDirect Line 2445  String LSCPServer::SetDbInstrumentDirect
2445      return result.Produce();      return result.Produce();
2446  }  }
2447    
2448  String LSCPServer::AddDbInstruments(String DbDir, String FilePath, int Index) {  String LSCPServer::AddDbInstruments(String DbDir, String FilePath, int Index, bool bBackground) {
2449      dmsg(2,("LSCPServer: AddDbInstruments(DbDir=%s,FilePath=%s,Index=%d)\n", DbDir.c_str(), FilePath.c_str(), Index));      dmsg(2,("LSCPServer: AddDbInstruments(DbDir=%s,FilePath=%s,Index=%d,bBackground=%d)\n", DbDir.c_str(), FilePath.c_str(), Index, bBackground));
2450      LSCPResultSet result;      LSCPResultSet result;
2451  #if HAVE_SQLITE3  #if HAVE_SQLITE3
2452      try {      try {
2453          InstrumentsDb::GetInstrumentsDb()->AddInstruments(DbDir, FilePath, Index);          int id;
2454            InstrumentsDb* db = InstrumentsDb::GetInstrumentsDb();
2455            id = db->AddInstruments(DbDir, FilePath, Index, bBackground);
2456            if (bBackground) result = id;
2457      } catch (Exception e) {      } catch (Exception e) {
2458           result.Error(e);           result.Error(e);
2459      }      }
# Line 2426  String LSCPServer::AddDbInstruments(Stri Line 2463  String LSCPServer::AddDbInstruments(Stri
2463      return result.Produce();      return result.Produce();
2464  }  }
2465    
2466  String LSCPServer::AddDbInstrumentsFlat(String DbDir, String FsDir) {  String LSCPServer::AddDbInstruments(String ScanMode, String DbDir, String FsDir, bool bBackground) {
2467      dmsg(2,("LSCPServer: AddDbInstrumentsFlat(DbDir=%s,FilePath=%s)\n", DbDir.c_str(), FsDir.c_str()));      dmsg(2,("LSCPServer: AddDbInstruments(ScanMode=%s,DbDir=%s,FsDir=%s,bBackground=%d)\n", ScanMode.c_str(), DbDir.c_str(), FsDir.c_str(), bBackground));
2468      LSCPResultSet result;      LSCPResultSet result;
2469  #if HAVE_SQLITE3  #if HAVE_SQLITE3
2470      try {      try {
2471          InstrumentsDb::GetInstrumentsDb()->AddInstrumentsRecursive(DbDir, FsDir, true);          int id;
2472      } catch (Exception e) {          InstrumentsDb* db = InstrumentsDb::GetInstrumentsDb();
2473           result.Error(e);          if (ScanMode.compare("RECURSIVE") == 0) {
2474      }             id = db->AddInstruments(RECURSIVE, DbDir, FsDir, bBackground);
2475  #else          } else if (ScanMode.compare("NON_RECURSIVE") == 0) {
2476      result.Error(String(DOESNT_HAVE_SQLITE3), 0);             id = db->AddInstruments(NON_RECURSIVE, DbDir, FsDir, bBackground);
2477  #endif          } else if (ScanMode.compare("FLAT") == 0) {
2478      return result.Produce();             id = db->AddInstruments(FLAT, DbDir, FsDir, bBackground);
2479  }          } else {
2480                throw Exception("Unknown scan mode: " + ScanMode);
2481            }
2482    
2483  String LSCPServer::AddDbInstrumentsNonrecursive(String DbDir, String FsDir) {          if (bBackground) result = id;
     dmsg(2,("LSCPServer: AddDbInstrumentsNonrecursive(DbDir=%s,FilePath=%s)\n", DbDir.c_str(), FsDir.c_str()));  
     LSCPResultSet result;  
 #if HAVE_SQLITE3  
     try {  
         InstrumentsDb::GetInstrumentsDb()->AddInstrumentsNonrecursive(DbDir, FsDir);  
2484      } catch (Exception e) {      } catch (Exception e) {
2485           result.Error(e);           result.Error(e);
2486      }      }
# Line 2537  String LSCPServer::GetDbInstrumentInfo(S Line 2571  String LSCPServer::GetDbInstrumentInfo(S
2571      return result.Produce();      return result.Produce();
2572  }  }
2573    
2574    String LSCPServer::GetDbInstrumentsJobInfo(int JobId) {
2575        dmsg(2,("LSCPServer: GetDbInstrumentsJobInfo(JobId=%d)\n", JobId));
2576        LSCPResultSet result;
2577    #if HAVE_SQLITE3
2578        try {
2579            ScanJob job = InstrumentsDb::GetInstrumentsDb()->Jobs.GetJobById(JobId);
2580    
2581            result.Add("FILES_TOTAL", job.FilesTotal);
2582            result.Add("FILES_SCANNED", job.FilesScanned);
2583            result.Add("SCANNING", job.Scanning);
2584            result.Add("STATUS", job.Status);
2585        } catch (Exception e) {
2586             result.Error(e);
2587        }
2588    #else
2589        result.Error(String(DOESNT_HAVE_SQLITE3), 0);
2590    #endif
2591        return result.Produce();
2592    }
2593    
2594  String LSCPServer::SetDbInstrumentName(String Instr, String Name) {  String LSCPServer::SetDbInstrumentName(String Instr, String Name) {
2595      dmsg(2,("LSCPServer: SetDbInstrumentName(Instr=%s,Name=%s)\n", Instr.c_str(), Name.c_str()));      dmsg(2,("LSCPServer: SetDbInstrumentName(Instr=%s,Name=%s)\n", Instr.c_str(), Name.c_str()));
2596      LSCPResultSet result;      LSCPResultSet result;
# Line 2719  String LSCPServer::FilterEndlines(String Line 2773  String LSCPServer::FilterEndlines(String
2773          if (s2.at(i) == '\r') s2.at(i) = ' ';          if (s2.at(i) == '\r') s2.at(i) = ' ';
2774          else if (s2.at(i) == '\n') s2.at(i) = ' ';          else if (s2.at(i) == '\n') s2.at(i) = ' ';
2775      }      }
2776        
2777      return s2;      return s2;
2778  }  }
Legend:
Removed from v.1187  
changed lines
  Added in v.1252
  ViewVC Help
Powered by ViewVC