[Gtab-cvs] src/midi MidiMessage.cpp,1.6,1.7 MidiParser.cpp,1.8,1.9

[m0ta <m0...@us...>]

Update of /cvsroot/gtab/src/midi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25877/midi

Modified Files:
	MidiMessage.cpp MidiParser.cpp 
Log Message:
* midi stack takes all pages into account, though 2nd page plays one quarter after the other
* time signature is used, now everything works even the common time symbols
* clef works

Index: MidiParser.cpp
===================================================================
RCS file: /cvsroot/gtab/src/midi/MidiParser.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** MidiParser.cpp	28 Feb 2006 07:32:31 -0000	1.8
--- MidiParser.cpp	5 Apr 2006 15:01:18 -0000	1.9
***************
*** 35,39 ****
  MidiStack* MidiParser::parse(DocumentData* pData)
  {
!     return parsePage( pData->getConcrete(0) );
  }
  
--- 35,45 ----
  MidiStack* MidiParser::parse(DocumentData* pData)
  {
!     MidiStack* result = new MidiStack;
!     for (size_t i = 0; i < pData->size(); i++) {
!         MidiStack* stack = parsePage(pData->getConcrete(i));
!         result->pushStack(stack);
!         delete stack;
!     }
!     return result;
  }
  

Index: MidiMessage.cpp
===================================================================
RCS file: /cvsroot/gtab/src/midi/MidiMessage.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** MidiMessage.cpp	28 Feb 2006 07:15:24 -0000	1.6
--- MidiMessage.cpp	5 Apr 2006 15:01:18 -0000	1.7
***************
*** 28,35 ****
          u_char	singleData[4];
  	} midiMessage;    
!     if(status_ & MSG_NOTE_OFF )
      {
          int i = 0;
      }
  	midiMessage.singleData[0] = status_;
  	midiMessage.singleData[1] = data1_;
--- 28,36 ----
          u_char	singleData[4];
  	} midiMessage;    
! /*    if(status_ & MSG_NOTE_OFF )
      {
          int i = 0;
      }
+     */
  	midiMessage.singleData[0] = status_;
  	midiMessage.singleData[1] = data1_;