Merge pull request #130 from jpcima/track-options

rename enum members for consistency

3 files changed, 8 insertions, 8 deletions

diff --git a/include/adlmidi.h b/include/adlmidi.h
index dc6fd8c..f19bca0 100644
--- a/include/adlmidi.h
+++ b/include/adlmidi.h
@@ -649,11 +649,11 @@ extern size_t adl_trackCount(struct ADL_MIDIPlayer *device);
 enum ADLMIDI_TrackOptions
 {
     /*! Enabled track */
-    ADL_TrackOption_On   = 1,
+    ADLMIDI_TrackOption_On   = 1,
     /*! Disabled track */
-    ADL_TrackOption_Off  = 2,
+    ADLMIDI_TrackOption_Off  = 2,
     /*! Solo track */
-    ADL_TrackOption_Solo = 3,
+    ADLMIDI_TrackOption_Solo = 3,
 };
 
 /**
diff --git a/src/adlmidi.cpp b/src/adlmidi.cpp
index 93d1bf1..37e0c21 100644
--- a/src/adlmidi.cpp
+++ b/src/adlmidi.cpp
@@ -1389,12 +1389,12 @@ ADLMIDI_EXPORT int adl_setTrackOptions(struct ADL_MIDIPlayer *device, size_t tra
     {
     default:
         break;
-    case ADL_TrackOption_On:
-    case ADL_TrackOption_Off:
-        if(!seq.setTrackEnabled(trackNumber, enableFlag == ADL_TrackOption_On))
+    case ADLMIDI_TrackOption_On:
+    case ADLMIDI_TrackOption_Off:
+        if(!seq.setTrackEnabled(trackNumber, enableFlag == ADLMIDI_TrackOption_On))
             return -1;
         break;
-    case ADL_TrackOption_Solo:
+    case ADLMIDI_TrackOption_Solo:
         seq.setSoloTrack(trackNumber);
         break;
     }
diff --git a/utils/midiplay/adlmidiplay.cpp b/utils/midiplay/adlmidiplay.cpp
index 8cdfef5..8f499df 100644
--- a/utils/midiplay/adlmidiplay.cpp
+++ b/utils/midiplay/adlmidiplay.cpp
@@ -605,7 +605,7 @@ int main(int argc, char **argv)
     if(soloTrack != ~(size_t)0)
     {
         std::fprintf(stdout, " - Solo track: %lu\n", (unsigned long)soloTrack);
-        adl_setTrackOptions(myDevice, soloTrack, ADL_TrackOption_Solo);
+        adl_setTrackOptions(myDevice, soloTrack, ADLMIDI_TrackOption_Solo);
     }
 
     std::fprintf(stdout, " - File [%s] opened!\n", musPath.c_str());