/[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 2856 by persson, Wed Jan 6 10:02:40 2016 UTC revision 3455 by persson, Sun Jan 27 10:07:54 2019 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-2016 Christian Schoenebeck                         *   *   Copyright (C) 2005-2017 Christian Schoenebeck                         *
7   *                                                                         *   *                                                                         *
8   *   This program is free software; you can redistribute it and/or modify  *   *   This program 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 58  LSCPServer* pLSCPServer = NULL; Line 58  LSCPServer* pLSCPServer = NULL;
58  #define INADDR_NONE 0xffffffff  #define INADDR_NONE 0xffffffff
59  #endif  #endif
60    
61    typedef unsigned long in_addr_t;
62    
63  int inet_aton(const char *cp, struct in_addr *addr)  int inet_aton(const char *cp, struct in_addr *addr)
64  {  {
65      addr->s_addr = inet_addr(cp);      addr->s_addr = inet_addr(cp);
# Line 100  int main(int argc, char **argv) { Line 102  int main(int argc, char **argv) {
102      if (bShowStackTrace) {      if (bShowStackTrace) {
103          #if defined(WIN32)          #if defined(WIN32)
104          // FIXME: sigaction() not supported on WIN32, we ignore it for now          // FIXME: sigaction() not supported on WIN32, we ignore it for now
105            #elif AC_APPLE_UNIVERSAL_BUILD
106            // not used for Xcode
107          #else          #else
108          StackTraceInit(argv[0], -1);          StackTraceInit(argv[0], -1);
109          // register signal handler for all unusual signals          // register signal handler for all unusual signals
# Line 119  int main(int argc, char **argv) { Line 123  int main(int argc, char **argv) {
123    
124      dmsg(1,("LinuxSampler %s\n", VERSION));      dmsg(1,("LinuxSampler %s\n", VERSION));
125      dmsg(1,("Copyright (C) 2003,2004 by Benno Senoner and Christian Schoenebeck\n"));      dmsg(1,("Copyright (C) 2003,2004 by Benno Senoner and Christian Schoenebeck\n"));
126      dmsg(1,("Copyright (C) 2005-2016 Christian Schoenebeck\n"));      dmsg(1,("Copyright (C) 2005-2019 Christian Schoenebeck\n"));
127        dmsg(1,("Binary built: " __DATE__ "\n"))
128    
129      #if defined(WIN32)      #if defined(WIN32)
130      #if 0      #if 0
# Line 195  int main(int argc, char **argv) { Line 200  int main(int argc, char **argv) {
200    
201      // start LSCP network server      // start LSCP network server
202      struct in_addr addr;      struct in_addr addr;
203      addr.s_addr = lscp_addr;      addr.s_addr = (in_addr_t)lscp_addr;
204      dmsg(1,("Starting LSCP network server (%s:%d)...", inet_ntoa(addr), ntohs(lscp_port)));      dmsg(1,("Starting LSCP network server (%s:%d)...", inet_ntoa(addr), ntohs(lscp_port)));
205      pLSCPServer = new LSCPServer(pSampler, lscp_addr, lscp_port);      pLSCPServer = new LSCPServer(pSampler, lscp_addr, lscp_port);
206      pLSCPServer->StartThread();      pLSCPServer->StartThread();
# Line 312  void signal_handler(int iSignal) { Line 317  void signal_handler(int iSignal) {
317      signal(iSignal, SIG_DFL); // Reinstall default handler to prevent race conditions      signal(iSignal, SIG_DFL); // Reinstall default handler to prevent race conditions
318      if (bShowStackTrace) {      if (bShowStackTrace) {
319          std::cerr << "Showing stack trace...\n" << std::flush;          std::cerr << "Showing stack trace...\n" << std::flush;
320            #if !AC_APPLE_UNIVERSAL_BUILD
321          StackTrace();          StackTrace();
322            #endif
323          sleep(2);          sleep(2);
324      }      }
325      std::cerr << "Killing LinuxSampler...\n" << std::flush;      std::cerr << "Killing LinuxSampler...\n" << std::flush;
# Line 333  void parse_options(int argc, char **argv Line 340  void parse_options(int argc, char **argv
340      int option_index = 0;      int option_index = 0;
341      static struct option long_options[] =      static struct option long_options[] =
342          {          {
343              {"help",0,0,0},              {"help",no_argument,0,0},
344              {"version",0,0,0},              {"version",no_argument,0,0},
345              {"profile",0,0,0},              {"profile",no_argument,0,0},
346              {"no-tune",0,0,0},              {"no-tune",no_argument,0,0},
347              {"statistics",0,0,0},              {"statistics",no_argument,0,0},
348              {"instruments-db-location",1,0,0},              {"instruments-db-location",required_argument,0,0},
349              {"create-instruments-db",1,0,0},              {"create-instruments-db",optional_argument,0,0},
350              {"lscp-addr",1,0,0},              {"lscp-addr",required_argument,0,0},
351              {"lscp-port",1,0,0},              {"lscp-port",required_argument,0,0},
352              {"stacktrace",0,0,0},              {"stacktrace",no_argument,0,0},
353              {"exec-after-init",1,0,0},              {"exec-after-init",required_argument,0,0},
354              {0,0,0,0}              {0,0,0,0}
355          };          };
356    
# Line 424  void parse_options(int argc, char **argv Line 431  void parse_options(int argc, char **argv
431                  case 6: // --create-instruments-db                  case 6: // --create-instruments-db
432  #if HAVE_SQLITE3  #if HAVE_SQLITE3
433                      try {                      try {
434                          if (optarg) {                          std::cout << "Creating instruments database..." << std::endl;
435                              std::cout << "Creating instruments database..." << std::endl;                          if (optarg) // with glibc this only fires with form --create-instruments-db=bla (see below)
436                              InstrumentsDb::CreateInstrumentsDb(String(optarg));                              InstrumentsDb::GetInstrumentsDb()->CreateInstrumentsDb(String(optarg));
437                              std::cout << "Done" << std::endl;                          else if (argv[optind] && argv[optind][0] != '-') // workaround: glibc actually expects form --foo=value for all optional arguments ...
438                          }                              InstrumentsDb::GetInstrumentsDb()->CreateInstrumentsDb(String(argv[optind++]));
439                            else
440                                InstrumentsDb::GetInstrumentsDb()->CreateInstrumentsDb(); // use default instruments db location
441                            std::cout << "Done" << std::endl;
442                      } catch(Exception e) {                      } catch(Exception e) {
443                          std::cerr << e.Message() << std::endl;                          std::cerr << e.Message() << std::endl;
444                          exit(EXIT_FAILURE);                          exit(EXIT_FAILURE);
Legend:
Removed from v.2856  
changed lines
  Added in v.3455
  ViewVC Help
Powered by ViewVC