/[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 2885 by schoenebeck, Fri Apr 22 15:37:45 2016 UTC revision 3056 by schoenebeck, Fri Dec 16 12:57:59 2016 UTC
# 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 196  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 313  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;
Legend:
Removed from v.2885  
changed lines
  Added in v.3056
  ViewVC Help
Powered by ViewVC