[Lmuse-cvs-traffic] muse/muse/driver alsatimer.cpp, 1.1.2.6, 1.1.2.7 dummyaudio.cpp, 1.3.2.6, 1.3.2.7 rtctimer.cpp, 1.1.2.8, 1.1.2.9

[Robert J. <spa...@us...>]

Update of /cvsroot/lmuse/muse/muse/driver
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv5576/driver

Modified Files:
      Tag: REL07
	alsatimer.cpp dummyaudio.cpp rtctimer.cpp 
Log Message:
Fixes to remove warnings and potential errors, from WillyFoobar

Index: rtctimer.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/driver/rtctimer.cpp,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -C2 -d -r1.1.2.8 -r1.1.2.9
*** rtctimer.cpp	13 Jan 2006 18:10:55 -0000	1.1.2.8
--- rtctimer.cpp	27 Jan 2007 14:52:42 -0000	1.1.2.9
***************
*** 138,142 ****
      }
  
! unsigned int RtcTimer::getTimerTicks(bool printTicks)
      {
      if(TIMER_DEBUG)
--- 138,142 ----
      }
  
! unsigned int RtcTimer::getTimerTicks(bool /*printTicks*/)// prevent compiler warning: unused parameter
      {
      if(TIMER_DEBUG)

Index: dummyaudio.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/driver/dummyaudio.cpp,v
retrieving revision 1.3.2.6
retrieving revision 1.3.2.7
diff -C2 -d -r1.3.2.6 -r1.3.2.7
*** dummyaudio.cpp	19 Mar 2006 16:26:48 -0000	1.3.2.6
--- dummyaudio.cpp	27 Jan 2007 14:52:42 -0000	1.3.2.7
***************
*** 237,241 ****
              }
        undoSetuid();
!       unsigned long tick = 0;
        for (;;) {
              int _pollWait = 10;   // ms
--- 237,241 ----
              }
        undoSetuid();
!       /* unsigned long tick = 0;*/    // prevent compiler warning: unused variable
        for (;;) {
              int _pollWait = 10;   // ms
***************
*** 243,247 ****
              while (count < 1 /*250/tickRate*/) // will loop until the next tick occurs
                  {
!                 int n = poll(&myPollFd, 1 /* npfd */, _pollWait);
                  count += timer.getTimerTicks();
                  while (drvPtr->cmdQueue.size())
--- 243,247 ----
              while (count < 1 /*250/tickRate*/) // will loop until the next tick occurs
                  {
!                 /*int n = */  poll(&myPollFd, 1 /* npfd */, _pollWait);
                  count += timer.getTimerTicks();
                  while (drvPtr->cmdQueue.size())

Index: alsatimer.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/driver/alsatimer.cpp,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -C2 -d -r1.1.2.6 -r1.1.2.7
*** alsatimer.cpp	21 Aug 2005 18:11:27 -0000	1.1.2.6
--- alsatimer.cpp	27 Jan 2007 14:52:42 -0000	1.1.2.7
***************
*** 107,112 ****
        fprintf(stderr,"AlsaTimer::setTimerTicks(): requested freq %u Hz too high for timer (max is %g)\n",
          freq, 1000000000.0 / snd_timer_info_get_resolution(info));
!       fprintf(stderr,"  freq stays at %d Hz\n",
!         (1000000000 / snd_timer_info_get_resolution(info)) / snd_timer_params_get_ticks(params));
  
        return 0;
--- 107,113 ----
        fprintf(stderr,"AlsaTimer::setTimerTicks(): requested freq %u Hz too high for timer (max is %g)\n",
          freq, 1000000000.0 / snd_timer_info_get_resolution(info));
!       fprintf(stderr,"  freq stays at %ld Hz\n",
!         (long int)((1000000000.0 / snd_timer_info_get_resolution(info)) / snd_timer_params_get_ticks(params)) 
!       );
  
        return 0;