[Lmuse-cvs-traffic] muse/muse midi.cpp,1.43.2.12,1.43.2.13

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

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

Modified Files:
      Tag: REL07
	midi.cpp 
Log Message:
Fixed MIDI VU meters

Index: midi.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/midi.cpp,v
retrieving revision 1.43.2.12
retrieving revision 1.43.2.13
diff -C2 -d -r1.43.2.12 -r1.43.2.13
*** midi.cpp	27 Jan 2007 14:30:22 -0000	1.43.2.12
--- midi.cpp	28 Jan 2008 04:56:48 -0000	1.43.2.13
***************
*** 710,714 ****
                                      stuckNotes->add(MidiPlayEvent(tick + len, port, channel,
                                         veloOff ? 0x80 : 0x90, pitch, veloOff));
!                                           track->addActivity(velo);
                                      }
                                else { //Handle events to different port than standard.
--- 710,715 ----
                                      stuckNotes->add(MidiPlayEvent(tick + len, port, channel,
                                         veloOff ? 0x80 : 0x90, pitch, veloOff));
!                                     // Removed by Tim. p3.3.0      
!                                     //track->addActivity(velo);
                                      }
                                else { //Handle events to different port than standard.
***************
*** 719,725 ****
                                          mdAlt->stuckNotes()->add(MidiPlayEvent(tick + len, port, channel,
                                            veloOff ? 0x80 : 0x90, pitch, veloOff));
!                                               track->addActivity(velo);
!                                         }
                                      }
                                }
                                break;
--- 720,731 ----
                                          mdAlt->stuckNotes()->add(MidiPlayEvent(tick + len, port, channel,
                                            veloOff ? 0x80 : 0x90, pitch, veloOff));
!                                         // Removed by Tim. p3.3.0      
!                                         //track->addActivity(velo);
!                                       }
                                      }
+                               // Added by Tim. p3.3.0      
+                               if(!veloOff && velo > track->activity())
+                                 track->setActivity(velo);
+                               
                                }
                                break;
***************
*** 777,780 ****
--- 783,796 ----
              MidiDevice* md = midiPorts[port].device();
  
+             // Added by Tim. p3.3.0
+             int act = track->activity();
+             if(act)
+             {  
+               if((act - 10) < 0)
+                 track->setActivity(0); 
+               else
+                 track->addActivity(-10);
+             }
+             
              MPEventList* playEvents = md->playEvents();
              if (md == 0)
***************
*** 872,876 ****
                                            mdAlt->playEvents()->add(event);
                                            }
!                                     }
  
                                time = tempomap.frame2tick(event.time());
--- 888,896 ----
                                            mdAlt->playEvents()->add(event);
                                            }
!                                           
!                                           // Added by Tim. p3.3.0
!                                           if(event.isNote() && event.dataB() > track->activity())
!                                             track->setActivity(event.dataB());
!                               }
  
                                time = tempomap.frame2tick(event.time());