[Alsamodular-commits] ams/src m_wavout.cpp, 1.4, 1.5 main.cpp, 1.6, 1.7 mainwindow.cpp, 1.7, 1.8 modularsynth.cpp, 1.22, 1.23 synthdata.cpp, 1.16, 1.17

[Guido S. <gs...@us...>]

Update of /cvsroot/alsamodular/ams/src
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv7254/src

Modified Files:
	m_wavout.cpp main.cpp mainwindow.cpp modularsynth.cpp 
	synthdata.cpp 
Log Message:
Fixed compiler warnings caused by usage of string literals without format parameters in qWarning(), appears with Qt 4.5; compiler warning about ignored write() result fixed; compiler warning about ignored getcwd() result fixed.

Index: main.cpp
===================================================================
RCS file: /cvsroot/alsamodular/ams/src/main.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** main.cpp	12 Jun 2009 21:48:06 -0000	1.6
--- main.cpp	28 Dec 2009 17:10:58 -0000	1.7
***************
*** 62,67 ****
      if (!amshome.exists(AMSDIR)) {
          if (!amshome.mkdir(AMSDIR)) {
!             qWarning(QObject::tr("Could not create ams home "
!                         "directory.").toUtf8());
              return -1;
          }
--- 62,67 ----
      if (!amshome.exists(AMSDIR)) {
          if (!amshome.mkdir(AMSDIR)) {
!             qWarning("%s", QObject::tr("Could not create ams home "
!                         "directory.").toLatin1().constData());
              return -1;
          }
***************
*** 73,78 ****
          fd = open(rcPath.toLatin1().data(), O_CREAT|O_RDWR, 0666);
          if (fd == -1) {
!             qWarning(QObject::tr("Failed to open file '%1'")
!                     .arg(rcPath).toUtf8());
              return -1;
          }
--- 73,78 ----
          fd = open(rcPath.toLatin1().data(), O_CREAT|O_RDWR, 0666);
          if (fd == -1) {
!             qWarning("%s", QObject::tr("Failed to open file '%1'")
!                     .arg(rcPath).toLatin1().constData());
              return -1;
          }
***************
*** 85,90 ****
              lock.l_type = F_RDLCK;
              if (fcntl(fd, F_SETLK, &lock) == -1) {
!                 qWarning(QObject::tr("Ooops in %1 at %2")
!                         .arg(__FUNCTION__).arg(__LINE__).toUtf8());
                  return -1;
              }
--- 85,90 ----
              lock.l_type = F_RDLCK;
              if (fcntl(fd, F_SETLK, &lock) == -1) {
!                 qWarning("%s", QObject::tr("Ooops in %1 at %2")
!                         .arg(__FUNCTION__).arg(__LINE__).toLatin1().constData());
                  return -1;
              }
***************
*** 93,97 ****
          }
      }
!     qWarning(QObject::tr("Client name '%1' occupied.").arg(name).toUtf8());
      return -1;
  }
--- 93,98 ----
          }
      }
!     qWarning("%s", QObject::tr("Client name '%1' occupied.").arg(name)
!             .toLatin1().constData());
      return -1;
  }
***************
*** 119,123 ****
    else
        qWarning("No Qt translation for locale '%s' found.",
!               loc.name().toUtf8().constData());
    
    // translator for ams strings
--- 120,124 ----
    else
        qWarning("No Qt translation for locale '%s' found.",
!               loc.name().toLatin1().constData());
    
    // translator for ams strings
***************
*** 128,132 ****
    else
        qWarning("No " AMS_LONGNAME " translation for locale '%s' found.",
!               loc.name().toUtf8().constData());
    
    int getopt_return;
--- 129,133 ----
    else
        qWarning("No " AMS_LONGNAME " translation for locale '%s' found.",
!               loc.name().toLatin1().constData());
    
    int getopt_return;

Index: m_wavout.cpp
===================================================================
RCS file: /cvsroot/alsamodular/ams/src/m_wavout.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** m_wavout.cpp	9 Jun 2009 09:01:35 -0000	1.4
--- m_wavout.cpp	28 Dec 2009 17:10:58 -0000	1.5
***************
*** 236,248 ****
  void M_wavout::openBrowser() {
  
!   char buf[2048];
  
!   getcwd(buf, 2048);
!   wavname = QFileDialog::getSaveFileName(this, tr("Choose Wave File"),
!           buf, tr("WAV files (*.wav)"));
!   if (!wavname.isEmpty()) {
!     configDialog->lineEditList.at(0)->setText(wavname);    
!     createWav();
!   }
  }
  
