Changeset 257 for trunk/libjdkmidi/trunk

Timestamp:

12/20/06 09:29:03 (2 years ago)

Author:

jeffk@…

Message:

more const correctness for multitrack. MIDIFileWriteMultiTrack now has Write() method overloads which automatically extract num_tracks and dividion from multitrack object.

Location:

trunk/libjdkmidi/trunk

Files:

• include/jdkmidi/filewritemultitrack.h (modified) (1 diff)
• include/jdkmidi/multitrack.h (modified) (3 diffs)
• src/jdkmidi_multitrack.cpp (modified) (2 diffs)

trunk/libjdkmidi/trunk/include/jdkmidi/filewritemultitrack.h

@@ -43 +43 @@
       
       bool Write( int num_tracks, int division );
+
+      bool Write( int num_tracks )
+      {
+        return Write( num_tracks, multitrack->GetClksPerBeat() );
+      }
+      bool Write()
+      {
+        return Write( multitrack->GetNumTracks(), multitrack->GetClksPerBeat() );
+      }
+
     private:
       

trunk/libjdkmidi/trunk/include/jdkmidi/multitrack.h

@@ -54 +54 @@
       MIDITrack *GetTrack( int trk );
       const MIDITrack *GetTrack( int trk ) const;
-      int   GetNumTracks()                      { return num_tracks; }
+      int   GetNumTracks() const                      { return num_tracks; }
       
       
       void Clear();
       
-      int GetClksPerBeat()    
+      int GetClksPerBeat() const
         {
           return clks_per_beat;
@@ -91 +91 @@
       const MIDIMultiTrackIteratorState & operator = ( const MIDIMultiTrackIteratorState &m );  
       
-      int   GetNumTracks()                      { return num_tracks;    }
-      int   GetCurEventTrack()                     { return cur_event_track;  }
-      MIDIClockTime GetCurrentTime()               { return cur_time;         }
+      int   GetNumTracks() const                      { return num_tracks;    }
+      int   GetCurEventTrack() const                     { return cur_event_track;  }
+      MIDIClockTime GetCurrentTime() const               { return cur_time;         }
       
       void Reset();
@@ -115 +115 @@
       void GoToTime( MIDIClockTime time );      
       
-      bool GetCurEventTime( MIDIClockTime *t);
-      bool GetCurEvent( int *track, MIDITimedBigMessage **msg );
+      bool GetCurEventTime( MIDIClockTime *t) const;
+      bool GetCurEvent( int *track, MIDITimedBigMessage **msg ) const;
       bool GoToNextEvent();
       

trunk/libjdkmidi/trunk/src/jdkmidi_multitrack.cpp

@@ -297 +297 @@
   } 
   
-  bool MIDIMultiTrackIterator::GetCurEventTime( MIDIClockTime *t) 
+  bool MIDIMultiTrackIterator::GetCurEventTime( MIDIClockTime *t) const
   {
     // if there is a next event, then set *t to the time of the event and return true
@@ -313 +313 @@
   } 
   
-  bool MIDIMultiTrackIterator::GetCurEvent( int *track, MIDITimedBigMessage **msg ) 
+  bool MIDIMultiTrackIterator::GetCurEvent( int *track, MIDITimedBigMessage **msg ) const
   {   
     int t = state.GetCurEventTrack();