/[svn]/qsampler/trunk/src/qsamplerMainForm.cpp
ViewVC logotype

Diff of /qsampler/trunk/src/qsamplerMainForm.cpp

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

revision 3128 by capela, Thu Apr 27 11:09:16 2017 UTC revision 3357 by capela, Tue Oct 17 21:44:20 2017 UTC
# Line 91  static inline long lroundf ( float x ) Line 91  static inline long lroundf ( float x )
91    
92    
93  // All winsock apps needs this.  // All winsock apps needs this.
94  #if defined(WIN32)  #if defined(_WIN32)
95  static WSADATA _wsaData;  static WSADATA _wsaData;
96  #endif  #endif
97    
# Line 324  MainForm::MainForm ( QWidget *pParent ) Line 324  MainForm::MainForm ( QWidget *pParent )
324          m_statusItem[QSAMPLER_STATUS_SESSION] = pLabel;          m_statusItem[QSAMPLER_STATUS_SESSION] = pLabel;
325          statusBar()->addWidget(pLabel);          statusBar()->addWidget(pLabel);
326    
327  #if defined(WIN32)  #if defined(_WIN32)
328          WSAStartup(MAKEWORD(1, 1), &_wsaData);          WSAStartup(MAKEWORD(1, 1), &_wsaData);
329  #endif  #endif
330    
# Line 425  MainForm::~MainForm() Line 425  MainForm::~MainForm()
425          // Do final processing anyway.          // Do final processing anyway.
426          processServerExit();          processServerExit();
427    
428  #if defined(WIN32)  #if defined(_WIN32)
429          WSACleanup();          WSACleanup();
430  #endif  #endif
431    
# Line 2868  void MainForm::stopServer ( bool bIntera Line 2868  void MainForm::stopServer ( bool bIntera
2868          if (m_pServer && m_bForceServerStop) {          if (m_pServer && m_bForceServerStop) {
2869                  appendMessages(tr("Server is stopping..."));                  appendMessages(tr("Server is stopping..."));
2870                  if (m_pServer->state() == QProcess::Running) {                  if (m_pServer->state() == QProcess::Running) {
2871                  #if defined(WIN32)                  #if defined(_WIN32)
2872                          // Try harder...                          // Try harder...
2873                          m_pServer->kill();                          m_pServer->kill();
2874                  #else                  #else

Legend:
Removed from v.3128  
changed lines
  Added in v.3357

  ViewVC Help
Powered by ViewVC