--- 236,253 ----
  void M_wavout::openBrowser() {
  
!     char buf[2048];
!     char * result;
  
!     result = getcwd(buf, 2048);
!     if (result == NULL) {
!         qWarning("Error in getcwd((): %d", errno);
!         return;
!     }
!     wavname = QFileDialog::getSaveFileName(this, tr("Choose Wave File"),
!             buf, tr("WAV files (*.wav)"));
!     if (!wavname.isEmpty()) {
!         configDialog->lineEditList.at(0)->setText(wavname);    
!         createWav();
!     }
  }
  

Index: mainwindow.cpp
===================================================================
RCS file: /cvsroot/alsamodular/ams/src/mainwindow.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** mainwindow.cpp	25 May 2009 08:48:25 -0000	1.7
--- mainwindow.cpp	28 Dec 2009 17:10:58 -0000	1.8
***************
*** 172,176 ****
  
    if (mso.havePresetPath) {
!     qWarning(QObject::tr("Preset path now %1").arg(mso.presetPath).toUtf8()); 
      modularSynth->setLoadPath(mso.presetPath);
    }
--- 172,177 ----
  
    if (mso.havePresetPath) {
!     qWarning("%s", QObject::tr("Preset path now %1").arg(mso.presetPath)
!             .toUtf8().constData()); 
      modularSynth->setLoadPath(mso.presetPath);
    }
***************
*** 179,183 ****
    // autoload patch file
    if (mso.havePreset) {
!     qWarning(QObject::tr("Loading preset %1").arg(mso.presetName).toUtf8()); 
      openFile(mso.presetName);
    }
--- 180,185 ----
    // autoload patch file
    if (mso.havePreset) {
!     qWarning("%s", QObject::tr("Loading preset %1").arg(mso.presetName)
!             .toUtf8().constData()); 
      openFile(mso.presetName);
    }
***************
*** 192,196 ****
  MainWindow::~MainWindow()
  {
!     qWarning(QObject::tr("Closing synthesizer...").toUtf8());
      writeConfig();
  
--- 194,198 ----
  MainWindow::~MainWindow()
  {
!     qWarning("%s", QObject::tr("Closing synthesizer...").toUtf8().constData());
      writeConfig();
  
***************
*** 198,202 ****
      struct flock lock = {F_WRLCK, SEEK_SET, 0, 0, 0};
      if (fcntl(rcFd, F_UNLCK, &lock) == -1) {
!         qWarning(QObject::tr("Could not unlock preferences file.").toUtf8());
      }
  }
--- 200,205 ----
      struct flock lock = {F_WRLCK, SEEK_SET, 0, 0, 0};
      if (fcntl(rcFd, F_UNLCK, &lock) == -1) {
!         qWarning("%s", QObject::tr("Could not unlock preferences file.")
!                 .toUtf8().constData());
      }
  }
***************
*** 205,210 ****
  void MainWindow::sighandler(int s)
  {
!   char pipeMessage = s;
!   write(pipeFd[1], &pipeMessage, 1);
  }
  
--- 208,218 ----
  void MainWindow::sighandler(int s)
  {
!     ssize_t result;
! 
!     char pipeMessage = s;
!     result = write(pipeFd[1], &pipeMessage, 1);
!     if (result == -1)
!         qWarning("%s", QObject::tr("Error writing to pipe: %1")
!                 .arg(errno).toUtf8().constData());
  }
  
***************
*** 304,308 ****
  
      if (!f.open(QIODevice::ReadOnly)) {
!         qWarning(tr("Could not read file '%1'").arg(fn).toUtf8());
          return;
      }
--- 312,317 ----
  
      if (!f.open(QIODevice::ReadOnly)) {
!         qWarning("%s", tr("Could not read file '%1'").arg(fn)
!                 .toUtf8().constData());
          return;
      }
