Updated example programs for C++11.

Author: craigsapp

Makefile

@@ -27,10 +27,10 @@
 ##
 
 # targets which don't actually refer to files
-.PHONY : all info library examples programs bin options clean
+.PHONY : all info library examples programs bin options clean lib
 
 
-all: info library programs
+all: info library programs lib
 
 
 info:
@@ -49,6 +49,7 @@ info:
 	@echo ""
 
 
+lib: library
 library:
 	$(MAKE) -f Makefile.library
 

Makefile.library

@@ -103,18 +103,16 @@ OBJS = $(notdir $(patsubst %.cpp,%.o,$(wildcard $(SRCDIR)/*.cpp)))
 
 
 all: makedirs $(OBJS)
-ifeq ($(OSTYPE),LINUX)
-	@echo "Creating midifile library file for linux ..."
+ifeq ($(OSTYPE),OSX)
+	@echo "Creating midifile library file for OSX (Intel)..."
 	-rm -f $(LIBDIR)/$(LIBFILE)
 	$(AR) r $(LIBDIR)/$(LIBFILE) $(OBJDIR)/*.o
 	$(RANLIB) $(LIBDIR)/$(LIBFILE)
-else ifeq ($(OSTYPE),OSXPC)
-	@echo "Creating midifile library file for OSX (Intel)..."
+else
+	@echo "Creating midifile library file for linux ..."
 	-rm -f $(LIBDIR)/$(LIBFILE)
 	$(AR) r $(LIBDIR)/$(LIBFILE) $(OBJDIR)/*.o
 	$(RANLIB) $(LIBDIR)/$(LIBFILE)
-else
-	echo "Unkown operating system type."
 endif
 
 

Makefile.programs

@@ -127,7 +127,7 @@ info:
 
 bin:
 ifeq ($(wildcard $(TARGDIR)),)
-	-mkdir -p $(TARGDIR)
+	@-mkdir -p $(TARGDIR)
 endif
 
 
@@ -137,43 +137,12 @@ $(TARGDIR)/mid2hum:
 	-echo Skipping mid2hum.cpp since it needs external library.
 $(TARGDIR)/peep2midi:
 	-echo Skipping peep2midi.cpp since it needs external library.
+$(TARGDIR)/midiexcerpt:
+	@echo Skipping $@ until PerlRegularExpressions class is added.
 
 $(TARGDIR)/binasc:
 	@echo Skipping $@ until it is updated to C++11 + STL.
-$(TARGDIR)/createmidifile:
-	@echo Skipping $@ until it is updated to C++11 + STL.
-$(TARGDIR)/drumtab:
-	@echo Skipping $@ until it is updated to C++11 + STL.
-$(TARGDIR)/mid2mat:
-	@echo Skipping $@ until it is updated to C++11 + STL.
-$(TARGDIR)/midi2melody:
-	@echo Skipping $@ until it is updated to C++11 + STL.
-$(TARGDIR)/midi2notes:
-	@echo Skipping $@ until it is updated to C++11 + STL.
-$(TARGDIR)/midi2skini:
-	@echo Skipping $@ until it is updated to C++11 + STL.
-$(TARGDIR)/midi2text:
-	@echo Skipping $@ until it is updated to C++11 + STL.
-$(TARGDIR)/midicat:
-	@echo Skipping $@ until it is updated to C++11 + STL.
-$(TARGDIR)/midiexcerpt:
-	@echo Skipping $@ until it is updated to C++11 + STL.
-$(TARGDIR)/midimixup:
-	@echo Skipping $@ until it is updated to C++11 + STL.
-$(TARGDIR)/miditime:
-	@echo Skipping $@ until it is updated to C++11 + STL.
-$(TARGDIR)/perfid:
-	@echo Skipping $@ until it is updated to C++11 + STL.
-$(TARGDIR)/text2midi:
-	@echo Skipping $@ until it is updated to C++11 + STL.
-$(TARGDIR)/textmidi:
-	@echo Skipping $@ until it is updated to C++11 + STL.
-$(TARGDIR)/tobin:
-	@echo Skipping $@ until it is updated to C++11 + STL.
-$(TARGDIR)/todec:
-	@echo Skipping $@ until it is updated to C++11 + STL.
-$(TARGDIR)/tohex:
-	@echo Skipping $@ until it is updated to C++11 + STL.
+
 
 
 
@@ -184,7 +153,7 @@ $(TARGDIR)/tohex:
 
 $(TARGDIR)/% : $(notdir %.cpp)
 ifeq ($(wildcard $(TARGDIR)),)
-	-mkdir -p $(TARGDIR)
+	@-mkdir -p $(TARGDIR)
 endif
 ifeq ($(wildcard $(LIBDIR)),)
 	$(MAKE) -f Makefile.library
@@ -196,7 +165,7 @@ endif
 
 % : $(notdir %.cpp)
 ifeq ($(wildcard $(TARGDIR)),)
-	-mkdir -p $(TARGDIR)
+	@-mkdir -p $(TARGDIR)
 endif
 ifeq ($(wildcard $(LIBDIR)),)
 	$(MAKE) -f Makefile.library

include/MidiFile.h

@@ -26,12 +26,12 @@
 #ifndef _MIDIfILE_H_INCLUDED
 #define _MIDIfILE_H_INCLUDED
 
-using namespace std;
-
 #include <vector>
 #include <istream>
 #include <fstream>
 
+using namespace std;
+
 typedef unsigned char  uchar;
 typedef unsigned short ushort;
 typedef unsigned long  ulong;

src-library/MidiFile.cpp

@@ -802,6 +802,7 @@ int MidiFile::addTrack(int count) {
 }
 
 
+
 //////////////////////////////
 //
 // MidiFile::allocateEvents --
@@ -810,8 +811,7 @@ int MidiFile::addTrack(int count) {
 void MidiFile::allocateEvents(int track, int aSize) {
    int oldsize = events[track]->size();
    if (oldsize < aSize) {
-      events[track]->resize(aSize);
-      events[track]->resize(oldsize);
+      events[track]->reserve(aSize);
    } 
 }
 
@@ -1090,7 +1090,7 @@ int MidiFile::read(const string& filename) {
    setFilename(filename);
 
    fstream input;
-   input.open(filename, ios::binary | ios::in);
+   input.open(filename.data(), ios::binary | ios::in);
 
    if (!input.is_open()) {
       return 0;
@@ -1110,7 +1110,6 @@ int MidiFile::read(istream& input) {
    int    character;
    // uchar  buffer[123456] = {0};
    ulong  longdata;
-   uchar  chardata;
    ushort shortdata;
 
 
@@ -1125,7 +1124,7 @@ int MidiFile::read(istream& input) {
    } else if (character != 'M') {
       cout << "File " << filename << " is not a MIDI file" << endl;
       cout << "Expecting 'M' at first byte but got '" 
-           << chardata << "'" << endl;
+           << character << "'" << endl;
       return 0;
    }
 
@@ -1137,7 +1136,7 @@ int MidiFile::read(istream& input) {
    } else if (character != 'T') {
       cout << "File " << filename << " is not a MIDI file" << endl;
       cout << "Expecting 'T' at first byte but got '" 
-           << chardata << "'" << endl;
+           << character << "'" << endl;
       return 0;
    }
 
@@ -1149,7 +1148,7 @@ int MidiFile::read(istream& input) {
    } else if (character != 'h') {
       cout << "File " << filename << " is not a MIDI file" << endl;
       cout << "Expecting 'h' at first byte but got '" 
-           << chardata << "'" << endl;
+           << character << "'" << endl;
       return 0;
    }
 
@@ -1161,7 +1160,7 @@ int MidiFile::read(istream& input) {
    } else if (character != 'd') {
       cout << "File " << filename << " is not a MIDI file" << endl;
       cout << "Expecting 'd' at first byte but got '" 
-           << chardata << "'" << endl;
+           << character << "'" << endl;
       return 0;
    }
 
@@ -1264,7 +1263,7 @@ int MidiFile::read(istream& input) {
       } else if (character != 'M') {
          cout << "File " << filename << " is not a MIDI file" << endl;
          cout << "Expecting 'M' at first byte in track but got '" 
-              << chardata << "'" << endl;
+              << character << "'" << endl;
          return 0;
       }
 
@@ -1277,7 +1276,7 @@ int MidiFile::read(istream& input) {
       } else if (character != 'T') {
          cout << "File " << filename << " is not a MIDI file" << endl;
          cout << "Expecting 'T' at first byte in track but got '" 
-              << chardata << "'" << endl;
+              << character << "'" << endl;
          return 0;
       }
 
@@ -1290,7 +1289,7 @@ int MidiFile::read(istream& input) {
       } else if (character != 'r') {
          cout << "File " << filename << " is not a MIDI file" << endl;
          cout << "Expecting 'r' at first byte in track but got '" 
-              << chardata << "'" << endl;
+              << character << "'" << endl;
          return 0;
       }
 
@@ -1303,7 +1302,7 @@ int MidiFile::read(istream& input) {
       } else if (character != 'k') {
          cout << "File " << filename << " is not a MIDI file" << endl;
          cout << "Expecting 'k' at first byte in track but got '" 
-              << chardata << "'" << endl;
+              << character << "'" << endl;
          return 0;
       }
 

src-programs/80off.cpp

@@ -1,7 +1,7 @@
 //
 // Programmer:    Craig Stuart Sapp <craig@ccrma.stanford.edu>
 // Creation Date: Mon Feb  9 16:51:58 PST 2015
-// Last Modified: Mon Feb  9 16:52:00 PST 2015
+// Last Modified: Mon Feb  9 21:26:32 PST 2015 Updated for C++11.
 // Filename:      midifile/src-programs/80off.cpp
 // Website:       http://midifile.sapp.org
 // Syntax:        C++11
@@ -12,9 +12,9 @@
 
 #include "Options.h"
 #include "MidiFile.h"
+#include <iostream>
 
 using namespace std;
-#include <iostream>
 
 // Global variables for command-line options.
 Options  options;              // for command-line processing

src-programs/binasc.cpp

@@ -13,6 +13,7 @@
 #include <iostream>
 #include <fstream>
 #include <iomanip>
+
 using namespace std;
 
 typedef unsigned char uchar;

src-programs/createmidifile.cpp

@@ -1,22 +1,17 @@
 //
 // Programmer:    Craig Stuart Sapp <craig@ccrma.stanford.edu> 
 // Creation Date: Tue Jan  8 10:08:15 PST 2002
-// Last Modified: Tue Jan  8 10:31:08 PST 2002
+// Last Modified: Mon Feb  9 21:24:41 PST 2015 Updated for C++11.
 // Filename:      ...sig/doc/examples/all/createmidifile/createmidifile.cpp
 // Syntax:        C++
 // 
 // Description:   Demonstration of how to create a Multi-track MIDI file.
 //
 
 #include "MidiFile.h"
+#include <iostream>
 
-#ifndef OLDCPP
-   #include <iostream>
-   using namespace std;
-#else
-   #include <iostream.h>
-#endif
-
+using namespace std;
 
 typedef unsigned char uchar;
 
@@ -27,8 +22,8 @@ int main(int argc, char** argv) {
    outputfile.absoluteTime();  // time information stored as absolute time
                                // (will be coverted to delta time when written)
    outputfile.addTrack(2);     // Add another two tracks to the MIDI file
-   Array<uchar> midievent;     // temporary storage for MIDI events 
-   midievent.setSize(3);       // set the size of the array to 3 bytes
+   vector<uchar> midievent;     // temporary storage for MIDI events 
+   midievent.resize(3);        // set the size of the array to 3 bytes
    int tpq = 120;              // default value in MIDI file is 48
    outputfile.setTicksPerQuarterNote(tpq);
 
@@ -80,7 +75,7 @@ int main(int argc, char** argv) {
 
 void absoluteTime(void);
    Set the time information to absolute time.
-int addEvent(int aTrack, int aTime, Array<uchar>& midiData);
+int addEvent(int aTrack, int aTime, vector<uchar>& midiData);
    Add an event to the end of a MIDI track.
 int addTrack(void);
    Add an empty track to the MIDI file.
@@ -92,7 +87,7 @@ void deleteTrack(int aTrack);
    remove a track from the MIDI file.
 void erase(void);
    Empty the contents of the MIDI file, leaving one track with no data.
-_MFEvent& getEvent(int aTrack, int anIndex);
+MFEvent& getEvent(int aTrack, int anIndex);
    Return a MIDI event from the Track.
 int getTimeState(void);
    Indicates if the timestate is TIME_STATE_ABSOLUTE or TIME_STATE_DELTA.
@@ -117,13 +112,12 @@ int read(char* aFile);
    Read the contents of a MIDI file into the MidiFile class data structure
 void setTicksPerQuarterNote    (int ticks);
    Set the MIDI file's ticks per quarter note information
-void sortTrack(Collection<_MFEvent>& trackData);
+void sortTrack(vector<MFEvent>& trackData);
    If in absolute time, sort particular track into correct time order.
 void sortTracks(void);
    If in absolute time, sort tracks into correct time order.
 
 */
 
 
-
 // md5sum: 89b83de0fbe279cccd183ef8c1583f62 createmidifile.cpp [20100703]

src-programs/drumtab.cpp

@@ -1,7 +1,7 @@
 //
 // Programmer:    Craig Stuart Sapp <craig@ccrma.stanford.edu> 
 // Creation Date: Sat May 17 19:34:13 PDT 2003
-// Last Modified: Sat May 17 19:34:15 PDT 2003
+// Last Modified: Mon Feb  9 21:23:13 PST 2015 Updated for C++11.
 // Filename:      ...sig/doc/examples/all/drumtab/drumtab.cpp
 // Syntax:        C++
 // 
@@ -11,14 +11,9 @@
 //
 
 #include "MidiFile.h"
+#include <iostream>
 
-#ifndef OLDCPP
-   #include <iostream>
-   using namespace std;
-#else
-   #include <iostream.h>
-#endif
-
+using namespace std;
 
 #define HIGH_HAT    59
 #define SNARE       38
@@ -61,10 +56,10 @@ int main(int argc, char** argv) {
 //
 
 void AddDrumTrack(MidiFile& midifile, int* data, int instrument, int ticks) {
-   Array<uchar> midievent;   // temporary storage for MIDI events 
-   midievent.setSize(3);     // set the size of the array to 3 bytes
-   midievent[2] = 64;        // set the loudness to a constant value
-   int notestate = 0;        // 0 = off, 1 = on
+   vector<uchar> midievent;   // temporary storage for MIDI events 
+   midievent.resize(3);       // set the size of the array to 3 bytes
+   midievent[2] = 64;         // set the loudness to a constant value
+   int notestate = 0;         // 0 = off, 1 = on
    int i         = 0;
    int actiontime;
    int track = midifile.addTrack();      // Add a track to the MIDI file
@@ -111,4 +106,4 @@ void AddDrumTrack(MidiFile& midifile, int* data, int instrument, int ticks) {
 }
 
 
-// md5sum: 3c36ff696d281d9010f16e0ee50ae1ce drumtab.cpp [20050403]
+

src-programs/henonfile.cpp

@@ -16,10 +16,11 @@
 #include "Convert.h"
 #include "Options.h"
 #include "CircularBuffer.h"
-
 #include <string.h>
 #include <stdio.h>
 
+using namespace std;
+
 
 // function declarations:
 void        checkOptions        (Options& opts, int argc, char** argv);