[Lmuse-cvs-traffic] muse/muse/driver alsamidi.cpp, 1.8.2.5, 1.8.2.6 jack.cpp, 1.30.2.13, 1.30.2.14

[terminator356 <ter...@us...>]

Update of /cvsroot/lmuse/muse/muse/driver
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv26666/muse/driver

Modified Files:
      Tag: REL07
	alsamidi.cpp jack.cpp 
Log Message:
See ChangeLog

Index: jack.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/driver/jack.cpp,v
retrieving revision 1.30.2.13
retrieving revision 1.30.2.14
diff -C2 -d -r1.30.2.13 -r1.30.2.14
*** jack.cpp	24 Jun 2009 01:49:42 -0000	1.30.2.13
--- jack.cpp	25 Jun 2009 05:13:02 -0000	1.30.2.14
***************
*** 152,161 ****
              case 4:  
                // Added by Tim. p3.3.6
!               printf("processSync JackTransportNetStarting\n");
                
                audioState = Audio::START_PLAY;
              break;  
              }
        unsigned frame = pos->frame;
        return audio->sync(audioState, frame);
        }
--- 152,165 ----
              case 4:  
                // Added by Tim. p3.3.6
!               //printf("processSync JackTransportNetStarting\n");
                
                audioState = Audio::START_PLAY;
              break;  
              }
+             
        unsigned frame = pos->frame;
+       // Added by Tim. p3.3.6
+       //printf("processSync valid:%d frame:%d\n", pos->valid, frame);
+       
        return audio->sync(audioState, frame);
        }
***************
*** 864,868 ****
              case 4:  
                // Added by Tim. p3.3.6
!               printf("JackAudioDevice::getState JackTransportNetStarting\n");
                
                return Audio::START_PLAY;
--- 868,872 ----
              case 4:  
                // Added by Tim. p3.3.6
!               //printf("JackAudioDevice::getState JackTransportNetStarting\n");
                
                return Audio::START_PLAY;
***************
*** 985,989 ****
      // Make Muse the Jack timebase master. Do it unconditionally (second param = 0).
      r = jack_set_timebase_callback(_client, 0, (JackTimebaseCallback) timebase_callback, 0);
!     //if (JACK_DEBUG)
      {
        if(r)
--- 989,993 ----
      // Make Muse the Jack timebase master. Do it unconditionally (second param = 0).
      r = jack_set_timebase_callback(_client, 0, (JackTimebaseCallback) timebase_callback, 0);
!     if(debugMsg || JACK_DEBUG)
      {
        if(r)
***************
*** 994,998 ****
    {
      r = jack_release_timebase(_client);
!     //if (JACK_DEBUG)
      {
        if(r)
--- 998,1002 ----
    {
      r = jack_release_timebase(_client);
!     if(debugMsg || JACK_DEBUG)
      {
        if(r)

Index: alsamidi.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/driver/alsamidi.cpp,v
retrieving revision 1.8.2.5
retrieving revision 1.8.2.6
diff -C2 -d -r1.8.2.5 -r1.8.2.6
*** alsamidi.cpp	4 Apr 2009 01:49:50 -0000	1.8.2.5
--- alsamidi.cpp	25 Jun 2009 05:13:02 -0000	1.8.2.6
***************
*** 753,761 ****
                          break;
              }
!             if(event.type() && ev->type != SND_SEQ_EVENT_SYSEX)
              {
                mdev->recordEvent(event);
!               // Trigger general activity indicator detector. Sysex has no channel, don't trigger.
!               midiPorts[curPort].syncInfo().trigActDetect(event.channel());
              }
                    
--- 753,762 ----
                          break;
              }
!             if(event.type())
              {
                mdev->recordEvent(event);
!               if(ev->type != SND_SEQ_EVENT_SYSEX)
!                 // Trigger general activity indicator detector. Sysex has no channel, don't trigger.
!                 midiPorts[curPort].syncInfo().trigActDetect(event.channel());
              }