***************
*** 335,339 ****
      QFile f(fileName);
      if (!f.open(QIODevice::WriteOnly)) {
!         qWarning(tr("Could not open file '%1'").arg(fileName).toUtf8());
          return false;
      }
--- 344,349 ----
      QFile f(fileName);
      if (!f.open(QIODevice::WriteOnly)) {
!         qWarning("%s", tr("Could not open file '%1'").arg(fileName)
!                 .toUtf8().constData());
          return false;
      }
***************
*** 366,370 ****
      }
      else
!         qWarning(tr("Saving aborted").toUtf8());
  }
  
--- 376,380 ----
      }
      else
!         qWarning("%s", tr("Saving aborted").toUtf8().constData());
  }
  
***************
*** 400,408 ****
  
      if (!file.open(rcFd, QIODevice::ReadOnly)) {
!         qWarning("Could not open preferences file.");
          return;
      }
      if (!file.seek(0)) {
!         qWarning("Could not seek start of preferences file.");
          file.close();
          return;
--- 410,418 ----
  
      if (!file.open(rcFd, QIODevice::ReadOnly)) {
!         qWarning("%s", "Could not open preferences file.");
          return;
      }
      if (!file.seek(0)) {
!         qWarning("%s", "Could not seek start of preferences file.");
          file.close();
          return;
***************
*** 426,435 ****
  
      if (!file.open(rcFd, QIODevice::WriteOnly)) {
!         qWarning("Could not open preferences file.");
          return;
      }
  
      if (!file.resize(0)) {
!         qWarning("Could not resize preferences file.");
          file.close();
          return;
--- 436,445 ----
  
      if (!file.open(rcFd, QIODevice::WriteOnly)) {
!         qWarning("%s", "Could not open preferences file.");
          return;
      }
  
      if (!file.resize(0)) {
!         qWarning("%s", "Could not resize preferences file.");
          file.close();
          return;

Index: modularsynth.cpp
===================================================================
RCS file: /cvsroot/alsamodular/ams/src/modularsynth.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** modularsynth.cpp	12 Jun 2009 21:48:06 -0000	1.22
--- modularsynth.cpp	28 Dec 2009 17:10:58 -0000	1.23
***************
*** 282,286 ****
          initSeqNotifier();
      else
!         qWarning(QObject::tr("Alsa MIDI wont work!").toUtf8());
  
      midiWidget->setActiveMidiControllers();
--- 282,286 ----
          initSeqNotifier();
      else
!         qWarning("%s", QObject::tr("Alsa MIDI wont work!").toUtf8().constData());
  
      midiWidget->setActiveMidiControllers();
***************
*** 372,376 ****
      if (snd_seq_open(&seq_handle, "hw", SND_SEQ_OPEN_DUPLEX,
                  SND_SEQ_NONBLOCK) < 0) {
!         qWarning(QObject::tr("Error opening ALSA sequencer.").toUtf8());
          return NULL;
      }
--- 372,376 ----
      if (snd_seq_open(&seq_handle, "hw", SND_SEQ_OPEN_DUPLEX,
                  SND_SEQ_NONBLOCK) < 0) {
!         qWarning("%s", QObject::tr("Error opening ALSA sequencer.").toUtf8().constData());
          return NULL;
      }
***************
*** 382,386 ****
                  SND_SEQ_PORT_CAP_WRITE | SND_SEQ_PORT_CAP_SUBS_WRITE,
                  SND_SEQ_PORT_TYPE_APPLICATION) < 0) {
!         qWarning(QObject::tr("Error creating sequencer write port.").toUtf8());
          snd_seq_close(seq_handle);
          return NULL;
--- 382,386 ----
                  SND_SEQ_PORT_CAP_WRITE | SND_SEQ_PORT_CAP_SUBS_WRITE,
                  SND_SEQ_PORT_TYPE_APPLICATION) < 0) {
!         qWarning("%s", QObject::tr("Error creating sequencer write port.").toUtf8().constData());
          snd_seq_close(seq_handle);
          return NULL;
***************
*** 391,395 ****
                          SND_SEQ_PORT_CAP_READ | SND_SEQ_PORT_CAP_SUBS_READ,
                          SND_SEQ_PORT_TYPE_APPLICATION)) < 0) {
!             qWarning(QObject::tr("Error creating sequencer read port.").toUtf8());
              snd_seq_close(seq_handle);
              return NULL;
--- 391,395 ----
                          SND_SEQ_PORT_CAP_READ | SND_SEQ_PORT_CAP_SUBS_READ,
                          SND_SEQ_PORT_TYPE_APPLICATION)) < 0) {
!             qWarning("%s", QObject::tr("Error creating sequencer read port.").toUtf8().constData());
              snd_seq_close(seq_handle);
              return NULL;
***************
*** 951,955 ****
      } 
      else
