diff --git a/CMakeLists.txt b/CMakeLists.txt index ff2b8554..1740a24e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,8 +6,6 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) include(CheckIncludeFiles) -include_directories(include) - check_include_files(unistd.h HAVE_UNISTD_H) check_include_files(humdrum.h HAVE_HUMDRUM_H) check_include_files(sys/io.h HAVE_SYS_IO_H) @@ -54,15 +52,17 @@ set(SRCS ) set(HDRS - include/Binasc.h - include/MidiEvent.h - include/MidiEventList.h - include/MidiFile.h - include/MidiMessage.h - include/Options.h + include/midifile/Binasc.h + include/midifile/MidiEvent.h + include/midifile/MidiEventList.h + include/midifile/MidiFile.h + include/midifile/MidiMessage.h + include/midifile/Options.h ) add_library(midifile STATIC ${SRCS} ${HDRS}) +target_include_directories(midifile PUBLIC include) + ############################## ## diff --git a/Makefile b/Makefile index 0950bf18..2709c334 100644 --- a/Makefile +++ b/Makefile @@ -77,10 +77,10 @@ options: # necessary if you only want to use the compiled MidiFile library. ifneq ($(shell which wget),) wget https://raw.githubusercontent.com/craigsapp/optionlib/master/src/Options.cpp -O src/Options.cpp - wget https://raw.githubusercontent.com/craigsapp/optionlib/master/include/Options.h -O include/Options.h + wget https://raw.githubusercontent.com/craigsapp/optionlib/master/include/Options.h -O include/midifile/Options.h else ifneq ($(shell which curl),) curl https://raw.githubusercontent.com/craigsapp/optionlib/master/src/Options.cpp -o src/Options.cpp - curl https://raw.githubusercontent.com/craigsapp/optionlib/master/include/Options.h -O include/Options.h + curl https://raw.githubusercontent.com/craigsapp/optionlib/master/include/Options.h -O include/midifile/Options.h endif diff --git a/README.md b/README.md index e367656f..af2d2acd 100644 --- a/README.md +++ b/README.md @@ -126,7 +126,7 @@ Using in your own project ------------------------- The easiest way to use the midifile library in your own project is to -copy the header files in the `include` directory and the source-code +copy the header files in the `include/midifile` directory and the source-code files in the `src` directory into your own project. You do not need to copy `Options.h` or `Options.cpp` since the `MidiFile` class is not dependent on them. The [verovio](https://github.com/rism-ch/verovio) @@ -162,8 +162,8 @@ so `using namespace smf;` or `smf::` prefixes are needed to access the classes. ``` cpp -#include "MidiFile.h" -#include "Options.h" +#include "midifile/MidiFile.h" +#include "midifile/Options.h" #include #include @@ -325,8 +325,8 @@ of program that joins the `MidiEvents` into a single track so that the data can be processed in a single loop: ``` cpp -#include "MidiFile.h" -#include "Options.h" +#include "midifile/MidiFile.h" +#include "midifile/Options.h" #include #include @@ -451,8 +451,8 @@ before being written to a file. ``` cpp -#include "MidiFile.h" -#include "Options.h" +#include "midifile/MidiFile.h" +#include "midifile/Options.h" #include #include @@ -605,7 +605,7 @@ into a standard MIDI file: ```cpp -#include "MidiFile.h" +#include "midifile/MidiFile.h" #include using namespace std; @@ -638,8 +638,8 @@ duration of a MIDI file. Also, this example shows how to process multiple input files when using the Options class. ```cpp -#include "MidiFile.h" -#include "Options.h" +#include "midifile/MidiFile.h" +#include "midifile/Options.h" #include using namespace std; using namespace smf; @@ -675,7 +675,7 @@ them out when found. The `MidiMessage::getMetaContent()` function extracts the text string of the message from the raw MIDI file bytes. ```cpp -#include "MidiFile.h" +#include "midifile/MidiFile.h" #include using namespace std; @@ -713,7 +713,7 @@ Here is a demonstration of converting a multi-track MIDI file into a single-track MIDI file: ```cpp -#include "MidiFile.h" +#include "midifile/MidiFile.h" #include using namespace std; using namespace smf; @@ -751,7 +751,7 @@ represented by the integer 9. The following example searches through the MIDI events in each track until it finds a note on channel 9: ```cpp -#include "MidiFile.h" +#include "midifile/MidiFile.h" #include using namespace std; using namespace smf; @@ -794,7 +794,7 @@ notes from a MIDI file. Here is an example of how that can be done with the midifile library. ```cpp -#include "MidiFile.h" +#include "midifile/MidiFile.h" #include using namespace std; using namespace smf; @@ -844,8 +844,8 @@ reserved for the drum track (and most MIDI files use the General MIDI convention). ```cpp -#include "MidiFile.h" -#include "Options.h" +#include "midifile/MidiFile.h" +#include "midifile/Options.h" #include using namespace std; @@ -888,8 +888,8 @@ The following example lists all of the instrument numbers used in a MIDI file. It does not analyze the drum track. ```cpp -#include "MidiFile.h" -#include "Options.h" +#include "midifile/MidiFile.h" +#include "midifile/Options.h" #include #include #include @@ -938,7 +938,7 @@ to avoid MIDI channel 10, which is reserved for percussion timbres in General MIDI. ```cpp -#include "MidiFile.h" +#include "midifile/MidiFile.h" #include using namespace std; using namespace smf; @@ -1306,7 +1306,7 @@ tracks of the first MIDI file are copied to the 1st track of the output MIDI files. ```cpp -#include "MidiFile.h" +#include "midifile/MidiFile.h" #include #include using namespace std; @@ -1465,8 +1465,8 @@ The `MidiFile::getAbsoluteTickTime()` function calculates the conversion between physical time in seconds and tick time in the MIDI file. ```cpp -#include "MidiFile.h" -#include "Options.h" +#include "midifile/MidiFile.h" +#include "midifile/Options.h" #include #include #include @@ -1541,7 +1541,7 @@ options are: ```cpp -#include "MidiFile.h" +#include "midifile/MidiFile.h" #include "Options.h" #include #include diff --git a/include/Binasc.h b/include/midifile/Binasc.h similarity index 100% rename from include/Binasc.h rename to include/midifile/Binasc.h diff --git a/include/MidiEvent.h b/include/midifile/MidiEvent.h similarity index 98% rename from include/MidiEvent.h rename to include/midifile/MidiEvent.h index 39f141ee..6eb04f8c 100644 --- a/include/MidiEvent.h +++ b/include/midifile/MidiEvent.h @@ -14,7 +14,7 @@ #ifndef _MIDIEVENT_H_INCLUDED #define _MIDIEVENT_H_INCLUDED -#include "MidiMessage.h" +#include "midifile/MidiMessage.h" #include namespace smf { diff --git a/include/MidiEventList.h b/include/midifile/MidiEventList.h similarity index 98% rename from include/MidiEventList.h rename to include/midifile/MidiEventList.h index e3bfb13c..834a9ca2 100644 --- a/include/MidiEventList.h +++ b/include/midifile/MidiEventList.h @@ -13,7 +13,7 @@ #ifndef _MIDIEVENTLIST_H_INCLUDED #define _MIDIEVENTLIST_H_INCLUDED -#include "MidiEvent.h" +#include "midifile/MidiEvent.h" #include namespace smf { diff --git a/include/MidiFile.h b/include/midifile/MidiFile.h similarity index 99% rename from include/MidiFile.h rename to include/midifile/MidiFile.h index 94bb7a38..0aab07de 100644 --- a/include/MidiFile.h +++ b/include/midifile/MidiFile.h @@ -14,7 +14,7 @@ #ifndef _MIDIFILE_H_INCLUDED #define _MIDIFILE_H_INCLUDED -#include "MidiEventList.h" +#include "midifile/MidiEventList.h" #include #include diff --git a/include/MidiMessage.h b/include/midifile/MidiMessage.h similarity index 100% rename from include/MidiMessage.h rename to include/midifile/MidiMessage.h diff --git a/include/Options.h b/include/midifile/Options.h similarity index 100% rename from include/Options.h rename to include/midifile/Options.h diff --git a/src/Binasc.cpp b/src/Binasc.cpp index 02c6a4a1..d29c7d7b 100644 --- a/src/Binasc.cpp +++ b/src/Binasc.cpp @@ -9,7 +9,7 @@ // description: Interface to convert bytes between binary and ASCII forms. // -#include "Binasc.h" +#include "midifile/Binasc.h" #include #include diff --git a/src/MidiEvent.cpp b/src/MidiEvent.cpp index 945e3c53..dfeef65d 100644 --- a/src/MidiEvent.cpp +++ b/src/MidiEvent.cpp @@ -11,7 +11,7 @@ // for the MidiFile class. // -#include "MidiEvent.h" +#include "midifile/MidiEvent.h" #include diff --git a/src/MidiEventList.cpp b/src/MidiEventList.cpp index 03bbdb46..86475a5b 100644 --- a/src/MidiEventList.cpp +++ b/src/MidiEventList.cpp @@ -11,7 +11,7 @@ // -#include "MidiEventList.h" +#include "midifile/MidiEventList.h" #include #include diff --git a/src/MidiFile.cpp b/src/MidiFile.cpp index 7228dbfb..c40ee8b7 100644 --- a/src/MidiFile.cpp +++ b/src/MidiFile.cpp @@ -12,8 +12,8 @@ // class is used for example in the MidiPerform class. // -#include "MidiFile.h" -#include "Binasc.h" +#include "midifile/MidiFile.h" +#include "midifile/Binasc.h" #include #include diff --git a/src/MidiMessage.cpp b/src/MidiMessage.cpp index 00f119c9..3270ae8d 100644 --- a/src/MidiMessage.cpp +++ b/src/MidiMessage.cpp @@ -11,7 +11,7 @@ // MIDI Files. // -#include "MidiMessage.h" +#include "midifile/MidiMessage.h" #include #include diff --git a/src/Options.cpp b/src/Options.cpp index 53655688..c21edcaf 100644 --- a/src/Options.cpp +++ b/src/Options.cpp @@ -10,7 +10,7 @@ // Description: Interface to command-line options. // -#include "Options.h" +#include "midifile/Options.h" #include #include diff --git a/tools/80off.cpp b/tools/80off.cpp index a151e1cb..c58407bb 100644 --- a/tools/80off.cpp +++ b/tools/80off.cpp @@ -10,8 +10,8 @@ // "8? ?? 00". // -#include "Options.h" -#include "MidiFile.h" +#include "midifile/Options.h" +#include "midifile/MidiFile.h" #include using namespace std; diff --git a/tools/asciimidi.cpp b/tools/asciimidi.cpp index 1dd3d409..7adb7bd7 100644 --- a/tools/asciimidi.cpp +++ b/tools/asciimidi.cpp @@ -9,8 +9,8 @@ // reconversion into a binary Standard MIDI File. // -#include "MidiFile.h" -#include "Options.h" +#include "midifile/MidiFile.h" +#include "midifile/Options.h" #include using namespace std; diff --git a/tools/binasc.cpp b/tools/binasc.cpp index e38bcf98..e3a232a6 100644 --- a/tools/binasc.cpp +++ b/tools/binasc.cpp @@ -11,9 +11,9 @@ #include -#include "Binasc.h" -#include "Options.h" -#include "MidiFile.h" +#include "midifile/Binasc.h" +#include "midifile/Options.h" +#include "midifile/MidiFile.h" using namespace std; using namespace smf; diff --git a/tools/createmidifile.cpp b/tools/createmidifile.cpp index 24d16328..b9782628 100644 --- a/tools/createmidifile.cpp +++ b/tools/createmidifile.cpp @@ -8,7 +8,7 @@ // Description: Demonstration of how to create a Multi-track MIDI file. // -#include "MidiFile.h" +#include "midifile/MidiFile.h" #include using namespace std; diff --git a/tools/createmidifile2.cpp b/tools/createmidifile2.cpp index 83e982b9..9ccea07c 100644 --- a/tools/createmidifile2.cpp +++ b/tools/createmidifile2.cpp @@ -9,7 +9,7 @@ // with convenience functions. // -#include "MidiFile.h" +#include "midifile/MidiFile.h" #include using namespace std; diff --git a/tools/drumtab.cpp b/tools/drumtab.cpp index c831f671..acbb00cb 100644 --- a/tools/drumtab.cpp +++ b/tools/drumtab.cpp @@ -10,7 +10,7 @@ // drum part. // -#include "MidiFile.h" +#include "midifile/MidiFile.h" #include using namespace std; diff --git a/tools/durations.cpp b/tools/durations.cpp index 26a20262..6d47b1af 100644 --- a/tools/durations.cpp +++ b/tools/durations.cpp @@ -11,8 +11,8 @@ // events) will have a duration of 0. // -#include "Options.h" -#include "MidiFile.h" +#include "midifile/Options.h" +#include "midifile/MidiFile.h" #include using namespace std; diff --git a/tools/extractlyrics.cpp b/tools/extractlyrics.cpp index c7a4e99e..be6ecf90 100644 --- a/tools/extractlyrics.cpp +++ b/tools/extractlyrics.cpp @@ -10,8 +10,8 @@ // that the lyric occurs at. // -#include "MidiFile.h" -#include "Options.h" +#include "midifile/MidiFile.h" +#include "midifile/Options.h" #include using namespace std; diff --git a/tools/henonfile.cpp b/tools/henonfile.cpp index d7c4e555..34916d33 100644 --- a/tools/henonfile.cpp +++ b/tools/henonfile.cpp @@ -12,10 +12,10 @@ // plain text. // -#include "MidiFile.h" -#include "Convert.h" -#include "Options.h" -#include "CircularBuffer.h" +#include "midifile/MidiFile.h" +#include "midifile/Convert.h" +#include "midifile/Options.h" +#include "midifile/CircularBuffer.h" #include #include diff --git a/tools/maxtick.cpp b/tools/maxtick.cpp index 84832864..dfd88e99 100644 --- a/tools/maxtick.cpp +++ b/tools/maxtick.cpp @@ -9,8 +9,8 @@ // Description: Calculate the maximum timestamp in a MIDI file. // -#include "MidiFile.h" -#include "Options.h" +#include "midifile/MidiFile.h" +#include "midifile/Options.h" #include diff --git a/tools/mid2hex.cpp b/tools/mid2hex.cpp index 58a9d6bc..ecf53ba7 100644 --- a/tools/mid2hex.cpp +++ b/tools/mid2hex.cpp @@ -9,8 +9,8 @@ // or hex-byte MIDI file) into a hex byte-code MIDI file. // -#include "MidiFile.h" -#include "Options.h" +#include "midifile/MidiFile.h" +#include "midifile/Options.h" #include using namespace std; diff --git a/tools/mid2hum.cpp b/tools/mid2hum.cpp index 2433ef06..951eb3aa 100644 --- a/tools/mid2hum.cpp +++ b/tools/mid2hum.cpp @@ -41,10 +41,10 @@ // Reference: http://crystal.apana.org.au/ghansper/midi_introduction/midi_file_format.html // -#include "MidiFile.h" -#include "Options.h" -#include "Convert.h" -#include "HumdrumFile.h" +#include "midifile/MidiFile.h" +#include "midifile/Options.h" +#include "midifile/Convert.h" +#include "midifile/HumdrumFile.h" #include #include #include diff --git a/tools/mid2mat.cpp b/tools/mid2mat.cpp index 0ff16afe..1bff6eb8 100644 --- a/tools/mid2mat.cpp +++ b/tools/mid2mat.cpp @@ -18,8 +18,8 @@ // tpq = ticks per quarter note // -#include "MidiFile.h" -#include "Options.h" +#include "midifile/MidiFile.h" +#include "midifile/Options.h" #include #include diff --git a/tools/mid2mtb.cpp b/tools/mid2mtb.cpp index 67aaf42d..5ffa85c0 100644 --- a/tools/mid2mtb.cpp +++ b/tools/mid2mtb.cpp @@ -10,8 +10,8 @@ // text file. // -#include "MidiFile.h" -#include "Options.h" +#include "midifile/MidiFile.h" +#include "midifile/Options.h" #include #include diff --git a/tools/mid2svg.cpp b/tools/mid2svg.cpp index 364589dc..9b564c9b 100644 --- a/tools/mid2svg.cpp +++ b/tools/mid2svg.cpp @@ -9,8 +9,8 @@ // Description: Convert a MIDI file into an SVG piano roll. // -#include "MidiFile.h" -#include "Options.h" +#include "midifile/MidiFile.h" +#include "midifile/Options.h" #include #include #include diff --git a/tools/midi2beep.cpp b/tools/midi2beep.cpp index ddb52447..a0140499 100644 --- a/tools/midi2beep.cpp +++ b/tools/midi2beep.cpp @@ -10,8 +10,8 @@ // on a single channel playing a single note at a time) // -#include "MidiFile.h" -#include "Options.h" +#include "midifile/MidiFile.h" +#include "midifile/Options.h" #include #include diff --git a/tools/midi2binasc.cpp b/tools/midi2binasc.cpp index 45ef6547..89c5e172 100644 --- a/tools/midi2binasc.cpp +++ b/tools/midi2binasc.cpp @@ -12,8 +12,8 @@ // http://binasc.googlecode.com // -#include "MidiFile.h" -#include "Options.h" +#include "midifile/MidiFile.h" +#include "midifile/Options.h" #include #include diff --git a/tools/midi2melody.cpp b/tools/midi2melody.cpp index e7243308..e688d2e8 100644 --- a/tools/midi2melody.cpp +++ b/tools/midi2melody.cpp @@ -10,8 +10,8 @@ // format with starting time and pitch. // -#include "MidiFile.h" -#include "Options.h" +#include "midifile/MidiFile.h" +#include "midifile/Options.h" #include #include diff --git a/tools/midi2notes.cpp b/tools/midi2notes.cpp index 15a75b9d..5175d277 100644 --- a/tools/midi2notes.cpp +++ b/tools/midi2notes.cpp @@ -10,8 +10,8 @@ // Description: Description: Converts a MIDI file into a text based notelist. // -#include "MidiFile.h" -#include "Options.h" +#include "midifile/MidiFile.h" +#include "midifile/Options.h" #include #include diff --git a/tools/midi2skini.cpp b/tools/midi2skini.cpp index a6c8f040..99fe7bd5 100644 --- a/tools/midi2skini.cpp +++ b/tools/midi2skini.cpp @@ -11,8 +11,8 @@ // SKINI data format. // -#include "MidiFile.h" -#include "Options.h" +#include "midifile/MidiFile.h" +#include "midifile/Options.h" #include #include diff --git a/tools/midi2text.cpp b/tools/midi2text.cpp index d8947793..ae094c71 100644 --- a/tools/midi2text.cpp +++ b/tools/midi2text.cpp @@ -10,8 +10,8 @@ // Description: Description: Converts a MIDI file into a text based notelist. // -#include "MidiFile.h" -#include "Options.h" +#include "midifile/MidiFile.h" +#include "midifile/Options.h" #include #include diff --git a/tools/midicat.cpp b/tools/midicat.cpp index 49874656..cef15ee6 100644 --- a/tools/midicat.cpp +++ b/tools/midicat.cpp @@ -9,8 +9,8 @@ // Description: Concatenate multiple MIDI files into single type-0 MIDI file. // -#include "MidiFile.h" -#include "Options.h" +#include "midifile/MidiFile.h" +#include "midifile/Options.h" #include #include diff --git a/tools/midiexcerpt.cpp b/tools/midiexcerpt.cpp index 4d6e9011..f66ccc0b 100644 --- a/tools/midiexcerpt.cpp +++ b/tools/midiexcerpt.cpp @@ -11,9 +11,9 @@ // will be turned off at the given end time. // -#include "Options.h" -#include "MidiFile.h" -#include "PerlRegularExpression.h" +#include "midifile/Options.h" +#include "midifile/MidiFile.h" +#include "midifile/PerlRegularExpression.h" #include using namespace std; diff --git a/tools/midimixup.cpp b/tools/midimixup.cpp index 584cc8dd..23bf29b8 100644 --- a/tools/midimixup.cpp +++ b/tools/midimixup.cpp @@ -9,8 +9,8 @@ // into a random order. // -#include "MidiFile.h" -#include "Options.h" +#include "midifile/MidiFile.h" +#include "midifile/Options.h" #include #include #include diff --git a/tools/miditime.cpp b/tools/miditime.cpp index c76b03ca..d2da2d89 100644 --- a/tools/miditime.cpp +++ b/tools/miditime.cpp @@ -9,8 +9,8 @@ // in seconds for MIDI events in a MIDI file, along with // the track information. -#include "Options.h" -#include "MidiFile.h" +#include "midifile/Options.h" +#include "midifile/MidiFile.h" #include #include diff --git a/tools/peep2midi.cpp b/tools/peep2midi.cpp index b0f3cb7a..42c80ddc 100644 --- a/tools/peep2midi.cpp +++ b/tools/peep2midi.cpp @@ -9,9 +9,9 @@ // output data into MIDI data. // -#include "MidiFile.h" +#include "midifile/MidiFile.h" #include "humdrum.h" -#include "Options.h" +#include "midifile/Options.h" #include #include diff --git a/tools/perfid.cpp b/tools/perfid.cpp index 24a4d558..0e7faa2f 100644 --- a/tools/perfid.cpp +++ b/tools/perfid.cpp @@ -10,8 +10,8 @@ // it is step edit. // -#include "MidiFile.h" -#include "Options.h" +#include "midifile/MidiFile.h" +#include "midifile/Options.h" #include #include #include diff --git a/tools/readstatus.cpp b/tools/readstatus.cpp index ea2df4f9..20d7248e 100644 --- a/tools/readstatus.cpp +++ b/tools/readstatus.cpp @@ -8,8 +8,8 @@ // Description: Demonstration of checking the read status. // -#include "MidiFile.h" -#include "Options.h" +#include "midifile/MidiFile.h" +#include "midifile/Options.h" #include using namespace std; diff --git a/tools/redexpress.cpp b/tools/redexpress.cpp index 710f63b5..897f4370 100644 --- a/tools/redexpress.cpp +++ b/tools/redexpress.cpp @@ -47,8 +47,8 @@ // /////////////////////////////////////////////////////////// -#include "MidiFile.h" -#include "Options.h" +#include "midifile/MidiFile.h" +#include "midifile/Options.h" #include #include diff --git a/tools/removenote.cpp b/tools/removenote.cpp index 8d0c7e61..1d151081 100644 --- a/tools/removenote.cpp +++ b/tools/removenote.cpp @@ -8,7 +8,7 @@ // Description: Demonstration of how to remove a MIDI message. // -#include "MidiFile.h" +#include "midifile/MidiFile.h" #include using namespace std; diff --git a/tools/retick.cpp b/tools/retick.cpp index 60ea2bd7..43c181ab 100644 --- a/tools/retick.cpp +++ b/tools/retick.cpp @@ -11,8 +11,8 @@ // time values the same as before. // -#include "MidiFile.h" -#include "Options.h" +#include "midifile/MidiFile.h" +#include "midifile/Options.h" #include using namespace std; diff --git a/tools/shutak.cpp b/tools/shutak.cpp index 2ece0a23..b5276f27 100644 --- a/tools/shutak.cpp +++ b/tools/shutak.cpp @@ -24,8 +24,8 @@ // (66, 75, 63) // -#include "Options.h" -#include "MidiFile.h" +#include "midifile/Options.h" +#include "midifile/MidiFile.h" #include #include #include diff --git a/tools/smfdur.cpp b/tools/smfdur.cpp index d35e36bc..cb849662 100644 --- a/tools/smfdur.cpp +++ b/tools/smfdur.cpp @@ -9,8 +9,8 @@ // Description: Calcualte the total duration of a MIDI file. // -#include "MidiFile.h" -#include "Options.h" +#include "midifile/MidiFile.h" +#include "midifile/Options.h" #include using namespace std; diff --git a/tools/stretch.cpp b/tools/stretch.cpp index 03850114..6f99b41f 100644 --- a/tools/stretch.cpp +++ b/tools/stretch.cpp @@ -17,8 +17,8 @@ // bars, and also sometimes does not preserve // the tempo of the original. // -#include "MidiFile.h" -#include "Options.h" +#include "midifile/MidiFile.h" +#include "midifile/Options.h" #include #include #include diff --git a/tools/sysextest.cpp b/tools/sysextest.cpp index 6e1e6960..881fb5fd 100644 --- a/tools/sysextest.cpp +++ b/tools/sysextest.cpp @@ -26,7 +26,7 @@ // after the first byte in the sysex message. // -#include "MidiFile.h" +#include "midifile/MidiFile.h" #include using namespace std; diff --git a/tools/text2midi.cpp b/tools/text2midi.cpp index 19c3b262..28189ca7 100644 --- a/tools/text2midi.cpp +++ b/tools/text2midi.cpp @@ -11,8 +11,8 @@ // MIDI file. // -#include "MidiFile.h" -#include "Options.h" +#include "midifile/MidiFile.h" +#include "midifile/Options.h" #include #include #include diff --git a/tools/textmidi.cpp b/tools/textmidi.cpp index 6375de42..7838275a 100644 --- a/tools/textmidi.cpp +++ b/tools/textmidi.cpp @@ -9,8 +9,8 @@ // Description: Reads a MIDI file and converts data to/from ASCII text. // -#include "Options.h" -#include "MidiFile.h" +#include "midifile/Options.h" +#include "midifile/MidiFile.h" #include using namespace std; diff --git a/tools/toascii.cpp b/tools/toascii.cpp index 24ebb92d..fe8b6bb3 100644 --- a/tools/toascii.cpp +++ b/tools/toascii.cpp @@ -11,8 +11,8 @@ // back into the binary format without information loss). // -#include "Options.h" -#include "MidiFile.h" +#include "midifile/Options.h" +#include "midifile/MidiFile.h" #include using namespace std; diff --git a/tools/tobinary.cpp b/tools/tobinary.cpp index 9dabd33c..063df240 100644 --- a/tools/tobinary.cpp +++ b/tools/tobinary.cpp @@ -12,8 +12,8 @@ // information loss). // -#include "Options.h" -#include "MidiFile.h" +#include "midifile/Options.h" +#include "midifile/MidiFile.h" #include using namespace std; diff --git a/tools/type0.cpp b/tools/type0.cpp index d95c545b..9e11f8c7 100644 --- a/tools/type0.cpp +++ b/tools/type0.cpp @@ -10,8 +10,8 @@ // a type=0 (single track) Standard MIDI file. // -#include "Options.h" -#include "MidiFile.h" +#include "midifile/Options.h" +#include "midifile/MidiFile.h" #include using namespace std; diff --git a/tools/vlv.cpp b/tools/vlv.cpp index dffbb8e4..54271f87 100644 --- a/tools/vlv.cpp +++ b/tools/vlv.cpp @@ -10,7 +10,7 @@ // well as converts integers into VLVs. // -#include "Options.h" +#include "midifile/Options.h" #include #include #include diff --git a/visual-studio/binasc.vcxproj b/visual-studio/binasc.vcxproj index 3bd5b7ca..e8b99d3b 100644 --- a/visual-studio/binasc.vcxproj +++ b/visual-studio/binasc.vcxproj @@ -41,13 +41,13 @@ true - $(VC_IncludePath);$(WindowsSDK_IncludePath);../include + $(VC_IncludePath);$(WindowsSDK_IncludePath);../include/midifile $(Configuration)Exe\ $(SolutionDir)$(Configuration)Exe\ false - $(VC_IncludePath);$(WindowsSDK_IncludePath);../include + $(VC_IncludePath);$(WindowsSDK_IncludePath);../include/midifile $(Configuration)Exe\ $(SolutionDir)$(Configuration)Exe\ diff --git a/visual-studio/createmidifile.vcxproj b/visual-studio/createmidifile.vcxproj index 5d36e156..638ed138 100644 --- a/visual-studio/createmidifile.vcxproj +++ b/visual-studio/createmidifile.vcxproj @@ -41,13 +41,13 @@ true - $(VC_IncludePath);$(WindowsSDK_IncludePath);../include + $(VC_IncludePath);$(WindowsSDK_IncludePath);../include/midifile $(Configuration)Exe\ $(SolutionDir)$(Configuration)Exe\ false - $(VC_IncludePath);$(WindowsSDK_IncludePath);../include + $(VC_IncludePath);$(WindowsSDK_IncludePath);../include/midifile $(Configuration)Exe\ $(SolutionDir)$(Configuration)Exe\ diff --git a/visual-studio/midifile.vcxproj b/visual-studio/midifile.vcxproj index 982c83f4..c6a3fa6b 100644 --- a/visual-studio/midifile.vcxproj +++ b/visual-studio/midifile.vcxproj @@ -33,13 +33,13 @@ true - $(VC_IncludePath);$(WindowsSDK_IncludePath);../include + $(VC_IncludePath);$(WindowsSDK_IncludePath);../include/midifile $(Configuration)Lib\ $(SolutionDir)$(Configuration)Lib\ false - $(VC_IncludePath);$(WindowsSDK_IncludePath);../include + $(VC_IncludePath);$(WindowsSDK_IncludePath);../include/midifile $(Configuration)Lib\ $(SolutionDir)$(Configuration)Lib\ @@ -76,11 +76,11 @@ - - - - - + + + + + diff --git a/visual-studio/stretch.vcxproj b/visual-studio/stretch.vcxproj index 161b5d20..30541e88 100644 --- a/visual-studio/stretch.vcxproj +++ b/visual-studio/stretch.vcxproj @@ -41,13 +41,13 @@ true - $(VC_IncludePath);$(WindowsSDK_IncludePath);../include + $(VC_IncludePath);$(WindowsSDK_IncludePath);../include/midifile $(Configuration)Exe\ $(SolutionDir)$(Configuration)Exe\ false - $(VC_IncludePath);$(WindowsSDK_IncludePath);../include + $(VC_IncludePath);$(WindowsSDK_IncludePath);../include/midifile $(Configuration)Exe\ $(SolutionDir)$(Configuration)Exe\