/[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 2306 by iliev, Tue Jan 24 13:00:40 2012 UTC revision 3056 by schoenebeck, Fri Dec 16 12:57:59 2016 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-2011 Christian Schoenebeck                         *   *   Copyright (C) 2005-2016 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 56  LSCPServer* pLSCPServer = NULL; Line 56  LSCPServer* pLSCPServer = NULL;
56  // inet_aton seems missing under WIN32  // inet_aton seems missing under WIN32
57  #ifndef INADDR_NONE  #ifndef INADDR_NONE
58  #define INADDR_NONE 0xffffffff  #define INADDR_NONE 0xffffffff
59    typedef unsigned long in_addr_t;
60  #endif  #endif
61    
62  int inet_aton(const char *cp, struct in_addr *addr)  int inet_aton(const char *cp, struct in_addr *addr)
# Line 100  int main(int argc, char **argv) { Line 101  int main(int argc, char **argv) {
101      if (bShowStackTrace) {      if (bShowStackTrace) {
102          #if defined(WIN32)          #if defined(WIN32)
103          // FIXME: sigaction() not supported on WIN32, we ignore it for now          // FIXME: sigaction() not supported on WIN32, we ignore it for now
104            #elif AC_APPLE_UNIVERSAL_BUILD
105            // not used for Xcode
106          #else          #else
107          StackTraceInit(argv[0], -1);          StackTraceInit(argv[0], -1);
108          // register signal handler for all unusual signals          // register signal handler for all unusual signals
# Line 119  int main(int argc, char **argv) { Line 122  int main(int argc, char **argv) {
122    
123      dmsg(1,("LinuxSampler %s\n", VERSION));      dmsg(1,("LinuxSampler %s\n", VERSION));
124      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"));
125      dmsg(1,("Copyright (C) 2005-2011 Christian Schoenebeck\n"));      dmsg(1,("Copyright (C) 2005-2016 Christian Schoenebeck\n"));
126        dmsg(1,("Binary built: " __DATE__ "\n"))
127    
128      #if defined(WIN32)      #if defined(WIN32)
129      #if 0      #if 0
# Line 195  int main(int argc, char **argv) { Line 199  int main(int argc, char **argv) {
199    
200      // start LSCP network server      // start LSCP network server
201      struct in_addr addr;      struct in_addr addr;
202      addr.s_addr = lscp_addr;      addr.s_addr = (in_addr_t)lscp_addr;
203      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)));
204      pLSCPServer = new LSCPServer(pSampler, lscp_addr, lscp_port);      pLSCPServer = new LSCPServer(pSampler, lscp_addr, lscp_port);
205      pLSCPServer->StartThread();      pLSCPServer->StartThread();
# Line 220  int main(int argc, char **argv) { Line 224  int main(int argc, char **argv) {
224          }          }
225      }      }
226    
227    //TODO: (hopefully) just a temporary nasty hack for launching gigedit on the main thread on Mac (see comments in gigedit.cpp for details)
228    #if defined(__APPLE__)
229        g_mainThreadCallbackSupported = true;
230    #endif
231    
232      while (atomic_read(&running)) {      while (atomic_read(&running)) {
233          if (bPrintStatistics) {          if (bPrintStatistics) {
234              const std::set<Engine*>& engines = EngineFactory::EngineInstances();              const std::set<Engine*>& engines = EngineFactory::EngineInstances();
# Line 247  int main(int argc, char **argv) { Line 256  int main(int argc, char **argv) {
256          }          }
257    
258          pSampler->fireStatistics();          pSampler->fireStatistics();
259            
260            //TODO: (hopefully) just a temporary nasty hack for launching gigedit on the main thread on Mac (see comments in gigedit.cpp for details)
261            #if defined(__APPLE__)
262            if (g_fireMainThreadCallback && g_mainThreadCallback) {
263                void (*fn)(void* info) = g_mainThreadCallback;
264                void* info = g_mainThreadCallbackInfo;
265                g_mainThreadCallbackInfo = NULL;
266                g_mainThreadCallback     = NULL;
267                g_fireMainThreadCallback = false;
268                printf("Received main thread callback, calling now ...\n"); fflush(stdout);
269                (*fn)(info);
270                printf("Main thread callback executed.\n"); fflush(stdout);
271            }
272            #endif
273      }      }
274    //#endif
275      if (pLSCPServer) pLSCPServer->StopThread();      if (pLSCPServer) pLSCPServer->StopThread();
276      // the delete order here is important: the Sampler      // the delete order here is important: the Sampler
277      // destructor sends notifications to the lscpserver      // destructor sends notifications to the lscpserver
# Line 292  void signal_handler(int iSignal) { Line 316  void signal_handler(int iSignal) {
316      signal(iSignal, SIG_DFL); // Reinstall default handler to prevent race conditions      signal(iSignal, SIG_DFL); // Reinstall default handler to prevent race conditions
317      if (bShowStackTrace) {      if (bShowStackTrace) {
318          std::cerr << "Showing stack trace...\n" << std::flush;          std::cerr << "Showing stack trace...\n" << std::flush;
319            #if !AC_APPLE_UNIVERSAL_BUILD
320          StackTrace();          StackTrace();
321            #endif
322          sleep(2);          sleep(2);
323      }      }
324      std::cerr << "Killing LinuxSampler...\n" << std::flush;      std::cerr << "Killing LinuxSampler...\n" << std::flush;
# Line 433  void parse_options(int argc, char **argv Line 459  void parse_options(int argc, char **argv
459                  }                  }
460                  case 8: {// --lscp-port                  case 8: {// --lscp-port
461                      long unsigned int port = 0;                      long unsigned int port = 0;
462                      if ((sscanf(optarg, "%u", &port) != 1) || (port == 0) || (port > 65535))                      if ((sscanf(optarg, "%lu", &port) != 1) || (port == 0) || (port > 65535))
463                          printf("WARNING: Failed to parse lscp-port argument, ignoring!\n");                          printf("WARNING: Failed to parse lscp-port argument, ignoring!\n");
464                      else                      else
465                          lscp_port = htons(port);                          lscp_port = htons(port);
Legend:
Removed from v.2306  
changed lines
  Added in v.3056
  ViewVC Help
Powered by ViewVC