!         qWarning(QObject::tr("All available output ports are in use").toUtf8());
  }
  
--- 951,955 ----
      } 
      else
!         qWarning("%s", QObject::tr("All available output ports are in use").toUtf8().constData());
  }
  
***************
*** 969,973 ****
      } 
      else
!         qWarning(QObject::tr("All available input ports are in use").toUtf8());
  }
  
--- 969,973 ----
      } 
      else
!         qWarning("%s", QObject::tr("All available input ports are in use").toUtf8().constData());
  }
  
***************
*** 1255,1259 ****
                ladspaLibName = tokens[6];
                pluginName = qs.section(' ', 7);
!               qWarning(tr("Loading LADSPA plugin \"%1\" from library \"%2\".") 
                        .arg(pluginName).arg(ladspaLibName).toUtf8().constData());
  
--- 1255,1259 ----
                ladspaLibName = tokens[6];
                pluginName = qs.section(' ', 7);
!               qWarning("%s", tr("Loading LADSPA plugin \"%1\" from library \"%2\".") 
                        .arg(pluginName).arg(ladspaLibName).toUtf8().constData());
  
***************
*** 1478,1484 ****
  
          if (inport->hasConnectedPort()) {
!             qWarning(tr("Input port %1 of module %2 is already connected. "
                          "New connection to module %3 ignored.")
!                     .arg(index1).arg(moduleID1).arg(moduleID2).toUtf8());
              continue;
          }
--- 1478,1484 ----
  
          if (inport->hasConnectedPort()) {
!             qWarning("%s", tr("Input port %1 of module %2 is already connected. "
                          "New connection to module %3 ignored.")
!                     .arg(index1).arg(moduleID1).arg(moduleID2).toUtf8().constData());
              continue;
          }
***************
*** 1735,1740 ****
          }
          else
!             qWarning(tr("Unknown MIDI controller tag found: %1")
!                     .arg(qs).toUtf8());
      }
  
--- 1735,1740 ----
          }
          else
!             qWarning("%s", tr("Unknown MIDI controller tag found: %1")
!                     .arg(qs).toUtf8().constData());
      }
  
***************
*** 1771,1776 ****
              guiWidget->addTab(rx.cap(1));
          else
!             qWarning(QObject::tr("No title for tab '%1' found.")
!                     .arg(qs).toUtf8());
      }
  
--- 1771,1776 ----
              guiWidget->addTab(rx.cap(1));
          else
!             qWarning("%s", QObject::tr("No title for tab '%1' found.")
!                     .arg(qs).toUtf8().constData());
      }
  
***************
*** 1787,1792 ****
          }
          else
!             qWarning(QObject::tr("No data for frame '%1' found.")
!                     .arg(qs).toUtf8());
      }
  
--- 1787,1792 ----
          }
          else
!             qWarning("%s", QObject::tr("No data for frame '%1' found.")
!                     .arg(qs).toUtf8().constData());
      }
  
***************
*** 1802,1806 ****
              tokens = numbers.split(' ');
              if (tokens.isEmpty()) {
!                 qWarning(QObject::tr("No parameter values found.").toUtf8());
                  continue;
              }
--- 1802,1806 ----
              tokens = numbers.split(' ');
              if (tokens.isEmpty()) {
!                 qWarning("%s", QObject::tr("No parameter values found.").toUtf8().constData());
                  continue;
              }
***************
*** 1811,1816 ****
          }
          else {
!             qWarning(QObject::tr("No parameter name '%1' found.")
!                     .arg(qs).toUtf8());
              continue;
          }
--- 1811,1816 ----
          }
          else {
!             qWarning("%s", QObject::tr("No parameter name '%1' found.")
!                     .arg(qs).toUtf8().constData());
              continue;
          }
