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

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

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

revision 1212 by schoenebeck, Tue May 29 23:59:36 2007 UTC revision 1424 by schoenebeck, Sun Oct 14 22:00:17 2007 UTC
# Line 25  Line 25 
25  #include <signal.h>  #include <signal.h>
26    
27  #include "Sampler.h"  #include "Sampler.h"
28    #include "common/global_private.h"
29  #include "engines/EngineFactory.h"  #include "engines/EngineFactory.h"
30  #include "engines/InstrumentEditorFactory.h"  #include "plugins/InstrumentEditorFactory.h"
31  #include "drivers/midi/MidiInputDeviceFactory.h"  #include "drivers/midi/MidiInputDeviceFactory.h"
32  #include "drivers/audio/AudioOutputDeviceFactory.h"  #include "drivers/audio/AudioOutputDeviceFactory.h"
33  #include "engines/gig/Profiler.h"  #include "engines/gig/Profiler.h"
# Line 165  int main(int argc, char **argv) { Line 166  int main(int argc, char **argv) {
166                if (!pEngineChannel) continue;                if (!pEngineChannel) continue;
167                Engine* pEngine = pEngineChannel->GetEngine();                Engine* pEngine = pEngineChannel->GetEngine();
168                if (!pEngine) continue;                if (!pEngine) continue;
169                pSampler->fireVoiceCountChanged(iter->first, pEngine->VoiceCount());                pSampler->fireVoiceCountChanged(iter->first, pEngineChannel->GetVoiceCount());
170                pSampler->fireStreamCountChanged(iter->first, pEngine->DiskStreamCount());                pSampler->fireStreamCountChanged(iter->first, pEngineChannel->GetDiskStreamCount());
171                pSampler->fireBufferFillChanged(iter->first, pEngine->DiskStreamBufferFillPercentage());                pSampler->fireBufferFillChanged(iter->first, pEngine->DiskStreamBufferFillPercentage());
172                pSampler->fireTotalVoiceCountChanged(pSampler->GetVoiceCount());                pSampler->fireTotalVoiceCountChanged(pSampler->GetVoiceCount());
173            }            }
# Line 182  void signal_handler(int iSignal) { Line 183  void signal_handler(int iSignal) {
183      switch (iSignal) {      switch (iSignal) {
184          case SIGINT: {          case SIGINT: {
185              if (pthread_equal(pthread_self(), main_thread)) {              if (pthread_equal(pthread_self(), main_thread)) {
186                  if (pLSCPServer) {                  if (pLSCPServer) pLSCPServer->StopThread();
187                      pLSCPServer->StopThread();                  // the delete order here is important: the Sampler
188                      delete pLSCPServer;                  // destructor sends notifications to the lscpserver
                 }  
189                  if (pSampler) delete pSampler;                  if (pSampler) delete pSampler;
190                    if (pLSCPServer) delete pLSCPServer;
191  #if HAVE_SQLITE3  #if HAVE_SQLITE3
192                  InstrumentsDb::Destroy();                  InstrumentsDb::Destroy();
193  #endif  #endif
# Line 291  void parse_options(int argc, char **argv Line 292  void parse_options(int argc, char **argv
292    
293                              if (res) {                              if (res) {
294                                  std::stringstream ss;                                  std::stringstream ss;
295                                  ss << "Fail to stat `" << optarg << "`: " << strerror(errno);                                  ss << "Failed to stat `" << optarg << "`: " << strerror(errno);
296                                  throw Exception(ss.str());                                  throw Exception(ss.str());
297                              }                              }
298    
# Line 304  void parse_options(int argc, char **argv Line 305  void parse_options(int argc, char **argv
305                              InstrumentsDb::GetInstrumentsDb()->SetDbFile(String(optarg));                              InstrumentsDb::GetInstrumentsDb()->SetDbFile(String(optarg));
306                          }                          }
307                      } catch(Exception e) {                      } catch(Exception e) {
308                          std::cerr << e.Message() << std::endl << std::endl;                          std::cerr << "Could not open instruments DB file: "
309                          return;                                    << e.Message() << std::endl;
310                            exit(EXIT_FAILURE);
311                      }                      }
312                        break;
                     return;  
313  #else  #else
314                      std::cerr << "LinuxSampler was not build with ";                      std::cerr << "LinuxSampler was not build with ";
315                      std::cerr << "instruments database support." <<std::endl;                      std::cerr << "instruments database support!\n";
316                      return;                      exit(EXIT_FAILURE);
317  #endif                                    break;
318    #endif
319                  case 6: // --create-instruments-db                  case 6: // --create-instruments-db
320  #if HAVE_SQLITE3  #if HAVE_SQLITE3
321                      try {                      try {
# Line 333  void parse_options(int argc, char **argv Line 335  void parse_options(int argc, char **argv
335                      return;                      return;
336  #else  #else
337                      std::cerr << "Failed to create the database. LinuxSampler was ";                      std::cerr << "Failed to create the database. LinuxSampler was ";
338                      std::cerr << "not build with instruments database support." <<std::endl;                      std::cerr << "not build with instruments database support!\n";
339                      exit(EXIT_FAILURE);                      exit(EXIT_FAILURE);
340                      return;                      return;
341  #endif                #endif
342                  case 7: // --lscp-addr                  case 7: // --lscp-addr
343                      struct in_addr addr;                      struct in_addr addr;
344                      if (inet_aton(optarg, &addr) == 0)                      if (inet_aton(optarg, &addr) == 0)
Legend:
Removed from v.1212  
changed lines
  Added in v.1424
  ViewVC Help
Powered by ViewVC