***************
*** 1877,1882 ****
              qs = rx.cap(1);
          else {
!             qWarning(QObject::tr("No name for preset '%1' found.")
!                     .arg(qs).toUtf8());
              continue;
          }
--- 1877,1882 ----
              qs = rx.cap(1);
          else {
!             qWarning("%s", QObject::tr("No name for preset '%1' found.")
!                     .arg(qs).toUtf8().constData());
              continue;
          }
***************
*** 1887,1891 ****
      /*For debugging only, 'Module' and 'Comment' will also apear
      else
!         qWarning(tr("Unknown tag found: %1").arg(qs).toUtf8());
      */
    } // end while loop
--- 1887,1891 ----
      /*For debugging only, 'Module' and 'Comment' will also apear
      else
!         qWarning("%s", tr("Unknown tag found: %1").arg(qs).toUtf8().constData());
      */
    } // end while loop

Index: synthdata.cpp
===================================================================
RCS file: /cvsroot/alsamodular/ams/src/synthdata.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** synthdata.cpp	26 Sep 2009 17:45:51 -0000	1.16
--- synthdata.cpp	28 Dec 2009 17:10:58 -0000	1.17
***************
*** 390,394 ****
      if (pthread_create (&alsa_thread, &attr, alsa_static_thr_main, this))
      {
!         qWarning(QObject::tr("Can't create ALSA thread with RT priority").toUtf8());
          pthread_attr_setschedpolicy (&attr, SCHED_OTHER);
          parm.sched_priority = sched_get_priority_max (SCHED_OTHER);
--- 390,395 ----
      if (pthread_create (&alsa_thread, &attr, alsa_static_thr_main, this))
      {
!         qWarning("%s", QObject::tr("Can't create ALSA thread with RT priority")
!                 .toUtf8().constData());
          pthread_attr_setschedpolicy (&attr, SCHED_OTHER);
          parm.sched_priority = sched_get_priority_max (SCHED_OTHER);
***************
*** 396,400 ****
          if (pthread_create (&alsa_thread, &attr, alsa_static_thr_main, this))
          {
!             qWarning(QObject::tr("Can't create ALSA thread").toUtf8());
              exit (1);
  	}
--- 397,401 ----
          if (pthread_create (&alsa_thread, &attr, alsa_static_thr_main, this))
          {
!             qWarning("%s", QObject::tr("Can't create ALSA thread").toUtf8().constData());
              exit (1);
  	}
***************
*** 405,409 ****
  int SynthData::closeAlsa ()
  {
!     qWarning(QObject::tr("Closing ALSA...").toUtf8());
      withAlsa = false;
      sleep (1);
--- 406,410 ----
  int SynthData::closeAlsa ()
  {
!     qWarning("%s", QObject::tr("Closing ALSA...").toUtf8().constData());
      withAlsa = false;
      sleep (1);
***************
*** 498,502 ****
  				   JackNullOption, NULL);
      if (!jack_handle) {
!         qWarning(QObject::tr("Can't connect to JACK").toUtf8());
          return -ENODEV;
      }
--- 499,503 ----
  				   JackNullOption, NULL);
      if (!jack_handle) {
!         qWarning("%s", QObject::tr("Can't connect to JACK").toUtf8().constData());
          return -ENODEV;
      }
***************
*** 521,525 ****
      if (jack_activate (jack_handle))
      {
!         qWarning(QObject::tr("Can't activate JACK").toUtf8());
          exit (1);
      }
--- 522,526 ----
      if (jack_activate (jack_handle))
      {
!         qWarning("%s", QObject::tr("Can't activate JACK").toUtf8().constData());
          exit (1);
      }
***************
*** 533,537 ****
  int SynthData::closeJack ()
  {
!     qWarning(QObject::tr("Closing JACK...").toUtf8());
      jack_deactivate (jack_handle);
      for (int i = 0; i < play_ports; i++)
--- 534,538 ----
  int SynthData::closeJack ()
  {
!     qWarning("%s", QObject::tr("Closing JACK...").toUtf8().constData());
      jack_deactivate (jack_handle);
      for (int i = 0; i < play_ports; i++)